automatic 13.12.0 → 14.1.0

data/plugins/subscription/pocket.rb

@@ -2,8 +2,8 @@
 # Name::      Automatic::Plugin::Subscription::Pocket
 # Author::    soramugi <http://soramugi.net>
 # Created::   May 21, 2013
-# Updated::   May 21, 2013
-# Copyright:: Copyright (c) 2012-2013 Automatic Ruby Developers.
+# Updated::   Jan 15, 2014
+# Copyright:: Copyright (c) 2012-2014 Automatic Ruby Developers.
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
 module Automatic::Plugin
@@ -22,14 +22,15 @@ module Automatic::Plugin
 
     def run
       retries = 0
+      retry_max = @config['retry'].to_i || 0
       begin
         dummyfeeds = cleate_dummy_feed(@client.retrieve(@config['optional']))
         @pipeline << Automatic::FeedParser.create(dummyfeeds)
       rescue
         retries += 1
         Automatic::Log.puts("error", "ErrorCount: #{retries}, Fault in parsing: #{retries}")
-        sleep @config['interval'].to_i unless @config['interval'].nil?
-        retry if retries <= @config['retry'].to_i unless @config['retry'].nil?
+        sleep ||= @config['interval'].to_i
+        retry if retries <= retry_max
       end
       @pipeline
     end

data/plugins/subscription/tumblr.rb

@@ -2,8 +2,8 @@
 # Name::      Automatic::Plugin::Subscription::Tumblr
 # Author::    774 <http://id774.net>
 # Created::   Oct 16, 2012
-# Updated::   Apr  5, 2013
-# Copyright:: Copyright (c) 2012-2013 Automatic Ruby Developers.
+# Updated::   Jan 15, 2014
+# Copyright:: Copyright (c) 2012-2014 Automatic Ruby Developers.
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
 module Automatic::Plugin
@@ -19,6 +19,7 @@ module Automatic::Plugin
       @return_feeds = []
       @config['urls'].each {|url|
         retries = 0
+        retry_max = @config['retry'].to_i || 0
         begin
           create_rss(url)
           unless @config['pages'].nil?
@@ -32,8 +33,8 @@ module Automatic::Plugin
         rescue
           retries += 1
           Automatic::Log.puts("error", "ErrorCount: #{retries}, Fault in parsing: #{url}")
-          sleep @config['interval'].to_i unless @config['interval'].nil?
-          retry if retries <= @config['retry'].to_i unless @config['retry'].nil?
+          sleep ||= @config['interval'].to_i
+          retry if retries <= retry_max
         end
       }
       @return_feeds
@@ -51,7 +52,7 @@ module Automatic::Plugin
              item.link = nil
            end
         }
-        sleep @config['interval'].to_i unless @config['interval'].nil?
+        sleep ||= @config['interval'].to_i
         @return_feeds << rss
       end
     end

data/plugins/subscription/twitter.rb

@@ -2,8 +2,8 @@
 # Name::      Automatic::Plugin::Subscription::Twitter
 # Author::    774 <http://id774.net>
 # Created::   Sep  9, 2012
-# Updated::   Apr  5, 2013
-# Copyright:: Copyright (c) 2012-2013 Automatic Ruby Developers.
+# Updated::   Jan 15, 2014
+# Copyright:: Copyright (c) 2012-2014 Automatic Ruby Developers.
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
 module Automatic::Plugin
@@ -21,19 +21,21 @@ module Automatic::Plugin
       @return_feeds = []
       @config['urls'].each {|url|
         retries = 0
+        retry_max = @config['retry'].to_i || 0
         begin
           create_rss(url)
         rescue
           retries += 1
           Automatic::Log.puts("error", "ErrorCount: #{retries}, Fault in parsing: #{url}")
-          sleep @config['interval'].to_i unless @config['interval'].nil?
-          retry if retries <= @config['retry'].to_i unless @config['retry'].nil?
+          sleep ||= @config['interval'].to_i
+          retry if retries <= retry_max
         end
       }
       @return_feeds
     end
 
     private
+
     def create_rss(url)
       Automatic::Log.puts("info", "Parsing: #{url}")
       html = open(url).read
@@ -59,7 +61,7 @@ module Automatic::Plugin
             item.description = content.search('[@class="js-tweet-text"]').text.to_s
           }
         }
-        sleep @config['interval'].to_i unless @config['interval'].nil?
+        sleep ||= @config['interval'].to_i
         @return_feeds << rss
       end
     end

data/plugins/subscription/twitter_search.rb

@@ -2,8 +2,8 @@
 # Name::      Automatic::Plugin::Subscription::TwitterSearch
 # Author::    soramugi <http://soramugi.net>
 # Created::   May 30, 2013
-# Updated::   May 30, 2013
-# Copyright:: Copyright (c) 2012-2013 Automatic Ruby Developers.
+# Updated::   Jan 15, 2014
+# Copyright:: Copyright (c) 2012-2014 Automatic Ruby Developers.
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
 module Automatic::Plugin
@@ -24,6 +24,7 @@ module Automatic::Plugin
     def run
       @pipeline = []
       retries = 0
+      retry_max = @config['retry'].to_i || 0
       begin
         feeds = []
         @client.search(@config['search'],@config['opt']).results.each do |status|
@@ -41,8 +42,8 @@ module Automatic::Plugin
       rescue
         retries += 1
         Automatic::Log.puts("error", "ErrorCount: #{retries}")
-        sleep @config['interval'].to_i unless @config['interval'].nil?
-        retry if retries <= @config['retry'].to_i unless @config['retry'].nil?
+        sleep ||= @config['interval'].to_i
+        retry if retries <= retry_max
       end
       @pipeline
     end

data/plugins/subscription/xml.rb

@@ -2,8 +2,8 @@
 # Name::      Automatic::Plugin::Subscription::Xml
 # Author::    774 <http://id774.net>
 # Created::   Jul 12, 2013
-# Updated::   Jul 12, 2013
-# Copyright:: Copyright (c) 2012-2013 Automatic Ruby Developers.
+# Updated::   Jan 15, 2014
+# Copyright:: Copyright (c) 2012-2014 Automatic Ruby Developers.
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
 module Automatic::Plugin
@@ -22,13 +22,14 @@ module Automatic::Plugin
       @return_feeds = []
       @config['urls'].each {|url|
         retries = 0
+        retry_max = @config['retry'].to_i || 0
         begin
           create_rss(URI.encode(url))
         rescue
           retries += 1
           Automatic::Log.puts("error", "ErrorCount: #{retries}, Fault in parsing: #{url}")
-          sleep @config['interval'].to_i unless @config['interval'].nil?
-          retry if retries <= @config['retry'].to_i unless @config['retry'].nil?
+          sleep ||= @config['interval'].to_i
+          retry if retries <= retry_max
         end
       }
       @return_feeds
@@ -42,7 +43,7 @@ module Automatic::Plugin
       data = ActiveSupport::JSON.decode(json)
       unless data.nil?
         rss = Automatic::FeedParser.content_provide(url, data)
-        sleep @config['interval'].to_i unless @config['interval'].nil?
+        sleep ||= @config['interval'].to_i
         @return_feeds << rss
       end
     end

data/spec/lib/automatic/recipe_spec.rb

@@ -20,14 +20,19 @@ describe Automatic::Recipe do
       Automatic.user_dir = nil
     end
 
-    describe "with a normal recipe" do
-      it "correctly load recipe" do
+    context "with a normal recipe" do
+      subject {
         recipe = Automatic::Recipe.new(TEST_RECIPE)
-        expect =[{"module"=>"SubscriptionFeed",
-          "config"=>{"feeds"=>["http://blog.id774.net/post/feed/"]}},
-          {"module"=>"FilterIgnore", "config"=>{"link"=>["hoge"]}},
-          {"module"=>"StorePermalink", "config"=>{"db"=>"test_permalink.db"}}]
-        recipe.each_plugin{recipe}.should == expect
+        recipe.each_plugin{recipe}
+      }
+      let(:expected) { [{"module"=>"SubscriptionFeed",
+        "config"=>{"feeds"=>["http://blog.id774.net/post/feed/"]}},
+        {"module"=>"FilterIgnore", "config"=>{"link"=>["hoge"]}},
+        {"module"=>"StorePermalink", "config"=>{"db"=>"test_permalink.db"}}]
+      }
+
+      it "correctly load recipe" do
+        expect(subject).to eq expected
       end
     end
 

data/spec/lib/automatic_spec.rb

@@ -3,7 +3,7 @@
 # Author::    kzgs
 #             774 <http://id774.net>
 # Created::   Mar  9, 2012
-# Updated::   Dec 17, 2013
+# Updated::   Jan 24, 2014
 # Copyright:: Copyright (c) 2012-2013 Automatic Ruby Developers.
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
@@ -27,7 +27,7 @@ describe Automatic do
   describe "#version" do
     subject { Automatic.const_get(:VERSION) }
 
-    it { expect(subject).to eq "13.12.0" }
+    it { expect(subject).to eq "14.1.0" }
   end
 
   describe "#(root)_dir" do

data/test/integration/test_add_pocket.yml

@@ -19,6 +19,8 @@ plugins:
     config:
       consumer_key: consumer_key
       access_token: access_token
+      interval:     2
+      retry:        2
 
   #- module: PublishConsole
 

data/test/integration/test_chan_toru.yml

@@ -8,8 +8,10 @@ global:
 plugins:
   - module: SubscriptionChanToru
     config:
-      keyword: 'アニメ'
-      station: '地上波'
+      keyword:  'アニメ'
+      station:  '地上波'
+      interval: 2
+      retry:    2
 
   - module: StorePermalink
     config:

data/test/integration/test_image2local.yml

@@ -23,7 +23,7 @@ plugins:
     config:
       path: /tmp
       retry: 2
-      interval: 4
+      interval: 2
 
   #- module: PublishConsole
 

data/test/integration/test_instapaper.yml

@@ -19,7 +19,8 @@ plugins:
     config:
       email:    your_email
       password: your_pass
-      interval: 5
+      interval: 2
+      retry:    2
 
   #- module: PublishConsole
 

data/test/integration/test_link2local.yml

@@ -21,8 +21,8 @@ plugins:
     config:
       urls:
         - http://reblog.id774.net
-      interval: 5
-      retry: 5
+      interval: 2
+      retry: 2
 
   - module: FilterImage
 

data/test/integration/test_pocket.yml

@@ -11,7 +11,7 @@ plugins:
       consumer_key: 'consumer_key'
       access_token: 'access_token'
       optional:
-        favorite: 1
+        favorite: 3
         count: 2
 
   - module: StorePermalink
@@ -20,4 +20,3 @@ plugins:
 
   #- module: PublishConsole
 
- 

data/test/integration/test_sort.yml

@@ -21,8 +21,8 @@ plugins:
     config:
       feeds:
         - http://blog.id774.net/post/feed/
-      interval: 5
-      retry: 5
+      interval: 2
+      retry: 2
 
   - module: FilterSort
     config:

data/test/integration/test_tumblr2local.yml

@@ -24,8 +24,8 @@ plugins:
       urls:
         - http://reblog.id774.net
       pages: 1
-      interval: 5
-      retry: 5
+      interval: 2
+      retry: 2
 
   - module: FilterImage