automatic 13.2.0 → 13.4.1

data/plugins/filter/ignore.rb

@@ -2,8 +2,8 @@
 # Name::      Automatic::Plugin::Filter::Ignore
 # Author::    774 <http://id774.net>
 # Created::   Feb 22, 2012
-# Updated::   Feb 13, 2013
-# Copyright:: 774 Copyright (c) 2012
+# Updated::   Apr  5, 2013
+# Copyright:: 774 Copyright (c) 2012-2013
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
 module Automatic::Plugin
@@ -13,6 +13,22 @@ module Automatic::Plugin
       @pipeline = pipeline
     end
 
+    def run
+      @return_feeds = []
+      @pipeline.each {|feeds|
+        new_feeds = []
+        unless feeds.nil?
+          feeds.items.each {|items|
+            new_feeds << items if exclude(items) == false
+          }
+        end
+        @return_feeds << Automatic::FeedParser.create(new_feeds) if new_feeds.length > 0
+      }
+      @return_feeds
+    end
+
+    private
+
     def exclude(items)
       detection = false
       unless @config['link'].nil?
@@ -33,19 +49,5 @@ module Automatic::Plugin
       end
       detection
     end
-
-    def run
-      @return_feeds = []
-      @pipeline.each {|feeds|
-        new_feeds = []
-        unless feeds.nil?
-          feeds.items.each {|items|
-            new_feeds << items if exclude(items) == false
-          }
-        end
-        @return_feeds << Automatic::FeedParser.create(new_feeds) if new_feeds.length > 0
-      }
-      @return_feeds
-    end
   end
 end

data/plugins/filter/image.rb

@@ -2,8 +2,8 @@
 # Name::      Automatic::Plugin::Filter::Image
 # Author::    774 <http://id774.net>
 # Created::   Sep 18, 2012
-# Updated::   Sep 18, 2012
-# Copyright:: 774 Copyright (c) 2012
+# Updated::   Apr  5, 2013
+# Copyright:: 774 Copyright (c) 2012-2013
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
 module Automatic::Plugin
@@ -20,27 +20,23 @@ module Automatic::Plugin
         return_feed_items = []
         unless feeds.nil?
           feeds.items.each {|feed|
-            unless feed.link.nil?
-              image_link = nil
-              feed.link.scan(/(.*?\.jp.*g$)/i) { |matched|
-                image_link = matched.join(" ")
-              }
-              feed.link.scan(/(.*?\.png$)/i) { |matched|
-                image_link = matched.join(" ")
-              }
-              feed.link.scan(/(.*?\.gif$)/i) { |matched|
-                image_link = matched.join(" ")
-              }
-              feed.link.scan(/(.*?\.tiff$)/i) { |matched|
-                image_link = matched.join(" ")
-              }
-              feed.link = image_link
-            end
+            feed.link = image?(feed.link) unless feed.link.nil?
           }
           @return_feeds << feeds
         end
       }
       @return_feeds
     end
+
+    private
+    def image?(link)
+      case link
+        when /\.jpe?g\Z/i then link
+        when /\.gif\Z/i then link
+        when /\.png\Z/i then link
+        when /\.tiff\Z/i then link
+        else nil
+      end
+    end
   end
 end

data/plugins/filter/image_source.rb

@@ -2,8 +2,8 @@
 # Name::      Automatic::Plugin::Filter::ImageSource
 # Author::    774 <http://id774.net>
 # Created::   Feb 28, 2012
-# Updated::   Oct 16, 2012
-# Copyright:: 774 Copyright (c) 2012
+# Updated::   Apr  5, 2013
+# Copyright:: 774 Copyright (c) 2012-2013
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
 module Automatic::Plugin
@@ -16,14 +16,6 @@ module Automatic::Plugin
       @pipeline = pipeline
     end
 
-    def rewrite_link(string)
-      array = Array.new
-      string.scan(/<img src="(.*?)"/) { |matched|
-        array = array | matched
-      }
-      array
-    end
-
     def run
       @return_feeds = []
       @pipeline.each {|feeds|
@@ -42,5 +34,14 @@ module Automatic::Plugin
       }
       @return_feeds
     end
+
+    private
+    def rewrite_link(string)
+      array = Array.new
+      string.scan(/<img src="(.*?)"/) { |matched|
+        array = array | matched
+      }
+      array
+    end
   end
 end

data/plugins/filter/tumblr_resize.rb

@@ -2,8 +2,8 @@
 # Name::      Automatic::Plugin::Filter::TumblrResize
 # Author::    774 <http://id774.net>
 # Created::   Feb 28, 2012
-# Updated::   Feb 28, 2012
-# Copyright:: 774 Copyright (c) 2012
+# Updated::   Apr  5, 2013
+# Copyright:: 774 Copyright (c) 2012-2013
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
 module Automatic::Plugin
@@ -14,14 +14,6 @@ module Automatic::Plugin
       @pipeline = pipeline
     end
 
-    def resize(string)
-      string = string.gsub("_75sq\.", "_1280\.")
-      string = string.gsub("_100\.", "_1280\.")
-      string = string.gsub("_250\.", "_1280\.")
-      string = string.gsub("_400\.", "_1280\.")
-      string = string.gsub("_500\.", "_1280\.")
-    end
-
     def run
       @return_feeds = []
       @pipeline.each {|feeds|
@@ -35,5 +27,14 @@ module Automatic::Plugin
       }
       @return_feeds
     end
+
+    private
+    def resize(string)
+      string = string.gsub("_75sq\.", "_1280\.")
+      string = string.gsub("_100\.", "_1280\.")
+      string = string.gsub("_250\.", "_1280\.")
+      string = string.gsub("_400\.", "_1280\.")
+      string = string.gsub("_500\.", "_1280\.")
+    end
   end
 end

data/plugins/notify/ikachan.rb

@@ -20,10 +20,6 @@ module Automatic::Plugin
       }
     end
 
-    def endpoint_url
-      "#{@params['url']}:#{@params['port']}/#{@params['command']}"
-    end
-
     def post(link, title = "")
       message     = build_message(link, title)
       uri         = URI.parse(endpoint_url)
@@ -45,6 +41,10 @@ module Automatic::Plugin
 
     private
 
+    def endpoint_url
+      "#{@params['url']}:#{@params['port']}/#{@params['command']}"
+    end
+
     def build_message(link, title)
       message = ""
       message += "#{title.to_s} - " unless title.blank?

data/plugins/publish/google_calendar.rb

@@ -3,7 +3,7 @@
 # Author::    774 <http://id774.net>
 # Created::   Feb 24, 2012
 # Updated::   Jan  8, 2013
-# Copyright:: 774 Copyright (c) 2012
+# Copyright:: 774 Copyright (c) 2012-2013
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
 module Automatic::Plugin

data/plugins/publish/hatena_bookmark.rb

@@ -2,8 +2,8 @@
 # Name::      Automatic::Plugin::Publish::HatenaBookmark
 # Author::    774 <http://id774.net>
 # Created::   Feb 22, 2012
-# Updated::   Jan  8, 2013
-# Copyright:: 774 Copyright (c) 2012
+# Updated::   Mar  7, 2013
+# Copyright:: 774 Copyright (c) 2012-2013
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
 module Automatic::Plugin
@@ -49,6 +49,7 @@ module Automatic::Plugin
     end
 
     def post(b_url, b_comment)
+      Automatic::Log.puts("info", "Bookmarking: #{b_url}")
       url = "http://b.hatena.ne.jp/atom/post"
       header = wsse(@user["hatena_id"], @user["password"])
       uri = URI.parse(url)
@@ -87,13 +88,23 @@ module Automatic::Plugin
       @pipeline.each {|feeds|
         unless feeds.nil?
           feeds.items.each {|feed|
-            Automatic::Log.puts("info", "Bookmarking: #{feed.link}")
-            hb.post(feed.link, nil)
+            hb.post(rewrite(feed.link), nil)
             sleep @config['interval'].to_i unless @config['interval'].nil?
           }
         end
       }
       @pipeline
     end
+
+    private
+    def rewrite(string)
+      if /^https?:\/\/.*$/ =~ string
+        return string
+      elsif /^\/\/.*$/ =~ string
+        return "http:" + string
+      else
+        return "http://" + string
+      end
+    end
   end
 end

data/plugins/publish/instapaper.rb

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
 # Name::      Automatic::Plugin::Publish::Instapaper
 # Author::    soramugi <http://soramugi.net>
-# Created::   Feb 9, 2013
-# Updated::   Feb 9, 2013
+#             774 <http://id774.net>
+# Created::   Feb  9, 2013
+# Updated::   Mar 23, 2013
 # Copyright:: soramugi Copyright (c) 2013
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
@@ -66,7 +67,15 @@ module Automatic::Plugin
         unless feeds.nil?
           feeds.items.each {|feed|
             Automatic::Log.puts("info", "add: #{feed.link}")
-            instapaper.add(feed.link, feed.title, feed.description)
+            retries = 0
+            begin
+              instapaper.add(feed.link, feed.title, feed.description)
+            rescue
+              retries += 1
+              Automatic::Log.puts("error", "ErrorCount: #{retries}, Fault in publish to instapaper.")
+              sleep @config['interval'].to_i unless @config['interval'].nil?
+              retry if retries <= @config['retry'].to_i unless @config['retry'].nil?
+            end
             sleep @config['interval'].to_i unless @config['interval'].nil?
           }
         end

data/plugins/store/target_link.rb

@@ -4,7 +4,7 @@
 # Author::    774 <http://id774.net>
 # Created::   Feb 28, 2012
 # Updated::   Feb  9, 2013
-# Copyright:: 774 Copyright (c) 2012
+# Copyright:: 774 Copyright (c) 2012-2013
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
 require 'open-uri'

data/plugins/subscription/feed.rb

@@ -3,7 +3,7 @@
 # Author::    774 <http://id774.net>
 # Created::   Feb 22, 2012
 # Updated::   Feb  8, 2013
-# Copyright:: 774 Copyright (c) 2012
+# Copyright:: 774 Copyright (c) 2012-2013
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
 module Automatic::Plugin

data/plugins/subscription/google_reader_star.rb

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
 # Name::      Automatic::Plugin::Subscription::GoogleReaderStar
 # Author::    soramugi <http://soramugi.net>
+#             774 <http://id774.net>
 # Created::   Feb 10, 2013
-# Updated::   Feb 10, 2013
+# Updated::   Feb 17, 2013
 # Copyright:: soramugi Copyright (c) 2013
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
@@ -20,11 +21,15 @@ module Automatic::Plugin
     def run
       @return_feeds = []
       @config['feeds'].each {|feed|
+        retries = 0
         begin
           Automatic::Log.puts("info", "Parsing: #{feed}")
           @return_feeds << self.parse(Automatic::FeedParser.get(feed).items)
         rescue
-          Automatic::Log.puts("error", "Fault in parsing: #{feed}")
+          retries += 1
+          Automatic::Log.puts("error", "ErrorCount: #{retries}, Fault in parsing: #{feed}")
+          sleep @config['interval'].to_i unless @config['interval'].nil?
+          retry if retries <= @config['retry'].to_i unless @config['retry'].nil?
         end
       }
       @return_feeds
@@ -46,10 +51,8 @@ module Automatic::Plugin
               item.title = feed.title.content # google reader feed
               item.link  = feed.link.href     # google reader feed
               begin
-                item.description = feed.description
-                item.author      = feed.author
-                item.comments    = feed.comments
-                item.date        = feed.pubDate || Time.now
+                item.description = feed.content
+                item.date        = feed.dc_date || Time.now
               rescue NoMethodError
                 Automatic::Log.puts("warn", "Undefined field detected in feed.")
               end

data/plugins/subscription/link.rb

@@ -2,8 +2,8 @@
 # Name::      Automatic::Plugin::Subscription::Link
 # Author::    774 <http://id774.net>
 # Created::   Sep 18, 2012
-# Updated::   Feb  8, 2013
-# Copyright:: 774 Copyright (c) 2012
+# Updated::   Apr  5, 2013
+# Copyright:: 774 Copyright (c) 2012-2013
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
 module Automatic::Plugin
@@ -17,16 +17,6 @@ module Automatic::Plugin
       @pipeline = pipeline
     end
 
-    def create_rss(url)
-      Automatic::Log.puts("info", "Parsing: #{url}")
-      html = open(url).read
-      unless html.nil?
-        rss = Automatic::FeedParser.parse(html)
-        sleep @config['interval'].to_i unless @config['interval'].nil?
-        @return_feeds << rss
-      end
-    end
-
     def run
       @return_feeds = []
       @config['urls'].each {|url|
@@ -42,5 +32,16 @@ module Automatic::Plugin
       }
       @return_feeds
     end
+
+    private
+    def create_rss(url)
+      Automatic::Log.puts("info", "Parsing: #{url}")
+      html = open(url).read
+      unless html.nil?
+        rss = Automatic::FeedParser.parse(html)
+        sleep @config['interval'].to_i unless @config['interval'].nil?
+        @return_feeds << rss
+      end
+    end
   end
 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::   Feb  8, 2013
-# Copyright:: 774 Copyright (c) 2012
+# Updated::   Apr  5, 2013
+# Copyright:: 774 Copyright (c) 2012-2013
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
 module Automatic::Plugin
@@ -15,16 +15,6 @@ module Automatic::Plugin
       @pipeline = pipeline
     end
 
-    def create_rss(url)
-      Automatic::Log.puts("info", "Parsing: #{url}")
-      html = open(url).read
-      unless html.nil?
-        rss = Automatic::FeedParser.parse(html)
-        sleep @config['interval'].to_i unless @config['interval'].nil?
-        @return_feeds << rss
-      end
-    end
-
     def run
       @return_feeds = []
       @config['urls'].each {|url|
@@ -48,5 +38,16 @@ module Automatic::Plugin
       }
       @return_feeds
     end
+
+    private
+    def create_rss(url)
+      Automatic::Log.puts("info", "Parsing: #{url}")
+      html = open(url).read
+      unless html.nil?
+        rss = Automatic::FeedParser.parse(html)
+        sleep @config['interval'].to_i unless @config['interval'].nil?
+        @return_feeds << rss
+      end
+    end
   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::   Feb  8, 2013
-# Copyright:: 774 Copyright (c) 2012
+# Updated::   Apr  5, 2013
+# Copyright:: 774 Copyright (c) 2012-2013
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
 module Automatic::Plugin
@@ -17,6 +17,23 @@ module Automatic::Plugin
       @pipeline = pipeline
     end
 
+    def run
+      @return_feeds = []
+      @config['urls'].each {|url|
+        retries = 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?
+        end
+      }
+      @return_feeds
+    end
+
+    private
     def create_rss(url)
       Automatic::Log.puts("info", "Parsing: #{url}")
       html = open(url).read
@@ -46,21 +63,5 @@ module Automatic::Plugin
         @return_feeds << rss
       end
     end
-
-    def run
-      @return_feeds = []
-      @config['urls'].each {|url|
-        retries = 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?
-        end
-      }
-      @return_feeds
-    end
   end
 end

data/script/build

@@ -6,6 +6,8 @@
 #
 #  Maintainer: id774 <idnanashi@gmail.com>
 #
+#  v1.3 2/26,2013
+#       Remove script/bootstrap.
 #  v1.2 6/16,2012
 #       Add all option for integration tests.
 #  v1.1 6/14,2012
@@ -19,20 +21,20 @@ kickstart() {
     export RACK_ENV="test"
     export DATABASE_URL="$RACK_ROOT/db"
     ruby -v
-    test_config log info started.
+    test_subcommand log info started.
 }
 
 exec_rspec() {
     $RACK_ROOT/bin/automatic -v
-    $RACK_ROOT/script/bootstrap
-    bundle exec $RACK_ROOT/bin/rake simplecov
+    bundle install --path vendor/gems
+    bundle exec rake simplecov
 }
 
 run_test() {
     while [ $# -gt 0 ]
     do
         $RACK_ROOT/bin/automatic -c $1
-        test_config log info $?
+        test_subcommand log info $?
         shift
     done
 }
@@ -45,21 +47,21 @@ load_tests() {
     unset YAML_FILE
 }
 
-test_config() {
-    $RACK_ROOT/bin/automatic-config $*
+test_subcommand() {
+    $RACK_ROOT/bin/automatic $*
 }
 
 test_scaffold() {
-    test_config scaffold
-    test_config unscaffold
+    test_subcommand scaffold
+    test_subcommand unscaffold
 }
 
 added_tests() {
     test -f $HOME/.automatic || test_scaffold
-    test_config autodiscovery http://blog.id774.net/blogs/
-    test_config opmlparser "$RACK_ROOT/test/fixtures/sampleOPML.xml"
-    test_config feedparser http://blog.id774.net/blogs/feed/ > /dev/null
-    test_config log info finished.
+    test_subcommand autodiscovery http://blog.id774.net/blogs/
+    test_subcommand opmlparser "$RACK_ROOT/test/fixtures/sampleOPML.xml"
+    test_subcommand feedparser http://blog.id774.net/blogs/feed/ > /dev/null
+    test_subcommand log info finished.
 }
 
 integration() {

data/spec/lib/automatic_spec.rb

@@ -3,8 +3,8 @@
 # Author::    kzgs
 #             774 <http://id774.net>
 # Created::   Mar  9, 2012
-# Updated::   Feb 13, 2013
-# Copyright:: kzgs Copyright (c) 2012
+# Updated::   Apr 10, 2013
+# Copyright:: kzgs Copyright (c) 2012-2013
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
 require File.expand_path(File.join(File.dirname(__FILE__), '../spec_helper'))
@@ -26,7 +26,7 @@ describe Automatic do
 
   describe "#version" do
     specify {
-      Automatic.const_get(:VERSION).should == "13.2.0"
+      Automatic.const_get(:VERSION).should == "13.4.1"
     }
   end