csv 3.2.8 → 3.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c64817c16c8991fc2596875101449b5452326fe91bd05e4bb6a66213113525d6
-  data.tar.gz: 19d6d80d6959f6cde0ac651774ea795dbd0f949135cae021fef3983d94248f9c
+  metadata.gz: d7dabc413b85090aa7c9c93ca318de9adb1c0c2d94273f4e8d23d73d2882680a
+  data.tar.gz: 8e8484c342de0947a59af726ab20d7a88a2ae766a9e62139edb6c5650d144d0a
 SHA512:
-  metadata.gz: 556f6582468d4a3c2994c12c25dba73b8db65e1a10f7306b9b5bc1fa345f47bf7872db1c603ddcd1a0eb359e7857c51a9874be2231dc821730ae62d15604c3b7
-  data.tar.gz: 348a25f4c1bb8e4fe0d71dc944e0a26165627803cb2528fc067642827fd3c253bda48aba179d3575950a7244bd4e8edf2eed9a99101952a07256a3f4f9d1e7fe
+  metadata.gz: 28edfb536bed667f78a618a3d13f5b305d1749879efae7256aaa8a0fa84694f2df7cc285851976b8b2f45ce9a7ae5741f9bd4277c3ea32c9a27fd2379a0f1be2
+  data.tar.gz: 7fe44532cde1e9022da25f798b696ad51b7c81bc3bd64cfd97610d13f073f141886bfdd03e9bb710bab2d3e7fda71a47cfea0ea7da8d3f6c06b38edfc295e364

data/NEWS.md

@@ -1,5 +1,23 @@
 # News
 
+## 3.2.9 - 2024-03-22
+
+### Fixes
+
+  * Fixed a parse bug that wrong result may be happen when:
+
+    * `:skip_lines` is used
+    * `:row_separator` is `"\r\n"`
+    * There is a line that includes `\n` as a column value
+
+    Reported by Ryo Tsukamoto.
+
+    GH-296
+
+### Thanks
+
+  * Ryo Tsukamoto
+
 ## 3.2.8 - 2023-11-08
 
 ### Improvements

data/README.md

@@ -30,8 +30,8 @@ end
 
 ## Documentation
 
-- [API](https://ruby-doc.org/stdlib/libdoc/csv/rdoc/CSV.html):  all classes, methods, and constants.
-- [Recipes](https://ruby-doc.org/core/doc/csv/recipes/recipes_rdoc.html):  specific code for specific tasks.
+- [API](https://ruby.github.io/csv/):  all classes, methods, and constants.
+- [Recipes](https://ruby.github.io/csv/doc/csv/recipes/recipes_rdoc.html):  specific code for specific tasks.
 
 ## Development
 

data/lib/csv/parser.rb

@@ -220,6 +220,15 @@ class CSV
           end
           # trace(__method__, :repos, start, buffer)
           @scanner.pos = start
+          last_scanner, last_start, last_buffer = @keeps.last
+          # Drop the last buffer when the last buffer is the same data
+          # in the last keep. If we keep it, we have duplicated data
+          # by the next keep_back.
+          if last_scanner == @scanner and
+            last_buffer and
+            last_buffer == last_scanner.string.byteslice(last_start, start)
+            @keeps.last[2] = nil
+          end
         end
         read_chunk if @scanner.eos?
       end
@@ -892,18 +901,15 @@ class CSV
     def skip_needless_lines
       return unless @skip_lines
 
-      until @scanner.eos?
-        @scanner.keep_start
-        line = @scanner.scan_all(@not_line_end) || "".encode(@encoding)
+      @scanner.keep_start
+      @scanner.each_line(@row_separator) do |line|
         line << @row_separator if parse_row_end
-        if skip_line?(line)
-          @lineno += 1
-          @scanner.keep_drop
-        else
-          @scanner.keep_back
-          return
-        end
+        break unless skip_line?(line)
+        @lineno += 1
+        @scanner.keep_drop
+        @scanner.keep_start
       end
+      @scanner.keep_back
     end
 
     def skip_line?(line)

data/lib/csv/version.rb

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

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csv
 version: !ruby/object:Gem::Version
-  version: 3.2.8
+  version: 3.2.9
 platform: ruby
 authors:
 - James Edward Gray II
 - Kouhei Sutou
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-08 00:00:00.000000000 Z
+date: 2024-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,7 +127,6 @@ licenses:
 - Ruby
 - BSD-2-Clause
 metadata: {}
-post_install_message:
 rdoc_options:
 - "--main"
 - README.md
@@ -145,8 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.0.dev
-signing_key:
+rubygems_version: 3.6.0.dev
 specification_version: 4
 summary: CSV Reading and Writing
 test_files: []