fastercsv 1.2.1 → 1.2.2

data/CHANGELOG

@@ -4,6 +4,11 @@ Below is a complete listing of changes for each revision of FasterCSV.
 
 == 1.2.1
 
+* Worked around GzipReader's lack of a seek() method so we could still use
+  automatic row separator detection with them.
+  
+== 1.2.1
+
 * Worked around an odd incompatibility with the Regexps used to remove line
   endings in some (seemingly rare) Ruby environments.
 * Made FasterCSV::lineno() writer aware.

data/lib/faster_csv.rb

@@ -75,7 +75,7 @@ require "stringio"
 # 
 class FasterCSV
   # The version of the installed library.
-  VERSION = "1.2.1".freeze
+  VERSION = "1.2.2".freeze
   
   # 
   # A FasterCSV::Row is part Array and part Hash.  It retains an order for the
@@ -1646,7 +1646,14 @@ class FasterCSV
               break
             end
           end
-          @io.seek(saved_pos)  # reset back to the remembered position 
+          # tricky seek() clone to work around GzipReader's lack of seek()
+          @io.rewind
+          # reset back to the remembered position
+          while saved_pos > 1024  # avoid loading a lot of data into memory
+            @io.read(1024)
+            saved_pos -= 1024
+          end
+          @io.read(saved_pos) if saved_pos.nonzero?
         rescue IOError  # stream not opened for reading
           @row_sep = $INPUT_RECORD_SEPARATOR
         end

data/test/tc_features.rb

@@ -6,6 +6,7 @@
 #  Copyright 2005 Gray Productions. All rights reserved.
 
 require "test/unit"
+require "zlib"
 
 require "faster_csv"
 
@@ -145,6 +146,18 @@ class TestFasterCSVFeatures < Test::Unit::TestCase
     assert_equal([[nil, nil, "A", "B", "C"], ["1", "2", "3"]], parsed)
   end
   
+  def test_gzip_reader_bug_fix
+    zipped = nil
+    assert_nothing_raised(NoMethodError) do
+      zipped = FasterCSV.new(
+                 Zlib::GzipReader.open(
+                   File.join(File.dirname(__FILE__), "line_endings.gz")
+                 )
+               )
+    end
+    assert_equal("\r\n", zipped.instance_eval { @row_sep })
+  end
+  
   def test_version
     assert_not_nil(FasterCSV::VERSION)
     assert_instance_of(String, FasterCSV::VERSION)

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: fastercsv
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
-date: 2007-09-20 00:00:00 -05:00
+  version: 1.2.2
+date: 2007-12-01 00:00:00 -06:00
 summary: FasterCSV is CSV, but faster, smaller, and cleaner.
 require_paths: 
 - lib