automatic 13.6.0 → 13.7.0

data/plugins/subscription/link.rb

@@ -9,7 +9,6 @@
 module Automatic::Plugin
   class SubscriptionLink
     require 'open-uri'
-    require 'nokogiri'
     require 'rss'
 
     def initialize(config, pipeline=[])

data/plugins/subscription/xml.rb

@@ -0,0 +1,50 @@
+# -*- coding: utf-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.
+# License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
+
+module Automatic::Plugin
+  class SubscriptionXml
+    require 'open-uri'
+    require 'active_support'
+    require 'active_support/core_ext'
+    require 'rss'
+
+    def initialize(config, pipeline=[])
+      @config = config
+      @pipeline = pipeline
+    end
+
+    def run
+      @return_feeds = []
+      @config['urls'].each {|url|
+        retries = 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?
+        end
+      }
+      @return_feeds
+    end
+
+    private
+    def create_rss(url)
+      Automatic::Log.puts("info", "Parsing: #{url}")
+      hash = Hash.from_xml(open(url).read)
+      json = hash.to_json
+      data = ActiveSupport::JSON.decode(json)
+      unless data.nil?
+        rss = Automatic::FeedParser.content_provide(url, data)
+        sleep @config['interval'].to_i unless @config['interval'].nil?
+        @return_feeds << rss
+      end
+    end
+  end
+end

data/spec/lib/automatic_spec.rb

@@ -3,7 +3,7 @@
 # Author::    kzgs
 #             774 <http://id774.net>
 # Created::   Mar  9, 2012
-# Updated::   Jun 27, 2013
+# Updated::   Jul 28, 2013
 # Copyright:: Copyright (c) 2012-2013 Automatic Ruby Developers.
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
@@ -26,7 +26,7 @@ describe Automatic do
 
   describe "#version" do
     specify {
-      Automatic.const_get(:VERSION).should == "13.6.0"
+      Automatic.const_get(:VERSION).should == "13.7.0"
     }
   end
 

data/spec/plugins/provide/fluentd_spec.rb

@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+# Name::      Automatic::Plugin::Provide::Fluentd
+# Author::    774 <http://id774.net>
+# Created::   Jul 12, 2013
+# Updated::   Jul 12, 2013
+# Copyright:: Copyright (c) 2012-2013 Automatic Ruby Developers.
+# License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
+
+require File.expand_path(File.dirname(__FILE__) + '../../../spec_helper')
+
+require 'provide/fluentd'
+
+describe Automatic::Plugin::ProvideFluentd do
+  context 'when feed' do
+    describe 'should forward the feeds' do
+      hash = {}
+      hash['test1'] = "test2"
+      hash['test3'] = "test4"
+      expect = hash
+
+      feeds = []
+      json = hash.to_json
+      data = ActiveSupport::JSON.decode(json)
+      url = "http://id774.net/test/xml/data"
+      rss = Automatic::FeedParser.content_provide(url, data)
+      feeds << rss
+
+      subject {
+        Automatic::Plugin::ProvideFluentd.new(
+          {
+            'host' => "localhost",
+            'port' => "10000",
+            'tag'  => "automatic_spec.provide_fluentd"
+          },
+          feeds
+        )
+      }
+
+      its (:run) {
+        fluentd = mock("fluentd")
+        subject.run.should have(1).feed
+        subject.instance_variable_get(:@pipeline)[0].items[0].content_encoded.class == Hash
+        subject.instance_variable_get(:@pipeline)[0].items[0].content_encoded.should == expect
+      }
+    end
+
+  end
+end

data/spec/plugins/publish/fluentd_spec.rb

@@ -17,8 +17,8 @@ describe Automatic::Plugin::PublishFluentd do
         Automatic::Plugin::PublishFluentd.new(
           {
             'host' => "localhost",
-            'port' => "9999",
-            'tag'  => "debug.forward"
+            'port' => "10000",
+            'tag'  => "automatic_spec.publish_fluent"
           },
           AutomaticSpec.generate_pipeline{
             feed {

data/spec/plugins/subscription/g_guide_spec.rb

@@ -28,12 +28,12 @@ describe 'Automatic::Plugin::SubscriptionGGuide' do
       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 @@ describe 'Automatic::Plugin::SubscriptionGGuide' do
       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

data/spec/plugins/subscription/xml_spec.rb

@@ -0,0 +1,84 @@
+# -*- coding: utf-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.
+# License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
+
+require File.expand_path(File.dirname(__FILE__) + '../../../spec_helper')
+
+require 'subscription/xml'
+
+describe Automatic::Plugin::SubscriptionXml do
+  context "with empty URLs" do
+    subject {
+      Automatic::Plugin::SubscriptionXml.new(
+        { 'urls' => [] })
+    }
+
+    its(:run) { should be_empty }
+  end
+
+  context "with URLs whose invalid URL" do
+    subject {
+      Automatic::Plugin::SubscriptionXml.new(
+        { 'urls' => ["invalid_url"] }
+      )
+    }
+
+    its(:run) { should be_empty }
+  end
+
+  context "with URLs whose invalid Xml" do
+    subject {
+      Automatic::Plugin::SubscriptionXml.new(
+        { 'urls' => [
+            "http://id774.net"]
+        }
+      )
+    }
+
+    its(:run) { should be_empty }
+  end
+
+  context "with URLs whose valid XML" do
+    subject {
+      Automatic::Plugin::SubscriptionXml.new(
+        { 'urls' => [
+            "http://id774.net/test/xml/data"],
+          'interval' => 1
+        }
+      )
+    }
+
+    its(:run) { should have(1).item }
+  end
+
+  context "with retry to URLs whose valid XML" do
+    subject {
+      Automatic::Plugin::SubscriptionXml.new(
+        { 'urls' => [
+            "http://id774.net/test/xml/data"],
+          'interval' => 2,
+          'retry' => 3
+        }
+      )
+    }
+
+    its(:run) { should have(1).item }
+  end
+
+  context "with retry to URLs whose invalid XML" do
+    subject {
+      Automatic::Plugin::SubscriptionXml.new(
+        { 'urls' => ["invalid_url"],
+          'interval' => 1,
+          'retry' => 1
+        }
+      )
+    }
+
+    its(:run) { should be_empty }
+  end
+end

data/test/integration/test_add_pocket.yml

@@ -21,3 +21,4 @@ plugins:
       access_token: access_token
 
   #- module: PublishConsole
+

data/test/integration/test_fluentd.yml

@@ -14,7 +14,8 @@ plugins:
   - module: PublishFluentd
     config:
       host: localhost
-      port: 9999
-      tag:  automatic.feed
+      port: 10000
+      tag:  automatic_test.publish_fluentd
 
   # - module: PublishConsole
+

data/test/integration/test_instapaper.yml

@@ -22,3 +22,4 @@ plugins:
       interval: 5
 
   #- module: PublishConsole
+

data/test/integration/test_one.yml

@@ -20,3 +20,4 @@ plugins:
       db: test_one.db
 
   # - module: PublishConsole
+

data/test/integration/test_pocket.yml

@@ -19,3 +19,5 @@ plugins:
       db: test_pocket.db
 
   #- module: PublishConsole
+
+ 

data/test/integration/test_rand.yml

@@ -18,3 +18,4 @@ plugins:
       db: test_rand.db
 
   # - module: PublishConsole
+

data/test/integration/test_sanitize.yml

@@ -20,3 +20,4 @@ plugins:
       db: test_sanitize.db
 
   # - module: PublishConsole
+

data/test/integration/test_text2feed.yml

@@ -25,3 +25,4 @@ plugins:
       db: test_text2feed.db
 
   # - module: PublishConsole
+

data/test/integration/test_twitter_search.yml

@@ -19,3 +19,4 @@ plugins:
       db: test_twitter_search.db
 
   #- module: PublishConsole
+

data/test/integration/test_weather.yml

@@ -16,3 +16,4 @@ plugins:
       db: test_weather.db
 
   #- module: PublishConsole
+

data/test/integration/test_xml2fluentd.yml

@@ -0,0 +1,21 @@
+global:
+  timezone: Asia/Tokyo
+  cache:
+    base: /tmp
+  log:
+    level: info
+
+plugins:
+  - module: SubscriptionXml
+    config:
+      urls:
+        - http://id774.net/test/xml/data
+
+  - module: ProvideFluentd
+    config:
+      host: localhost
+      port: 10000
+      tag:  automatic_test.provide_fluentd
+
+  # - module: PublishConsole
+

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: automatic
 version: !ruby/object:Gem::Version
-  version: 13.6.0
-  prerelease: 
+  version: 13.7.0
 platform: ruby
 authors:
 - id774
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-28 00:00:00.000000000 Z
+date: 2013-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,23 +27,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,23 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-- !ruby/object:Gem::Dependency
-  name: actionmailer
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,215 +69,188 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: gcalapi
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: xml-simple
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: feedbag
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sanitize
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: twitter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: weather_hacker
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pocket-ruby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: hipchat
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fluent-logger
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: dalli
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -310,7 +258,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -318,7 +265,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -326,7 +272,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -334,17 +279,15 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby General Automation Framework
@@ -392,6 +335,7 @@ files:
 - plugins/filter/sort.rb
 - plugins/filter/tumblr_resize.rb
 - plugins/notify/ikachan.rb
+- plugins/provide/fluentd.rb
 - plugins/publish/console.rb
 - plugins/publish/console_link.rb
 - plugins/publish/eject.rb
@@ -410,7 +354,6 @@ files:
 - plugins/subscription/chan_toru.rb
 - plugins/subscription/feed.rb
 - plugins/subscription/g_guide.rb
-- plugins/subscription/google_reader_star.rb
 - plugins/subscription/link.rb
 - plugins/subscription/pocket.rb
 - plugins/subscription/text.rb
@@ -418,6 +361,7 @@ files:
 - plugins/subscription/twitter.rb
 - plugins/subscription/twitter_search.rb
 - plugins/subscription/weather.rb
+- plugins/subscription/xml.rb
 - script/build
 - spec/fixtures/sampleRecipe.yml
 - spec/lib/automatic/log_spec.rb
@@ -438,6 +382,7 @@ files:
 - spec/plugins/filter/sort_spec.rb
 - spec/plugins/filter/tumblr_resize_spec.rb
 - spec/plugins/notify/ikachan_spec.rb
+- spec/plugins/provide/fluentd_spec.rb
 - spec/plugins/publish/console_spec.rb
 - spec/plugins/publish/eject_spec.rb
 - spec/plugins/publish/fluentd_spec.rb
@@ -454,7 +399,6 @@ files:
 - spec/plugins/subscription/chan_toru_spec.rb
 - spec/plugins/subscription/feed_spec.rb
 - spec/plugins/subscription/g_guide_spec.rb
-- spec/plugins/subscription/google_reader_star_spec.rb
 - spec/plugins/subscription/link_spec.rb
 - spec/plugins/subscription/pocket_spec.rb
 - spec/plugins/subscription/text_spec.rb
@@ -462,6 +406,7 @@ files:
 - spec/plugins/subscription/twitter_search_spec.rb
 - spec/plugins/subscription/twitter_spec.rb
 - spec/plugins/subscription/weather_spec.rb
+- spec/plugins/subscription/xml_spec.rb
 - spec/spec_helper.rb
 - spec/user_dir/plugins/store/mock.rb
 - test/fixtures/sampleOPML.xml
@@ -472,7 +417,6 @@ files:
 - test/integration/test_fluentd.yml
 - test/integration/test_fulltext.yml
 - test/integration/test_googlealert.yml
-- test/integration/test_googlestar.yml
 - test/integration/test_hatenabookmark.yml
 - test/integration/test_ignore.yml
 - test/integration/test_ignore2.yml
@@ -489,30 +433,30 @@ files:
 - test/integration/test_tumblr2local.yml
 - test/integration/test_twitter_search.yml
 - test/integration/test_weather.yml
+- test/integration/test_xml2fluentd.yml
 - vendor/.gitkeep
 homepage: http://github.com/automaticruby/automaticruby
 licenses:
 - GPL
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Automatic Ruby
 test_files: []