fastercsv 1.4.0 → 1.5.5

data/lib/fastercsv.rb

@@ -3,7 +3,7 @@
 # fastercsv.rb
 #
 #  Created by James Edward Gray II on 2006-04-01.
-#  Copyright 2006 Gray Productions. All rights reserved.
+#  Copyright 2012 Gray Productions. All rights reserved.
 # 
 # This file is just another name for faster_csv.rb.
 

data/test/tc_csv_parsing.rb

@@ -3,7 +3,7 @@
 # tc_csv_parsing.rb
 #
 #  Created by James Edward Gray II on 2005-10-31.
-#  Copyright 2005 Gray Productions. All rights reserved.
+#  Copyright 2012 Gray Productions. All rights reserved.
 
 require "test/unit"
 
@@ -108,6 +108,33 @@ class TestCSVParsing < Test::Unit::TestCase
     # 
     assert_equal(Array.new, FasterCSV.parse_line("\n1,2,3\n"))
   end
+
+  def test_rob_edge_cases
+    [ [%Q{"a\nb"},                         ["a\nb"]],
+      [%Q{"\n\n\n"},                       ["\n\n\n"]],
+      [%Q{a,"b\n\nc"},                     ['a', "b\n\nc"]],
+      [%Q{,"\r\n"},                        [nil,"\r\n"]],
+      [%Q{,"\r\n."},                       [nil,"\r\n."]],
+      [%Q{"a\na","one newline"},           ["a\na", 'one newline']],
+      [%Q{"a\n\na","two newlines"},        ["a\n\na", 'two newlines']],
+      [%Q{"a\r\na","one CRLF"},            ["a\r\na", 'one CRLF']],
+      [%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))
+    end
+  end
+
+  def test_non_regex_edge_cases
+    # An early version of the non-regex parser fails this test
+    [["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
     assert_raise(FasterCSV::MalformedCSVError) do
@@ -158,7 +185,7 @@ class TestCSVParsing < Test::Unit::TestCase
         assert_send([csv.lineno, :<, 4])
       end
     rescue FasterCSV::MalformedCSVError
-      assert_equal("Illegal quoting on line 4.", $!.message)
+      assert_equal("Illegal quoting in line 4.", $!.message)
     end
   end
 end

data/test/tc_csv_writing.rb

@@ -3,7 +3,7 @@
 # tc_csv_writing.rb
 #
 #  Created by James Edward Gray II on 2005-11-14.
-#  Copyright 2005 Gray Productions. All rights reserved.
+#  Copyright 2012 Gray Productions. All rights reserved.
 
 require "test/unit"
 

data/test/tc_data_converters.rb

@@ -3,7 +3,7 @@
 # tc_data_converters.rb
 #
 #  Created by James Edward Gray II on 2005-12-30.
-#  Copyright 2005 Gray Productions. All rights reserved.
+#  Copyright 2012 Gray Productions. All rights reserved.
 
 require "test/unit"
 

data/test/tc_encodings.rb

@@ -3,7 +3,7 @@
 # tc_encodings.rb
 #
 #  Created by Michael Reinsch.
-#  Copyright (c) 2008 Ubiquitous Business Technology, Inc.
+#  Copyright (c) 2012 Ubiquitous Business Technology, Inc.
 
 require "test/unit"
 

data/test/tc_features.rb

@@ -3,7 +3,7 @@
 # tc_features.rb
 #
 #  Created by James Edward Gray II on 2005-11-14.
-#  Copyright 2005 Gray Productions. All rights reserved.
+#  Copyright 2012 Gray Productions. All rights reserved.
 
 require "test/unit"
 require "zlib"

data/test/tc_headers.rb

@@ -3,7 +3,7 @@
 # tc_headers.rb
 #
 #  Created by James Edward Gray II on 2006-02-25.
-#  Copyright 2006 Gray Productions. All rights reserved.
+#  Copyright 2012 Gray Productions. All rights reserved.
 
 require "test/unit"
 

data/test/tc_interface.rb

@@ -3,7 +3,7 @@
 # tc_interface.rb
 #
 #  Created by James Edward Gray II on 2005-11-14.
-#  Copyright 2005 Gray Productions. All rights reserved.
+#  Copyright 2012 Gray Productions. All rights reserved.
 
 require "test/unit"
 
@@ -72,6 +72,11 @@ class TestFasterCSVInterface < Test::Unit::TestCase
     assert_equal(%w{1 2 3}, row)
   end
   
+  def test_parse_line_with_empty_lines
+    assert_equal(nil,       FasterCSV.parse_line(""))  # to signal eof
+    assert_equal(Array.new, FasterCSV.parse_line("\n1,2,3"))
+  end
+  
   def test_read_and_readlines
     assert_equal( @expected,
                   FasterCSV.read(@path, :col_sep => "\t", :row_sep => "\r\n") )
@@ -103,6 +108,17 @@ class TestFasterCSVInterface < Test::Unit::TestCase
       assert_equal(nil, csv.shift)
     end
   end
+
+  def test_long_line # ruby's regex parser may have problems with long rows
+    File.unlink(@path)
+
+    long_field_length = 2800
+    File.open(@path, "w") do |file|
+      file << "1\t2\t#{'3' * long_field_length}\r\n"
+    end
+    @expected = [%w{1 2} + ['3' * long_field_length]]
+    test_shift
+  end
   
   ### Test Write Interface ###
 
@@ -165,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_row.rb

@@ -3,7 +3,7 @@
 # tc_row.rb
 #
 #  Created by James Edward Gray II on 2006-02-24.
-#  Copyright 2006 Gray Productions. All rights reserved.
+#  Copyright 2012 Gray Productions. All rights reserved.
 
 require "test/unit"
 

data/test/tc_serialization.rb

@@ -3,7 +3,7 @@
 # tc_serialization.rb
 #
 #  Created by James Edward Gray II on 2006-03-28.
-#  Copyright 2006 Gray Productions. All rights reserved.
+#  Copyright 2012 Gray Productions. All rights reserved.
 
 require "test/unit"
 

data/test/tc_speed.rb

@@ -3,7 +3,7 @@
 # tc_speed.rb
 #
 #  Created by James Edward Gray II on 2005-11-14.
-#  Copyright 2005 Gray Productions. All rights reserved.
+#  Copyright 2012 Gray Productions. All rights reserved.
 
 require "test/unit"
 require "timeout"

data/test/tc_table.rb

@@ -3,7 +3,7 @@
 # tc_table.rb
 #
 #  Created by James Edward Gray II on 2006-02-24.
-#  Copyright 2006 Gray Productions. All rights reserved.
+#  Copyright 2012 Gray Productions. All rights reserved.
 
 require "test/unit"
 
@@ -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)
@@ -319,6 +321,12 @@ class TestFasterCSVTable < Test::Unit::TestCase
     END_RESULT
   end
   
+  def test_delete_with_blank_rows
+    data = "col1,col2\nra1,ra2\n\nrb1,rb2"
+    table = FasterCSV.parse(data, :headers => true)
+    assert_equal(["ra2", nil, "rb2"], table.delete("col2"))
+  end
+  
   def test_delete_if
     ######################
     ### Mixed/Row Mode ###

data/test/ts_all.rb

@@ -3,7 +3,7 @@
 # ts_all.rb
 #
 #  Created by James Edward Gray II on 2005-11-14.
-#  Copyright 2005 Gray Productions. All rights reserved.
+#  Copyright 2012 Gray Productions. All rights reserved.
 
 require "test/unit"
 

metadata

@@ -1,25 +1,28 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: fastercsv
-version: !ruby/object:Gem::Version 
-  version: 1.4.0
+version: !ruby/object:Gem::Version
+  version: 1.5.5
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - James Edward Gray II
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2008-09-10 00:00:00 -05:00
-default_executable: 
+date: 2012-05-15 00:00:00.000000000 Z
 dependencies: []
+description: ! '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.
 
-description: 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.
+'
 email: james@grayproductions.net
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - AUTHORS
 - COPYING
 - README
@@ -27,7 +30,7 @@ extra_rdoc_files:
 - TODO
 - CHANGELOG
 - LICENSE
-files: 
+files:
 - lib/faster_csv.rb
 - lib/fastercsv.rb
 - test/tc_csv_parsing.rb
@@ -51,7 +54,7 @@ files:
 - test/test_data.csv
 - examples/purchase.csv
 - Rakefile
-- setup.rb
+- test/line_endings.gz
 - AUTHORS
 - COPYING
 - README
@@ -59,34 +62,33 @@ files:
 - TODO
 - CHANGELOG
 - LICENSE
-has_rdoc: true
 homepage: http://fastercsv.rubyforge.org
+licenses: []
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --title
 - FasterCSV Documentation
 - --main
 - README
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: fastercsv
-rubygems_version: 1.2.0
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: FasterCSV is CSV, but faster, smaller, and cleaner.
-test_files: 
+test_files:
 - test/ts_all.rb