refactored

diff --git a/bin/read-upl.rb b/bin/read-upl.rb
index 94e428b..6ebbb27 100644 (file)
--- a/bin/read-upl.rb
+++ b/bin/read-upl.rb
@@ -4,17 +4,7 @@ $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 require 'scrap'
 
 location = ARGV.shift || 'mmd'
-
-case location
-when 'mmd'
-  scrap = Scrap_mmd.new
-when 'mmdfile'
-  scrap = Scrap_mmdfile.new
-when 'mmdacc1'
-  scrap = Scrap_mmdacc1.new
-when 'mmdacc2'
-  scrap = Scrap_mmdacc2.new
-end
+scrap = Scrap.find_by_location(location)
 
 ent = "/Volumes/uploader/src/#{location}/index.html"
 open(ent) do |f|

diff --git a/lib/scrap.rb b/lib/scrap.rb
index 05f8967..f8a3550 100644 (file)
--- a/lib/scrap.rb
+++ b/lib/scrap.rb
@@ -2,6 +2,7 @@
 require 'nkf'
 
 class Scrap
+
   def match(line)
     @md = @row_re.match(line)
   end
@@ -70,3 +71,16 @@ class Scrap_mmdacc2 < Scrap
     [ name, encode(comment), size, encode(date) ]
   end
 end
+
+def Scrap.find_by_location(location)
+  case location
+  when 'mmd'
+    scrap = Scrap_mmd.new
+  when 'mmdfile'
+    scrap = Scrap_mmdfile.new
+  when 'mmdacc1'
+    scrap = Scrap_mmdacc1.new
+  when 'mmdacc2'
+    scrap = Scrap_mmdacc2.new
+  end
+end