csv 3.0.1 → 3.0.2

data/lib/csv/version.rb

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

data/lib/csv/writer.rb

@@ -0,0 +1,144 @@
+# 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
+    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
+
+      line = row.collect(&@quote).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]
+      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 =
+          Regexp.new("[\r\n".encode(@encoding) +
+                     Regexp.escape(@column_separator) +
+                     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
+    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
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csv
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - James Edward Gray II
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-07 00:00:00.000000000 Z
+date: 2018-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,14 +78,18 @@ extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE.txt
+- NEWS.md
 - README.md
 - lib/csv.rb
 - lib/csv/core_ext/array.rb
 - lib/csv/core_ext/string.rb
+- lib/csv/fields_converter.rb
+- lib/csv/match_p.rb
+- lib/csv/parser.rb
 - lib/csv/row.rb
 - lib/csv/table.rb
 - lib/csv/version.rb
-- news.md
+- lib/csv/writer.rb
 homepage: https://github.com/ruby/csv
 licenses:
 - BSD-2-Clause
@@ -106,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 3.0.0.beta3
+rubygems_version: 3.0.0.beta2
 signing_key: 
 specification_version: 4
 summary: CSV Reading and Writing