csv 3.3.6 → 3.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2a1d74b0246a143f03c2e786ea5484cb3e5aebe370453141a9d69539eae900b
-  data.tar.gz: d8bb00a2e6842e28ca6b443e416f8f03186b098dcc81fde6ba5429eed138a755
+  metadata.gz: 405d44be299fb5493de237683e24cdbf6e29982e4378c1d01a82e2ad4bbb21a3
+  data.tar.gz: 28a53de42e2c35091f441a3d9a7a886afc30bad1c514ea26715d633ee8a00080
 SHA512:
-  metadata.gz: 3d26ab99eb2708d787022832ca171def6ef4647183667be03831d9a91c5320545146adac9e5471e92637e6e905c27c06499739fc5e510541c026c15388b9e316
-  data.tar.gz: f8e7b076653e2e3f04503db617e94f14c66064aa1a8ff790a342c018eb6c598eb84127b0818e0ed8f2688ec6404b163c80e6c58cbf7d3c9411583ad8cd2cd0bd
+  metadata.gz: 7cb81c8caf90a7673fd22fc24644b33fb171c9f7b60ea9e679612008912d7ae10150351001d2daea5afdc6360cbe486f454cc3b29387b9c514d232b0c68b5ad3
+  data.tar.gz: 72d77e22c654b26dc8fed349670d107169605119554f6b18cd79f7477bd7284f099560edc68bfba1561775fe8acb081fd1427aa6235c8540bc7cca93a7e7a397

data/NEWS.md

@@ -1,5 +1,24 @@
 # News
 
+## 3.3.7 - 2026-10-28
+
+### Improvements
+
+  * Improved documents.
+    * GH-376
+    * Patch by Oskar Eichler
+
+  * Improved error handling.
+    * GH-378
+    * GH-379
+    * Reported by sswander
+
+### Thanks
+
+  * Oskar Eichler
+
+  * sswander
+
 ## 3.3.6 - 2026-07-27
 
 ### Improvements

data/doc/csv/options/common/quote_char.rdoc

@@ -1,6 +1,6 @@
 ====== Option +quote_char+
 
-Specifies the character (\String of length 1) used used to quote fields
+Specifies the character (\String of length 1) used to quote fields
 in both parsing and generating.
 This String will be transcoded into the data's \Encoding before use.
 

data/doc/csv/options/generating/write_headers.rdoc

@@ -17,7 +17,7 @@ Without +write_headers+:
     csv.shift
   end # => ["foo", "0"]
 
-With +write_headers+":
+With +write_headers+:
   CSV.open(file_path,'w',
       :write_headers => true,
       :headers => ['Name','Value']

data/doc/csv/options/parsing/headers.rdoc

@@ -31,9 +31,10 @@ the first row of the data is treated as a row of headers:
   bax,2
   EOT
   csv = CSV.new(str, headers: true)
-  csv # => #<CSV io_type:StringIO encoding:UTF-8 lineno:2 col_sep:"," row_sep:"\n" quote_char:"\"" headers:["Name", "Count"]>
+  csv # => #<CSV io_type:StringIO encoding:UTF-8 lineno:0 col_sep:"," row_sep:"\n" quote_char:"\"" headers:true>
+  csv.headers # => true
+  csv.shift # => #<CSV::Row "Name":"foo" "Count":"0">
   csv.headers # => ["Name", "Count"]
-  csv.shift # => #<CSV::Row "Name":"bar" "Count":"1">
 
 ---
 
@@ -46,7 +47,7 @@ If set to an \Array, the \Array elements are treated as headers:
   csv = CSV.new(str, headers: ['Name', 'Count'])
   csv
   csv.headers # => ["Name", "Count"]
-  csv.shift # => #<CSV::Row "Name":"bar" "Count":"1">
+  csv.shift # => #<CSV::Row "Name":"foo" "Count":"0">
 
 ---
 
@@ -60,4 +61,4 @@ with the current +options+, and the returned \Array is treated as headers:
   csv = CSV.new(str, headers: 'Name,Count')
   csv
   csv.headers # => ["Name", "Count"]
-  csv.shift # => #<CSV::Row "Name":"bar" "Count":"1">
+  csv.shift # => #<CSV::Row "Name":"foo" "Count":"0">

data/doc/csv/options/parsing/skip_blanks.rdoc

@@ -6,7 +6,7 @@ a line that contains a column separator is not considered to be blank.
 Default value:
   CSV::DEFAULT_OPTIONS.fetch(:skip_blanks) # => false
 
-See also option {skiplines}[#class-CSV-label-Option+skip_lines].
+See also option {skip_lines}[#class-CSV-label-Option+skip_lines].
 
 For examples in this section:
   str = <<-EOT

data/doc/csv/options/parsing/skip_lines.rdoc

@@ -2,8 +2,9 @@
 
 Specifies an object to use in identifying comment lines in the input that are to be ignored:
 * If a \Regexp, ignores lines that match it.
-* If a \String, converts it to a \Regexp, ignores lines that match it.
+* If a \String, ignores lines that include it.
 * If +nil+, no lines are considered to be comments.
+* Otherwise, the object must respond to +match+; ignores lines for which +match+ returns a truthy value.
 
 Default value:
   CSV::DEFAULT_OPTIONS.fetch(:skip_lines) # => nil
@@ -32,6 +33,7 @@ Using a \String:
 
 ---
 
-Raises an exception if given an object that is not a \Regexp, a \String, or +nil+:
+Raises an exception if given an object that is not a \Regexp, a \String, +nil+,
+or an object that responds to +match+:
   # Raises ArgumentError (:skip_lines has to respond to #match: 0)
   CSV.parse(str, skip_lines: 0)

data/doc/csv/recipes/generating.rdoc

@@ -16,7 +16,7 @@ All code snippets on this page assume that the following has been executed:
   - {Generating to a File}[#label-Generating+to+a+File]
     - {Recipe: Generate to File with Headers}[#label-Recipe-3A+Generate+to+File+with+Headers]
     - {Recipe: Generate to File Without Headers}[#label-Recipe-3A+Generate+to+File+Without+Headers]
-  - {Generating to IO an Stream}[#label-Generating+to+an+IO+Stream]
+  - {Generating to an IO Stream}[#label-Generating+to+an+IO+Stream]
     - {Recipe: Generate to IO Stream with Headers}[#label-Recipe-3A+Generate+to+IO+Stream+with+Headers]
     - {Recipe: Generate to IO Stream Without Headers}[#label-Recipe-3A+Generate+to+IO+Stream+Without+Headers]
 - {Converting Fields}[#label-Converting+Fields]
@@ -71,11 +71,11 @@ that are to be generated:
 
 ==== Generating to a \File
 
-You can generate /CSV data to a \File, with or without headers.
+You can generate \CSV data to a \File, with or without headers.
 
 ===== Recipe: Generate to \File with Headers
 
-Use class method CSV.open with option +headers+ generate to a \File.
+Use class method CSV.open with option +headers+ to generate to a \File.
 
 This example uses method CSV#<< to append the rows
 that are to be generated:
@@ -105,7 +105,7 @@ that are to be generated:
 
 You can generate \CSV data to an \IO stream, with or without headers.
 
-==== Recipe: Generate to \IO Stream with Headers
+===== Recipe: Generate to \IO Stream with Headers
 
 Use class method CSV.new with option +headers+ to generate \CSV data to an \IO stream:
   path = 't.csv'
@@ -187,7 +187,7 @@ For strict compliance, use option +:row_sep+ to specify row separator <tt>"\r\n"
 ===== Recipe: Generate Non-Compliant Row Separator
 
 For data with non-compliant row separators, use option +:row_sep+ with a different value:
-This example source uses semicolon (<tt>";'</tt>) as its row separator:
+This example source uses semicolon (<tt>";"</tt>) as its row separator:
   output_string = CSV.generate('', row_sep: ";") do |csv|
     csv << ['Foo', 0]
     csv << ['Bar', 1]
@@ -223,11 +223,11 @@ This example source uses TAB (<tt>"\t"</tt>) as its column separator:
 
 ==== Quotes
 
-IFC 4180 allows most fields to be quoted or not.
+RFC 4180 allows most fields to be quoted or not.
 By default, \CSV does not quote most fields.
 
 However, a field containing the current row separator, column separator,
-or quote character is automatically quoted, producing IFC 4180 compliance:
+or quote character is automatically quoted, producing RFC 4180 compliance:
   # Field contains row separator.
   output_string = CSV.generate('') do |csv|
     row_sep = csv.row_sep

data/lib/csv/parser.rb

@@ -978,63 +978,69 @@ class CSV
 
     def parse_quotable_loose(&block)
       @scanner.keep_start
-      @scanner.each_line(@row_separator) do |line|
-        if @skip_lines and skip_line?(line)
-          @scanner.keep_drop
-          @scanner.keep_start
-          next
-        end
-        original_line = line
-        line = line.delete_suffix(@row_separator)
-
-        if line.empty?
-          if @skip_blanks
+      kept = true
+      begin
+        @scanner.each_line(@row_separator) do |line|
+          if @skip_lines and skip_line?(line)
             @scanner.keep_drop
             @scanner.keep_start
             next
           end
-          row = []
-          quoted_fields = FieldsConverter::NO_QUOTED_FIELDS
-        elsif line.include?(@cr) or line.include?(@lf)
-          @scanner.keep_back
-          @parse_method = :parse_quotable_robust
-          return parse_quotable_robust(&block)
-        else
-          row = line.split(@split_column_separator, -1)
-          quoted_fields = []
-          n_columns = row.size
-          i = 0
-          while i < n_columns
-            column = row[i]
-            if column.empty?
-              quoted_fields << false
-              row[i] = nil
-            else
-              n_quotes = column.count(@quote_character)
-              if n_quotes.zero?
+          original_line = line
+          line = line.delete_suffix(@row_separator)
+
+          if line.empty?
+            if @skip_blanks
+              @scanner.keep_drop
+              @scanner.keep_start
+              next
+            end
+            row = []
+            quoted_fields = FieldsConverter::NO_QUOTED_FIELDS
+          elsif line.include?(@cr) or line.include?(@lf)
+            kept = false
+            @scanner.keep_back
+            @parse_method = :parse_quotable_robust
+            return parse_quotable_robust(&block)
+          else
+            row = line.split(@split_column_separator, -1)
+            quoted_fields = []
+            n_columns = row.size
+            i = 0
+            while i < n_columns
+              column = row[i]
+              if column.empty?
                 quoted_fields << false
-                # no quote
-              elsif n_quotes == 2 and
-                   column.start_with?(@quote_character) and
-                   column.end_with?(@quote_character)
-                quoted_fields << true
-                row[i] = column[1..-2]
+                row[i] = nil
               else
-                @scanner.keep_back
-                @parse_method = :parse_quotable_robust
-                return parse_quotable_robust(&block)
+                n_quotes = column.count(@quote_character)
+                if n_quotes.zero?
+                  quoted_fields << false
+                  # no quote
+                elsif n_quotes == 2 and
+                     column.start_with?(@quote_character) and
+                     column.end_with?(@quote_character)
+                  quoted_fields << true
+                  row[i] = column[1..-2]
+                else
+                  kept = false
+                  @scanner.keep_back
+                  @parse_method = :parse_quotable_robust
+                  return parse_quotable_robust(&block)
+                end
+                validate_field_size(row[i])
               end
-              validate_field_size(row[i])
+              i += 1
             end
-            i += 1
           end
+          @scanner.keep_drop
+          @scanner.keep_start
+          @last_line = original_line
+          emit_row(row, quoted_fields, &block)
         end
-        @scanner.keep_drop
-        @scanner.keep_start
-        @last_line = original_line
-        emit_row(row, quoted_fields, &block)
+      ensure
+        @scanner.keep_drop if kept
       end
-      @scanner.keep_drop
     end
 
     def parse_quotable_robust(&block)

data/lib/csv/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csv
 version: !ruby/object:Gem::Version
-  version: 3.3.6
+  version: 3.3.7
 platform: ruby
 authors:
 - James Edward Gray II
@@ -71,7 +71,7 @@ licenses:
 - Ruby
 - BSD-2-Clause
 metadata:
-  changelog_uri: https://github.com/ruby/csv/releases/tag/v3.3.6
+  changelog_uri: https://github.com/ruby/csv/releases/tag/v3.3.7
 rdoc_options:
 - "--main"
 - README.md
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.16
+rubygems_version: 4.0.20
 specification_version: 4
 summary: CSV Reading and Writing
 test_files: []