fastercsv 1.5.4 → 1.5.5

data/CHANGELOG

@@ -2,6 +2,13 @@
 
 Below is a complete listing of changes for each revision of FasterCSV.
 
+== 1.5.5
+
+* Removed setup.rb due to licensing concerns.
+* Updated and clarified Copyright notices.
+* Improved stray quoting error message (patch by Edvard Majakari).
+* Improved line ending detection algorithm (patch by Alexey Smolianinov).
+
 == 1.5.4
 
 * Improved test coverage for the parser.

data/INSTALL

@@ -20,14 +20,6 @@ command:
 
   $ rake package
 
-== Installing Manually
-
-Download the latest version of FasterCSV from the
-{RubyForge project page}[http://rubyforge.org/frs/?group_id=1102].  Navigate to
-the root project directory and enter:
-
-	$ sudo ruby setup.rb
-
 == Running the Tests
 
 If you would like to run FasterCSV's test suite on your system before installing

data/LICENSE

@@ -1,5 +1,7 @@
 = License Terms
 
+This project is copyright Gray Productions Software Inc. and Ubiquitous Business Technology, Inc. with all rights reserved.
+
 Distributed under the user's choice of the {GPL Version 2}[http://www.gnu.org/licenses/old-licenses/gpl-2.0.html] (see COPYING for details) or the
 {Ruby software license}[http://www.ruby-lang.org/en/LICENSE.txt] by
 James Edward Gray II.

data/Rakefile

@@ -20,6 +20,7 @@ Rake::RDocTask.new do |rdoc|
 	rdoc.main     = "README"
 	rdoc.rdoc_dir = "doc/html"
 	rdoc.title    = "FasterCSV Documentation"
+	rdoc.options  = %w[--charset utf-8]
 	rdoc.rdoc_files.include( "README",  "INSTALL",
 	                         "TODO",    "CHANGELOG",
 	                         "AUTHORS", "COPYING",
@@ -61,7 +62,7 @@ spec = Gem::Specification.new do |spec|
 	                           reject { |item| item.include?(".svn") } +
 	                       Dir.glob("{test,examples}/**/*.csv").
 	                           reject { |item| item.include?(".svn") } +
-	                       %w[Rakefile setup.rb test/line_endings.gz]
+	                       %w[Rakefile test/line_endings.gz]
 
 	spec.has_rdoc         = true
 	spec.extra_rdoc_files = %w[ AUTHORS COPYING README INSTALL TODO CHANGELOG

data/examples/shortcut_interface.rb

@@ -3,7 +3,7 @@
 # shortcut_interface.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.
 # 
 # Feature implementation and example code by Ara.T.Howard.
 

data/lib/faster_csv.rb

@@ -100,7 +100,7 @@ else
   # 
   class FasterCSV
     # The version of the installed library.
-    VERSION = "1.5.4".freeze
+    VERSION = "1.5.5".freeze
 
     # 
     # A FasterCSV::Row is part Array and part Hash.  It retains an order for the
@@ -1258,7 +1258,7 @@ else
     # a into an Array.  Note that if +line+ contains multiple rows, anything 
     # beyond the first row is ignored.
     # 
-    # The +options+ parameter can be anthing FasterCSV::new() understands.
+    # The +options+ parameter can be anything FasterCSV::new() understands.
     # 
     def self.parse_line(line, options = Hash.new)
       new(line, options).shift
@@ -1297,7 +1297,7 @@ else
     # list.)  If you pass a String for +data+, you can later retrieve it (after
     # writing to it, for example) with FasterCSV.string().
     # 
-    # Note that a wrapped String will be positioned at at the beginning (for 
+    # Note that a wrapped String will be positioned at the beginning (for 
     # reading).  If you want it at the end (for writing), use 
     # FasterCSV::generate().  If you want any other positioning, pass a preset 
     # StringIO object instead.
@@ -1318,9 +1318,7 @@ else
     #                                       even if it occurs in a quoted field,
     #                                       assuming that you would have the same
     #                                       line endings there.  If none of those
-    #                                       sequences is found, +data+ is
-    #                                       <tt>ARGF</tt>, <tt>STDIN</tt>,
-    #                                       <tt>STDOUT</tt>, or <tt>STDERR</tt>,
+    #                                       sequences is found, 
     #                                       or the stream is only available for
     #                                       output, the default
     #                                       <tt>$INPUT_RECORD_SEPARATOR</tt>
@@ -1344,7 +1342,7 @@ else
     #                                       double sequence this character to be
     #                                       an escaped quote.
     # <b><tt>:encoding</tt></b>::           The encoding to use when parsing the
-    #                                       file. Defaults to your <tt>$KDOCE</tt>
+    #                                       file. Defaults to your <tt>$KCODE</tt>
     #                                       setting. Valid values: <tt>`n’</tt> or
     #                                       <tt>`N’</tt> for none, <tt>`e’</tt> or
     #                                       <tt>`E’</tt> for EUC, <tt>`s’</tt> or
@@ -1402,6 +1400,10 @@ else
     #                                       through the converters).
     # <b><tt>:write_headers</tt></b>::      When +true+ and <tt>:headers</tt> is
     #                                       set, a header row will be added to the
+    #                                       output. Note that if the table only
+    #                                       contains header rows,
+    #                                       <tt>:return_headers</tt> must also be
+    #                                       set in order for a header row to be
     #                                       output.
     # <b><tt>:header_converters</tt></b>::  Identical in functionality to
     #                                       <tt>:converters</tt> save that the
@@ -1638,8 +1640,10 @@ else
             field_quotes += match.count(@quote_char)
             if field_quotes % 2 == 0
               in_quotes = current_field[@parsers[:quoted_field], 1]
-              raise MalformedCSVError if !in_quotes ||
-                                         in_quotes[@parsers[:stray_quote]]
+              if !in_quotes || in_quotes[@parsers[:stray_quote]]
+                raise MalformedCSVError,
+                      "Missing or stray quote in line #{lineno + 1}"
+              end
               current_field = in_quotes
               current_field.gsub!(@quote_char * 2, @quote_char) # unescape contents
               csv           << current_field
@@ -1649,7 +1653,7 @@ else
               current_field << @col_sep
             end
           elsif match.count("\r\n").zero?
-            raise MalformedCSVError, "Illegal quoting on line #{lineno + 1}."
+            raise MalformedCSVError, "Illegal quoting in line #{lineno + 1}."
           else
             raise MalformedCSVError, "Unquoted fields do not allow " +
                                      "\\r or \\n (line #{lineno + 1})."
@@ -1739,43 +1743,50 @@ else
 
       # automatically discover row separator when requested
       if @row_sep == :auto
-        if [ARGF, STDIN, STDOUT, STDERR].include?(@io) or
-          (defined?(Zlib) and @io.class == Zlib::GzipWriter)
-          @row_sep = $INPUT_RECORD_SEPARATOR
-        else
-          begin
-            saved_pos = @io.pos  # remember where we were
-            while @row_sep == :auto
-              # 
-              # if we run out of data, it's probably a single line 
-              # (use a sensible default)
-              # 
-              if @io.eof?
-                @row_sep = $INPUT_RECORD_SEPARATOR
-                break
-              end
-
-              # read ahead a bit
-              sample =  @io.read(1024)
-              sample += @io.read(1) if sample[-1..-1] == "\r" and not @io.eof?
-
-              # try to find a standard separator
-              if sample =~ /\r\n?|\n/
-                @row_sep = $&
-                break
-              end
-            end
-            # 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
+        begin
+          #
+          # remember where we were (pos() will raise an axception if @io is pipe
+          # or not opened for reading)
+          #
+          saved_pos = @io.pos
+          while @row_sep == :auto
+            #
+            # if we run out of data, it's probably a single line
+            # (ensure will set default value)
+            #
+            break if @io.eof?
+
+            # read ahead a bit
+            sample =  @io.read(1024)
+            sample += @io.read(1) if sample[-1..-1] == "\r" and not @io.eof?
+
+            # try to find a standard separator
+            if sample =~ /\r\n?|\n/
+              @row_sep = $&
+              break
             end
-            @io.read(saved_pos) if saved_pos.nonzero?
-          rescue IOError  # stream not opened for reading
-            @row_sep = $INPUT_RECORD_SEPARATOR
           end
+
+          # 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         # not opened for reading
+          # do nothing:  ensure will set default
+        rescue NoMethodError   # Zlib::GzipWriter doesn't have eof?
+          # do nothing:  ensure will set default
+        rescue SystemCallError # pipe
+          # do nothing:  ensure will set default
+        ensure
+          #
+          # set default if we failed to detect
+          # (stream not opened for reading, a pipe, or a single line of data)
+          #
+          @row_sep = $INPUT_RECORD_SEPARATOR if @row_sep == :auto
         end
       end
 

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"
 
@@ -185,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"
 

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"
 

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,35 +1,28 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: fastercsv
-version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: false
-  segments: 
-  - 1
-  - 5
-  - 4
-  version: 1.5.4
+version: !ruby/object:Gem::Version
+  version: 1.5.5
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - James Edward Gray II
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-01-07 00:00:00 -06: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
 
-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
@@ -37,7 +30,7 @@ extra_rdoc_files:
 - TODO
 - CHANGELOG
 - LICENSE
-files: 
+files:
 - lib/faster_csv.rb
 - lib/fastercsv.rb
 - test/tc_csv_parsing.rb
@@ -61,7 +54,6 @@ files:
 - test/test_data.csv
 - examples/purchase.csv
 - Rakefile
-- setup.rb
 - test/line_endings.gz
 - AUTHORS
 - COPYING
@@ -70,42 +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 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: fastercsv
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: FasterCSV is CSV, but faster, smaller, and cleaner.
-test_files: 
+test_files:
 - test/ts_all.rb