rw_fastercsv 1.5.6 → 1.5.7

data/Rakefile

@@ -12,7 +12,7 @@ task :default => [:test]
 
 Rake::TestTask.new do |test|
 	test.libs       << "test"
-	test.test_files =  %w[test/ts_all.rb]
+  test.test_files =  %w[test/ts_all.rb]
 	test.verbose    =  true
 end
 
@@ -49,38 +49,38 @@ task :benchmark do
 	   %Q{'#{TESTS}.times { FasterCSV.foreach("#{path}") { |row| } }'}
 end
 
-spec = Gem::Specification.new do |spec|
-	spec.name    = "fastercsv"
-	spec.version = version
-
-	spec.platform = Gem::Platform::RUBY
-	spec.summary  = "FasterCSV is CSV, but faster, smaller, and cleaner."
-
-	spec.test_files      = %w[test/ts_all.rb]
-	spec.files           = Dir.glob("{lib,test,examples}/**/*.rb").
-	                           reject { |item| item.include?(".svn") } +
-	                       Dir.glob("{test,examples}/**/*.csv").
-	                           reject { |item| item.include?(".svn") } +
-	                       %w[Rakefile setup.rb test/line_endings.gz]
-
-	spec.has_rdoc         = true
-	spec.extra_rdoc_files = %w[ AUTHORS COPYING README INSTALL TODO CHANGELOG
-	                            LICENSE ]
-	spec.rdoc_options     << "--title" << "FasterCSV Documentation" <<
-	                         "--main"  << "README"
-
-	spec.require_path = "lib"
-
-	spec.author            = "James Edward Gray II"
-	spec.email             = "james@grayproductions.net"
-	spec.rubyforge_project = "fastercsv"
-	spec.homepage          = "http://fastercsv.rubyforge.org"
-	spec.description       = <<END_DESC
-FasterCSV is intended as a complete replacement to the CSV standard library. It
-is significantly faster and smaller while still being pure Ruby code. It also
-strives for a better interface.
-END_DESC
-end
+# spec = Gem::Specification.new do |spec|
+#   spec.name    = "fastercsv"
+#   spec.version = '1.5.6'
+# 
+#   spec.platform = Gem::Platform::RUBY
+#   spec.summary  = "FasterCSV is CSV, but faster, smaller, and cleaner."
+# 
+#   spec.test_files      = %w[test/ts_all.rb]
+#   spec.files           = Dir.glob("{lib,test,examples}/**/*.rb").
+#                              reject { |item| item.include?(".svn") } +
+#                          Dir.glob("{test,examples}/**/*.csv").
+#                              reject { |item| item.include?(".svn") } +
+#                          %w[Rakefile setup.rb test/line_endings.gz]
+# 
+#   spec.has_rdoc         = true
+#   spec.extra_rdoc_files = %w[ AUTHORS COPYING README INSTALL TODO CHANGELOG
+#                               LICENSE ]
+#   spec.rdoc_options     << "--title" << "FasterCSV Documentation" <<
+#                            "--main"  << "README"
+# 
+#   spec.require_path = "lib"
+# 
+#   spec.author            = "James Edward Gray II"
+#   spec.email             = "james@grayproductions.net"
+#   spec.rubyforge_project = "fastercsv"
+#   spec.homepage          = "http://fastercsv.rubyforge.org"
+#   spec.description       = <<END_DESC
+# FasterCSV is intended as a complete replacement to the CSV standard library. It
+# is significantly faster and smaller while still being pure Ruby code. It also
+# strives for a better interface.
+# END_DESC
+# end
 
 Rake::GemPackageTask.new(spec) do |pkg|
 	pkg.need_zip = true

data/lib/faster_csv.rb

@@ -833,7 +833,8 @@ class FasterCSV
                       :header_converters  => nil,
                       :skip_blanks        => false,
                       :force_quotes       => false,
-                      :raise_exception    => false}.freeze
+                      :raise_exception    => false,
+                      :single_line        => true}.freeze
   
   # 
   # This method will build a drop-in replacement for many of the standard CSV
@@ -1591,9 +1592,12 @@ class FasterCSV
       # add another read to the line
       if read_line = @io.gets(@row_sep)
        line += read_line
+       
+        line = '' if @single_line && line.scan(Regexp.new(@quote_char)).size%2 != 0
       else
        return nil
       end
+      
       # copy the line so we can chop it up in parsing
       parse =  line.dup
       parse.sub!(@parsers[:line_end], "")
@@ -1804,7 +1808,8 @@ class FasterCSV
     @encoding         = options.delete(:encoding)  # nil will use $KCODE
     @field_size_limit = options.delete(:field_size_limit)
     @raise_exception  = options.delete(:raise_exception)
-
+    @single_line      = options.delete(:single_line)
+    
     # prebuild Regexps for faster parsing
     esc_col_sep = Regexp.escape(@col_sep)
     esc_row_sep = Regexp.escape(@row_sep)

data/test/quotes_firstrow.csv

@@ -0,0 +1,4 @@
+NameF,NameL,E-mail Address,Address,Phone,Comment,IM,Gcolumn8,Column9,Column10,Column11
+"slash,,myemail@at.com,,,,,,,,
+Aaron1, Highlander1,Aaron1_Highlander1@example.com,Moscow 1,495-333-22-11,this is short comment 1,testbuddy,FirstText1,SecondText1,ThirdText1,ForthText1
+Aaron2, Highlander2,Aaron2_Highlander2@example.com,Moscow 2,495-333-22-12,this is short comment 2,testbuddy,FirstText2,SecondText2,ThirdText2,ForthText2

data/test/tc_csv_parsing.rb

@@ -52,7 +52,7 @@ class TestCSVParsing < Test::Unit::TestCase
       ["foo,\"\r\n\n\",baz", ["foo", "\r\n\n", "baz"]],
       ["foo,\"foo,bar\",baz", ["foo", "foo,bar", "baz"]],
       [";,;", [";", ";"]] ].each do |csv_test|
-      assert_equal(csv_test.last, FasterCSV.parse_line(csv_test.first))
+      assert_equal(csv_test.last, FasterCSV.parse_line(csv_test.first, :single_line => false))
     end
 
     [ ["foo,\"\"\"\"\"\",baz", ["foo", "\"\"", "baz"]],
@@ -71,7 +71,7 @@ class TestCSVParsing < Test::Unit::TestCase
       ["foo,bar", ["foo", "bar"]],
       ["foo,\"\r\n\n\",baz", ["foo", "\r\n\n", "baz"]],
       ["foo,\"foo,bar\",baz", ["foo", "foo,bar", "baz"]] ].each do |csv_test|
-      assert_equal(csv_test.last, FasterCSV.parse_line(csv_test.first))
+      assert_equal(csv_test.last, FasterCSV.parse_line(csv_test.first, :single_line => false))
     end
   end
   
@@ -94,7 +94,7 @@ class TestCSVParsing < Test::Unit::TestCase
       [%Q{,"\r"},             [nil,"\r"]],
       [%Q{"\r\n,"},           ["\r\n,"]],
       [%Q{"\r\n,",},          ["\r\n,", nil]] ].each do |edge_case|
-        assert_equal(edge_case.last, FasterCSV.parse_line(edge_case.first))
+        assert_equal(edge_case.last, FasterCSV.parse_line(edge_case.first, :single_line => false))
       end
   end
   
@@ -121,7 +121,7 @@ class TestCSVParsing < Test::Unit::TestCase
       [%Q{"a\r\n\r\na","two CRLFs"},       ["a\r\n\r\na", 'two CRLFs']],
       [%Q{with blank,"start\n\nfinish"\n}, ['with blank', "start\n\nfinish"]],
     ].each do |edge_case|
-      assert_equal(edge_case.last, FasterCSV.parse_line(edge_case.first))
+      assert_equal(edge_case.last, FasterCSV.parse_line(edge_case.first, :single_line => false))
     end
   end
 
@@ -138,7 +138,7 @@ class TestCSVParsing < Test::Unit::TestCase
   
   def test_malformed_csv
     assert_raise(FasterCSV::MalformedCSVError) do
-      FasterCSV.parse_line("1,2\r,3", :row_sep => "\n")
+      FasterCSV.parse_line("1,2\r,3", :row_sep => "\n", :raise_exception => true, :single_line => false)
     end
     
     bad_data = <<-END_DATA.gsub(/^ +/, "")
@@ -152,7 +152,7 @@ class TestCSVParsing < Test::Unit::TestCase
     assert_equal(6, lines.size)
     assert_match(/\Aline,4/, lines.find { |l| l =~ /some\rjunk/ })
     
-    csv = FasterCSV.new(bad_data)
+    csv = FasterCSV.new(bad_data, :raise_exception => true, :single_line => false)
     begin
       loop do
         assert_not_nil(csv.shift)
@@ -164,10 +164,10 @@ class TestCSVParsing < Test::Unit::TestCase
     end
 
     assert_nothing_raised(FasterCSV::MalformedCSVError) do 
-      FasterCSV.parse_line('1,2,"3...',{:raise_exception => false})
+      FasterCSV.parse_line('1,2,"3...')
     end
     assert_raise(FasterCSV::MalformedCSVError) do 
-      FasterCSV.parse_line('1,2,"3...')
+      FasterCSV.parse_line('1,2,"3...',{:raise_exception => true, :single_line => false} )
     end
     
     bad_data = <<-END_DATA.gsub(/^ +/, "")
@@ -181,7 +181,7 @@ class TestCSVParsing < Test::Unit::TestCase
     assert_equal(6, lines.size)
     assert_match(/\Aline,4/, lines.find { |l| l =~ /8'10"/ })
     
-    csv = FasterCSV.new(bad_data)
+    csv = FasterCSV.new(bad_data, :raise_exception => true, :single_line => false)
     begin
       loop do
         assert_not_nil(csv.shift)

data/test/tc_features.rb

@@ -36,7 +36,7 @@ class TestFasterCSVFeatures < Test::Unit::TestCase
     
     line,4,jkl
     END_DATA
-    @csv = FasterCSV.new(@sample_data)
+    @csv = FasterCSV.new(@sample_data,  :single_line => false)
   end
   
   def test_col_sep
@@ -44,7 +44,7 @@ class TestFasterCSVFeatures < Test::Unit::TestCase
       TEST_CASES.each do |test_case|
         assert_equal( test_case.last.map { |t| t.tr(",", sep) unless t.nil? },
                       FasterCSV.parse_line( test_case.first.tr(",", sep),
-                                            :col_sep => sep ) )
+                                            :col_sep => sep, :single_line => false ) )
       end
     end
     assert_equal( [",,,", nil],
@@ -53,7 +53,7 @@ class TestFasterCSVFeatures < Test::Unit::TestCase
   
   def test_row_sep
     assert_raise(FasterCSV::MalformedCSVError) do
-        FasterCSV.parse_line("1,2,3\n,4,5\r\n", :row_sep => "\r\n")
+        FasterCSV.parse_line("1,2,3\n,4,5\r\n", :row_sep => "\r\n", :raise_exception => true, :single_line => false)
     end
     assert_equal( ["1", "2", "3\n", "4", "5"],
                   FasterCSV.parse_line( %Q{1,2,"3\n",4,5\r\n},
@@ -64,7 +64,7 @@ class TestFasterCSVFeatures < Test::Unit::TestCase
     TEST_CASES.each do |test_case|
       assert_equal( test_case.last.map { |t| t.tr('"', "'") unless t.nil? },
                     FasterCSV.parse_line( test_case.first.tr('"', "'"),
-                                          :quote_char => "'" ) )
+                                          :quote_char => "'", :single_line => false ) )
     end
   end
   
@@ -110,7 +110,7 @@ class TestFasterCSVFeatures < Test::Unit::TestCase
   def test_skip_blanks
     assert_equal(4, @csv.to_a.size)
 
-    @csv  = FasterCSV.new(@sample_data, :skip_blanks => true)
+    @csv  = FasterCSV.new(@sample_data, :skip_blanks => true, :single_line => false)
     
     count = 0
     @csv.each do |row|

data/test/tc_rp_cases.rb

@@ -41,5 +41,29 @@ class TestFasterCSVRPCases < Test::Unit::TestCase
     assert_equal(5,lines.size)
   end
   
+  #RPBS-3899
+  def test_success_import_file_with_unclosed_quotes
+    lines = []
+    csv = FasterCSV.open(File.join(File.dirname(__FILE__), "quotes_firstrow.csv"), :raise_exception => false)
+    assert_nothing_raised do
+      while line = csv.gets
+        lines<<line
+      end
+    end
+    # puts lines.inspect
+    assert_equal(4,lines.size)
+  end
+
+  def test_failed_import_file_with_unclosed_quotes
+    lines = []
+    csv = FasterCSV.open(File.join(File.dirname(__FILE__), "quotes_firstrow.csv"), :raise_exception => false, :single_line => false)
+    assert_nothing_raised do
+      while line = csv.gets
+        lines<<line
+      end
+    end
+    assert_equal(1,lines.size)
+  end
+  
 
 end

data/test/tc_speed.rb

@@ -40,16 +40,16 @@ class TestFasterCSVSpeed < Test::Unit::TestCase
   end
   
   def test_the_parse_fails_fast_when_it_can_for_unquoted_fields
-    assert_parse_errors_out('valid,fields,bad start"' + BIG_DATA)
+    assert_parse_errors_out('valid,fields,bad start"' + BIG_DATA, :raise_exception => true, :single_line => false)
   end
   
   def test_the_parse_fails_fast_when_it_can_for_unescaped_quotes
-    assert_parse_errors_out('valid,fields,"bad start"unescaped' + BIG_DATA)
+    assert_parse_errors_out('valid,fields,"bad start"unescaped' + BIG_DATA, :raise_exception => true, :single_line => false)
   end
   
   def test_field_size_limit_controls_lookahead
     assert_parse_errors_out( 'valid,fields,"' + BIG_DATA + '"',
-                             :field_size_limit => 2048 )
+                             :field_size_limit => 2048, :raise_exception => true, :single_line => false)
   end
   
   private

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 5
-  - 6
-  version: 1.5.6
+  - 7
+  version: 1.5.7
 platform: ruby
 authors: 
 - James Edward Gray II
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-12 00:00:00 +02:00
+date: 2010-11-22 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -41,6 +41,7 @@ files:
 - lib/fastercsv.rb
 - test/export.csv
 - test/line_endings.gz
+- test/quotes_firstrow.csv
 - test/tc_csv_parsing.rb
 - test/tc_csv_writing.rb
 - test/tc_data_converters.rb