Refactoring store plugins #13

kzgs · kzgs · commit 676e48ff90c2 · 2012-02-27T23:25:55.000+09:00
- introduce Automatic::Plugin::StoreDatabase module
diff --git a/plugins/store/bookmark.rb b/plugins/store/bookmark.rb
@@ -6,52 +6,41 @@
 # Updated::   Feb 22, 2012
 # Copyright:: 774 Copyright (c) 2012
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
-require 'active_record'
+require 'plugins/store/store_database'
 
-module Automatic::Plugin
+module Automatic::Plugin  
   class Bookmark < ActiveRecord::Base
   end
 
   class StoreBookmark
-    attr_accessor :hb
+    include Automatic::Plugin::StoreDatabase
 
     def initialize(config, pipeline=[])
       @config = config
       @pipeline = pipeline
     end
 
-    def create_table
-      ActiveRecord::Migration.create_table :bookmarks do |t|
-        t.column :url, :string
-        t.column :created_at, :string
-      end
+    def column_definition
+      return {
+        :url => :string,
+        :created_at => :string
+      } 
+    end
+    
+    def unique_key
+      return :url
     end
 
+    def model_class
+      return Automatic::Plugin::Bookmark
+    end
+    
     def run
-      ActiveRecord::Base.establish_connection(
-                                              :adapter  => "sqlite3",
-                                              :database => (File.join(File.dirname(__FILE__),
-                                                                      '..', '..', 'db', @config['db']))
-                                              )
-      create_table unless Bookmark.table_exists?()
-
-      bookmarks = Bookmark.find(:all)
-      return_feeds = []
-      @pipeline.each {|feeds|
-        unless feeds.nil?
-          new_feed = false
-          feeds.items.each {|feed|
-            unless bookmarks.detect {|b|b.url == feed.link}
-              new_bookmark = Bookmark.new(:url => feed.link,
-                                          :created_at => Time.now.strftime("%Y/%m/%d %X"))
-              new_bookmark.save
-              new_feed = true
-            end
-          }
-          return_feeds << feeds if new_feed
-        end
+      return for_each_new_feed { |feed|
+        Bookmark.create(
+          :url => feed.link,
+          :created_at => Time.now.strftime("%Y/%m/%d %X"))
       }
-      return_feeds
     end
   end
 end
diff --git a/plugins/store/full_text.rb b/plugins/store/full_text.rb
@@ -6,55 +6,47 @@
 # Updated::   Feb 26, 2012
 # Copyright:: 774 Copyright (c) 2012
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
-require 'active_record'
+require 'plugins/store/store_database'
 
 module Automatic::Plugin
   class Blog < ActiveRecord::Base
   end
 
   class StoreFullText
+    include Automatic::Plugin::StoreDatabase
+    
     def initialize(config, pipeline=[])
       @config = config
       @pipeline = pipeline
     end
 
-    def create_table
-      ActiveRecord::Migration.create_table :blogs do |t|
-        t.column :title, :string
-        t.column :link, :string
-        t.column :description, :string
-        t.column :content, :string
-        t.column :created_at, :string
-      end
+    def column_definition
+      return {
+        :title => :string,
+        :link => :string,
+        :description => :string,
+        :content => :string,
+        :created_at => :string,
+      }
+    end
+
+    def unique_key
+      return :link
+    end
+
+    def model_class
+      return Automatic::Plugin::Blog
     end
 
     def run
-      ActiveRecord::Base.establish_connection(
-        :adapter  => "sqlite3",
-        :database => (File.join(File.dirname(__FILE__),
-          '..', '..', 'db', @config['db'])))
-      create_table unless Blog.table_exists?()
-      blogs = Blog.find(:all)
-      return_feeds = []
-      @pipeline.each {|feeds|
-        unless feeds.nil?
-          new_feed = false
-          feeds.items.each {|feed|
-            unless blogs.detect {|b|b.link == feed.link}
-              new_blog = Blog.new(
-                :title => feed.title,
-                :link => feed.link,
-                :description => feed.description,
-                :content => feed.content_encoded,
-                :created_at => Time.now.strftime("%Y/%m/%d %X"))
-              new_blog.save
-              new_feed = true
-            end
-          }
-          return_feeds << feeds if new_feed
-        end
+      return for_each_new_feed { |feed|
+        Blog.create(
+          :title => feed.title,
+          :link => feed.link,
+          :description => feed.description,
+          :content => feed.content_encoded,
+          :created_at => Time.now.strftime("%Y/%m/%d %X"))
       }
-      return_feeds
     end
   end
 end
diff --git a/plugins/store/store_database.rb b/plugins/store/store_database.rb
@@ -0,0 +1,46 @@
+require 'active_record'
+
+module Automatic::Plugin
+  module StoreDatabase
+    def for_each_new_feed
+      prepare_database
+      existing_records = model_class.find(:all)
+      return_feeds = []
+      @pipeline.each { |feeds|
+        unless feeds.nil?
+          new_feed = false
+          feeds.items.each { |feed|
+            unless existing_records.detect { |b| b.try(unique_key) == feed.link }
+              yield(feed)
+              new_feed = true
+            end
+          }
+          return_feeds << feeds if new_feed
+        end
+      }
+      return_feeds
+    end
+
+    private
+
+    def create_table
+      ActiveRecord::Migration.create_table(model_class.table_name) do |t|
+        column_definition.each_pair do |column_name, column_type|
+          t.column column_name, column_type
+        end
+      end
+    end
+
+    def db_dir
+      return File.join(File.dirname(__FILE__), '..', '..', 'db')
+    end
+
+    def prepare_database
+      ActiveRecord::Base.establish_connection(
+        :adapter  => "sqlite3",
+        :database => File.join(db_dir, @config['db']))
+      create_table unless model_class.table_exists?
+    end
+  end
+end
+  
