csv 3.1.9 → 3.3.2

data/doc/csv/recipes/parsing.rdoc

@@ -45,6 +45,7 @@ All code snippets on this page assume that the following has been executed:
     - {Recipe: Convert Fields to Numerics}[#label-Recipe-3A+Convert+Fields+to+Numerics]
     - {Recipe: Convert Fields to Dates}[#label-Recipe-3A+Convert+Fields+to+Dates]
     - {Recipe: Convert Fields to DateTimes}[#label-Recipe-3A+Convert+Fields+to+DateTimes]
+    - {Recipe: Convert Fields to Times}[#label-Recipe-3A+Convert+Fields+to+Times]
     - {Recipe: Convert Assorted Fields to Objects}[#label-Recipe-3A+Convert+Assorted+Fields+to+Objects]
     - {Recipe: Convert Fields to Other Objects}[#label-Recipe-3A+Convert+Fields+to+Other+Objects]
   - {Recipe: Filter Field Strings}[#label-Recipe-3A+Filter+Field+Strings]
@@ -83,7 +84,7 @@ Use instance method CSV#each with option +headers+ to read a source \String one
   CSV.new(string, headers: true).each do |row|
     p row
   end
-Ouput:
+Output:
   #<CSV::Row "Name":"foo" "Value":"0">
   #<CSV::Row "Name":"bar" "Value":"1">
   #<CSV::Row "Name":"baz" "Value":"2">
@@ -110,7 +111,7 @@ You can parse \CSV data from a \File, with or without headers.
 
 ===== Recipe: Parse from \File with Headers
 
-Use instance method CSV#read with option +headers+ to read a file all at once:
+Use class method CSV.read with option +headers+ to read a file all at once:
   string = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
   path = 't.csv'
   File.write(path, string)
@@ -191,7 +192,7 @@ Output:
 === RFC 4180 Compliance
 
 By default, \CSV parses data that is compliant with
-{RFC 4180}[https://tools.ietf.org/html/rfc4180]
+{RFC 4180}[https://www.rfc-editor.org/rfc/rfc4180]
 with respect to:
 - Row separator.
 - Column separator.
@@ -339,6 +340,7 @@ There are built-in field converters for converting to objects of certain classes
 - \Integer
 - \Date
 - \DateTime
+- \Time
 
 Other built-in field converters include:
 - +:numeric+: converts to \Integer and \Float.
@@ -381,6 +383,13 @@ Convert fields to \DateTime objects using built-in converter +:date_time+:
   parsed = CSV.parse(source, headers: true, converters: :date_time)
   parsed.map {|row| row['DateTime'].class} # => [DateTime, DateTime, DateTime]
 
+===== Recipe: Convert Fields to Times
+
+Convert fields to \Time objects using built-in converter +:time+:
+  source = "Name,Time\nfoo,2001-02-03\nbar,2001-02-04\nbaz,2020-05-07T14:59:00-05:00\n"
+  parsed = CSV.parse(source, headers: true, converters: :time)
+  parsed.map {|row| row['Time'].class} # => [Time, Time, Time]
+
 ===== Recipe: Convert Assorted Fields to Objects
 
 Convert assorted fields to objects using built-in converter +:all+:
@@ -431,7 +440,7 @@ You can use multiple field converters in either of these ways:
 
 ===== Recipe: Specify Multiple Field Converters in Option +:converters+
 
-Apply multiple field converters by specifying them in option +:conveters+:
+Apply multiple field converters by specifying them in option +:converters+:
   source = "Name,Value\nfoo,0\nbar,1.0\nbaz,2.0\n"
   parsed = CSV.parse(source, headers: true, converters: [:integer, :float])
   parsed['Value'] # => [0, 1.0, 2.0]
@@ -500,7 +509,7 @@ You can use multiple header converters in either of these ways:
 
 ===== Recipe: Specify Multiple Header Converters in Option :header_converters
 
-Apply multiple header converters by specifying them in option +:header_conveters+:
+Apply multiple header converters by specifying them in option +:header_converters+:
   source = "Name,Value\nfoo,0\nbar,1.0\nbaz,2.0\n"
   parsed = CSV.parse(source, headers: true, header_converters: [:downcase, :symbol])
   parsed.headers # => [:name, :value]
@@ -520,7 +529,7 @@ Apply multiple header converters by defining and registering a custom header con
 To capture unconverted field values, use option +:unconverted_fields+:
   source = "Name,Value\nfoo,0\nbar,1\nbaz,2\n"
   parsed = CSV.parse(source, converters: :integer, unconverted_fields: true)
-  parsed # => [["foo", "0"], ["bar", "1"], ["baz", "2"]]
+  parsed # => [["Name", "Value"], ["foo", 0], ["bar", 1], ["baz", 2]]
   parsed.each {|row| p row.unconverted_fields }
 Output:
   ["Name", "Value"]
@@ -542,4 +551,4 @@ Output:
   #<struct CSV::FieldInfo index=0, line=2, header=nil>
   #<struct CSV::FieldInfo index=1, line=2, header=nil>
   #<struct CSV::FieldInfo index=0, line=3, header=nil>
-  #<struct CSV::FieldInfo index=1, line=3, header=nil>
+  #<struct CSV::FieldInfo index=1, line=3, header=nil>

data/lib/csv/core_ext/array.rb

@@ -1,4 +1,4 @@
-class Array # :nodoc:
+class Array
   # Equivalent to CSV::generate_line(self, options)
   #
   #   ["CSV", "data"].to_csv

data/lib/csv/core_ext/string.rb

@@ -1,4 +1,4 @@
-class String # :nodoc:
+class String
   # Equivalent to CSV::parse_line(self, options)
   #
   #   "CSV,data".parse_csv

data/lib/csv/fields_converter.rb

@@ -4,6 +4,13 @@ class CSV
   # Note: Don't use this class directly. This is an internal class.
   class FieldsConverter
     include Enumerable
+
+    NO_QUOTED_FIELDS = [] # :nodoc:
+    def NO_QUOTED_FIELDS.[](_index)
+      false
+    end
+    NO_QUOTED_FIELDS.freeze
+
     #
     # A CSV::FieldsConverter is a data structure for storing the
     # fields converter properties to be passed as a parameter
@@ -16,7 +23,7 @@ class CSV
       @empty_value = options[:empty_value]
       @empty_value_is_empty_string = (@empty_value == "")
       @accept_nil = options[:accept_nil]
-      @builtin_converters = options[:builtin_converters]
+      @builtin_converters_name = options[:builtin_converters_name]
       @need_static_convert = need_static_convert?
     end
 
@@ -24,7 +31,7 @@ class CSV
       if name.nil?  # custom converter
         @converters << converter
       else          # named converter
-        combo = @builtin_converters[name]
+        combo = builtin_converters[name]
         case combo
         when Array  # combo converter
           combo.each do |sub_name|
@@ -44,7 +51,7 @@ class CSV
       @converters.empty?
     end
 
-    def convert(fields, headers, lineno)
+    def convert(fields, headers, lineno, quoted_fields=NO_QUOTED_FIELDS)
       return fields unless need_convert?
 
       fields.collect.with_index do |field, index|
@@ -63,7 +70,8 @@ class CSV
             else
               header = nil
             end
-            field = converter[field, FieldInfo.new(index, lineno, header)]
+            quoted = quoted_fields[index]
+            field = converter[field, FieldInfo.new(index, lineno, header, quoted)]
           end
           break unless field.is_a?(String)  # short-circuit pipeline for speed
         end
@@ -80,5 +88,9 @@ class CSV
       @need_static_convert or
         (not @converters.empty?)
     end
+
+    def builtin_converters
+      @builtin_converters ||= ::CSV.const_get(@builtin_converters_name)
+    end
   end
 end

data/lib/csv/input_record_separator.rb

@@ -0,0 +1,18 @@
+require "English"
+require "stringio"
+
+class CSV
+  module InputRecordSeparator
+    class << self
+      if RUBY_VERSION >= "3.0.0"
+        def value
+          "\n"
+        end
+      else
+        def value
+          $INPUT_RECORD_SEPARATOR
+        end
+      end
+    end
+  end
+end