csv 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: e520c33af1acab822be6e93e034e176ecd24c73b89e68d4325871d5261da0050
-  data.tar.gz: c97cfd5a50a41209c74f292e834f3b4d1b9bef3b89726e928d0c65006102342d
+SHA1:
+  metadata.gz: 05b9101e168faf6acec7dd2c841e6a30084e3585
+  data.tar.gz: ad75132c6ed63c2cf95c16b6dbf948d76d83d69f
 SHA512:
-  metadata.gz: f827cc12fd35947f6058e3026bac1820b36c71b8203567ee3be54930bc05884d05ed6ec1011f2170d5a19463e171a906d2567a2b19ccd62ba85886453114ef00
-  data.tar.gz: fa880bb7f2bd71e1d29ce2efad98b549ea37851efaffa09880fab5a439a26b40f5a8d703fc86d58dbc6c169c2062ff9ce8419142e04e64c7506b0d91b7c27c5c
+  metadata.gz: 45c5498cf70618cd26ddf0acd17db083beec0b9a532adf7279cc5cb830f400a1ae0b291e6492f4191020b97a427c46c019aa97fbfb83aaded9fc66b920015c26
+  data.tar.gz: 5dd1c842d29df9e2c89da50b2ebbbed42e6386d05f3e5f76403b5d977e13a485b9978c815d418246798e4a4e72bf62995476ca4e9ea40095cc80f73319b30d7b

data/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.

data/README.md

@@ -0,0 +1,46 @@
+# CSV
+
+[![Build Status](https://travis-ci.org/ruby/csv.svg?branch=master)](https://travis-ci.org/ruby/csv)
+
+This 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, as needed.
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'csv'
+```
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install csv
+
+## Usage
+
+```ruby
+require "csv"
+
+CSV.foreach("path/to/file.csv") do |row|
+  # use row here...
+end
+```
+
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/ruby/csv.
+
+
+## License
+
+The gem is available as open source under the terms of the [2-Clause BSD License](https://opensource.org/licenses/BSD-2-Clause).

data/lib/core_ext/array.rb

@@ -0,0 +1,9 @@
+class Array # :nodoc:
+  # Equivalent to CSV::generate_line(self, options)
+  #
+  #   ["CSV", "data"].to_csv
+  #     #=> "CSV,data\n"
+  def to_csv(**options)
+    CSV.generate_line(self, options)
+  end
+end

data/lib/core_ext/string.rb

@@ -0,0 +1,9 @@
+class String # :nodoc:
+  # Equivalent to CSV::parse_line(self, options)
+  #
+  #   "CSV,data".parse_csv
+  #     #=> ["CSV", "data"]
+  def parse_csv(**options)
+    CSV.parse_line(self, options)
+  end
+end

data/lib/csv.rb

@@ -208,7 +208,7 @@ require "stringio"
 #
 class CSV
   # The version of the installed library.
-  VERSION = "2.4.8"
+  VERSION = "1.0.1"
 
   #
   # A CSV::Row is part Array and part Hash.  It retains an order for the fields
@@ -434,7 +434,7 @@ class CSV
     # If no block is given, an Enumerator is returned.
     #
     def delete_if(&block)
-      block or return enum_for(__method__) { size }
+      return enum_for(__method__) { size } unless block_given?
 
       @row.delete_if(&block)
 
@@ -513,7 +513,7 @@ class CSV
     # Support for Enumerable.
     #
     def each(&block)
-      block or return enum_for(__method__) { size }
+      return enum_for(__method__) { size } unless block_given?
 
       @row.each(&block)
 
@@ -547,6 +547,24 @@ class CSV
     end
     alias_method :to_s, :to_csv
 
+    #
+    # Extracts the nested value specified by the sequence of +index+ or +header+ objects by calling dig at each step,
+    # returning nil if any intermediate step is nil.
+    #
+    def dig(index_or_header, *indexes)
+      value = field(index_or_header)
+      if value.nil?
+        nil
+      elsif indexes.empty?
+        value
+      else
+        unless value.respond_to?(:dig)
+          raise TypeError, "#{value.class} does not have \#dig method"
+        end
+        value.dig(*indexes)
+      end
+    end
+
     # A summary of fields, by header, in an ASCII compatible String.
     def inspect
       str = ["#<", self.class.to_s]
@@ -808,16 +826,26 @@ class CSV
     end
 
     #
-    # Removes and returns the indicated column or row.  In the default mixed
+    # Removes and returns the indicated columns or rows.  In the default mixed
     # mode indices refer to rows and everything else is assumed to be a column
-    # header.  Use by_col!() or by_row!() to force the lookup.
+    # headers.  Use by_col!() or by_row!() to force the lookup.
     #
-    def delete(index_or_header)
-      if @mode == :row or  # by index
-         (@mode == :col_or_row and index_or_header.is_a? Integer)
-        @table.delete_at(index_or_header)
-      else                 # by header
-        @table.map { |row| row.delete(index_or_header).last }
+    def delete(*indexes_or_headers)
+      if indexes_or_headers.empty?
+        raise ArgumentError, "wrong number of arguments (given 0, expected 1+)"
+      end
+      deleted_values = indexes_or_headers.map do |index_or_header|
+        if @mode == :row or  # by index
+            (@mode == :col_or_row and index_or_header.is_a? Integer)
+          @table.delete_at(index_or_header)
+        else                 # by header
+          @table.map { |row| row.delete(index_or_header).last }
+        end
+      end
+      if indexes_or_headers.size == 1
+        deleted_values[0]
+      else
+        deleted_values
       end
     end
 
@@ -832,14 +860,14 @@ class CSV
     # If no block is given, an Enumerator is returned.
     #
     def delete_if(&block)
-      block or return enum_for(__method__) { @mode == :row or @mode == :col_or_row ? size : headers.size }
+      return enum_for(__method__) { @mode == :row or @mode == :col_or_row ? size : headers.size } unless block_given?
 
       if @mode == :row or @mode == :col_or_row  # by index
         @table.delete_if(&block)
       else                                      # by header
         deleted = []
         headers.each do |header|
-          deleted << delete(header) if block[[header, self[header]]]
+          deleted << delete(header) if yield([header, self[header]])
         end
       end
 
@@ -858,10 +886,10 @@ class CSV
     # If no block is given, an Enumerator is returned.
     #
     def each(&block)
-      block or return enum_for(__method__) { @mode == :col ? headers.size : size }
+      return enum_for(__method__) { @mode == :col ? headers.size : size } unless block_given?
 
       if @mode == :col
-        headers.each { |header| block[[header, self[header]]] }
+        headers.each { |header| yield([header, self[header]]) }
       else
         @table.each(&block)
       end
@@ -903,6 +931,24 @@ class CSV
     end
     alias_method :to_s, :to_csv
 
+    #
+    # Extracts the nested value specified by the sequence of +index+ or +header+ objects by calling dig at each step,
+    # returning nil if any intermediate step is nil.
+    #
+    def dig(index_or_header, *index_or_headers)
+      value = self[index_or_header]
+      if value.nil?
+        nil
+      elsif index_or_headers.empty?
+        value
+      else
+        unless value.respond_to?(:dig)
+          raise TypeError, "#{value.class} does not have \#dig method"
+        end
+        value.dig(*index_or_headers)
+      end
+    end
+
     # Shows the mode and size of this table in a US-ASCII String.
     def inspect
       "#<#{self.class} mode:#{@mode} row_count:#{to_a.size}>".encode("US-ASCII")
@@ -930,7 +976,11 @@ class CSV
   # A Regexp used to find and convert some common DateTime formats.
   DateTimeMatcher =
     / \A(?: (\w+,?\s+)?\w+\s+\d{1,2}\s+\d{1,2}:\d{1,2}:\d{1,2},?\s+\d{2,4} |
-            \d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2} )\z /x
+            \d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2} |
+            # ISO-8601
+            \d{4}-\d{2}-\d{2}
+              (?:T\d{2}:\d{2}(?::\d{2}(?:\.\d+)?(?:[+-]\d{2}(?::\d{2})|Z)?)?)?
+        )\z /x
 
   # The encoding used by all converters.
   ConverterEncoding = Encoding.find("UTF-8")
@@ -1137,7 +1187,7 @@ class CSV
   # but transcode it to UTF-8 before CSV parses it.
   #
   def self.foreach(path, **options, &block)
-    return to_enum(__method__, path, options) unless block
+    return to_enum(__method__, path, options) unless block_given?
     open(path, options) do |csv|
       csv.each(&block)
     end
@@ -1164,8 +1214,8 @@ class CSV
   def self.generate(str=nil, **options)
     # add a default empty String, if none was given
     if str
-      io = StringIO.new(str)
-      io.seek(0, IO::SEEK_END)
+      str = StringIO.new(str)
+      str.seek(0, IO::SEEK_END)
     else
       encoding = options[:encoding]
       str      = String.new
@@ -1309,14 +1359,14 @@ class CSV
   #
   def self.parse(*args, &block)
     csv = new(*args)
-    if block.nil?  # slurp contents, if no block is given
-      begin
-        csv.read
-      ensure
-        csv.close
-      end
-    else           # or pass each row to a provided block
-      csv.each(&block)
+
+    return csv.each(&block) if block_given?
+
+    # slurp contents, if no block is given
+    begin
+      csv.read
+    ensure
+      csv.close
     end
   end
 
@@ -2334,22 +2384,5 @@ def CSV(*args, &block)
   CSV.instance(*args, &block)
 end
 
-class Array # :nodoc:
-  # Equivalent to CSV::generate_line(self, options)
-  #
-  #   ["CSV", "data"].to_csv
-  #     #=> "CSV,data\n"
-  def to_csv(**options)
-    CSV.generate_line(self, options)
-  end
-end
-
-class String # :nodoc:
-  # Equivalent to CSV::parse_line(self, options)
-  #
-  #   "CSV,data".parse_csv
-  #     #=> ["CSV", "data"]
-  def parse_csv(**options)
-    CSV.parse_line(self, options)
-  end
-end
+require_relative "core_ext/array"
+require_relative "core_ext/string"

data/news.md

@@ -0,0 +1,49 @@
+# News
+
+## 1.0.1 - 2018-02-09
+
+### Improvements
+
+  * `CSV::Table#delete`: Added bulk delete support. You can delete
+    multiple rows and columns at once.
+    [GitHub#4][Patch by Vladislav]
+
+  * Updated Gem description.
+    [GitHub#11][Patch by Marcus Stollsteimer]
+
+  * Code cleanup.
+    [GitHub#12][Patch by Marcus Stollsteimer]
+    [GitHub#14][Patch by Steven Daniels]
+    [GitHub#18][Patch by takkanm]
+
+  * `CSV::Table#dig`: Added.
+    [GitHub#15][Patch by Tomohiro Ogoke]
+
+  * `CSV::Row#dig`: Added.
+    [GitHub#15][Patch by Tomohiro Ogoke]
+
+  * Added ISO 8601 support to date time converter.
+    [GitHub#16]
+
+### Fixes
+
+  * Fixed wrong `CSV::VERSION`.
+    [GitHub#10][Reported by Marcus Stollsteimer]
+
+  * `CSV.generate`: Fixed a regression bug that `String` argument is
+    ignored.
+    [GitHub#13][Patch by pavel]
+
+### Thanks
+
+  * Vladislav
+
+  * Marcus Stollsteimer
+
+  * Steven Daniels
+
+  * takkanm
+
+  * Tomohiro Ogoke
+
+  * pavel

metadata

@@ -1,51 +1,60 @@
 --- !ruby/object:Gem::Specification
 name: csv
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - James Edward Gray II
+- Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-13 00:00:00.000000000 Z
+date: 2018-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12'
-description: the CSV library began its life as FasterCSV.
+        version: '0'
+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,
+  as needed.
 email:
 - 
+- kou@cozmixng.org
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE.txt
+- README.md
+- lib/core_ext/array.rb
+- lib/core_ext/string.rb
 - lib/csv.rb
+- news.md
 homepage: https://github.com/ruby/csv
 licenses:
 - BSD-2-Clause
@@ -66,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.5.2.2
 signing_key: 
 specification_version: 4
 summary: CSV Reading and Writing