csv 3.0.0 → 3.1.0

data/lib/csv/row.rb

@@ -48,6 +48,11 @@ class CSV
     extend Forwardable
     def_delegators :@row, :empty?, :length, :size
 
+    def initialize_copy(other)
+      super
+      @row = @row.dup
+    end
+
     # Returns +true+ if this is a header row.
     def header_row?
       @header_row
@@ -125,6 +130,7 @@ class CSV
     alias_method :include?, :has_key?
     alias_method :key?,     :has_key?
     alias_method :member?,  :has_key?
+    alias_method :header?,  :has_key?
 
     #
     # :call-seq:
@@ -281,12 +287,6 @@ class CSV
       index.nil? ? nil : index + minimum_index
     end
 
-    # Returns +true+ if +name+ is a header for this row, and +false+ otherwise.
-    def header?(name)
-      headers.include? name
-    end
-    alias_method :include?, :header?
-
     #
     # Returns +true+ if +data+ matches a field in this row, and +false+
     # otherwise.

data/lib/csv/table.rb

@@ -16,6 +16,11 @@ class CSV
     # Construct a new CSV::Table from +array_of_rows+, which are expected
     # to be CSV::Row objects.  All rows are assumed to have the same headers.
     #
+    # The optional +headers+ parameter can be set to Array of headers.
+    # If headers aren't set, headers are fetched from CSV::Row objects.
+    # Otherwise, headers() method will return headers being set in
+    # headers argument.
+    #
     # A CSV::Table object supports the following Array methods through
     # delegation:
     #
@@ -23,8 +28,17 @@ class CSV
     # * length()
     # * size()
     #
-    def initialize(array_of_rows)
+    def initialize(array_of_rows, headers: nil)
       @table = array_of_rows
+      @headers = headers
+      unless @headers
+        if @table.empty?
+          @headers = []
+        else
+          @headers = @table.first.headers
+        end
+      end
+
       @mode  = :col_or_row
     end
 
@@ -119,11 +133,12 @@ class CSV
 
     #
     # Returns the headers for the first row of this table (assumed to match all
-    # other rows).  An empty Array is returned for empty tables.
+    # other rows). The headers Array passed to CSV::Table.new is returned for
+    # empty tables.
     #
     def headers
       if @table.empty?
-        Array.new
+        @headers.dup
       else
         @table.first.headers
       end
@@ -171,6 +186,10 @@ class CSV
           @table[index_or_header] = value
         end
       else                 # set column
+        unless index_or_header.is_a? Integer
+          index = @headers.index(index_or_header) || @headers.size
+          @headers[index] = index_or_header
+        end
         if value.is_a? Array  # multiple values
           @table.each_with_index do |row, i|
             if row.header_row?
@@ -258,6 +277,11 @@ class CSV
             (@mode == :col_or_row and index_or_header.is_a? Integer)
           @table.delete_at(index_or_header)
         else                 # by header
+          if index_or_header.is_a? Integer
+            @headers.delete_at(index_or_header)
+          else
+            @headers.delete(index_or_header)
+          end
           @table.map { |row| row.delete(index_or_header).last }
         end
       end
@@ -375,4 +399,4 @@ class CSV
       "#<#{self.class} mode:#{@mode} row_count:#{to_a.size}>".encode("US-ASCII")
     end
   end
-end
+end

data/lib/csv/version.rb

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

data/lib/csv/writer.rb

@@ -0,0 +1,156 @@
+# frozen_string_literal: true
+
+require_relative "match_p"
+require_relative "row"
+
+using CSV::MatchP if CSV.const_defined?(:MatchP)
+
+class CSV
+  class Writer
+    attr_reader :lineno
+    attr_reader :headers
+
+    def initialize(output, options)
+      @output = output
+      @options = options
+      @lineno = 0
+      prepare
+      if @options[:write_headers] and @headers
+        self << @headers
+      end
+      @fields_converter = @options[:fields_converter]
+    end
+
+    def <<(row)
+      case row
+      when Row
+        row = row.fields
+      when Hash
+        row = @headers.collect {|header| row[header]}
+      end
+
+      @headers ||= row if @use_headers
+      @lineno += 1
+
+      row = @fields_converter.convert(row, nil, lineno) if @fields_converter
+
+      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
+      @output << line
+
+      self
+    end
+
+    def rewind
+      @lineno = 0
+      @headers = nil if @options[:headers].nil?
+    end
+
+    private
+    def prepare
+      @encoding = @options[:encoding]
+
+      prepare_header
+      prepare_format
+      prepare_output
+    end
+
+    def prepare_header
+      headers = @options[:headers]
+      case headers
+      when Array
+        @headers = headers
+        @use_headers = true
+      when String
+        @headers = CSV.parse_line(headers,
+                                  col_sep: @options[:column_separator],
+                                  row_sep: @options[:row_separator],
+                                  quote_char: @options[:quote_character])
+        @use_headers = true
+      when true
+        @headers = nil
+        @use_headers = true
+      else
+        @headers = nil
+        @use_headers = false
+      end
+      return unless @headers
+
+      converter = @options[:header_fields_converter]
+      @headers = converter.convert(@headers, nil, 0)
+      @headers.each do |header|
+        header.freeze if header.is_a?(String)
+      end
+    end
+
+    def prepare_format
+      @column_separator = @options[:column_separator].to_s.encode(@encoding)
+      row_separator = @options[:row_separator]
+      if row_separator == :auto
+        @row_separator = $INPUT_RECORD_SEPARATOR.encode(@encoding)
+      else
+        @row_separator = row_separator.to_s.encode(@encoding)
+      end
+      @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)) +
+                     "]".encode(@encoding))
+      end
+      @quote_empty = @options.fetch(:quote_empty, true)
+    end
+
+    def prepare_output
+      @output_encoding = nil
+      return unless @output.is_a?(StringIO)
+
+      output_encoding = @output.internal_encoding || @output.external_encoding
+      if @encoding != output_encoding
+        if @options[:force_encoding]
+          @output_encoding = output_encoding
+        else
+          compatible_encoding = Encoding.compatible?(@encoding, output_encoding)
+          if compatible_encoding
+            @output.set_encoding(compatible_encoding)
+            @output.seek(0, IO::SEEK_END)
+          end
+        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