Merge pull request #76 from id774/issue66

id774 · id774 · commit fe7adc85eb5f · 2014-02-20T17:38:15.000+09:00
Refactoring plugin Subscription::Text
diff --git a/lib/automatic/feed_parser.rb b/lib/automatic/feed_parser.rb
@@ -12,6 +12,27 @@ module FeedParser
     require 'uri'
     require 'nokogiri'
 
+    class FeedObject
+      attr_accessor :title, :link, :description, :author, :comments
+      def initialize
+        @link        = 'http://dummy'
+        @title       = 'dummy'
+        @description = ''
+        @author      = ''
+        @comments    = ''
+      end
+    end
+
+    def self.generate_feed(feed)
+      feed_object = FeedObject.new
+      feed_object.title = feed['title'] unless feed['title'].nil?
+      feed_object.link = feed['url'] unless feed['url'].nil?
+      feed_object.description = feed['description'] unless feed['description'].nil?
+      feed_object.author = feed['author'] unless feed['author'].nil?
+      feed_object.comments = feed['comments'] unless feed['comments'].nil?
+      feed_object
+    end
+
     def self.get(url)
       begin
         unless url.nil?
diff --git a/plugins/subscription/text.rb b/plugins/subscription/text.rb
@@ -8,68 +8,43 @@
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
 module Automatic::Plugin
-  class TextFeed
-    attr_accessor :title, :link, :description, :author, :comments
-
-    def initialize
-      @link        = 'http://dummy'
-      @title       = 'dummy'
-      @description = ''
-      @author      = ''
-      @comments    = ''
-    end
-  end
-
   class SubscriptionText
-
     def initialize(config, pipeline=[])
       @config   = config
       @pipeline = pipeline
+      @return_feeds = []
     end
 
     def run
       create_feed
-
-      if @dummyfeeds != []
-        @pipeline << Automatic::FeedParser.create(@dummyfeeds)
-      end
+      @pipeline << Automatic::FeedParser.create(@return_feeds) unless @return_feeds.length == 0
       @pipeline
     end
 
     private
 
-    def generate_textfeed(feed)
-      textFeed = TextFeed.new
-      textFeed.title = feed['title'] unless feed['title'].nil?
-      textFeed.link = feed['url'] unless feed['url'].nil?
-      textFeed.description = feed['description'] unless feed['description'].nil?
-      textFeed.author = feed['author'] unless feed['author'].nil?
-      textFeed.comments = feed['comments'] unless feed['comments'].nil?
-      @dummyfeeds << textFeed
-    end
-
     def create_feed
       unless @config.nil?
         @dummyfeeds = []
         unless @config['titles'].nil?
           @config['titles'].each {|title|
             feed = {}
             feed['title'] = title
-            generate_textfeed(feed)
+            @return_feeds << Automatic::FeedParser.generate_feed(feed)
           }
         end
 
         unless @config['urls'].nil?
           @config['urls'].each {|url|
             feed = {}
             feed['url'] = url
-            generate_textfeed(feed)
+            @return_feeds << Automatic::FeedParser.generate_feed(feed)
           }
         end
 
         unless @config['feeds'].nil?
           @config['feeds'].each {|feed|
-            generate_textfeed(feed)
+            @return_feeds << Automatic::FeedParser.generate_feed(feed)
           }
         end
 
@@ -80,7 +55,7 @@ def create_feed
                 feed = {}
                 feed['title'], feed['url'], feed['description'], feed['author'],
                 feed['comments'] = line.force_encoding("utf-8").strip.split("\t")
-                generate_textfeed(feed)
+                @return_feeds << Automatic::FeedParser.generate_feed(feed)
               end
             end
           }
diff --git a/spec/fixtures/sampleFeeds.tsv b/spec/fixtures/sampleFeeds.tsv
@@ -1 +1 @@
-testTitle	http://dummy.from.file	testDescription	testComments
+testTitle	http://dummy.from.file	testDescription	testAuthor	testComments
diff --git a/spec/fixtures/sampleFeeds2.tsv b/spec/fixtures/sampleFeeds2.tsv
@@ -1,2 +1,2 @@
-testTitle1	http://dummy.from.file1	testDescription1	testComments1
-testTitle2	http://dummy.from.file2	testDescription2	testComments2
+testTitle1	http://dummy.from.file1	testDescription1		testComments1
+testTitle2	http://dummy.from.file2	testDescription2	testAuthor2

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-testTitle http://dummy.from.file testDescription testComments`
	`1`	`+testTitle http://dummy.from.file testDescription testAuthor testComments`