fasterer-csv 2.0.0 → 2.1.0

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.1.0

data/fasterer-csv.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fasterer-csv}
-  s.version = "2.0.0"
+  s.version = "2.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mason"]

data/lib/fasterer_csv.rb

@@ -11,11 +11,12 @@ module FastererCSV
       end
     end
 
-    attr_reader :headers, :lines
+    attr_reader :headers, :lines, :line_block
 
-    def initialize(headers, fail_on_malformed_columns = true)
+    def initialize(headers, fail_on_malformed_columns = true, &line_block)
       @headers = Table.format_headers(headers)
       @fail_on_malformed_columns = fail_on_malformed_columns
+      @line_block = line_block
       @lines = 0
       @indexes = {}
     end
@@ -37,8 +38,13 @@ module FastererCSV
         puts error
         raise error if @fail_on_malformed_columns
       end
-      super(row)
+      if line_block
+        line_block.call(row)
+      else
+        super(row)
+      end
     end
+    alias_method :push, :<<
 
     def merge(*tables)
 
@@ -122,7 +128,7 @@ module FastererCSV
     end
 
     def headers
-      @table.headers
+      @headers ||= @table.headers.dup
     end
 
     attr_reader :line
@@ -293,21 +299,25 @@ module FastererCSV
     end
 
     def read(file, quot = '~', sep = ',', fail_on_malformed = true, column = NoConversion.new, &block)
-      parse(File.open(file, 'r') { |io| io.sysread(File.size(file)) }, quot, sep, fail_on_malformed, column, &block)
+      File.open(file, 'r') do |io|
+        parse(io, quot, sep, fail_on_malformed, column, &block)
+      end
     end
 
     def convread(file, quot = '~', sep = ',', fail_on_malformed = true, column = NumericConversion.new, &block)
-      parse(File.open(file, 'r') { |io| io.sysread(File.size(file)) }, quot, sep, fail_on_malformed, column, &block)
+      File.open(file, 'r') do |io|
+        parse(io, quot, sep, fail_on_malformed, column, &block)
+      end
     end
 
     def parse_headers(data, quot = '~', sep = ',', fail_on_malformed = true, column = NoConversion.new, &block)
       parse(data, quot, sep, fail_on_malformed, column, &block).headers
     end
 
-    def parse(data, quot = '~', sep = ',', fail_on_malformed = true, column = NoConversion.new)
+    def parse(io, quot = '~', sep = ',', fail_on_malformed = true, column = NoConversion.new, &block)
       q, s, row, inquot, clean, maybe, table, field, endline = quot.ord, sep.ord, [], false, true, false, nil, true, false
 
-      data.each_byte do |c|
+      io.each_byte do |c|
         next if c == ?\r.ord
 
         if maybe && c == s
@@ -317,7 +327,7 @@ module FastererCSV
         elsif maybe && c == ?\n.ord && table.nil?
           row << column.convert(true) unless (column.empty? && endline)
           column.clear
-          table = Table.new(row, fail_on_malformed) unless row.empty?
+          table = Table.new(row, fail_on_malformed, &block) unless row.empty?
           row, clean, inquot, maybe, field, endline = [], true, false, false, false, true
         elsif maybe && c == ?\n.ord
           row << column.convert(true) unless (column.empty? && endline)
@@ -343,7 +353,7 @@ module FastererCSV
           row << column.convert(false) unless column.empty? && endline
 
           column.clear
-          table = Table.new(row, fail_on_malformed) unless row.empty?
+          table = Table.new(row, fail_on_malformed, &block) unless row.empty?
           row, clean, inquot, field, endline = [], true, false, false, true
         elsif c == ?\n.ord
 
@@ -363,16 +373,12 @@ module FastererCSV
         if table
           table << row unless row.empty?
         else
-          table = Table.new(row, fail_on_malformed) unless row.empty?
+          table = Table.new(row, fail_on_malformed, &block) unless row.empty?
         end
       elsif field
         row << column.convert(maybe)
       end
 
-      table.each do |line|
-        yield(line)
-      end if table && block_given?
-
       table
     end
 
@@ -422,4 +428,3 @@ module FastererCSV
 
   end
 end
-

data/spec/fasterer_csv_spec.rb

@@ -105,11 +105,11 @@ a,b,c,d,e,f,g,h,i,j,k,l,m,
     describe "parse" do
       it "works" do
         table = FastererCSV.parse(@data)
-        table.headers.should == [:a, :b, :c, :d, :e, :f, :g, :h, :i, :j, :k, :l, :m, :_]
+        table.headers.should == [:a, :b, :c,:d,:e,:f,:g,:h,:i,:j,:k,:l,:m,:_]
         table.lines.should == 2
 
-        table[0].should == [nil, nil, "1", "1.1", "-1", "-1.1", "1.1.1", "1", "a", "a", "a~a", "a\n~a",  ",", nil ]
-        table[1].should == ["0", "1", "2",   "3",  "4",    "5",     "6", "7", "8", "9",  "10",    "11", "12", "14"]
+        table[0].should == [nil, nil, "1", "1.1", "-1", "-1.1", "1.1.1", "1", "a", "a", "a~a", "a\n~a", ",", nil]
+        table[1].should == ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "14"]
 
         row = table[1]
         row.pull(:a, nil, 'd').should == ["0","14","3"]
@@ -117,6 +117,17 @@ a,b,c,d,e,f,g,h,i,j,k,l,m,
         row["b"].should == "1"
 
       end
+
+      it "allows mutation of rows" do
+        each_called = false
+        table = FastererCSV.parse(@data).each do |row|
+          each_called = true
+          row[:foo] = "bar"
+          row.headers.should == [:a, :b, :c,:d,:e,:f,:g,:h,:i,:j,:k,:l,:m,:_, :foo]
+        end
+        each_called.should be_true
+        table.headers.should == [:a, :b, :c,:d,:e,:f,:g,:h,:i,:j,:k,:l,:m,:_]
+      end
     end
 
     describe "read" do

metadata

@@ -2,7 +2,7 @@
 name: fasterer-csv
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors: 
 - Mason