refactored

	modified:   format.rb

Author: Mooophy

.tools/format.rb

@@ -1,28 +1,7 @@
 require_relative 'dir_handler'
 
-#extensions = [ "cpp", "h", "hpp", "md" ]
-#extensions.freeze
-#dir = ARGV[0] 
-#dir.freeze
-#
-##init handlers for all types of files
-#handlers = extensions.collect{ |e| DirHandler.new dir, e }
-#
-##for comma:
-##   1,2,3,4   =>  1, 2, 3, 4
-#handlers.each do |h|
-#  h.on_each_line do |line| 
-#    begin
-#      line.gsub! /,(\S)/, ', \1' unless line.match /.*\".*,.*\".*/ or line.match /','/
-#    rescue Exception => e
-#      puts e.message + ", ignored."
-#    end
-#  end
-#end
-#
-
 class Format
-  attr_reader :extensions
+  attr_reader :dir, :extensions
 
   def initialize dir, extensions
     @dir = dir
@@ -33,16 +12,21 @@ def initialize dir, extensions
   end
 
   def for_commas
-    @handlers.each do |h|
-      h.on_each_line do |line| 
-        begin
-          line.gsub! /,(\S)/, ', \1' unless line.match /.*\".*,.*\".*/ or line.match /','/
-        rescue Exception => e
-          puts e.message + ", ignored."
-        end
+    each_line do |line|   
+      begin
+        line.gsub! /,(\S)/, ', \1' unless line.match /.*\".*,.*\".*/ or line.match /','/
+      rescue Exception => e
+        puts e.message + ", ignored."
       end
     end
   end 
+  
+  private
+  def each_line
+    @handlers.each do |h|
+      h.on_each_line { |line| yield line }
+    end   
+  end
 end    
 
 format = Format.new ARGV[0], [ "cpp", "h", "hpp", "md" ]