csv 3.1.2 → 3.1.7

data/lib/csv/version.rb

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

data/lib/csv/writer.rb

@@ -43,8 +43,10 @@ class CSV
 
       row = @fields_converter.convert(row, nil, lineno) if @fields_converter
 
+      i = -1
       converted_row = row.collect do |field|
-        quote(field)
+        i += 1
+        quote(field, i)
       end
       line = converted_row.join(@column_separator) + @row_separator
       if @output_encoding
@@ -100,6 +102,33 @@ class CSV
       end
     end
 
+    def prepare_force_quotes_fields(force_quotes)
+      @force_quotes_fields = {}
+      force_quotes.each do |name_or_index|
+        case name_or_index
+        when Integer
+          index = name_or_index
+          @force_quotes_fields[index] = true
+        when String, Symbol
+          name = name_or_index.to_s
+          if @headers.nil?
+            message = ":headers is required when you use field name " +
+                      "in :force_quotes: " +
+                      "#{name_or_index.inspect}: #{force_quotes.inspect}"
+            raise ArgumentError, message
+          end
+          index = @headers.index(name)
+          next if index.nil?
+          @force_quotes_fields[index] = true
+        else
+          message = ":force_quotes element must be " +
+                    "field index or field name: " +
+                    "#{name_or_index.inspect}: #{force_quotes.inspect}"
+          raise ArgumentError, message
+        end
+      end
+    end
+
     def prepare_format
       @column_separator = @options[:column_separator].to_s.encode(@encoding)
       row_separator = @options[:row_separator]
@@ -109,7 +138,17 @@ class CSV
         @row_separator = row_separator.to_s.encode(@encoding)
       end
       @quote_character = @options[:quote_character]
-      @force_quotes = @options[:force_quotes]
+      force_quotes = @options[:force_quotes]
+      if force_quotes.is_a?(Array)
+        prepare_force_quotes_fields(force_quotes)
+        @force_quotes = false
+      elsif force_quotes
+        @force_quotes_fields = nil
+        @force_quotes = true
+      else
+        @force_quotes_fields = nil
+        @force_quotes = false
+      end
       unless @force_quotes
         @quotable_pattern =
           Regexp.new("[\r\n".encode(@encoding) +
@@ -147,16 +186,18 @@ class CSV
         encoded_quote_character
     end
 
-    def quote(field)
+    def quote(field, i)
       if @force_quotes
         quote_field(field)
+      elsif @force_quotes_fields and @force_quotes_fields[i]
+        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)
+          if (@quote_empty and field.empty?) or (field.valid_encoding? and @quotable_pattern.match?(field))
             quote_field(field)
           else
             field  # unquoted field

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csv
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.1.7
 platform: ruby
 authors:
 - James Edward Gray II
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-11 00:00:00.000000000 Z
+date: 2020-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,11 +75,36 @@ email:
 - kou@cozmixng.org
 executables: []
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- LICENSE.txt
+- NEWS.md
+- README.md
 files:
 - LICENSE.txt
 - NEWS.md
 - README.md
+- doc/csv/arguments/io.rdoc
+- doc/csv/options/common/col_sep.rdoc
+- doc/csv/options/common/quote_char.rdoc
+- doc/csv/options/common/row_sep.rdoc
+- doc/csv/options/generating/force_quotes.rdoc
+- doc/csv/options/generating/quote_empty.rdoc
+- doc/csv/options/generating/write_converters.rdoc
+- doc/csv/options/generating/write_empty_value.rdoc
+- doc/csv/options/generating/write_headers.rdoc
+- doc/csv/options/generating/write_nil_value.rdoc
+- doc/csv/options/parsing/converters.rdoc
+- doc/csv/options/parsing/empty_value.rdoc
+- doc/csv/options/parsing/field_size_limit.rdoc
+- doc/csv/options/parsing/header_converters.rdoc
+- doc/csv/options/parsing/headers.rdoc
+- doc/csv/options/parsing/liberal_parsing.rdoc
+- doc/csv/options/parsing/nil_value.rdoc
+- doc/csv/options/parsing/return_headers.rdoc
+- doc/csv/options/parsing/skip_blanks.rdoc
+- doc/csv/options/parsing/skip_lines.rdoc
+- doc/csv/options/parsing/strip.rdoc
+- doc/csv/options/parsing/unconverted_fields.rdoc
 - lib/csv.rb
 - lib/csv/core_ext/array.rb
 - lib/csv/core_ext/string.rb
@@ -96,22 +121,23 @@ licenses:
 - BSD-2-Clause
 metadata: {}
 post_install_message: 
-rdoc_options: []
+rdoc_options:
+- "--main"
+- README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.2.0.rc.1
 signing_key: 
 specification_version: 4
 summary: CSV Reading and Writing