loady 0.1.1 → 0.2.0

data/README.rdoc

@@ -39,18 +39,3 @@ Name your attributes:
     Monkey.create row.to_attributes [:name, :year, :mom]
   end
 
-
-== Development
-
-Fork away. Please create a topic branch and write passing tests if you are submitting a pull request.
-
-  git clone git://github.com/[yourfork]/loady.git
-  cd loady
-  bundle install
-  rake test
-  git checkout -b your_fix
-
-
-== ToDo
-
-Read attribute names from header row

data/lib/loady/csv_loader.rb

@@ -4,9 +4,11 @@ require 'logger'
 module Loady
   class CsvLoader
 
-    # options:
+    # 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
@@ -18,42 +20,39 @@ module Loady
         logger.datetime_format = "%H:%M:%S"
       end
 
-      begin
-        f = File.new(filename)
-        f.readline if options[:skip_first_row]
-
-        line_number = 0
+      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
+      begin
+        while (line = f.readline)
+          begin
+            line_number += 1
 
-              row = CSV.parse(line)[0]
+            row = CSV.parse(line, options)[0]
 
-              unless row.empty?
-                yield row
+            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}"
+              success += 1
             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
-
-        logger.info "Finished. Loaded #{success} rows. #{warning} unprocessed rows."
-
+      rescue EOFError
+        f.close
       rescue Exception => message
-        logger.fatal "Unhandled error: \n#{message}\n"
+        warning += 1
+        line_number += 1
+        logger.error "#{message.to_s + " - at line #{line_number}"}\n#{line}"
       end
+
+      logger.info "Finished. Loaded #{success} rows. #{warning} unprocessed rows."
     end
         
   end

data/lib/loady/version.rb

@@ -1,3 +1,3 @@
 module Loady
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/test/csv/file3.dat

@@ -0,0 +1,11 @@
+monkey name	best year
+Bubbles	2000
+Grape Ape	1975
+Albert	1948
+Koko	1971
+Curious George	1941
+Clyde	1975
+Bear	1980
+Mighty Joe Young	1998
+Donkey Kong	1981
+King Kong	1933

data/test/test_csv_loader.rb

@@ -32,6 +32,20 @@ class CsvLoaderTest < Test::Unit::TestCase
       assert_equal monkeys[9][:name], "King Kong", "last row name"
       assert_equal monkeys[9][:year], "1933", "last row year"
     end
+    
+    should "read file3, a tab-delimited file" do
+      monkeys = []
+
+      Loady.csv "test/csv/file3.dat", :skip_first_row => true, :col_sep => "\t"  do |row|
+        monkeys << { :name => row[0], :year => row[1] }
+      end
+
+      assert_equal monkeys.count, 10, "total rows read"
+      assert_equal monkeys[0][:name], "Bubbles", "first row name"
+      assert_equal monkeys[0][:year], "2000", "first row year"
+      assert_equal monkeys[9][:name], "King Kong", "last row name"
+      assert_equal monkeys[9][:year], "1933", "last row year"
+    end
        
   end
 

metadata

@@ -2,7 +2,7 @@
 name: loady
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - Tee Parham
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-18 00:00:00 -06:00
-default_executable: 
+date: 2011-06-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: test-unit
@@ -57,10 +56,10 @@ files:
 - loady.gemspec
 - test/csv/file1.csv
 - test/csv/file2.csv
+- test/csv/file3.dat
 - test/test_csv_loader.rb
 - test/test_helper.rb
 - test/test_loady.rb
-has_rdoc: true
 homepage: http://github.com/stackpilot/loady
 licenses: []
 
@@ -84,13 +83,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: loady
-rubygems_version: 1.6.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: CSV file loader with simple logging
 test_files: 
 - test/csv/file1.csv
 - test/csv/file2.csv
+- test/csv/file3.dat
 - test/test_csv_loader.rb
 - test/test_helper.rb
 - test/test_loady.rb