csv 3.1.2 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30015ee78d9fd5fa7b6bc0bbca7b785adef465e39dd654d4c4a020420f2f47ec
-  data.tar.gz: 72ece87ac30a9748dc64b37c8ca77de23b21939c19568c870b9ccb020f8cabf4
+  metadata.gz: 287ad200c61c1756e9386a9d910c9e16c3f876e3860d7a147d82ef3d2017ca72
+  data.tar.gz: 98d1b16dfad00c08f5b07e0beb0d535c3e1777d9e01ecca9a2d21c2e5665eefb
 SHA512:
-  metadata.gz: '09cdbbeb0d72c765d3cd15e690dfb6a25a7e731f5d79f15815cdc17cbb074c5d592d4805f9e59778f911478ea25dc635ee91a43210e8720e8c996166bbe4467c'
-  data.tar.gz: 8144fa3744620a731ff8b601316e476c6263a9928db41fa95ef50902d20928e1be174fbe115d42585a46dc455971e65fe1abc82032a9f6d82c959a675b1e252f
+  metadata.gz: f0d55f65f559d083f570a3f72f27d5123c961cad244ea6b0b098c9f3e806474a5a8fc4335ada22f9031fa37664c05229428c6630ecc800709a7e0c90b72514ab
+  data.tar.gz: 97f936a5e13547f9c362c66617f36ae9e3e84c7e611b105ea40b0f59442cec165d9382aa34a6c9eebb16b365c2fa12620d839396a2041ad0a97c878ed86a1da3

data/NEWS.md

@@ -1,5 +1,37 @@
 # News
 
+## 3.1.3 - 2020-05-09
+
+### Improvements
+
+  * `CSV::Row#dup`: Copied deeply.
+    [GitHub#108][Patch by Jim Kane]
+
+### Fixes
+
+  * Fixed a infinite loop bug for zero length match `skip_lines`.
+    [GitHub#110][Patch by Mike MacDonald]
+
+  * `CSV.generate`: Fixed a bug that encoding isn't set correctly.
+    [GitHub#110][Patch by Seiei Miyagi]
+
+  * Fixed document for the `:strip` option.
+    [GitHub#114][Patch by TOMITA Masahiro]
+
+  * Fixed a parse bug when split charcter exists in middle of column
+    value.
+    [GitHub#115][Reported by TOMITA Masahiro]
+
+### Thanks
+
+  * Jim Kane
+
+  * Mike MacDonald
+
+  * Seiei Miyagi
+
+  * TOMITA Masahiro
+
 ## 3.1.2 - 2019-10-12
 
 ### Improvements

data/lib/csv.rb

@@ -531,12 +531,13 @@ class CSV
     # plan to output non-ASCII compatible data.
     #
     def generate(str=nil, **options)
+      encoding = options[:encoding]
       # add a default empty String, if none was given
       if str
         str = StringIO.new(str)
         str.seek(0, IO::SEEK_END)
+        str.set_encoding(encoding) if encoding
       else
-        encoding = options[:encoding]
         str = +""
         str.force_encoding(encoding) if encoding
       end
@@ -908,7 +909,7 @@ class CSV
   #                                       empty value(s) on each line will be
   #                                       replaced with the specified value.
   # <b><tt>:strip</tt></b>::              When setting a +true+ value, CSV will
-  #                                       strip "\t\r\n\f\v" around the values.
+  #                                       strip " \t\f\v" around the values.
   #                                       If you specify a string instead of
   #                                       +true+, CSV will strip string. The
   #                                       length of the string must be 1.
@@ -1326,7 +1327,7 @@ class CSV
   # ASCII compatible String.
   #
   def inspect
-    str = ["<#", self.class.to_s, " io_type:"]
+    str = ["#<", self.class.to_s, " io_type:"]
     # show type of wrapped IO
     if    @io == $stdout then str << "$stdout"
     elsif @io == $stdin  then str << "$stdin"

data/lib/csv/parser.rb

@@ -446,6 +446,7 @@ class CSV
       @strip = @options[:strip]
       @escaped_strip = nil
       @strip_value = nil
+      @rstrip_value = nil
       if @strip.is_a?(String)
         case @strip.length
         when 0
@@ -460,6 +461,8 @@ class CSV
         if @quote_character
           @strip_value = Regexp.new(@escaped_strip +
                                     "+".encode(@encoding))
+          @rstrip_value = Regexp.new(@escaped_strip +
+                                     "+\\z".encode(@encoding))
         end
         @need_robust_parsing = true
       elsif @strip
@@ -467,6 +470,7 @@ class CSV
         @escaped_strip = strip_values.encode(@encoding)
         if @quote_character
           @strip_value = Regexp.new("[#{strip_values}]+".encode(@encoding))
+          @rstrip_value = Regexp.new("[#{strip_values}]+\\z".encode(@encoding))
         end
         @need_robust_parsing = true
       end
@@ -561,9 +565,6 @@ class CSV
       unless @liberal_parsing
         no_unquoted_values << @escaped_quote_character
       end
-      if @escaped_strip
-        no_unquoted_values << @escaped_strip
-      end
       @unquoted_value = Regexp.new("[^".encode(@encoding) +
                                    no_unquoted_values +
                                    "]+".encode(@encoding))
@@ -769,7 +770,7 @@ class CSV
     def skip_needless_lines
       return unless @skip_lines
 
-      while true
+      until @scanner.eos?
         @scanner.keep_start
         line = @scanner.scan_all(@not_line_end) || "".encode(@encoding)
         line << @row_separator if parse_row_end
@@ -939,6 +940,7 @@ class CSV
       if @liberal_parsing
         quoted_value = parse_quoted_column_value
         if quoted_value
+          @scanner.scan_all(@strip_value) if @strip_value
           unquoted_value = parse_unquoted_column_value
           if unquoted_value
             if @double_quote_outside_quote
@@ -986,6 +988,9 @@ class CSV
         end
       end
       value.gsub!(@backslash_quote_character, @quote_character) if @backslash_quote
+      if @rstrip_value
+        value.gsub!(@rstrip_value, "")
+      end
       value
     end
 

data/lib/csv/row.rb

@@ -50,7 +50,7 @@ class CSV
 
     def initialize_copy(other)
       super
-      @row = @row.dup
+      @row = @row.collect(&:dup)
     end
 
     # Returns +true+ if this is a header row.

data/lib/csv/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csv
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.1.3
 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-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -110,8 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.2.0.pre1
 signing_key: 
 specification_version: 4
 summary: CSV Reading and Writing