fastercsv 1.1.0 → 1.1.1

data/CHANGELOG

@@ -2,6 +2,10 @@
 
 Below is a complete listing of changes for each revision of FasterCSV.
 
+== 1.1.1
+
+* Added a <tt>:force_quotes</tt> output option.
+
 == 1.1.0
 
 * Added empty?(), length(), and size() methods to FasterCSV::Row and

data/lib/faster_csv.rb

@@ -75,7 +75,7 @@ require "stringio"
 # 
 class FasterCSV
   # The version of the installed library.
-  VERSION = "1.1.0".freeze
+  VERSION = "1.1.1".freeze
   
   # 
   # A FasterCSV::Row is part Array and part Hash.  It retains an order for the
@@ -774,6 +774,7 @@ class FasterCSV
   # <b><tt>:return_headers</tt></b>::     +false+
   # <b><tt>:header_converters</tt></b>::  +nil+
   # <b><tt>:skip_blanks</tt></b>::        +false+
+  # <b><tt>:force_quotes</tt></b>::       +false+
   # 
   DEFAULT_OPTIONS = { :col_sep            => ",",
                       :row_sep            => :auto,
@@ -782,7 +783,8 @@ class FasterCSV
                       :headers            => false,
                       :return_headers     => false,
                       :header_converters  => nil,
-                      :skip_blanks        => false }.freeze
+                      :skip_blanks        => false,
+                      :force_quotes       => false }.freeze
   
   # 
   # This method will build a drop-in replacement for many of the standard CSV
@@ -1292,6 +1294,8 @@ class FasterCSV
   # <b><tt>:skip_blanks</tt></b>::        When set to a +true+ value, FasterCSV
   #                                       will skip over any rows with no
   #                                       content.
+  # <b><tt>:force_quotes</tt></b>::       When set to a +true+ value, FasterCSV
+  #                                       will quote all CSV fields it creates.
   # 
   # See FasterCSV::DEFAULT_OPTIONS for the default settings.
   # 
@@ -1354,19 +1358,7 @@ class FasterCSV
     # handle FasterCSV::Row objects
     row = row.fields if row.is_a? self.class::Row
     
-    @io << row.map do |field|
-      if field.nil?  # represent +nil+ fields as empty unquoted fields
-        ""
-      else
-        field = String(field)  # Stringify fields
-        # represent empty fields as empty quoted fields
-        if field.empty? or field.count(%Q{\r\n#{@col_sep}"}).nonzero?
-          %Q{"#{field.gsub('"', '""')}"}  # escape quoted fields
-        else
-          field  # unquoted field
-        end
-      end
-    end.join(@col_sep) + @row_sep  # add separators
+    @io << row.map(&@quote).join(@col_sep) + @row_sep  # quote and separate
     
     self  # for chaining
   end
@@ -1573,6 +1565,8 @@ class FasterCSV
   # +STDERR+ and any stream open for output only with a default
   # <tt>@row_sep</tt> of <tt>$INPUT_RECORD_SEPARATOR</tt> (<tt>$/</tt>).
   # 
+  # This method also establishes the quoting rules used for CSV output.
+  # 
   def init_separators(options)
     # store the selected separators
     @col_sep = options.delete(:col_sep)
@@ -1611,6 +1605,25 @@ class FasterCSV
         end
       end
     end
+    
+    # establish quoting rules
+    @quote = if options.delete(:force_quotes)
+      lambda { |field| %Q{"#{String(field).gsub('"', '""')}"} }
+    else
+      lambda do |field|
+        if field.nil?  # represent +nil+ fields as empty unquoted fields
+          ""
+        else
+          field = String(field)  # Stringify fields
+          # represent empty fields as empty quoted fields
+          if field.empty? or field.count(%Q{\r\n#{@col_sep}"}).nonzero?
+            %Q{"#{field.gsub('"', '""')}"}  # escape quoted fields
+          else
+            field  # unquoted field
+          end
+        end
+      end
+    end
   end
   
   # Pre-compiles parsers and stores them by name for access during reads.

data/test/tc_csv_writing.rb

@@ -87,4 +87,10 @@ class TestFasterCSVWriting < Test::Unit::TestCase
     assert_equal( "a,b,,c\r\n", FasterCSV.generate_line( ["a", "b", nil, "c"],
                                                          :row_sep => "\r\n" ) )
   end
+  
+  def test_force_quotes
+    assert_equal( %Q{"1","b","","already ""quoted"""\n},
+                  FasterCSV.generate_line( [1, "b", nil, %Q{already "quoted"}],
+                                           :force_quotes => true ) )
+  end
 end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.1
 specification_version: 1
 name: fastercsv
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
-date: 2006-12-12 00:00:00 -06:00
+  version: 1.1.1
+date: 2007-01-31 00:00:00 -06:00
 summary: FasterCSV is CSV, but faster, smaller, and cleaner.
 require_paths: 
 - lib
@@ -25,6 +25,7 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - James Edward Gray II
 files: