Merge pull request #49 from soramugi/chantoru-keywords

id774 · id774 · commit c3994948c293 · 2013-07-16T01:32:50.000-07:00
keyword ',' more serche
diff --git a/doc/PLUGINS b/doc/PLUGINS
@@ -188,7 +188,7 @@ SubscriptionGGuide
 [Syntax]
   - module: SubscriptionGGuide
     config:
-      keyword: 'anime' # search word
+      keyword: 'anime,shogi' # search word (',' dividing and coming out two or more search)
       station: '地上波' # (It means terrestrial broadcasting in Japanese.)
       interval: INTERVAL_FOR_SCRAPING (in seconds.)
       retry:    RETRY_COUNT
diff --git a/doc/PLUGINS.ja b/doc/PLUGINS.ja
@@ -190,7 +190,7 @@ SubscriptionGGuide
 [レシピ記法]
   - module: SubscriptionGGuide
     config:
-      keyword: 'アニメ' # 検索ワード
+      keyword: 'アニメ,将棋' # 検索ワード(','区切りで複数検索)
       station: '地上波' # 衛星放送の区域(現在は地上波のみ対応)
       interval: スクレイピングの間隔 (秒数, 省略可)
       retry: エラー時のリトライ回数 (回数, 省略時 0)
@@ -208,7 +208,7 @@ SubscriptionChanToru
 [レシピ記法]
   - module: SubscriptionChanToru
     config:
-      keyword: 'アニメ' # 検索ワード
+      keyword: 'アニメ,将棋' # 検索ワード(','区切りで複数検索)
       station: '地上波' # 衛星放送の区域(現在は地上波のみ対応)
       interval: スクレイピングの間隔 (秒数, 省略可)
       retry: エラー時のリトライ回数 (回数, 省略時 0)
diff --git a/plugins/subscription/g_guide.rb b/plugins/subscription/g_guide.rb
@@ -13,12 +13,19 @@ class SubscriptionGGuide
     def initialize(config, pipeline=[])
       @config   = config
       @pipeline = pipeline
+      unless @config['keyword'].nil? || @config['keyword'].index(',').nil?
+        @keywords = @config['keyword'].split(',')
+      else
+        @keywords = [@config['keyword']]
+      end
     end
 
     def run
       retries = 0
       begin
-        @pipeline << Automatic::FeedParser.get(feed_url)
+        @keywords.each {|keyword|
+          @pipeline << Automatic::FeedParser.get(feed_url keyword)
+        }
       rescue
         retries += 1
         Automatic::Log.puts("error", "ErrorCount: #{retries}, Fault in parsing: #{retries}")
@@ -28,10 +35,10 @@ def run
       @pipeline
     end
 
-    def feed_url
+    def feed_url keyword = nil
       feed = G_GUIDE_RSS
-      unless @config['keyword'].nil?
-        feed += "condition.keyword=#{@config['keyword']}&"
+      unless keyword.nil?
+        feed += "condition.keyword=#{keyword}&"
       end
       feed += station_param
       URI.encode(feed)
diff --git a/spec/plugins/subscription/g_guide_spec.rb b/spec/plugins/subscription/g_guide_spec.rb
@@ -28,12 +28,12 @@ def g_guide(config = {}, pipeline = [])
       config = { 'keyword' => 'anime' }
       subject { g_guide(config) }
 
-      its(:feed_url) {
-        should == URI.encode(
+      it 'feed_url' do
+        subject.feed_url(config['keyword']).should == URI.encode(
           Automatic::Plugin::SubscriptionGGuide::G_GUIDE_RSS +
             "condition.keyword=#{config['keyword']}&" +
             'stationPlatformId=0&')
-      }
+      end
     end
     describe 'station is 地上波' do
       config = { 'station' => '地上波' }
@@ -72,5 +72,11 @@ def g_guide(config = {}, pipeline = [])
       subject { g_guide(config) }
       its(:run) { should have(1).feed }
     end
+
+    describe 'config keyword ","' do
+      config = { 'keyword' => 'おじゃる丸,忍たま', 'station' => '地上波' }
+      subject { g_guide(config) }
+      its(:run) { should have(2).feed }
+    end
   end
 end
