csv 3.3.2 → 3.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb25f2d0582cf6f7fd0677b63468bf268cc362f8fc45209376a08d3f93995b01
-  data.tar.gz: 32b3a6a958da3fbf005d0aea7217393befefe0da204ddf92b728c5c9514a1cce
+  metadata.gz: 2b09d2eaa0c8e6c8c385fa6f958d93d893ee7c3441cc83248d07562cd719d960
+  data.tar.gz: 7e2aff2545b8bbeaefd4adb73627e7345bec284b18d431f3ab41f5a136f479a1
 SHA512:
-  metadata.gz: 77a56a3847636b8297007fa175c8e503933471b16ad8c34f3f676bc37af963d47101ee21eeb805cf1dd80201bce7117c20840bb94d25effb2e6bd299b2a5263d
-  data.tar.gz: 04b07a2b4f9dd23062caa1b7cfe0fe7e85c45176379806249abdf2151f866d919a1dda7337c0bef1459f5ebee846fde27efb1b67664fdd3f5ab15301a7ecffc1
+  metadata.gz: 88525c73bd61ae40b2fe4314a402210acc2ad4993def484e7531d6356d1652f80b2b5a1f72be1f4b4a38350d4c25d00ac43b3a8b1b41817b0c95bc2df8f5c082
+  data.tar.gz: 28322a68f915cee37aebbcd2fbaee39293d289760c878f3b6bcfe237a9247fd319368d1c54d9170f25929625b71c89475b016ccbdb80afc88a3d0926784b6a7e

data/NEWS.md

@@ -1,5 +1,30 @@
 # News
 
+## 3.3.3 - 2025-03-20
+
+### Improvements
+
+  * `csv-filter`: Add an experimental command line tool to filter a CSV.
+    * Patch by Burdette Lamar
+
+### Fixes
+
+  * Fixed wrong EOF detection for `ARGF`
+    * GH-328
+    * Reported by Takeshi Nishimatsu
+
+  * Fixed a regression bug that `CSV.open` rejects integer mode.
+    * GH-336
+    * Reported by Dave Burgess
+
+### Thanks
+
+  * Takeshi Nishimatsu
+
+  * Burdette Lamar
+
+  * Dave Burgess
+
 ## 3.3.2 - 2024-12-21
 
 ### Fixes

data/bin/csv-filter

@@ -0,0 +1,59 @@
+#!/usr/bin/env ruby
+
+require 'optparse'
+require 'csv'
+
+options = {}
+
+parser = OptionParser.new
+
+parser.version = CSV::VERSION
+parser.banner = <<-BANNER
+Usage: #{parser.program_name} [options]
+
+  Reads and parses the CSV text content of the standard input per the given input options.
+  From that content, generates CSV text per the given output options
+  and writes that text to the standard output.
+BANNER
+
+
+parser.on('--input-col-sep=SEPARATOR',
+          'Input column separator string.') do |value|
+  options[:input_col_sep] = value
+end
+
+parser.on('--input-quote-char=SEPARATOR',
+          'Input quote character.') do |value|
+  options[:input_quote_char] = value
+end
+
+parser.on('--input-row-sep=SEPARATOR',
+          'Input row separator string.') do |value|
+  options[:input_row_sep] = value
+end
+
+parser.on('--output-col-sep=SEPARATOR',
+          'Output column separator string.') do |value|
+  options[:output_col_sep] = value
+end
+
+parser.on('--output-row-sep=SEPARATOR',
+          'Output row separator string.') do |value|
+  options[:output_row_sep] = value
+end
+
+parser.on('-r', '--row-sep=SEPARATOR',
+          'Row separator string.') do |value|
+  options[:row_sep] = value
+end
+
+begin
+  parser.parse!
+rescue OptionParser::InvalidOption
+  $stderr.puts($!.message)
+  $stderr.puts(parser)
+  exit(false)
+end
+
+CSV.filter(**options) do |row|
+end

data/lib/csv/parser.rb

@@ -18,6 +18,19 @@ class CSV
     # into your Encoding.
     #
 
+    class << self
+      ARGF_OBJECT_ID = ARGF.object_id
+      # Convenient method to check whether the give input reached EOF
+      # or not.
+      def eof?(input)
+        # We can't use input != ARGF in Ractor. Because ARGF isn't a
+        # shareable object.
+        input.object_id != ARGF_OBJECT_ID and
+          input.respond_to?(:eof) and
+          input.eof?
+      end
+    end
+
     # Raised when encoding is invalid.
     class InvalidEncoding < StandardError
     end
@@ -312,7 +325,7 @@ class CSV
             raise InvalidEncoding unless chunk.valid_encoding?
             # trace(__method__, :chunk, chunk)
             @scanner = StringScanner.new(chunk)
-            if input.respond_to?(:eof?) and input.eof?
+            if Parser.eof?(input)
               @inputs.shift
               @last_scanner = @inputs.empty?
             end
@@ -869,10 +882,7 @@ class CSV
         string = nil
         if @samples.empty? and @input.is_a?(StringIO)
           string = @input.read
-        elsif @samples.size == 1 and
-              @input != ARGF and
-              @input.respond_to?(:eof?) and
-              @input.eof?
+        elsif @samples.size == 1 and Parser.eof?(@input)
           string = @samples[0]
         end
         if string

data/lib/csv/version.rb

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

data/lib/csv.rb

@@ -1976,7 +1976,7 @@ class CSV
       return unless Encoding.default_external == Encoding::UTF_8
       return if options.key?(:encoding)
       return if options.key?(:external_encoding)
-      return if mode.include?(":")
+      return if mode.is_a?(String) and mode.include?(":")
       file_opts[:encoding] = "bom|utf-8"
     end
 

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csv
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.3.3
 platform: ruby
 authors:
 - James Edward Gray II
 - Kouhei Sutou
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-21 00:00:00.000000000 Z
+date: 2025-03-20 00:00:00.000000000 Z
 dependencies: []
 description: The CSV library provides a complete interface to CSV files and data.
   It offers tools to enable you to read and write to and from Strings or IO objects,
@@ -17,7 +16,8 @@ description: The CSV library provides a complete interface to CSV files and data
 email:
 -
 - kou@cozmixng.org
-executables: []
+executables:
+- csv-filter
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
@@ -31,6 +31,7 @@ files:
 - LICENSE.txt
 - NEWS.md
 - README.md
+- bin/csv-filter
 - doc/csv/arguments/io.rdoc
 - doc/csv/options/common/col_sep.rdoc
 - doc/csv/options/common/quote_char.rdoc
@@ -71,8 +72,8 @@ homepage: https://github.com/ruby/csv
 licenses:
 - Ruby
 - BSD-2-Clause
-metadata: {}
-post_install_message:
+metadata:
+  changelog_uri: https://github.com/ruby/csv/releases/tag/v3.3.3
 rdoc_options:
 - "--main"
 - README.md
@@ -89,8 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: CSV Reading and Writing
 test_files: []