csv 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25367f06751ab916228ddcffcbc857bc13ca1e7fcc65a908fcfc7c974e5473f6
-  data.tar.gz: 92ff4c8f3b96219b9d74fc849311afd0cb97f3d124c77250878402fc006ce2ac
+  metadata.gz: a240b6e6a405972ac623bbc1c369d6833e57b449606ce02d01b183604d621353
+  data.tar.gz: 73cb12bafe60a7331b13d9d7b75837007c55044b78d4580d422ba123af692d25
 SHA512:
-  metadata.gz: 25584f3c7ccf6ffa990dfa5a58cb4564092f51c3145fccb0b54252210096d8d322044c72647be36d7151362fe02e76c3ab103f99615ac42e9f1621ba6f2e9aa4
-  data.tar.gz: 2e0bb6973a005ae822b08bf6c13ff1681bf7c599e2c966f8bfd19ecffc6083fb09a03b74bbb47019a44bda729c0d173bed864815bffa670d19684092da0f128d
+  metadata.gz: 739201c445c8b6ad1644d2ede0522635d10b83a1a2253cea7386190749b762d0301fc15af98c55976180263a210b5c954f49428897760682675db420704543a6
+  data.tar.gz: 6b55c8703407e7fdd09075ce5ce798d66fad1317b65b19b035cde5653f29c13087775cbf1117cdb044689b6a33c031c9624c503eb3c441a817741fdc5dc6084e

data/NEWS.md

@@ -1,5 +1,48 @@
 # News
 
+## 3.0.3 - 2019-01-12
+
+### Improvements
+
+  * Migrated benchmark tool to benchmark-driver from benchmark-ips.
+    [GitHub#57][Patch by 284km]
+
+  * Added `liberal_parsing: {double_quote_outside_quote: true}` parse
+    option.
+    [GitHub#66][Reported by Watson]
+
+  * Added `quote_empty:` write option.
+    [GitHub#35][Reported by Dave Myron]
+
+### Fixes
+
+  * Fixed a compatibility bug that `CSV.generate` always return
+    `ASCII-8BIT` encoding string.
+    [GitHub#63][Patch by Watson]
+
+  * Fixed a compatibility bug that `CSV.parse("", headers: true)`
+    doesn't return `CSV::Table`.
+    [GitHub#64][Reported by Watson][Patch by 284km]
+
+  * Fixed a compatibility bug that multiple-characters column
+    separator doesn't work.
+    [GitHub#67][Reported by Jesse Reiss]
+
+  * Fixed a compatibility bug that double `#each` parse twice.
+    [GitHub#68][Reported by Max Schwenk]
+
+### Thanks
+
+  * Watson
+
+  * 284km
+
+  * Jesse Reiss
+
+  * Dave Myron
+
+  * Max Schwenk
+
 ## 3.0.2 - 2018-12-23
 
 ### Improvements

data/lib/csv.rb

@@ -397,6 +397,7 @@ class CSV
   # <b><tt>:force_quotes</tt></b>::       +false+
   # <b><tt>:skip_lines</tt></b>::         +nil+
   # <b><tt>:liberal_parsing</tt></b>::    +false+
+  # <b><tt>:quote_empty</tt></b>::        +true+
   #
   DEFAULT_OPTIONS = {
     col_sep:            ",",
@@ -412,6 +413,7 @@ class CSV
     force_quotes:       false,
     skip_lines:         nil,
     liberal_parsing:    false,
+    quote_empty:        true,
   }.freeze
 
   #
@@ -534,7 +536,7 @@ class CSV
       str.seek(0, IO::SEEK_END)
     else
       encoding = options[:encoding]
-      str      = String.new
+      str = +""
       str.force_encoding(encoding) if encoding
     end
     csv = new(str, options) # wrap
@@ -557,11 +559,11 @@ class CSV
   #
   def self.generate_line(row, **options)
     options = {row_sep: $INPUT_RECORD_SEPARATOR}.merge(options)
-    str = String.new
+    str = +""
     if options[:encoding]
       str.force_encoding(options[:encoding])
-    elsif field = row.find { |f| not f.nil? }
-      str.force_encoding(String(field).encoding)
+    elsif field = row.find {|f| f.is_a?(String)}
+      str.force_encoding(field.encoding)
     end
     (new(str, options) << row).string
   end
@@ -882,6 +884,7 @@ class CSV
   # <b><tt>:empty_value</tt></b>::        When set an object, any values of a
   #                                       blank string field is replaced by
   #                                       the set object.
+  # <b><tt>:quote_empty</tt></b>::        TODO
   #
   # See CSV::DEFAULT_OPTIONS for the default settings.
   #
@@ -907,7 +910,8 @@ class CSV
                  external_encoding: nil,
                  encoding: nil,
                  nil_value: nil,
-                 empty_value: "")
+                 empty_value: "",
+                 quote_empty: true)
     raise ArgumentError.new("Cannot parse nil as CSV") if data.nil?
 
     # create the IO object we will read from
@@ -947,6 +951,7 @@ class CSV
       column_separator: col_sep,
       row_separator: row_sep,
       quote_character: quote_char,
+      quote_empty: quote_empty,
     }
 
     @writer = nil
@@ -1178,9 +1183,8 @@ class CSV
   #
   def read
     rows = to_a
-    headers = parser.headers
-    if headers
-      Table.new(rows, headers: headers)
+    if parser.use_headers?
+      Table.new(rows, headers: parser.headers)
     else
       rows
     end

data/lib/csv/parser.rb

@@ -170,6 +170,7 @@ class CSV
       @input = input
       @options = options
       @samples = []
+      @parsed = false
 
       prepare
     end
@@ -229,6 +230,8 @@ class CSV
     def parse(&block)
       return to_enum(__method__) unless block_given?
 
+      return if @parsed
+
       if @return_headers and @headers
         headers = Row.new(@headers, @raw_headers, true)
         if @unconverted_fields
@@ -262,10 +265,10 @@ class CSV
             skip_needless_lines
             start_row
           elsif @scanner.eos?
-            return if row.empty? and value.nil?
+            break if row.empty? and value.nil?
             row << value
             emit_row(row, &block)
-            return
+            break
           else
             if @quoted_column_value
               message = "Do not allow except col_sep_split_separator " +
@@ -287,6 +290,12 @@ class CSV
         message = "Invalid byte sequence in #{@encoding}"
         raise MalformedCSVError.new(message, @lineno + 1)
       end
+
+      @parsed = true
+    end
+
+    def use_headers?
+      @use_headers
     end
 
     private
@@ -300,7 +309,18 @@ class CSV
 
     def prepare_variable
       @encoding = @options[:encoding]
-      @liberal_parsing = @options[:liberal_parsing]
+      liberal_parsing = @options[:liberal_parsing]
+      if liberal_parsing
+        @liberal_parsing = true
+        if liberal_parsing.is_a?(Hash)
+          @double_quote_outside_quote =
+            liberal_parsing[:double_quote_outside_quote]
+        else
+          @double_quote_outside_quote = false
+        end
+      else
+        @liberal_parsing = false
+      end
       @unconverted_fields = @options[:unconverted_fields]
       @field_size_limit = @options[:field_size_limit]
       @skip_blanks = @options[:skip_blanks]
@@ -318,6 +338,7 @@ class CSV
       end
 
       escaped_column_separator = Regexp.escape(@column_separator)
+      escaped_first_column_separator = Regexp.escape(@column_separator[0])
       escaped_row_separator = Regexp.escape(@row_separator)
       escaped_quote_character = Regexp.escape(@quote_character)
 
@@ -341,8 +362,11 @@ class CSV
         @column_ends = @column_separator.each_char.collect do |char|
           Regexp.new(Regexp.escape(char))
         end
+        @first_column_separators = Regexp.new(escaped_first_column_separator +
+                                              "+".encode(@encoding))
       else
         @column_ends = nil
+        @first_column_separators = nil
       end
       @row_end = Regexp.new(escaped_row_separator)
       if @row_separator.size > 1
@@ -359,12 +383,12 @@ class CSV
                                  "]+".encode(@encoding))
       if @liberal_parsing
         @unquoted_value = Regexp.new("[^".encode(@encoding) +
-                                     escaped_column_separator +
+                                     escaped_first_column_separator +
                                      "\r\n]+".encode(@encoding))
       else
         @unquoted_value = Regexp.new("[^".encode(@encoding) +
                                      escaped_quote_character +
-                                     escaped_column_separator +
+                                     escaped_first_column_separator +
                                      "\r\n]+".encode(@encoding))
       end
       @cr_or_lf = Regexp.new("[\r\n]".encode(@encoding))
@@ -583,6 +607,13 @@ class CSV
         if quoted_value
           unquoted_value = parse_unquoted_column_value
           if unquoted_value
+            if @double_quote_outside_quote
+              unquoted_value = unquoted_value.gsub(@quote_character * 2,
+                                                   @quote_character)
+              if quoted_value.empty? # %Q{""...} case
+                return @quote_character + unquoted_value
+              end
+            end
             @quote_character + quoted_value + @quote_character + unquoted_value
           else
             quoted_value
@@ -601,7 +632,25 @@ class CSV
 
     def parse_unquoted_column_value
       value = @scanner.scan_all(@unquoted_value)
-      @unquoted_column_value = true if value
+      return nil unless value
+
+      @unquoted_column_value = true
+      if @first_column_separators
+        while true
+          @scanner.keep_start
+          is_column_end = @column_ends.all? do |column_end|
+            @scanner.scan(column_end)
+          end
+          @scanner.keep_back
+          break if is_column_end
+          sub_separator = @scanner.scan_all(@first_column_separators)
+          break if sub_separator.nil?
+          value << sub_separator
+          sub_value = @scanner.scan_all(@unquoted_value)
+          break if sub_value.nil?
+          value << sub_value
+        end
+      end
       value
     end
 

data/lib/csv/version.rb

@@ -2,5 +2,5 @@
 
 class CSV
   # The version of the installed library.
-  VERSION = "3.0.2"
+  VERSION = "3.0.3"
 end

data/lib/csv/writer.rb

@@ -31,7 +31,10 @@ class CSV
       @headers ||= row if @use_headers
       @lineno += 1
 
-      line = row.collect(&@quote).join(@column_separator) + @row_separator
+      converted_row = row.collect do |field|
+        quote(field)
+      end
+      line = converted_row.join(@column_separator) + @row_separator
       if @output_encoding
         line = line.encode(@output_encoding)
       end
@@ -90,37 +93,16 @@ class CSV
       else
         @row_separator = row_separator.to_s.encode(@encoding)
       end
-      quote_character = @options[:quote_character]
-      quote = lambda do |field|
-        field = String(field)
-        encoded_quote_character = quote_character.encode(field.encoding)
-        encoded_quote_character +
-          field.gsub(encoded_quote_character,
-                     encoded_quote_character * 2) +
-          encoded_quote_character
-      end
-      if @options[:force_quotes]
-        @quote = quote
-      else
-        quotable_pattern =
+      @quote_character = @options[:quote_character]
+      @force_quotes = @options[:force_quotes]
+      unless @force_quotes
+        @quotable_pattern =
           Regexp.new("[\r\n".encode(@encoding) +
                      Regexp.escape(@column_separator) +
-                     Regexp.escape(quote_character.encode(@encoding)) +
+                     Regexp.escape(@quote_character.encode(@encoding)) +
                      "]".encode(@encoding))
-        @quote = 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 quotable_pattern.match?(field)
-              quote.call(field)
-            else
-              field  # unquoted field
-            end
-          end
-        end
       end
+      @quote_empty = @options.fetch(:quote_empty, true)
     end
 
     def prepare_output
@@ -140,5 +122,32 @@ class CSV
         end
       end
     end
+
+    def quote_field(field)
+      field = String(field)
+      encoded_quote_character = @quote_character.encode(field.encoding)
+      encoded_quote_character +
+        field.gsub(encoded_quote_character,
+                   encoded_quote_character * 2) +
+        encoded_quote_character
+    end
+
+    def quote(field)
+      if @force_quotes
+        quote_field(field)
+      else
+        if field.nil?  # represent +nil+ fields as empty unquoted fields
+          ""
+        else
+          field = String(field)  # Stringify fields
+          # represent empty fields as empty quoted fields
+          if (@quote_empty and field.empty?) or @quotable_pattern.match?(field)
+            quote_field(field)
+          else
+            field  # unquoted field
+          end
+        end
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csv
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - James Edward Gray II
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-23 00:00:00.000000000 Z
+date: 2019-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -40,7 +40,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: benchmark-ips
+  name: benchmark_driver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,8 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 3.0.0.beta2
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: CSV Reading and Writing