loady 0.5.0 → 0.5.1

data/lib/loady/csv_loader.rb

@@ -4,56 +4,57 @@ require 'logger'
 module Loady
   class CsvLoader
 
-    # valid options:
-    #   :skip_first_row => true                       -- default = false
-    #   :logger => Logger.new('/somewhere/file.log')  -- default = Logger.new(STDOUT)
-    #   plus any valid options you can pass to CSV.new: 
-    #     see http://www.ruby-doc.org/stdlib/libdoc/csv/rdoc/classes/CSV.html#M000190
-    def self.read(filename, options={})
-      success = 0
-      warning = 0
-
-      logger = options[:logger]
-
-      unless logger
-        logger = Logger.new(STDOUT)
-        logger.datetime_format = "%H:%M:%S"
-      end
-
-      f = File.new(filename)
-      f.readline if options[:skip_first_row]
-      
-      [:logger, :skip_first_row].each {|d| options.delete(d) }
-      
-      line_number = 0
-
-      begin
-        while (line = f.readline)
-          begin
-            line_number += 1
-
-            row = CSV.parse(line, options)[0]
-            row.extend Loady::Array
-
-            unless row.empty?
-              yield row
-              success += 1
+    class << self
+      # valid options:
+      #   :skip_first_row => true                       -- default = false
+      #   :logger => Logger.new('/somewhere/file.log')  -- default = Logger.new(STDOUT)
+      #   plus any valid options you can pass to CSV.new:
+      #     see http://www.ruby-doc.org/stdlib/libdoc/csv/rdoc/classes/CSV.html#M000190
+      def read(filename, options={})
+        success = 0
+        warning = 0
+
+        logger = options.delete(:logger) || default_logger
+
+        f = File.new(filename)
+        f.readline if options.delete(:skip_first_row)
+
+        line_number = 0
+
+        begin
+          while (line = f.readline)
+            begin
+              line_number += 1
+
+              row = CSV.parse(line, options)[0]
+              row.extend Loady::Array
+
+              unless row.empty?
+                yield row
+                success += 1
+              end
+            rescue Exception => message
+              warning += 1
+              logger.warn "#{message.to_s.gsub("line 1", "line #{line_number}")}\n#{line}"
             end
-          rescue Exception => message
-            warning += 1
-            logger.warn "#{message.to_s.gsub("line 1", "line #{line_number}")}\n#{line}"
           end
+        rescue EOFError
+          f.close
+        rescue Exception => message
+          warning += 1
+          line_number += 1
+          logger.error "#{message.to_s} - at line #{line_number}\n#{line}"
         end
-      rescue EOFError
-        f.close
-      rescue Exception => message
-        warning += 1
-        line_number += 1
-        logger.error "#{message.to_s + " - at line #{line_number}"}\n#{line}"
+
+        logger.info "Finished. Loaded #{success} rows. #{warning} unprocessed rows."
+      end
+
+      def default_logger
+        logger = Logger.new(STDOUT)
+        logger.datetime_format = "%H:%M:%S"
+        logger
       end
 
-      logger.info "Finished. Loaded #{success} rows. #{warning} unprocessed rows."
     end
-        
   end
 end

data/lib/loady/memory_logger.rb

@@ -2,7 +2,7 @@ module Loady
   class MemoryLogger
     attr_reader :messages
 
-    def initialize
+    def initialize(options={})
       @messages = []
     end
 
@@ -13,4 +13,4 @@ module Loady
     alias_method :warn, :info
     alias_method :error, :info
   end
-end
+end

data/lib/loady/version.rb

@@ -1,3 +1,3 @@
 module Loady
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: loady
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-03 00:00:00.000000000 Z
+date: 2012-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -98,7 +98,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3713324824844609253
+      hash: -1716122112452948356
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3713324824844609253
+      hash: -1716122112452948356
 requirements: []
 rubyforge_project: loady
 rubygems_version: 1.8.24