203 Refactoring

id774 · id774 · commit 3c4b6dcc25fb · 2012-09-18T08:54:37.000+09:00
diff --git a/config/html2console.yml b/config/html2console.yml
diff --git a/plugins/filter/absolute_uri.rb b/plugins/filter/absolute_uri.rb
@@ -18,7 +18,7 @@ def rewrite(string)
       if /^http:\/\/.*$/ =~ string
         return string
       else
-        return @config['url'] + string 
+        return @config['url'] + string
       end
     end
 
diff --git a/plugins/store/database.rb b/plugins/store/database.rb
@@ -60,9 +60,9 @@ def create_table
     def db_dir
       dir = (File.expand_path('~/.automatic/db'))
       if File.directory?(dir)
-        return dir
+        dir
       else
-        return File.join(File.dirname(__FILE__), '..', '..', 'db')
+        File.join(File.dirname(__FILE__), '..', '..', 'db')
       end
     end
 
diff --git a/plugins/store/full_text.rb b/plugins/store/full_text.rb
@@ -21,7 +21,7 @@ def initialize(config, pipeline=[])
     end
 
     def column_definition
-      return {
+      {
         :title => :string,
         :link => :string,
         :description => :string,
@@ -31,15 +31,15 @@ def column_definition
     end
 
     def unique_key
-      return :link
+      :link
     end
 
     def model_class
-      return Automatic::Plugin::Blog
+      Automatic::Plugin::Blog
     end
 
     def run
-      return for_each_new_feed { |feed|
+      for_each_new_feed { |feed|
         begin
           Blog.create(
             :title => feed.title,
diff --git a/plugins/store/permalink.rb b/plugins/store/permalink.rb
@@ -6,6 +6,7 @@
 # Updated::   Sep 18, 2012
 # Copyright:: 774 Copyright (c) 2012
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
+
 require 'plugins/store/database'
 
 module Automatic::Plugin
@@ -21,22 +22,22 @@ def initialize(config, pipeline=[])
     end
 
     def column_definition
-      return {
+      {
         :url => :string,
         :created_at => :string
       }
     end
 
     def unique_key
-      return :url
+      :url
     end
 
     def model_class
-      return Automatic::Plugin::Permalink
+      Automatic::Plugin::Permalink
     end
 
     def run
-      return for_each_new_feed {|feed|
+      for_each_new_feed {|feed|
         unless feed.link.nil?
           Permalink.create(
             :url => feed.link,
diff --git a/plugins/store/target_link.rb b/plugins/store/target_link.rb
@@ -7,9 +7,10 @@
 # Copyright:: 774 Copyright (c) 2012
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
+require 'open-uri'
+
 module Automatic::Plugin
   class StoreTargetLink
-    require 'open-uri'
 
     def initialize(config, pipeline=[])
       @config = config
