fastercsv 1.5.1 → 1.5.3

data/CHANGELOG

@@ -2,6 +2,16 @@
 
 Below is a complete listing of changes for each revision of FasterCSV.
 
+== 1.5.3
+
+* A bug fix from Timothy Elliott to return the new parser to its strict quote
+  tolerance.
+
+== 1.5.2
+
+* A bug fix to allow IO Exceptions to reach the calling code from Moses Hohman.
+* Added support for <tt>:write_headers => false</tt> to Table.to_csv().
+
 == 1.5.1
 
 * A bug fix for deleting blank Table rows from Andy Hartford.

data/lib/faster_csv.rb

@@ -82,7 +82,7 @@ require "stringio"
 # 
 class FasterCSV
   # The version of the installed library.
-  VERSION = "1.5.1".freeze
+  VERSION = "1.5.3".freeze
   
   # 
   # A FasterCSV::Row is part Array and part Hash.  It retains an order for the
@@ -704,8 +704,12 @@ class FasterCSV
     # Returns the table as a complete CSV String.  Headers will be listed first,
     # then all of the field rows.
     # 
+    # This method assumes you want the Table.headers(), unless you explicitly
+    # pass <tt>:write_headers => false</tt>.
+    # 
     def to_csv(options = Hash.new)
-      @table.inject([headers.to_csv(options)]) do |rows, row|
+      wh = options.fetch(:write_headers, true)
+      @table.inject(wh ? [headers.to_csv(options)] : [ ]) do |rows, row|
         if row.header_row?
           rows
         else
@@ -1576,10 +1580,10 @@ class FasterCSV
     # 
     loop do
       # add another read to the line
-      begin
-        line  += @io.gets(@row_sep)
-      rescue
-        return nil
+      if read_line = @io.gets(@row_sep)
+       line += read_line
+      else
+       return nil
       end
       # copy the line so we can chop it up in parsing
       parse =  line.dup
@@ -1610,12 +1614,14 @@ class FasterCSV
       parse.split(@col_sep, -1).each do |match|
         if current_field.empty? && match.count(@quote_and_newlines).zero?
           csv           << (match.empty? ? nil : match)
-        elsif(current_field.empty? ? match[0] : current_field[0]) == @quote_char[0]
+        elsif (current_field.empty? ? match[0] : current_field[0]) ==
+              @quote_char[0]
           current_field << match
           field_quotes += match.count(@quote_char)
           if field_quotes % 2 == 0
             in_quotes = current_field[@parsers[:quoted_field], 1]
-            raise MalformedCSVError unless in_quotes
+            raise MalformedCSVError if !in_quotes ||
+                                       in_quotes[@parsers[:stray_quote]]
             current_field = in_quotes
             current_field.gsub!(@quote_char * 2, @quote_char) # unescape contents
             csv           << current_field
@@ -1793,14 +1799,17 @@ class FasterCSV
     esc_row_sep = Regexp.escape(@row_sep)
     esc_quote   = Regexp.escape(@quote_char)
     @parsers = {
-      :any_field      => Regexp.new( "[^#{esc_col_sep}]+",
-                                     Regexp::MULTILINE,
-                                     @encoding ),
-      :quoted_field   => Regexp.new( "^#{esc_quote}(.*)#{esc_quote}$",
-                                     Regexp::MULTILINE,
-                                     @encoding ),
+      :any_field    => Regexp.new( "[^#{esc_col_sep}]+",
+                                   Regexp::MULTILINE,
+                                   @encoding ),
+      :quoted_field => Regexp.new( "^#{esc_quote}(.*)#{esc_quote}$",
+                                   Regexp::MULTILINE,
+                                   @encoding ),
+      :stray_quote  => Regexp.new( "[^#{esc_quote}]#{esc_quote}[^#{esc_quote}]",
+                                   Regexp::MULTILINE,
+                                   @encoding ),
       # safer than chomp!()
-      :line_end       => Regexp.new("#{esc_row_sep}\\z", nil, @encoding)
+      :line_end     => Regexp.new("#{esc_row_sep}\\z", nil, @encoding)
     }
   end
   

data/test/tc_csv_parsing.rb

@@ -114,6 +114,10 @@ class TestCSVParsing < Test::Unit::TestCase
     [["foo,\"foo,bar,baz,foo\",\"foo\"", ["foo", "foo,bar,baz,foo", "foo"]]].each do |edge_case|
       assert_equal(edge_case.last, FasterCSV.parse_line(edge_case.first))
     end
+
+    assert_raise(FasterCSV::MalformedCSVError) do
+      FasterCSV.parse_line("1,\"23\"4\"5\", 6")
+    end
   end
   
   def test_malformed_csv

data/test/tc_interface.rb

@@ -181,7 +181,7 @@ class TestFasterCSVInterface < Test::Unit::TestCase
       csv << lines.first.keys
       lines.each { |line| csv << line }
     end
-    FasterCSV.open( @path, "w", :headers           => true,
+    FasterCSV.open( @path, "r", :headers           => true,
                                 :converters        => :all,
                                 :header_converters => :symbol ) do |csv|
       csv.each { |line| assert_equal(lines.shift, line.to_hash) }

data/test/tc_table.rb

@@ -251,6 +251,8 @@ class TestFasterCSVTable < Test::Unit::TestCase
     # with options
     assert_equal( csv.gsub(",", "|").gsub("\n", "\r\n"),
                   @table.to_csv(:col_sep => "|", :row_sep => "\r\n") )
+    assert_equal( csv.to_a[1..-1].join,
+                  @table.to_csv(:write_headers => false) )
 
     # with headers
     assert_equal(csv, @header_table.to_csv)

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: fastercsv
 version: !ruby/object:Gem::Version 
-  version: 1.5.1
+  prerelease: false
+  segments: 
+  - 1
+  - 5
+  - 3
+  version: 1.5.3
 platform: ruby
 authors: 
 - James Edward Gray II
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-30 00:00:00 -06:00
+date: 2010-03-16 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -80,18 +85,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: fastercsv
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: FasterCSV is CSV, but faster, smaller, and cleaner.