#149 Using URI::Parser

id774 · id774 · commit f738ef62ab26 · 2014-10-29T13:32:47.000+09:00
diff --git a/plugins/filter/absolute_uri.rb b/plugins/filter/absolute_uri.rb
@@ -2,8 +2,8 @@
 # Name::      Automatic::Plugin::Filter::AbsoluteURI
 # Author::    774 <http://id774.net>
 # Created::   Jun 20, 2012
-# Updated::   Apr  5, 2013
-# Copyright:: Copyright (c) 2012-2013 Automatic Ruby Developers.
+# Updated::   Oct 29, 2014
+# Copyright:: Copyright (c) 2012-2014 Automatic Ruby Developers.
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
 module Automatic::Plugin
@@ -37,7 +37,7 @@ def rewrite(string)
         @config['url'] = @config['url'] + '/'
       end
       string = @config['url'] + string.sub(/^\./,'').sub(/^\//,'')
-      string = URI.encode(string)
+      string = URI::Parser.new.escape(string)
       return string
     end
   end
diff --git a/plugins/subscription/g_guide.rb b/plugins/subscription/g_guide.rb
@@ -3,7 +3,7 @@
 # Author::    soramugi <http://soramugi.net>
 #             774 <http://id774.net>
 # Created::   Jun 28, 2013
-# Updated::   Feb 21, 2014
+# Updated::   Oct 29, 2014
 # Copyright:: Copyright (c) 2012-2014 Automatic Ruby Developers.
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
@@ -43,7 +43,7 @@ def feed_url keyword = nil
         feed += "condition.keyword=#{keyword}&"
       end
       feed += station_param
-      URI.encode(feed)
+      URI::Parser.new.escape(feed)
     end
 
     def station_param
diff --git a/plugins/subscription/link.rb b/plugins/subscription/link.rb
@@ -2,7 +2,7 @@
 # Name::      Automatic::Plugin::Subscription::Link
 # Author::    774 <http://id774.net>
 # Created::   Sep 18, 2012
-# Updated::   Feb 21, 2014
+# Updated::   Oct 29, 2014
 # Copyright:: Copyright (c) 2012-2014 Automatic Ruby Developers.
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
@@ -22,7 +22,7 @@ def run
         retries = 0
         retry_max = @config['retry'].to_i || 0
         begin
-          create_rss(URI.encode(url))
+          create_rss(URI::Parser.new.escape(url))
         rescue
           retries += 1
           Automatic::Log.puts("error", "ErrorCount: #{retries}, Fault in parsing: #{url}")
diff --git a/plugins/subscription/xml.rb b/plugins/subscription/xml.rb
@@ -2,7 +2,7 @@
 # Name::      Automatic::Plugin::Subscription::Xml
 # Author::    774 <http://id774.net>
 # Created::   Jul 12, 2013
-# Updated::   May 16, 2014
+# Updated::   Oct 29, 2014
 # Copyright:: Copyright (c) 2012-2014 Automatic Ruby Developers.
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
@@ -25,7 +25,7 @@ def run
         retries = 0
         retry_max = @config['retry'].to_i || 0
         begin
-          create_rss(URI.encode(url))
+          create_rss(URI::Parser.new.escape(url))
         rescue
           retries += 1
           Automatic::Log.puts("error", "ErrorCount: #{retries}, Fault in parsing: #{url}")
diff --git a/spec/plugins/subscription/g_guide_spec.rb b/spec/plugins/subscription/g_guide_spec.rb
@@ -29,7 +29,7 @@ def g_guide(config = {}, pipeline = [])
       subject { g_guide(config) }
 
       it 'feed_url' do
-        subject.feed_url(config['keyword']).should == URI.encode(
+        subject.feed_url(config['keyword']).should == URI::Parser.new.escape(
           Automatic::Plugin::SubscriptionGGuide::G_GUIDE_RSS +
             "condition.keyword=#{config['keyword']}&" +
             'stationPlatformId=0&')
@@ -40,7 +40,7 @@ def g_guide(config = {}, pipeline = [])
       subject { g_guide(config) }
 
       its(:feed_url) {
-        should == URI.encode(
+        should == URI::Parser.new.escape(
           Automatic::Plugin::SubscriptionGGuide::G_GUIDE_RSS +
             'stationPlatformId=1&')
       }
