2009-08-16 02:31:13 -04:00
|
|
|
# encoding: US-ASCII
|
2007-12-24 21:46:26 -05:00
|
|
|
# = csv.rb -- CSV Reading and Writing
|
|
|
|
#
|
|
|
|
# Created by James Edward Gray II on 2005-10-31.
|
|
|
|
# Copyright 2005 James Edward Gray II. You can redistribute or modify this code
|
|
|
|
# under the terms of Ruby's license.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# See CSV for documentation.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# == Description
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# Welcome to the new and improved CSV.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# This version of the CSV library began its life as FasterCSV. FasterCSV was
|
|
|
|
# intended as a replacement to Ruby's then standard CSV library. It was
|
|
|
|
# designed to address concerns users of that library had and it had three
|
|
|
|
# primary goals:
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# 1. Be significantly faster than CSV while remaining a pure Ruby library.
|
|
|
|
# 2. Use a smaller and easier to maintain code base. (FasterCSV eventually
|
|
|
|
# grew larger, was also but considerably richer in features. The parsing
|
|
|
|
# core remains quite small.)
|
|
|
|
# 3. Improve on the CSV interface.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# Obviously, the last one is subjective. I did try to defer to the original
|
|
|
|
# interface whenever I didn't have a compelling reason to change it though, so
|
|
|
|
# hopefully this won't be too radically different.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# We must have met our goals because FasterCSV was renamed to CSV and replaced
|
2011-05-26 09:32:40 -04:00
|
|
|
# the original library as of Ruby 1.9. If you are migrating code from 1.8 or
|
|
|
|
# earlier, you may have to change your code to comply with the new interface.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# == What's Different From the Old CSV?
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# I'm sure I'll miss something, but I'll try to mention most of the major
|
|
|
|
# differences I am aware of, to help others quickly get up to speed:
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# === CSV Parsing
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# * This parser is m17n aware. See CSV for full details.
|
2007-12-24 21:46:26 -05:00
|
|
|
# * This library has a stricter parser and will throw MalformedCSVErrors on
|
|
|
|
# problematic data.
|
|
|
|
# * This library has a less liberal idea of a line ending than CSV. What you
|
|
|
|
# set as the <tt>:row_sep</tt> is law. It can auto-detect your line endings
|
|
|
|
# though.
|
|
|
|
# * The old library returned empty lines as <tt>[nil]</tt>. This library calls
|
|
|
|
# them <tt>[]</tt>.
|
|
|
|
# * This library has a much faster parser.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# === Interface
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# * CSV now uses Hash-style parameters to set options.
|
|
|
|
# * CSV no longer has generate_row() or parse_row().
|
|
|
|
# * The old CSV's Reader and Writer classes have been dropped.
|
|
|
|
# * CSV::open() is now more like Ruby's open().
|
|
|
|
# * CSV objects now support most standard IO methods.
|
|
|
|
# * CSV now has a new() method used to wrap objects like String and IO for
|
|
|
|
# reading and writing.
|
|
|
|
# * CSV::generate() is different from the old method.
|
|
|
|
# * CSV no longer supports partial reads. It works line-by-line.
|
|
|
|
# * CSV no longer allows the instance methods to override the separators for
|
|
|
|
# performance reasons. They must be set in the constructor.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# If you use this library and find yourself missing any functionality I have
|
|
|
|
# trimmed, please {let me know}[mailto:james@grayproductions.net].
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# == Documentation
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# See CSV for documentation.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# == What is CSV, really?
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# CSV maintains a pretty strict definition of CSV taken directly from
|
|
|
|
# {the RFC}[http://www.ietf.org/rfc/rfc4180.txt]. I relax the rules in only one
|
|
|
|
# place and that is to make using this library easier. CSV will parse all valid
|
|
|
|
# CSV.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# What you don't want to do is feed CSV invalid data. Because of the way the
|
|
|
|
# CSV format works, it's common for a parser to need to read until the end of
|
|
|
|
# the file to be sure a field is invalid. This eats a lot of time and memory.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# Luckily, when working with invalid CSV, Ruby's built-in methods will almost
|
|
|
|
# always be superior in every way. For example, parsing non-quoted fields is as
|
|
|
|
# easy as:
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# data.split(",")
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# == Questions and/or Comments
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# Feel free to email {James Edward Gray II}[mailto:james@grayproductions.net]
|
|
|
|
# with any questions.
|
|
|
|
|
|
|
|
require "forwardable"
|
|
|
|
require "English"
|
|
|
|
require "date"
|
|
|
|
require "stringio"
|
|
|
|
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# This class 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.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# == Reading
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# === From a File
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# ==== A Line at a Time
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# CSV.foreach("path/to/file.csv") do |row|
|
|
|
|
# # use row here...
|
|
|
|
# end
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# ==== All at Once
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# arr_of_arrs = CSV.read("path/to/file.csv")
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# === From a String
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# ==== A Line at a Time
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# CSV.parse("CSV,data,String") do |row|
|
|
|
|
# # use row here...
|
|
|
|
# end
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# ==== All at Once
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# arr_of_arrs = CSV.parse("CSV,data,String")
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# == Writing
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# === To a File
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# CSV.open("path/to/file.csv", "wb") do |csv|
|
2007-12-24 21:46:26 -05:00
|
|
|
# csv << ["row", "of", "CSV", "data"]
|
|
|
|
# csv << ["another", "row"]
|
|
|
|
# # ...
|
|
|
|
# end
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# === To a String
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# csv_string = CSV.generate do |csv|
|
|
|
|
# csv << ["row", "of", "CSV", "data"]
|
|
|
|
# csv << ["another", "row"]
|
|
|
|
# # ...
|
|
|
|
# end
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# == Convert a Single Line
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# csv_string = ["CSV", "data"].to_csv # to CSV
|
|
|
|
# csv_array = "CSV,String".parse_csv # from CSV
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# == Shortcut Interface
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# CSV { |csv_out| csv_out << %w{my data here} } # to $stdout
|
|
|
|
# CSV(csv = "") { |csv_str| csv_str << %w{my data here} } # to a String
|
|
|
|
# CSV($stderr) { |csv_err| csv_err << %w{my data here} } # to $stderr
|
2010-07-01 10:11:02 -04:00
|
|
|
# CSV($stdin) { |csv_in| csv_in.each { |row| p row } } # from $stdin
|
2011-04-26 11:57:04 -04:00
|
|
|
#
|
2010-07-01 10:11:02 -04:00
|
|
|
# == Advanced Usage
|
2011-04-26 11:57:04 -04:00
|
|
|
#
|
2010-07-01 10:11:02 -04:00
|
|
|
# === Wrap an IO Object
|
2011-04-26 11:57:04 -04:00
|
|
|
#
|
2010-07-01 10:11:02 -04:00
|
|
|
# csv = CSV.new(io, options)
|
|
|
|
# # ... read (with gets() or each()) from and write (with <<) to csv here ...
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# == CSV and Character Encodings (M17n or Multilingualization)
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# This new CSV parser is m17n savvy. The parser works in the Encoding of the IO
|
|
|
|
# or String object being read from or written to. Your data is never transcoded
|
|
|
|
# (unless you ask Ruby to transcode it for you) and will literally be parsed in
|
|
|
|
# the Encoding it is in. Thus CSV will return Arrays or Rows of Strings in the
|
|
|
|
# Encoding of your data. This is accomplished by transcoding the parser itself
|
|
|
|
# into your Encoding.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# Some transcoding must take place, of course, to accomplish this multiencoding
|
|
|
|
# support. For example, <tt>:col_sep</tt>, <tt>:row_sep</tt>, and
|
|
|
|
# <tt>:quote_char</tt> must be transcoded to match your data. Hopefully this
|
|
|
|
# makes the entire process feel transparent, since CSV's defaults should just
|
|
|
|
# magically work for you data. However, you can set these values manually in
|
|
|
|
# the target Encoding to avoid the translation.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# It's also important to note that while all of CSV's core parser is now
|
|
|
|
# Encoding agnostic, some features are not. For example, the built-in
|
|
|
|
# converters will try to transcode data to UTF-8 before making conversions.
|
|
|
|
# Again, you can provide custom converters that are aware of your Encodings to
|
|
|
|
# avoid this translation. It's just too hard for me to support native
|
|
|
|
# conversions in all of Ruby's Encodings.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# Anyway, the practical side of this is simple: make sure IO and String objects
|
|
|
|
# passed into CSV have the proper Encoding set and everything should just work.
|
|
|
|
# CSV methods that allow you to open IO objects (CSV::foreach(), CSV::open(),
|
|
|
|
# CSV::read(), and CSV::readlines()) do allow you to specify the Encoding.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# One minor exception comes when generating CSV into a String with an Encoding
|
|
|
|
# that is not ASCII compatible. There's no existing data for CSV to use to
|
|
|
|
# prepare itself and thus you will probably need to manually specify the desired
|
|
|
|
# Encoding for most of those cases. It will try to guess using the fields in a
|
|
|
|
# row of output though, when using CSV::generate_line() or Array#to_csv().
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# I try to point out any other Encoding issues in the documentation of methods
|
|
|
|
# as they come up.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# This has been tested to the best of my ability with all non-"dummy" Encodings
|
|
|
|
# Ruby ships with. However, it is brave new code and may have some bugs.
|
|
|
|
# Please feel free to {report}[mailto:james@grayproductions.net] any issues you
|
|
|
|
# find with it.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
class CSV
|
|
|
|
# The version of the installed library.
|
2011-06-02 10:52:11 -04:00
|
|
|
VERSION = "2.4.8".freeze
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# A CSV::Row is part Array and part Hash. It retains an order for the fields
|
|
|
|
# and allows duplicates just as an Array would, but also allows you to access
|
|
|
|
# fields by name just as you could if they were in a Hash.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# All rows returned by CSV will be constructed from this class, if header row
|
|
|
|
# processing is activated.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
class Row
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# Construct a new CSV::Row from +headers+ and +fields+, which are expected
|
|
|
|
# to be Arrays. If one Array is shorter than the other, it will be padded
|
|
|
|
# with +nil+ objects.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# The optional +header_row+ parameter can be set to +true+ to indicate, via
|
|
|
|
# CSV::Row.header_row?() and CSV::Row.field_row?(), that this is a header
|
|
|
|
# row. Otherwise, the row is assumes to be a field row.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# A CSV::Row object supports the following Array methods through delegation:
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# * empty?()
|
|
|
|
# * length()
|
|
|
|
# * size()
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def initialize(headers, fields, header_row = false)
|
|
|
|
@header_row = header_row
|
2013-11-23 19:44:41 -05:00
|
|
|
headers.each { |h| h.freeze if h.is_a? String }
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
# handle extra headers or fields
|
2007-12-25 23:56:03 -05:00
|
|
|
@row = if headers.size > fields.size
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
headers.zip(fields)
|
2007-12-25 23:56:03 -05:00
|
|
|
else
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
fields.zip(headers).map { |pair| pair.reverse }
|
2007-12-24 21:46:26 -05:00
|
|
|
end
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
# Internal data format used to compare equality.
|
|
|
|
attr_reader :row
|
|
|
|
protected :row
|
|
|
|
|
|
|
|
### Array Delegation ###
|
|
|
|
|
|
|
|
extend Forwardable
|
|
|
|
def_delegators :@row, :empty?, :length, :size
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
# Returns +true+ if this is a header row.
|
|
|
|
def header_row?
|
|
|
|
@header_row
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
# Returns +true+ if this is a field row.
|
|
|
|
def field_row?
|
|
|
|
not header_row?
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
# Returns the headers of this row.
|
|
|
|
def headers
|
|
|
|
@row.map { |pair| pair.first }
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# :call-seq:
|
|
|
|
# field( header )
|
|
|
|
# field( header, offset )
|
|
|
|
# field( index )
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2012-12-27 11:15:53 -05:00
|
|
|
# This method will return the field value by +header+ or +index+. If a field
|
2007-12-24 21:46:26 -05:00
|
|
|
# is not found, +nil+ is returned.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2013-12-02 00:36:00 -05:00
|
|
|
# When provided, +offset+ ensures that a header match occurs on or later
|
2009-03-05 22:56:38 -05:00
|
|
|
# than the +offset+ index. You can use this to find duplicate headers,
|
2007-12-24 21:46:26 -05:00
|
|
|
# without resorting to hard-coding exact indices.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def field(header_or_index, minimum_index = 0)
|
|
|
|
# locate the pair
|
|
|
|
finder = header_or_index.is_a?(Integer) ? :[] : :assoc
|
|
|
|
pair = @row[minimum_index..-1].send(finder, header_or_index)
|
|
|
|
|
|
|
|
# return the field if we have a pair
|
|
|
|
pair.nil? ? nil : pair.last
|
|
|
|
end
|
|
|
|
alias_method :[], :field
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2012-12-27 11:15:53 -05:00
|
|
|
#
|
|
|
|
# :call-seq:
|
|
|
|
# fetch( header )
|
|
|
|
# fetch( header ) { |row| ... }
|
|
|
|
# fetch( header, default )
|
|
|
|
#
|
|
|
|
# This method will fetch the field value by +header+. It has the same
|
|
|
|
# behavior as Hash#fetch: if there is a field with the given +header+, its
|
|
|
|
# value is returned. Otherwise, if a block is given, it is yielded the
|
|
|
|
# +header+ and its result is returned; if a +default+ is given as the
|
|
|
|
# second argument, it is returned; otherwise a KeyError is raised.
|
|
|
|
#
|
|
|
|
def fetch(header, *varargs)
|
|
|
|
raise ArgumentError, "Too many arguments" if varargs.length > 1
|
|
|
|
pair = @row.assoc(header)
|
|
|
|
if pair
|
|
|
|
pair.last
|
|
|
|
else
|
|
|
|
if block_given?
|
|
|
|
yield header
|
|
|
|
elsif varargs.empty?
|
|
|
|
raise KeyError, "key not found: #{header}"
|
|
|
|
else
|
|
|
|
varargs.first
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
# Returns +true+ if there is a field with the given +header+.
|
|
|
|
def has_key?(header)
|
|
|
|
!!@row.assoc(header)
|
|
|
|
end
|
|
|
|
alias_method :include?, :has_key?
|
|
|
|
alias_method :key?, :has_key?
|
|
|
|
alias_method :member?, :has_key?
|
|
|
|
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# :call-seq:
|
|
|
|
# []=( header, value )
|
|
|
|
# []=( header, offset, value )
|
|
|
|
# []=( index, value )
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# Looks up the field by the semantics described in CSV::Row.field() and
|
|
|
|
# assigns the +value+.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# Assigning past the end of the row with an index will set all pairs between
|
|
|
|
# to <tt>[nil, nil]</tt>. Assigning to an unused header appends the new
|
|
|
|
# pair.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def []=(*args)
|
|
|
|
value = args.pop
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
if args.first.is_a? Integer
|
|
|
|
if @row[args.first].nil? # extending past the end with index
|
|
|
|
@row[args.first] = [nil, value]
|
|
|
|
@row.map! { |pair| pair.nil? ? [nil, nil] : pair }
|
|
|
|
else # normal index assignment
|
|
|
|
@row[args.first][1] = value
|
|
|
|
end
|
|
|
|
else
|
|
|
|
index = index(*args)
|
|
|
|
if index.nil? # appending a field
|
|
|
|
self << [args.first, value]
|
|
|
|
else # normal header assignment
|
|
|
|
@row[index][1] = value
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# :call-seq:
|
|
|
|
# <<( field )
|
|
|
|
# <<( header_and_field_array )
|
|
|
|
# <<( header_and_field_hash )
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# If a two-element Array is provided, it is assumed to be a header and field
|
|
|
|
# and the pair is appended. A Hash works the same way with the key being
|
|
|
|
# the header and the value being the field. Anything else is assumed to be
|
|
|
|
# a lone field which is appended with a +nil+ header.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# This method returns the row for chaining.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def <<(arg)
|
|
|
|
if arg.is_a?(Array) and arg.size == 2 # appending a header and name
|
|
|
|
@row << arg
|
|
|
|
elsif arg.is_a?(Hash) # append header and name pairs
|
|
|
|
arg.each { |pair| @row << pair }
|
|
|
|
else # append field value
|
|
|
|
@row << [nil, arg]
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
self # for chaining
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# A shortcut for appending multiple fields. Equivalent to:
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# args.each { |arg| csv_row << arg }
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# This method returns the row for chaining.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def push(*args)
|
|
|
|
args.each { |arg| self << arg }
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
self # for chaining
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# :call-seq:
|
|
|
|
# delete( header )
|
|
|
|
# delete( header, offset )
|
|
|
|
# delete( index )
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# Used to remove a pair from the row by +header+ or +index+. The pair is
|
|
|
|
# located as described in CSV::Row.field(). The deleted pair is returned,
|
|
|
|
# or +nil+ if a pair could not be found.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def delete(header_or_index, minimum_index = 0)
|
2010-01-31 00:34:17 -05:00
|
|
|
if header_or_index.is_a? Integer # by index
|
2007-12-24 21:46:26 -05:00
|
|
|
@row.delete_at(header_or_index)
|
2010-01-31 00:34:17 -05:00
|
|
|
elsif i = index(header_or_index, minimum_index) # by header
|
|
|
|
@row.delete_at(i)
|
|
|
|
else
|
|
|
|
[ ]
|
2007-12-24 21:46:26 -05:00
|
|
|
end
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# The provided +block+ is passed a header and field for each pair in the row
|
|
|
|
# and expected to return +true+ or +false+, depending on whether the pair
|
|
|
|
# should be deleted.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# This method returns the row for chaining.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def delete_if(&block)
|
|
|
|
@row.delete_if(&block)
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
self # for chaining
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# This method accepts any number of arguments which can be headers, indices,
|
2009-03-05 22:56:38 -05:00
|
|
|
# Ranges of either, or two-element Arrays containing a header and offset.
|
2007-12-24 21:46:26 -05:00
|
|
|
# Each argument will be replaced with a field lookup as described in
|
|
|
|
# CSV::Row.field().
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# If called with no arguments, all fields are returned.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def fields(*headers_and_or_indices)
|
|
|
|
if headers_and_or_indices.empty? # return all fields--no arguments
|
|
|
|
@row.map { |pair| pair.last }
|
|
|
|
else # or work like values_at()
|
|
|
|
headers_and_or_indices.inject(Array.new) do |all, h_or_i|
|
|
|
|
all + if h_or_i.is_a? Range
|
|
|
|
index_begin = h_or_i.begin.is_a?(Integer) ? h_or_i.begin :
|
|
|
|
index(h_or_i.begin)
|
|
|
|
index_end = h_or_i.end.is_a?(Integer) ? h_or_i.end :
|
|
|
|
index(h_or_i.end)
|
|
|
|
new_range = h_or_i.exclude_end? ? (index_begin...index_end) :
|
|
|
|
(index_begin..index_end)
|
|
|
|
fields.values_at(new_range)
|
|
|
|
else
|
|
|
|
[field(*Array(h_or_i))]
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
alias_method :values_at, :fields
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# :call-seq:
|
|
|
|
# index( header )
|
|
|
|
# index( header, offset )
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# This method will return the index of a field with the provided +header+.
|
|
|
|
# The +offset+ can be used to locate duplicate header names, as described in
|
|
|
|
# CSV::Row.field().
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def index(header, minimum_index = 0)
|
|
|
|
# find the pair
|
|
|
|
index = headers[minimum_index..-1].index(header)
|
|
|
|
# return the index at the right offset, if we found one
|
|
|
|
index.nil? ? nil : index + minimum_index
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
# Returns +true+ if +name+ is a header for this row, and +false+ otherwise.
|
|
|
|
def header?(name)
|
|
|
|
headers.include? name
|
|
|
|
end
|
|
|
|
alias_method :include?, :header?
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# Returns +true+ if +data+ matches a field in this row, and +false+
|
|
|
|
# otherwise.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def field?(data)
|
|
|
|
fields.include? data
|
|
|
|
end
|
|
|
|
|
|
|
|
include Enumerable
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# Yields each pair of the row as header and field tuples (much like
|
|
|
|
# iterating over a Hash).
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# Support for Enumerable.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# This method returns the row for chaining.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def each(&block)
|
|
|
|
@row.each(&block)
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
self # for chaining
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
|
|
|
# Returns +true+ if this row contains the same headers and fields in the
|
2007-12-24 21:46:26 -05:00
|
|
|
# same order as +other+.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def ==(other)
|
2012-12-07 12:42:16 -05:00
|
|
|
return @row == other.row if other.is_a? CSV::Row
|
|
|
|
@row == other
|
2007-12-24 21:46:26 -05:00
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# Collapses the row into a simple Hash. Be warning that this discards field
|
|
|
|
# order and clobbers duplicate fields.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def to_hash
|
|
|
|
# flatten just one level of the internal Array
|
|
|
|
Hash[*@row.inject(Array.new) { |ary, pair| ary.push(*pair) }]
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# Returns the row as a CSV String. Headers are not used. Equivalent to:
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# csv_row.fields.to_csv( options )
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def to_csv(options = Hash.new)
|
|
|
|
fields.to_csv(options)
|
|
|
|
end
|
|
|
|
alias_method :to_s, :to_csv
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2008-12-26 11:53:13 -05:00
|
|
|
# A summary of fields, by header, in an ASCII compatible String.
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
def inspect
|
|
|
|
str = ["#<", self.class.to_s]
|
|
|
|
each do |header, field|
|
|
|
|
str << " " << (header.is_a?(Symbol) ? header.to_s : header.inspect) <<
|
|
|
|
":" << field.inspect
|
|
|
|
end
|
|
|
|
str << ">"
|
2008-12-26 11:53:13 -05:00
|
|
|
begin
|
2010-12-25 01:58:58 -05:00
|
|
|
str.join('')
|
2008-12-26 11:53:13 -05:00
|
|
|
rescue # any encoding error
|
|
|
|
str.map do |s|
|
|
|
|
e = Encoding::Converter.asciicompat_encoding(s.encoding)
|
|
|
|
e ? s.encode(e) : s.force_encoding("ASCII-8BIT")
|
2010-12-25 01:58:58 -05:00
|
|
|
end.join('')
|
2008-12-26 11:53:13 -05:00
|
|
|
end
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
end
|
2007-12-24 21:46:26 -05:00
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# A CSV::Table is a two-dimensional data structure for representing CSV
|
2009-03-05 22:56:38 -05:00
|
|
|
# documents. Tables allow you to work with the data by row or column,
|
2007-12-24 21:46:26 -05:00
|
|
|
# manipulate the data, and even convert the results back to CSV, if needed.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# All tables returned by CSV will be constructed from this class, if header
|
|
|
|
# row processing is activated.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
class Table
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# Construct a new CSV::Table from +array_of_rows+, which are expected
|
|
|
|
# to be CSV::Row objects. All rows are assumed to have the same headers.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# A CSV::Table object supports the following Array methods through
|
|
|
|
# delegation:
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# * empty?()
|
|
|
|
# * length()
|
|
|
|
# * size()
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def initialize(array_of_rows)
|
|
|
|
@table = array_of_rows
|
|
|
|
@mode = :col_or_row
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
# The current access mode for indexing and iteration.
|
|
|
|
attr_reader :mode
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
# Internal data format used to compare equality.
|
|
|
|
attr_reader :table
|
|
|
|
protected :table
|
|
|
|
|
|
|
|
### Array Delegation ###
|
|
|
|
|
|
|
|
extend Forwardable
|
|
|
|
def_delegators :@table, :empty?, :length, :size
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
|
|
|
# Returns a duplicate table object, in column mode. This is handy for
|
|
|
|
# chaining in a single call without changing the table mode, but be aware
|
2007-12-24 21:46:26 -05:00
|
|
|
# that this method can consume a fair amount of memory for bigger data sets.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# This method returns the duplicate table for chaining. Don't chain
|
|
|
|
# destructive methods (like []=()) this way though, since you are working
|
|
|
|
# with a duplicate.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def by_col
|
|
|
|
self.class.new(@table.dup).by_col!
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# Switches the mode of this table to column mode. All calls to indexing and
|
|
|
|
# iteration methods will work with columns until the mode is changed again.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# This method returns the table and is safe to chain.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def by_col!
|
|
|
|
@mode = :col
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
self
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
|
|
|
# Returns a duplicate table object, in mixed mode. This is handy for
|
|
|
|
# chaining in a single call without changing the table mode, but be aware
|
2007-12-24 21:46:26 -05:00
|
|
|
# that this method can consume a fair amount of memory for bigger data sets.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# This method returns the duplicate table for chaining. Don't chain
|
|
|
|
# destructive methods (like []=()) this way though, since you are working
|
|
|
|
# with a duplicate.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def by_col_or_row
|
|
|
|
self.class.new(@table.dup).by_col_or_row!
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# Switches the mode of this table to mixed mode. All calls to indexing and
|
|
|
|
# iteration methods will use the default intelligent indexing system until
|
|
|
|
# the mode is changed again. In mixed mode an index is assumed to be a row
|
|
|
|
# reference while anything else is assumed to be column access by headers.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# This method returns the table and is safe to chain.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def by_col_or_row!
|
|
|
|
@mode = :col_or_row
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
self
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# Returns a duplicate table object, in row mode. This is handy for chaining
|
|
|
|
# in a single call without changing the table mode, but be aware that this
|
|
|
|
# method can consume a fair amount of memory for bigger data sets.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# This method returns the duplicate table for chaining. Don't chain
|
|
|
|
# destructive methods (like []=()) this way though, since you are working
|
|
|
|
# with a duplicate.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def by_row
|
|
|
|
self.class.new(@table.dup).by_row!
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# Switches the mode of this table to row mode. All calls to indexing and
|
|
|
|
# iteration methods will work with rows until the mode is changed again.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# This method returns the table and is safe to chain.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def by_row!
|
|
|
|
@mode = :row
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
self
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# Returns the headers for the first row of this table (assumed to match all
|
|
|
|
# other rows). An empty Array is returned for empty tables.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def headers
|
|
|
|
if @table.empty?
|
|
|
|
Array.new
|
|
|
|
else
|
|
|
|
@table.first.headers
|
|
|
|
end
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# In the default mixed mode, this method returns rows for index access and
|
|
|
|
# columns for header access. You can force the index association by first
|
|
|
|
# calling by_col!() or by_row!().
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# Columns are returned as an Array of values. Altering that Array has no
|
|
|
|
# effect on the table.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def [](index_or_header)
|
|
|
|
if @mode == :row or # by index
|
|
|
|
(@mode == :col_or_row and index_or_header.is_a? Integer)
|
|
|
|
@table[index_or_header]
|
|
|
|
else # by header
|
|
|
|
@table.map { |row| row[index_or_header] }
|
|
|
|
end
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# In the default mixed mode, this method assigns rows for index access and
|
|
|
|
# columns for header access. You can force the index association by first
|
|
|
|
# calling by_col!() or by_row!().
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# Rows may be set to an Array of values (which will inherit the table's
|
|
|
|
# headers()) or a CSV::Row.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
|
|
|
# Columns may be set to a single value, which is copied to each row of the
|
2007-12-24 21:46:26 -05:00
|
|
|
# column, or an Array of values. Arrays of values are assigned to rows top
|
|
|
|
# to bottom in row major order. Excess values are ignored and if the Array
|
|
|
|
# does not have a value for each row the extra rows will receive a +nil+.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# Assigning to an existing column or row clobbers the data. Assigning to
|
|
|
|
# new columns creates them at the right end of the table.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def []=(index_or_header, value)
|
|
|
|
if @mode == :row or # by index
|
|
|
|
(@mode == :col_or_row and index_or_header.is_a? Integer)
|
|
|
|
if value.is_a? Array
|
|
|
|
@table[index_or_header] = Row.new(headers, value)
|
|
|
|
else
|
|
|
|
@table[index_or_header] = value
|
|
|
|
end
|
|
|
|
else # set column
|
|
|
|
if value.is_a? Array # multiple values
|
|
|
|
@table.each_with_index do |row, i|
|
|
|
|
if row.header_row?
|
|
|
|
row[index_or_header] = index_or_header
|
|
|
|
else
|
|
|
|
row[index_or_header] = value[i]
|
|
|
|
end
|
|
|
|
end
|
|
|
|
else # repeated value
|
|
|
|
@table.each do |row|
|
|
|
|
if row.header_row?
|
|
|
|
row[index_or_header] = index_or_header
|
|
|
|
else
|
|
|
|
row[index_or_header] = value
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# The mixed mode default is to treat a list of indices as row access,
|
|
|
|
# returning the rows indicated. Anything else is considered columnar
|
|
|
|
# access. For columnar access, the return set has an Array for each row
|
|
|
|
# with the values indicated by the headers in each Array. You can force
|
|
|
|
# column or row mode using by_col!() or by_row!().
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# You cannot mix column and row access.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def values_at(*indices_or_headers)
|
|
|
|
if @mode == :row or # by indices
|
|
|
|
( @mode == :col_or_row and indices_or_headers.all? do |index|
|
|
|
|
index.is_a?(Integer) or
|
|
|
|
( index.is_a?(Range) and
|
|
|
|
index.first.is_a?(Integer) and
|
|
|
|
index.last.is_a?(Integer) )
|
|
|
|
end )
|
|
|
|
@table.values_at(*indices_or_headers)
|
|
|
|
else # by headers
|
|
|
|
@table.map { |row| row.values_at(*indices_or_headers) }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# Adds a new row to the bottom end of this table. You can provide an Array,
|
|
|
|
# which will be converted to a CSV::Row (inheriting the table's headers()),
|
|
|
|
# or a CSV::Row.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# This method returns the table for chaining.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def <<(row_or_array)
|
|
|
|
if row_or_array.is_a? Array # append Array
|
|
|
|
@table << Row.new(headers, row_or_array)
|
|
|
|
else # append Row
|
|
|
|
@table << row_or_array
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
self # for chaining
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# A shortcut for appending multiple rows. Equivalent to:
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# rows.each { |row| self << row }
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# This method returns the table for chaining.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def push(*rows)
|
|
|
|
rows.each { |row| self << row }
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
self # for chaining
|
|
|
|
end
|
|
|
|
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# Removes and returns the indicated column or row. 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.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
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 }
|
|
|
|
end
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# Removes any column or row for which the block returns +true+. In the
|
|
|
|
# default mixed mode or row mode, iteration is the standard row major
|
2013-12-02 00:36:00 -05:00
|
|
|
# walking of rows. In column mode, iteration will +yield+ two element
|
2007-12-24 21:46:26 -05:00
|
|
|
# tuples containing the column name and an Array of values for that column.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# This method returns the table for chaining.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def delete_if(&block)
|
|
|
|
if @mode == :row or @mode == :col_or_row # by index
|
|
|
|
@table.delete_if(&block)
|
|
|
|
else # by header
|
|
|
|
to_delete = Array.new
|
|
|
|
headers.each_with_index do |header, i|
|
|
|
|
to_delete << header if block[[header, self[header]]]
|
|
|
|
end
|
|
|
|
to_delete.map { |header| delete(header) }
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
self # for chaining
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
include Enumerable
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# In the default mixed mode or row mode, iteration is the standard row major
|
2013-12-02 00:36:00 -05:00
|
|
|
# walking of rows. In column mode, iteration will +yield+ two element
|
2007-12-24 21:46:26 -05:00
|
|
|
# tuples containing the column name and an Array of values for that column.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# This method returns the table for chaining.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def each(&block)
|
|
|
|
if @mode == :col
|
|
|
|
headers.each { |header| block[[header, self[header]]] }
|
|
|
|
else
|
|
|
|
@table.each(&block)
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
self # for chaining
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
# Returns +true+ if all rows of this table ==() +other+'s rows.
|
|
|
|
def ==(other)
|
|
|
|
@table == other.table
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# Returns the table as an Array of Arrays. Headers will be the first row,
|
|
|
|
# then all of the field rows will follow.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def to_a
|
|
|
|
@table.inject([headers]) do |array, row|
|
|
|
|
if row.header_row?
|
|
|
|
array
|
|
|
|
else
|
|
|
|
array + [row.fields]
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# Returns the table as a complete CSV String. Headers will be listed first,
|
|
|
|
# then all of the field rows.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2010-03-23 10:59:25 -04:00
|
|
|
# This method assumes you want the Table.headers(), unless you explicitly
|
|
|
|
# pass <tt>:write_headers => false</tt>.
|
2011-04-26 11:57:04 -04:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def to_csv(options = Hash.new)
|
2010-03-23 10:59:25 -04:00
|
|
|
wh = options.fetch(:write_headers, true)
|
|
|
|
@table.inject(wh ? [headers.to_csv(options)] : [ ]) do |rows, row|
|
2007-12-24 21:46:26 -05:00
|
|
|
if row.header_row?
|
|
|
|
rows
|
|
|
|
else
|
|
|
|
rows + [row.fields.to_csv(options)]
|
|
|
|
end
|
2010-12-25 01:58:58 -05:00
|
|
|
end.join('')
|
2007-12-24 21:46:26 -05:00
|
|
|
end
|
|
|
|
alias_method :to_s, :to_csv
|
2009-03-05 22:56:38 -05:00
|
|
|
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# Shows the mode and size of this table in a US-ASCII String.
|
|
|
|
def inspect
|
2008-09-27 20:06:21 -04:00
|
|
|
"#<#{self.class} mode:#{@mode} row_count:#{to_a.size}>".encode("US-ASCII")
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
end
|
2007-12-24 21:46:26 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
# The error thrown when the parser encounters illegal CSV formatting.
|
|
|
|
class MalformedCSVError < RuntimeError; end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# A FieldInfo Struct contains details about a field's position in the data
|
|
|
|
# source it was read from. CSV will pass this Struct to some blocks that make
|
|
|
|
# decisions based on field structure. See CSV.convert_fields() for an
|
|
|
|
# example.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# <b><tt>index</tt></b>:: The zero-based index of the field in its row.
|
|
|
|
# <b><tt>line</tt></b>:: The line of the data source this row is from.
|
|
|
|
# <b><tt>header</tt></b>:: The header for the column, when available.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
FieldInfo = Struct.new(:index, :line, :header)
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
# A Regexp used to find and convert some common Date formats.
|
|
|
|
DateMatcher = / \A(?: (\w+,?\s+)?\w+\s+\d{1,2},?\s+\d{2,4} |
|
|
|
|
\d{4}-\d{2}-\d{2} )\z /x
|
|
|
|
# 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
|
2009-03-05 22:56:38 -05:00
|
|
|
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# The encoding used by all converters.
|
|
|
|
ConverterEncoding = Encoding.find("UTF-8")
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# This Hash holds the built-in converters of CSV that can be accessed by name.
|
|
|
|
# You can select Converters with CSV.convert() or through the +options+ Hash
|
|
|
|
# passed to CSV::new().
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# <b><tt>:integer</tt></b>:: Converts any field Integer() accepts.
|
|
|
|
# <b><tt>:float</tt></b>:: Converts any field Float() accepts.
|
2009-03-05 22:56:38 -05:00
|
|
|
# <b><tt>:numeric</tt></b>:: A combination of <tt>:integer</tt>
|
2007-12-24 21:46:26 -05:00
|
|
|
# and <tt>:float</tt>.
|
|
|
|
# <b><tt>:date</tt></b>:: Converts any field Date::parse() accepts.
|
|
|
|
# <b><tt>:date_time</tt></b>:: Converts any field DateTime::parse() accepts.
|
2009-03-05 22:56:38 -05:00
|
|
|
# <b><tt>:all</tt></b>:: All built-in converters. A combination of
|
2007-12-24 21:46:26 -05:00
|
|
|
# <tt>:date_time</tt> and <tt>:numeric</tt>.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# All built-in converters transcode field data to UTF-8 before attempting a
|
|
|
|
# conversion. If your data cannot be transcoded to UTF-8 the conversion will
|
|
|
|
# fail and the field will remain unchanged.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2008-06-04 05:37:38 -04:00
|
|
|
# This Hash is intentionally left unfrozen and users should feel free to add
|
2007-12-24 21:46:26 -05:00
|
|
|
# values to it that can be accessed by all CSV objects.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# To add a combo field, the value should be an Array of names. Combo fields
|
|
|
|
# can be nested with other combo fields.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2008-10-10 11:09:34 -04:00
|
|
|
Converters = { integer: lambda { |f|
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
Integer(f.encode(ConverterEncoding)) rescue f
|
|
|
|
},
|
2008-10-10 11:09:34 -04:00
|
|
|
float: lambda { |f|
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
Float(f.encode(ConverterEncoding)) rescue f
|
|
|
|
},
|
2008-10-10 11:09:34 -04:00
|
|
|
numeric: [:integer, :float],
|
|
|
|
date: lambda { |f|
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
begin
|
|
|
|
e = f.encode(ConverterEncoding)
|
|
|
|
e =~ DateMatcher ? Date.parse(e) : f
|
|
|
|
rescue # encoding conversion or date parse errors
|
|
|
|
f
|
|
|
|
end
|
2007-12-24 21:46:26 -05:00
|
|
|
},
|
2008-10-10 11:09:34 -04:00
|
|
|
date_time: lambda { |f|
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
begin
|
|
|
|
e = f.encode(ConverterEncoding)
|
|
|
|
e =~ DateTimeMatcher ? DateTime.parse(e) : f
|
|
|
|
rescue # encoding conversion or date parse errors
|
|
|
|
f
|
|
|
|
end
|
2007-12-24 21:46:26 -05:00
|
|
|
},
|
2008-10-10 11:09:34 -04:00
|
|
|
all: [:date_time, :numeric] }
|
2007-12-24 21:46:26 -05:00
|
|
|
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# This Hash holds the built-in header converters of CSV that can be accessed
|
|
|
|
# by name. You can select HeaderConverters with CSV.header_convert() or
|
|
|
|
# through the +options+ Hash passed to CSV::new().
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# <b><tt>:downcase</tt></b>:: Calls downcase() on the header String.
|
|
|
|
# <b><tt>:symbol</tt></b>:: The header String is downcased, spaces are
|
|
|
|
# replaced with underscores, non-word characters
|
|
|
|
# are dropped, and finally to_sym() is called.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# All built-in header converters transcode header data to UTF-8 before
|
|
|
|
# attempting a conversion. If your data cannot be transcoded to UTF-8 the
|
|
|
|
# conversion will fail and the header will remain unchanged.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2013-12-02 00:36:00 -05:00
|
|
|
# This Hash is intentionally left unfrozen and users should feel free to add
|
2007-12-24 21:46:26 -05:00
|
|
|
# values to it that can be accessed by all CSV objects.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# To add a combo field, the value should be an Array of names. Combo fields
|
|
|
|
# can be nested with other combo fields.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
HeaderConverters = {
|
2008-10-10 11:09:34 -04:00
|
|
|
downcase: lambda { |h| h.encode(ConverterEncoding).downcase },
|
|
|
|
symbol: lambda { |h|
|
2014-04-01 10:40:48 -04:00
|
|
|
h.encode(ConverterEncoding).downcase.strip.gsub(/\s+/, "_").
|
|
|
|
gsub(/\W+/, "").to_sym
|
2007-12-24 21:46:26 -05:00
|
|
|
}
|
|
|
|
}
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# The options used when no overrides are given by calling code. They are:
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# <b><tt>:col_sep</tt></b>:: <tt>","</tt>
|
|
|
|
# <b><tt>:row_sep</tt></b>:: <tt>:auto</tt>
|
|
|
|
# <b><tt>:quote_char</tt></b>:: <tt>'"'</tt>
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# <b><tt>:field_size_limit</tt></b>:: +nil+
|
2007-12-24 21:46:26 -05:00
|
|
|
# <b><tt>:converters</tt></b>:: +nil+
|
|
|
|
# <b><tt>:unconverted_fields</tt></b>:: +nil+
|
|
|
|
# <b><tt>:headers</tt></b>:: +false+
|
|
|
|
# <b><tt>:return_headers</tt></b>:: +false+
|
|
|
|
# <b><tt>:header_converters</tt></b>:: +nil+
|
|
|
|
# <b><tt>:skip_blanks</tt></b>:: +false+
|
|
|
|
# <b><tt>:force_quotes</tt></b>:: +false+
|
2012-08-20 16:52:36 -04:00
|
|
|
# <b><tt>:skip_lines</tt></b>:: +nil+
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2008-10-10 11:09:34 -04:00
|
|
|
DEFAULT_OPTIONS = { col_sep: ",",
|
|
|
|
row_sep: :auto,
|
2009-03-05 22:56:38 -05:00
|
|
|
quote_char: '"',
|
2008-10-10 11:09:34 -04:00
|
|
|
field_size_limit: nil,
|
|
|
|
converters: nil,
|
|
|
|
unconverted_fields: nil,
|
|
|
|
headers: false,
|
|
|
|
return_headers: false,
|
|
|
|
header_converters: nil,
|
|
|
|
skip_blanks: false,
|
2012-08-20 16:52:36 -04:00
|
|
|
force_quotes: false,
|
|
|
|
skip_lines: nil }.freeze
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# This method will return a CSV instance, just like CSV::new(), but the
|
|
|
|
# instance will be cached and returned for all future calls to this method for
|
|
|
|
# the same +data+ object (tested by Object#object_id()) with the same
|
|
|
|
# +options+.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# If a block is given, the instance is passed to the block and the return
|
|
|
|
# value becomes the return value of the block.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
def self.instance(data = $stdout, options = Hash.new)
|
|
|
|
# create a _signature_ for this method call, data object and options
|
|
|
|
sig = [data.object_id] +
|
|
|
|
options.values_at(*DEFAULT_OPTIONS.keys.sort_by { |sym| sym.to_s })
|
2009-03-05 22:56:38 -05:00
|
|
|
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# fetch or create the instance for this signature
|
|
|
|
@@instances ||= Hash.new
|
|
|
|
instance = (@@instances[sig] ||= new(data, options))
|
|
|
|
|
|
|
|
if block_given?
|
|
|
|
yield instance # run block, if given, returning result
|
|
|
|
else
|
|
|
|
instance # or return the instance
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# :call-seq:
|
|
|
|
# filter( options = Hash.new ) { |row| ... }
|
|
|
|
# filter( input, options = Hash.new ) { |row| ... }
|
|
|
|
# filter( input, output, options = Hash.new ) { |row| ... }
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# This method is a convenience for building Unix-like filters for CSV data.
|
2009-03-05 22:56:38 -05:00
|
|
|
# Each row is yielded to the provided block which can alter it as needed.
|
2007-12-24 21:46:26 -05:00
|
|
|
# After the block returns, the row is appended to +output+ altered or not.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# The +input+ and +output+ arguments can be anything CSV::new() accepts
|
2009-03-05 22:56:38 -05:00
|
|
|
# (generally String or IO objects). If not given, they default to
|
2007-12-24 21:46:26 -05:00
|
|
|
# <tt>ARGF</tt> and <tt>$stdout</tt>.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# The +options+ parameter is also filtered down to CSV::new() after some
|
2009-03-05 22:56:38 -05:00
|
|
|
# clever key parsing. Any key beginning with <tt>:in_</tt> or
|
2007-12-24 21:46:26 -05:00
|
|
|
# <tt>:input_</tt> will have that leading identifier stripped and will only
|
|
|
|
# be used in the +options+ Hash for the +input+ object. Keys starting with
|
2009-03-05 22:56:38 -05:00
|
|
|
# <tt>:out_</tt> or <tt>:output_</tt> affect only +output+. All other keys
|
2007-12-24 21:46:26 -05:00
|
|
|
# are assigned to both objects.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# The <tt>:output_row_sep</tt> +option+ defaults to
|
|
|
|
# <tt>$INPUT_RECORD_SEPARATOR</tt> (<tt>$/</tt>).
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def self.filter(*args)
|
|
|
|
# parse options for input, output, or both
|
2008-10-10 11:09:34 -04:00
|
|
|
in_options, out_options = Hash.new, {row_sep: $INPUT_RECORD_SEPARATOR}
|
2007-12-24 21:46:26 -05:00
|
|
|
if args.last.is_a? Hash
|
|
|
|
args.pop.each do |key, value|
|
|
|
|
case key.to_s
|
|
|
|
when /\Ain(?:put)?_(.+)\Z/
|
|
|
|
in_options[$1.to_sym] = value
|
|
|
|
when /\Aout(?:put)?_(.+)\Z/
|
|
|
|
out_options[$1.to_sym] = value
|
|
|
|
else
|
|
|
|
in_options[key] = value
|
|
|
|
out_options[key] = value
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
# build input and output wrappers
|
|
|
|
input = new(args.shift || ARGF, in_options)
|
|
|
|
output = new(args.shift || $stdout, out_options)
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
# read, yield, write
|
|
|
|
input.each do |row|
|
|
|
|
yield row
|
|
|
|
output << row
|
|
|
|
end
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# This method is intended as the primary interface for reading CSV files. You
|
|
|
|
# pass a +path+ and any +options+ you wish to set for the read. Each row of
|
|
|
|
# file will be passed to the provided +block+ in turn.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# The +options+ parameter can be anything CSV::new() understands. This method
|
|
|
|
# also understands an additional <tt>:encoding</tt> parameter that you can use
|
|
|
|
# to specify the Encoding of the data in the file to be read. You must provide
|
|
|
|
# this unless your data is in Encoding::default_external(). CSV will use this
|
2010-10-07 11:25:23 -04:00
|
|
|
# to determine how to parse the data. You may provide a second Encoding to
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# have the data transcoded as it is read. For example,
|
2008-10-10 11:09:34 -04:00
|
|
|
# <tt>encoding: "UTF-32BE:UTF-8"</tt> would read UTF-32BE data from the file
|
|
|
|
# but transcode it to UTF-8 before CSV parses it.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def self.foreach(path, options = Hash.new, &block)
|
2013-10-03 20:32:35 -04:00
|
|
|
return to_enum(__method__, path, options) unless block
|
2010-12-25 04:04:33 -05:00
|
|
|
open(path, options) do |csv|
|
2007-12-24 21:46:26 -05:00
|
|
|
csv.each(&block)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# :call-seq:
|
|
|
|
# generate( str, options = Hash.new ) { |csv| ... }
|
|
|
|
# generate( options = Hash.new ) { |csv| ... }
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
|
|
|
# This method wraps a String you provide, or an empty default String, in a
|
2007-12-24 21:46:26 -05:00
|
|
|
# CSV object which is passed to the provided block. You can use the block to
|
|
|
|
# append CSV rows to the String and when the block exits, the final String
|
|
|
|
# will be returned.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2013-12-02 00:36:00 -05:00
|
|
|
# Note that a passed String *is* modified by this method. Call dup() before
|
2007-12-24 21:46:26 -05:00
|
|
|
# passing if you need a new String.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2010-03-19 23:30:59 -04:00
|
|
|
# The +options+ parameter can be anything CSV::new() understands. This method
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# understands an additional <tt>:encoding</tt> parameter when not passed a
|
|
|
|
# String to set the base Encoding for the output. CSV needs this hint if you
|
|
|
|
# plan to output non-ASCII compatible data.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def self.generate(*args)
|
|
|
|
# add a default empty String, if none was given
|
|
|
|
if args.first.is_a? String
|
|
|
|
io = StringIO.new(args.shift)
|
|
|
|
io.seek(0, IO::SEEK_END)
|
|
|
|
args.unshift(io)
|
|
|
|
else
|
2014-06-09 21:57:10 -04:00
|
|
|
encoding = args[-1][:encoding] if args.last.is_a?(Hash)
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
str = ""
|
2014-06-09 21:57:10 -04:00
|
|
|
str.force_encoding(encoding) if encoding
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
args.unshift(str)
|
2007-12-24 21:46:26 -05:00
|
|
|
end
|
|
|
|
csv = new(*args) # wrap
|
|
|
|
yield csv # yield for appending
|
|
|
|
csv.string # return final String
|
|
|
|
end
|
|
|
|
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
|
|
|
# This method is a shortcut for converting a single row (Array) into a CSV
|
2007-12-24 21:46:26 -05:00
|
|
|
# String.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2010-03-19 23:30:59 -04:00
|
|
|
# The +options+ parameter can be anything CSV::new() understands. This method
|
2009-03-05 22:56:38 -05:00
|
|
|
# understands an additional <tt>:encoding</tt> parameter to set the base
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# Encoding for the output. This method will try to guess your Encoding from
|
|
|
|
# the first non-+nil+ field in +row+, if possible, but you may need to use
|
|
|
|
# this parameter as a backup plan.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# The <tt>:row_sep</tt> +option+ defaults to <tt>$INPUT_RECORD_SEPARATOR</tt>
|
|
|
|
# (<tt>$/</tt>) when calling this method.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def self.generate_line(row, options = Hash.new)
|
2008-10-10 11:09:34 -04:00
|
|
|
options = {row_sep: $INPUT_RECORD_SEPARATOR}.merge(options)
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
encoding = options.delete(:encoding)
|
|
|
|
str = ""
|
|
|
|
if encoding
|
2008-09-27 20:06:21 -04:00
|
|
|
str.force_encoding(encoding)
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
elsif field = row.find { |f| not f.nil? }
|
2008-09-27 20:06:21 -04:00
|
|
|
str.force_encoding(String(field).encoding)
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
end
|
|
|
|
(new(str, options) << row).string
|
2007-12-24 21:46:26 -05:00
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# :call-seq:
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# open( filename, mode = "rb", options = Hash.new ) { |faster_csv| ... }
|
|
|
|
# open( filename, options = Hash.new ) { |faster_csv| ... }
|
|
|
|
# open( filename, mode = "rb", options = Hash.new )
|
|
|
|
# open( filename, options = Hash.new )
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# This method opens an IO object, and wraps that with CSV. This is intended
|
|
|
|
# as the primary interface for writing a CSV file.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# You must pass a +filename+ and may optionally add a +mode+ for Ruby's
|
|
|
|
# open(). You may also pass an optional Hash containing any +options+
|
|
|
|
# CSV::new() understands as the final argument.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# This method works like Ruby's open() call, in that it will pass a CSV object
|
2008-06-04 05:37:38 -04:00
|
|
|
# to a provided block and close it when the block terminates, or it will
|
2007-12-24 21:46:26 -05:00
|
|
|
# return the CSV object when no block is provided. (*Note*: This is different
|
|
|
|
# from the Ruby 1.8 CSV library which passed rows to the block. Use
|
|
|
|
# CSV::foreach() for that behavior.)
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# You must provide a +mode+ with an embedded Encoding designator unless your
|
|
|
|
# data is in Encoding::default_external(). CSV will check the Encoding of the
|
2010-10-07 11:25:23 -04:00
|
|
|
# underlying IO object (set by the +mode+ you pass) to determine how to parse
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# the data. You may provide a second Encoding to have the data transcoded as
|
|
|
|
# it is read just as you can with a normal call to IO::open(). For example,
|
|
|
|
# <tt>"rb:UTF-32BE:UTF-8"</tt> would read UTF-32BE data from the file but
|
|
|
|
# transcode it to UTF-8 before CSV parses it.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# An opened CSV object will delegate to many IO methods for convenience. You
|
2007-12-24 21:46:26 -05:00
|
|
|
# may call:
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# * binmode()
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# * binmode?()
|
2007-12-24 21:46:26 -05:00
|
|
|
# * close()
|
|
|
|
# * close_read()
|
|
|
|
# * close_write()
|
|
|
|
# * closed?()
|
|
|
|
# * eof()
|
|
|
|
# * eof?()
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# * external_encoding()
|
2007-12-24 21:46:26 -05:00
|
|
|
# * fcntl()
|
|
|
|
# * fileno()
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# * flock()
|
2007-12-24 21:46:26 -05:00
|
|
|
# * flush()
|
|
|
|
# * fsync()
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# * internal_encoding()
|
2007-12-24 21:46:26 -05:00
|
|
|
# * ioctl()
|
|
|
|
# * isatty()
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# * path()
|
2007-12-24 21:46:26 -05:00
|
|
|
# * pid()
|
|
|
|
# * pos()
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# * pos=()
|
2007-12-24 21:46:26 -05:00
|
|
|
# * reopen()
|
|
|
|
# * seek()
|
|
|
|
# * stat()
|
|
|
|
# * sync()
|
|
|
|
# * sync=()
|
|
|
|
# * tell()
|
|
|
|
# * to_i()
|
|
|
|
# * to_io()
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# * truncate()
|
2007-12-24 21:46:26 -05:00
|
|
|
# * tty?()
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def self.open(*args)
|
|
|
|
# find the +options+ Hash
|
|
|
|
options = if args.last.is_a? Hash then args.pop else Hash.new end
|
2011-04-27 17:07:09 -04:00
|
|
|
# wrap a File opened with the remaining +args+ with no newline
|
|
|
|
# decorator
|
|
|
|
file_opts = {universal_newline: false}.merge(options)
|
|
|
|
begin
|
|
|
|
f = File.open(*args, file_opts)
|
|
|
|
rescue ArgumentError => e
|
|
|
|
raise unless /needs binmode/ =~ e.message and args.size == 1
|
|
|
|
args << "rb"
|
|
|
|
file_opts = {encoding: Encoding.default_external}.merge(file_opts)
|
|
|
|
retry
|
|
|
|
end
|
2014-05-29 06:44:59 -04:00
|
|
|
begin
|
|
|
|
csv = new(f, options)
|
|
|
|
rescue Exception
|
|
|
|
f.close
|
|
|
|
raise
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
# handle blocks like Ruby's open(), not like the CSV library
|
|
|
|
if block_given?
|
|
|
|
begin
|
|
|
|
yield csv
|
|
|
|
ensure
|
|
|
|
csv.close
|
|
|
|
end
|
|
|
|
else
|
|
|
|
csv
|
|
|
|
end
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# :call-seq:
|
|
|
|
# parse( str, options = Hash.new ) { |row| ... }
|
|
|
|
# parse( str, options = Hash.new )
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# This method can be used to easily parse CSV out of a String. You may either
|
|
|
|
# provide a +block+ which will be called with each row of the String in turn,
|
|
|
|
# or just use the returned Array of Arrays (when no +block+ is given).
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# You pass your +str+ to read from, and an optional +options+ Hash containing
|
|
|
|
# anything CSV::new() understands.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
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)
|
|
|
|
end
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
|
|
|
# This method is a shortcut for converting a single line of a CSV String into
|
2013-11-07 12:10:34 -05:00
|
|
|
# an Array. Note that if +line+ contains multiple rows, anything beyond the
|
|
|
|
# first row is ignored.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2010-03-19 23:30:59 -04:00
|
|
|
# The +options+ parameter can be anything CSV::new() understands.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def self.parse_line(line, options = Hash.new)
|
|
|
|
new(line, options).shift
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
|
|
|
# Use to slurp a CSV file into an Array of Arrays. Pass the +path+ to the
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# file and any +options+ CSV::new() understands. This method also understands
|
|
|
|
# an additional <tt>:encoding</tt> parameter that you can use to specify the
|
|
|
|
# Encoding of the data in the file to be read. You must provide this unless
|
2010-10-07 11:25:23 -04:00
|
|
|
# your data is in Encoding::default_external(). CSV will use this to determine
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# how to parse the data. You may provide a second Encoding to have the data
|
|
|
|
# transcoded as it is read. For example,
|
2008-10-10 11:09:34 -04:00
|
|
|
# <tt>encoding: "UTF-32BE:UTF-8"</tt> would read UTF-32BE data from the file
|
|
|
|
# but transcode it to UTF-8 before CSV parses it.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2011-04-27 17:07:04 -04:00
|
|
|
def self.read(path, *options)
|
|
|
|
open(path, *options) { |csv| csv.read }
|
2007-12-24 21:46:26 -05:00
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
# Alias for CSV::read().
|
|
|
|
def self.readlines(*args)
|
|
|
|
read(*args)
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# A shortcut for:
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2008-10-10 11:09:34 -04:00
|
|
|
# CSV.read( path, { headers: true,
|
|
|
|
# converters: :numeric,
|
|
|
|
# header_converters: :symbol }.merge(options) )
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def self.table(path, options = Hash.new)
|
2008-10-10 11:09:34 -04:00
|
|
|
read( path, { headers: true,
|
|
|
|
converters: :numeric,
|
|
|
|
header_converters: :symbol }.merge(options) )
|
2007-12-24 21:46:26 -05:00
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# This constructor will wrap either a String or IO object passed in +data+ for
|
|
|
|
# reading and/or writing. In addition to the CSV instance methods, several IO
|
|
|
|
# methods are delegated. (See CSV::open() for a complete list.) If you pass
|
|
|
|
# a String for +data+, you can later retrieve it (after writing to it, for
|
|
|
|
# example) with CSV.string().
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
|
|
|
# Note that a wrapped String will be positioned at at the beginning (for
|
2007-12-24 21:46:26 -05:00
|
|
|
# reading). If you want it at the end (for writing), use CSV::generate().
|
|
|
|
# If you want any other positioning, pass a preset StringIO object instead.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
|
|
|
# You may set any reading and/or writing preferences in the +options+ Hash.
|
2007-12-24 21:46:26 -05:00
|
|
|
# Available options are:
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# <b><tt>:col_sep</tt></b>:: The String placed between each field.
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# This String will be transcoded into
|
|
|
|
# the data's Encoding before parsing.
|
2007-12-24 21:46:26 -05:00
|
|
|
# <b><tt>:row_sep</tt></b>:: The String appended to the end of each
|
|
|
|
# row. This can be set to the special
|
|
|
|
# <tt>:auto</tt> setting, which requests
|
|
|
|
# that CSV automatically discover this
|
|
|
|
# from the data. Auto-discovery reads
|
|
|
|
# ahead in the data looking for the next
|
|
|
|
# <tt>"\r\n"</tt>, <tt>"\n"</tt>, or
|
|
|
|
# <tt>"\r"</tt> sequence. A sequence
|
|
|
|
# will be selected even if it occurs in
|
|
|
|
# a quoted field, assuming that you
|
|
|
|
# would have the same line endings
|
|
|
|
# there. If none of those sequences is
|
|
|
|
# found, +data+ is <tt>ARGF</tt>,
|
|
|
|
# <tt>STDIN</tt>, <tt>STDOUT</tt>, or
|
|
|
|
# <tt>STDERR</tt>, or the stream is only
|
|
|
|
# available for output, the default
|
|
|
|
# <tt>$INPUT_RECORD_SEPARATOR</tt>
|
|
|
|
# (<tt>$/</tt>) is used. Obviously,
|
|
|
|
# discovery takes a little time. Set
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# manually if speed is important. Also
|
|
|
|
# note that IO objects should be opened
|
|
|
|
# in binary mode on Windows if this
|
|
|
|
# feature will be used as the
|
|
|
|
# line-ending translation can cause
|
|
|
|
# problems with resetting the document
|
|
|
|
# position to where it was before the
|
|
|
|
# read ahead. This String will be
|
|
|
|
# transcoded into the data's Encoding
|
|
|
|
# before parsing.
|
2007-12-24 21:46:26 -05:00
|
|
|
# <b><tt>:quote_char</tt></b>:: The character used to quote fields.
|
|
|
|
# This has to be a single character
|
|
|
|
# String. This is useful for
|
|
|
|
# application that incorrectly use
|
|
|
|
# <tt>'</tt> as the quote character
|
|
|
|
# instead of the correct <tt>"</tt>.
|
|
|
|
# CSV will always consider a double
|
2014-04-03 01:59:14 -04:00
|
|
|
# sequence of this character to be an
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# escaped quote. This String will be
|
|
|
|
# transcoded into the data's Encoding
|
|
|
|
# before parsing.
|
|
|
|
# <b><tt>:field_size_limit</tt></b>:: This is a maximum size CSV will read
|
|
|
|
# ahead looking for the closing quote
|
|
|
|
# for a field. (In truth, it reads to
|
|
|
|
# the first line ending beyond this
|
|
|
|
# size.) If a quote cannot be found
|
|
|
|
# within the limit CSV will raise a
|
|
|
|
# MalformedCSVError, assuming the data
|
|
|
|
# is faulty. You can use this limit to
|
|
|
|
# prevent what are effectively DoS
|
|
|
|
# attacks on the parser. However, this
|
|
|
|
# limit can cause a legitimate parse to
|
|
|
|
# fail and thus is set to +nil+, or off,
|
|
|
|
# by default.
|
2007-12-24 21:46:26 -05:00
|
|
|
# <b><tt>:converters</tt></b>:: An Array of names from the Converters
|
|
|
|
# Hash and/or lambdas that handle custom
|
|
|
|
# conversion. A single converter
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# doesn't have to be in an Array. All
|
|
|
|
# built-in converters try to transcode
|
|
|
|
# fields to UTF-8 before converting.
|
|
|
|
# The conversion will fail if the data
|
|
|
|
# cannot be transcoded, leaving the
|
|
|
|
# field unchanged.
|
2007-12-24 21:46:26 -05:00
|
|
|
# <b><tt>:unconverted_fields</tt></b>:: If set to +true+, an
|
|
|
|
# unconverted_fields() method will be
|
|
|
|
# added to all returned rows (Array or
|
|
|
|
# CSV::Row) that will return the fields
|
2008-06-04 05:37:38 -04:00
|
|
|
# as they were before conversion. Note
|
2007-12-24 21:46:26 -05:00
|
|
|
# that <tt>:headers</tt> supplied by
|
|
|
|
# Array or String were not fields of the
|
|
|
|
# document and thus will have an empty
|
|
|
|
# Array attached.
|
2009-03-05 22:56:38 -05:00
|
|
|
# <b><tt>:headers</tt></b>:: If set to <tt>:first_row</tt> or
|
2007-12-24 21:46:26 -05:00
|
|
|
# +true+, the initial row of the CSV
|
|
|
|
# file will be treated as a row of
|
|
|
|
# headers. If set to an Array, the
|
|
|
|
# contents will be used as the headers.
|
|
|
|
# If set to a String, the String is run
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# through a call of CSV::parse_line()
|
|
|
|
# with the same <tt>:col_sep</tt>,
|
|
|
|
# <tt>:row_sep</tt>, and
|
|
|
|
# <tt>:quote_char</tt> as this instance
|
|
|
|
# to produce an Array of headers. This
|
|
|
|
# setting causes CSV#shift() to return
|
2007-12-24 21:46:26 -05:00
|
|
|
# rows as CSV::Row objects instead of
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# Arrays and CSV#read() to return
|
2007-12-24 21:46:26 -05:00
|
|
|
# CSV::Table objects instead of an Array
|
|
|
|
# of Arrays.
|
|
|
|
# <b><tt>:return_headers</tt></b>:: When +false+, header rows are silently
|
|
|
|
# swallowed. If set to +true+, header
|
|
|
|
# rows are returned in a CSV::Row object
|
|
|
|
# with identical headers and
|
|
|
|
# fields (save that the fields do not go
|
|
|
|
# through the converters).
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# <b><tt>:write_headers</tt></b>:: When +true+ and <tt>:headers</tt> is
|
|
|
|
# set, a header row will be added to the
|
|
|
|
# output.
|
2007-12-24 21:46:26 -05:00
|
|
|
# <b><tt>:header_converters</tt></b>:: Identical in functionality to
|
|
|
|
# <tt>:converters</tt> save that the
|
|
|
|
# conversions are only made to header
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# rows. All built-in converters try to
|
|
|
|
# transcode headers to UTF-8 before
|
|
|
|
# converting. The conversion will fail
|
|
|
|
# if the data cannot be transcoded,
|
|
|
|
# leaving the header unchanged.
|
2007-12-24 21:46:26 -05:00
|
|
|
# <b><tt>:skip_blanks</tt></b>:: When set to a +true+ value, CSV will
|
|
|
|
# skip over any rows with no content.
|
|
|
|
# <b><tt>:force_quotes</tt></b>:: When set to a +true+ value, CSV will
|
|
|
|
# quote all CSV fields it creates.
|
2012-08-20 16:52:36 -04:00
|
|
|
# <b><tt>:skip_lines</tt></b>:: When set to an object responding to
|
|
|
|
# <tt>match</tt>, every line matching
|
|
|
|
# it is considered a comment and ignored
|
2013-11-23 18:12:11 -05:00
|
|
|
# during parsing. When set to a String,
|
|
|
|
# it is first converted to a Regexp.
|
|
|
|
# When set to +nil+ no line is considered
|
|
|
|
# a comment. If the passed object does
|
|
|
|
# not respond to <tt>match</tt>,
|
|
|
|
# <tt>ArgumentError</tt> is thrown.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# See CSV::DEFAULT_OPTIONS for the default settings.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2011-05-11 06:22:16 -04:00
|
|
|
# Options cannot be overridden in the instance methods for performance reasons,
|
2007-12-24 21:46:26 -05:00
|
|
|
# so be sure to set what you want here.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def initialize(data, options = Hash.new)
|
2014-05-25 12:41:40 -04:00
|
|
|
if data.nil?
|
|
|
|
raise ArgumentError.new("Cannot parse nil as CSV")
|
|
|
|
end
|
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
# build the options for this read/write
|
|
|
|
options = DEFAULT_OPTIONS.merge(options)
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
# create the IO object we will read from
|
2010-11-16 18:55:29 -05:00
|
|
|
@io = data.is_a?(String) ? StringIO.new(data) : data
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# honor the IO encoding if we can, otherwise default to ASCII-8BIT
|
2010-12-25 04:04:33 -05:00
|
|
|
@encoding = raw_encoding(nil) ||
|
2011-05-25 10:46:08 -04:00
|
|
|
( if encoding = options.delete(:internal_encoding)
|
|
|
|
case encoding
|
|
|
|
when Encoding; encoding
|
|
|
|
else Encoding.find(encoding)
|
|
|
|
end
|
|
|
|
end ) ||
|
|
|
|
( case encoding = options.delete(:encoding)
|
|
|
|
when Encoding; encoding
|
|
|
|
when /\A[^:]+/; Encoding.find($&)
|
|
|
|
end ) ||
|
2010-12-25 04:04:33 -05:00
|
|
|
Encoding.default_internal || Encoding.default_external
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2008-10-24 20:54:38 -04:00
|
|
|
# prepare for building safe regular expressions in the target encoding,
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# if we can transcode the needed characters
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
@re_esc = "\\".encode(@encoding) rescue ""
|
2014-03-20 10:38:21 -04:00
|
|
|
@re_chars = /#{%"[-\\]\\[\\.^$?*+{}()|# \r\n\t\f\v]".encode(@encoding)}/
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
init_separators(options)
|
|
|
|
init_parsers(options)
|
|
|
|
init_converters(options)
|
|
|
|
init_headers(options)
|
2012-08-20 16:52:36 -04:00
|
|
|
init_comments(options)
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2014-06-09 21:57:10 -04:00
|
|
|
@force_encoding = !!(encoding || options.delete(:encoding))
|
2010-12-25 02:44:50 -05:00
|
|
|
options.delete(:internal_encoding)
|
|
|
|
options.delete(:external_encoding)
|
2007-12-24 21:46:26 -05:00
|
|
|
unless options.empty?
|
|
|
|
raise ArgumentError, "Unknown options: #{options.keys.join(', ')}."
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
# track our own lineno since IO gets confused about line-ends is CSV fields
|
|
|
|
@lineno = 0
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# The encoded <tt>:col_sep</tt> used in parsing and writing. See CSV::new
|
|
|
|
# for details.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
attr_reader :col_sep
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# The encoded <tt>:row_sep</tt> used in parsing and writing. See CSV::new
|
|
|
|
# for details.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
attr_reader :row_sep
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# The encoded <tt>:quote_char</tt> used in parsing and writing. See CSV::new
|
|
|
|
# for details.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
attr_reader :quote_char
|
|
|
|
# The limit for field size, if any. See CSV::new for details.
|
|
|
|
attr_reader :field_size_limit
|
2012-08-20 16:52:36 -04:00
|
|
|
|
|
|
|
# The regex marking a line as a comment. See CSV::new for details
|
|
|
|
attr_reader :skip_lines
|
|
|
|
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# Returns the current list of converters in effect. See CSV::new for details.
|
|
|
|
# Built-in converters will be returned by name, while others will be returned
|
|
|
|
# as is.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
def converters
|
|
|
|
@converters.map do |converter|
|
|
|
|
name = Converters.rassoc(converter)
|
|
|
|
name ? name.first : converter
|
|
|
|
end
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# Returns +true+ if unconverted_fields() to parsed results. See CSV::new
|
|
|
|
# for details.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
def unconverted_fields?() @unconverted_fields end
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# Returns +nil+ if headers will not be used, +true+ if they will but have not
|
|
|
|
# yet been read, or the actual headers after they have been read. See
|
|
|
|
# CSV::new for details.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
def headers
|
|
|
|
@headers || true if @use_headers
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# Returns +true+ if headers will be returned as a row of results.
|
|
|
|
# See CSV::new for details.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
def return_headers?() @return_headers end
|
|
|
|
# Returns +true+ if headers are written in output. See CSV::new for details.
|
|
|
|
def write_headers?() @write_headers end
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# Returns the current list of converters in effect for headers. See CSV::new
|
|
|
|
# for details. Built-in converters will be returned by name, while others
|
|
|
|
# will be returned as is.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
def header_converters
|
|
|
|
@header_converters.map do |converter|
|
|
|
|
name = HeaderConverters.rassoc(converter)
|
|
|
|
name ? name.first : converter
|
|
|
|
end
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# Returns +true+ blank lines are skipped by the parser. See CSV::new
|
|
|
|
# for details.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
def skip_blanks?() @skip_blanks end
|
|
|
|
# Returns +true+ if all output fields are quoted. See CSV::new for details.
|
|
|
|
def force_quotes?() @force_quotes end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# The Encoding CSV is parsing or writing in. This will be the Encoding you
|
|
|
|
# receive parsed data in and/or the Encoding data will be written in.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
attr_reader :encoding
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
|
|
|
# The line number of the last row read from this file. Fields with nested
|
2007-12-24 21:46:26 -05:00
|
|
|
# line-end characters will not affect this count.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
attr_reader :lineno
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
### IO and StringIO Delegation ###
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
extend Forwardable
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
def_delegators :@io, :binmode, :binmode?, :close, :close_read, :close_write,
|
|
|
|
:closed?, :eof, :eof?, :external_encoding, :fcntl,
|
|
|
|
:fileno, :flock, :flush, :fsync, :internal_encoding,
|
|
|
|
:ioctl, :isatty, :path, :pid, :pos, :pos=, :reopen,
|
|
|
|
:seek, :stat, :string, :sync, :sync=, :tell, :to_i,
|
|
|
|
:to_io, :truncate, :tty?
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
# Rewinds the underlying IO object and resets CSV's lineno() counter.
|
|
|
|
def rewind
|
|
|
|
@headers = nil
|
|
|
|
@lineno = 0
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
@io.rewind
|
|
|
|
end
|
|
|
|
|
|
|
|
### End Delegation ###
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# The primary write method for wrapped Strings and IOs, +row+ (an Array or
|
|
|
|
# CSV::Row) is converted to CSV and appended to the data source. When a
|
|
|
|
# CSV::Row is passed, only the row's fields() are appended to the output.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# The data source must be open for writing.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def <<(row)
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# make sure headers have been assigned
|
|
|
|
if header_row? and [Array, String].include? @use_headers.class
|
|
|
|
parse_headers # won't read data for Array or String
|
|
|
|
self << @headers if @write_headers
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
# handle CSV::Row objects and Hashes
|
|
|
|
row = case row
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
when self.class::Row then row.fields
|
|
|
|
when Hash then @headers.map { |header| row[header] }
|
|
|
|
else row
|
|
|
|
end
|
2007-12-24 21:46:26 -05:00
|
|
|
|
|
|
|
@headers = row if header_row?
|
|
|
|
@lineno += 1
|
|
|
|
|
2010-11-16 18:55:29 -05:00
|
|
|
output = row.map(&@quote).join(@col_sep) + @row_sep # quote and separate
|
|
|
|
if @io.is_a?(StringIO) and
|
2014-06-09 21:57:10 -04:00
|
|
|
output.encoding != (encoding = raw_encoding)
|
|
|
|
if @force_encoding
|
|
|
|
output = output.encode(encoding)
|
|
|
|
elsif (compatible_encoding = Encoding.compatible?(@io.string, output))
|
|
|
|
@io.set_encoding(compatible_encoding)
|
|
|
|
@io.seek(0, IO::SEEK_END)
|
|
|
|
end
|
2010-11-16 18:55:29 -05:00
|
|
|
end
|
|
|
|
@io << output
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
self # for chaining
|
|
|
|
end
|
|
|
|
alias_method :add_row, :<<
|
|
|
|
alias_method :puts, :<<
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# :call-seq:
|
|
|
|
# convert( name )
|
|
|
|
# convert { |field| ... }
|
|
|
|
# convert { |field, field_info| ... }
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# You can use this method to install a CSV::Converters built-in, or provide a
|
|
|
|
# block that handles a custom conversion.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# If you provide a block that takes one argument, it will be passed the field
|
|
|
|
# and is expected to return the converted value or the field itself. If your
|
2009-03-05 22:56:38 -05:00
|
|
|
# block takes two arguments, it will also be passed a CSV::FieldInfo Struct,
|
|
|
|
# containing details about the field. Again, the block should return a
|
2007-12-24 21:46:26 -05:00
|
|
|
# converted field or the field itself.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def convert(name = nil, &converter)
|
|
|
|
add_converter(:converters, self.class::Converters, name, &converter)
|
|
|
|
end
|
|
|
|
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# :call-seq:
|
|
|
|
# header_convert( name )
|
|
|
|
# header_convert { |field| ... }
|
|
|
|
# header_convert { |field, field_info| ... }
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# Identical to CSV#convert(), but for header rows.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# Note that this method must be called before header rows are read to have any
|
|
|
|
# effect.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def header_convert(name = nil, &converter)
|
|
|
|
add_converter( :header_converters,
|
|
|
|
self.class::HeaderConverters,
|
|
|
|
name,
|
|
|
|
&converter )
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
include Enumerable
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# Yields each row of the data source in turn.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# Support for Enumerable.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# The data source must be open for reading.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def each
|
2011-05-26 11:35:06 -04:00
|
|
|
if block_given?
|
|
|
|
while row = shift
|
|
|
|
yield row
|
|
|
|
end
|
|
|
|
else
|
|
|
|
to_enum
|
2007-12-24 21:46:26 -05:00
|
|
|
end
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# Slurps the remaining rows and returns an Array of Arrays.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# The data source must be open for reading.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def read
|
|
|
|
rows = to_a
|
|
|
|
if @use_headers
|
|
|
|
Table.new(rows)
|
|
|
|
else
|
|
|
|
rows
|
|
|
|
end
|
|
|
|
end
|
|
|
|
alias_method :readlines, :read
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
# Returns +true+ if the next row read will be a header row.
|
|
|
|
def header_row?
|
|
|
|
@use_headers and @headers.nil?
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# The primary read method for wrapped Strings and IOs, a single row is pulled
|
|
|
|
# from the data source, parsed and returned as an Array of fields (if header
|
|
|
|
# rows are not used) or a CSV::Row (when header rows are used).
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# The data source must be open for reading.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def shift
|
|
|
|
#########################################################################
|
|
|
|
### This method is purposefully kept a bit long as simple conditional ###
|
|
|
|
### checks are faster than numerous (expensive) method calls. ###
|
|
|
|
#########################################################################
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
# handle headers not based on document content
|
|
|
|
if header_row? and @return_headers and
|
|
|
|
[Array, String].include? @use_headers.class
|
|
|
|
if @unconverted_fields
|
|
|
|
return add_unconverted_fields(parse_headers, Array.new)
|
|
|
|
else
|
|
|
|
return parse_headers
|
|
|
|
end
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# it can take multiple calls to <tt>@io.gets()</tt> to get a full line,
|
|
|
|
# because of \r and/or \n characters embedded in quoted fields
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2010-03-23 10:59:25 -04:00
|
|
|
in_extended_col = false
|
|
|
|
csv = Array.new
|
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
loop do
|
|
|
|
# add another read to the line
|
2010-03-23 10:59:25 -04:00
|
|
|
unless parse = @io.gets(@row_sep)
|
|
|
|
return nil
|
|
|
|
end
|
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
parse.sub!(@parsers[:line_end], "")
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2010-03-23 10:59:25 -04:00
|
|
|
if csv.empty?
|
|
|
|
#
|
|
|
|
# I believe a blank line should be an <tt>Array.new</tt>, not Ruby 1.8
|
|
|
|
# CSV's <tt>[nil]</tt>
|
|
|
|
#
|
|
|
|
if parse.empty?
|
|
|
|
@lineno += 1
|
|
|
|
if @skip_blanks
|
|
|
|
next
|
|
|
|
elsif @unconverted_fields
|
|
|
|
return add_unconverted_fields(Array.new, Array.new)
|
|
|
|
elsif @use_headers
|
|
|
|
return self.class::Row.new(Array.new, Array.new)
|
|
|
|
else
|
|
|
|
return Array.new
|
|
|
|
end
|
2007-12-24 21:46:26 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2012-08-20 16:52:36 -04:00
|
|
|
next if @skip_lines and @skip_lines.match parse
|
|
|
|
|
2010-03-23 10:59:25 -04:00
|
|
|
parts = parse.split(@col_sep, -1)
|
2010-06-24 22:59:20 -04:00
|
|
|
if parts.empty?
|
|
|
|
if in_extended_col
|
|
|
|
csv[-1] << @col_sep # will be replaced with a @row_sep after the parts.each loop
|
|
|
|
else
|
|
|
|
csv << nil
|
|
|
|
end
|
|
|
|
end
|
2010-03-23 10:59:25 -04:00
|
|
|
|
|
|
|
# This loop is the hot path of csv parsing. Some things may be non-dry
|
|
|
|
# for a reason. Make sure to benchmark when refactoring.
|
|
|
|
parts.each do |part|
|
|
|
|
if in_extended_col
|
|
|
|
# If we are continuing a previous column
|
|
|
|
if part[-1] == @quote_char && part.count(@quote_char) % 2 != 0
|
|
|
|
# extended column ends
|
|
|
|
csv.last << part[0..-2]
|
2011-05-25 10:46:08 -04:00
|
|
|
if csv.last =~ @parsers[:stray_quote]
|
|
|
|
raise MalformedCSVError,
|
|
|
|
"Missing or stray quote in line #{lineno + 1}"
|
|
|
|
end
|
2010-03-23 10:59:25 -04:00
|
|
|
csv.last.gsub!(@quote_char * 2, @quote_char)
|
|
|
|
in_extended_col = false
|
2007-12-24 21:46:26 -05:00
|
|
|
else
|
2010-03-23 10:59:25 -04:00
|
|
|
csv.last << part
|
|
|
|
csv.last << @col_sep
|
|
|
|
end
|
|
|
|
elsif part[0] == @quote_char
|
|
|
|
# If we are staring a new quoted column
|
|
|
|
if part[-1] != @quote_char || part.count(@quote_char) % 2 != 0
|
|
|
|
# start an extended column
|
|
|
|
csv << part[1..-1]
|
|
|
|
csv.last << @col_sep
|
|
|
|
in_extended_col = true
|
|
|
|
else
|
|
|
|
# regular quoted column
|
|
|
|
csv << part[1..-2]
|
2011-05-25 10:46:08 -04:00
|
|
|
if csv.last =~ @parsers[:stray_quote]
|
|
|
|
raise MalformedCSVError,
|
|
|
|
"Missing or stray quote in line #{lineno + 1}"
|
|
|
|
end
|
2010-03-23 10:59:25 -04:00
|
|
|
csv.last.gsub!(@quote_char * 2, @quote_char)
|
|
|
|
end
|
|
|
|
elsif part =~ @parsers[:quote_or_nl]
|
|
|
|
# Unquoted field with bad characters.
|
|
|
|
if part =~ @parsers[:nl_or_lf]
|
|
|
|
raise MalformedCSVError, "Unquoted fields do not allow " +
|
|
|
|
"\\r or \\n (line #{lineno + 1})."
|
|
|
|
else
|
2011-05-25 10:46:08 -04:00
|
|
|
raise MalformedCSVError, "Illegal quoting in line #{lineno + 1}."
|
2007-12-24 21:46:26 -05:00
|
|
|
end
|
2010-03-23 10:59:25 -04:00
|
|
|
else
|
|
|
|
# Regular ole unquoted field.
|
|
|
|
csv << (part.empty? ? nil : part)
|
2007-12-24 21:46:26 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2010-03-23 10:59:25 -04:00
|
|
|
# Replace tacked on @col_sep with @row_sep if we are still in an extended
|
|
|
|
# column.
|
|
|
|
csv[-1][-1] = @row_sep if in_extended_col
|
|
|
|
|
|
|
|
if in_extended_col
|
|
|
|
# if we're at eof?(), a quoted field wasn't closed...
|
|
|
|
if @io.eof?
|
|
|
|
raise MalformedCSVError,
|
|
|
|
"Unclosed quoted field on line #{lineno + 1}."
|
|
|
|
elsif @field_size_limit and csv.last.size >= @field_size_limit
|
|
|
|
raise MalformedCSVError, "Field size exceeded on line #{lineno + 1}."
|
|
|
|
end
|
|
|
|
# otherwise, we need to loop and pull some more data to complete the row
|
|
|
|
else
|
2007-12-24 21:46:26 -05:00
|
|
|
@lineno += 1
|
|
|
|
|
|
|
|
# save fields unconverted fields, if needed...
|
|
|
|
unconverted = csv.dup if @unconverted_fields
|
|
|
|
|
|
|
|
# convert fields, if needed...
|
|
|
|
csv = convert_fields(csv) unless @use_headers or @converters.empty?
|
|
|
|
# parse out header rows and handle CSV::Row conversions...
|
|
|
|
csv = parse_headers(csv) if @use_headers
|
|
|
|
|
|
|
|
# inject unconverted fields and accessor, if requested...
|
|
|
|
if @unconverted_fields and not csv.respond_to? :unconverted_fields
|
|
|
|
add_unconverted_fields(csv, unconverted)
|
|
|
|
end
|
|
|
|
|
|
|
|
# return the results
|
|
|
|
break csv
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
alias_method :gets, :shift
|
|
|
|
alias_method :readline, :shift
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2010-10-07 11:25:23 -04:00
|
|
|
# Returns a simplified description of the key CSV attributes in an
|
2008-12-26 11:53:13 -05:00
|
|
|
# ASCII compatible String.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
def inspect
|
|
|
|
str = ["<#", self.class.to_s, " io_type:"]
|
|
|
|
# show type of wrapped IO
|
|
|
|
if @io == $stdout then str << "$stdout"
|
|
|
|
elsif @io == $stdin then str << "$stdin"
|
|
|
|
elsif @io == $stderr then str << "$stderr"
|
|
|
|
else str << @io.class.to_s
|
|
|
|
end
|
|
|
|
# show IO.path(), if available
|
|
|
|
if @io.respond_to?(:path) and (p = @io.path)
|
|
|
|
str << " io_path:" << p.inspect
|
|
|
|
end
|
|
|
|
# show encoding
|
|
|
|
str << " encoding:" << @encoding.name
|
|
|
|
# show other attributes
|
|
|
|
%w[ lineno col_sep row_sep
|
|
|
|
quote_char skip_blanks ].each do |attr_name|
|
|
|
|
if a = instance_variable_get("@#{attr_name}")
|
|
|
|
str << " " << attr_name << ":" << a.inspect
|
|
|
|
end
|
|
|
|
end
|
|
|
|
if @use_headers
|
|
|
|
str << " headers:" << headers.inspect
|
|
|
|
end
|
|
|
|
str << ">"
|
2008-12-26 11:53:13 -05:00
|
|
|
begin
|
2010-12-25 01:58:58 -05:00
|
|
|
str.join('')
|
2008-12-26 11:53:13 -05:00
|
|
|
rescue # any encoding error
|
|
|
|
str.map do |s|
|
|
|
|
e = Encoding::Converter.asciicompat_encoding(s.encoding)
|
|
|
|
e ? s.encode(e) : s.force_encoding("ASCII-8BIT")
|
2010-12-25 01:58:58 -05:00
|
|
|
end.join('')
|
2008-12-26 11:53:13 -05:00
|
|
|
end
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
private
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# Stores the indicated separators for later use.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# If auto-discovery was requested for <tt>@row_sep</tt>, this method will read
|
|
|
|
# ahead in the <tt>@io</tt> and try to find one. +ARGF+, +STDIN+, +STDOUT+,
|
|
|
|
# +STDERR+ and any stream open for output only with a default
|
|
|
|
# <tt>@row_sep</tt> of <tt>$INPUT_RECORD_SEPARATOR</tt> (<tt>$/</tt>).
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# This method also establishes the quoting rules used for CSV output.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def init_separators(options)
|
|
|
|
# store the selected separators
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
@col_sep = options.delete(:col_sep).to_s.encode(@encoding)
|
|
|
|
@row_sep = options.delete(:row_sep) # encode after resolving :auto
|
|
|
|
@quote_char = options.delete(:quote_char).to_s.encode(@encoding)
|
2007-12-24 21:46:26 -05:00
|
|
|
|
|
|
|
if @quote_char.length != 1
|
|
|
|
raise ArgumentError, ":quote_char has to be a single character String"
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# automatically discover row separator when requested
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# (not fully encoding safe)
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
if @row_sep == :auto
|
|
|
|
if [ARGF, STDIN, STDOUT, STDERR].include?(@io) or
|
|
|
|
(defined?(Zlib) and @io.class == Zlib::GzipWriter)
|
|
|
|
@row_sep = $INPUT_RECORD_SEPARATOR
|
|
|
|
else
|
|
|
|
begin
|
2011-06-02 10:52:11 -04:00
|
|
|
#
|
2013-12-02 00:36:00 -05:00
|
|
|
# remember where we were (pos() will raise an exception if @io is pipe
|
2011-06-02 10:52:11 -04:00
|
|
|
# or not opened for reading)
|
|
|
|
#
|
|
|
|
saved_pos = @io.pos
|
2007-12-24 21:46:26 -05:00
|
|
|
while @row_sep == :auto
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
|
|
|
# if we run out of data, it's probably a single line
|
2011-06-02 10:52:11 -04:00
|
|
|
# (ensure will set default value)
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2011-06-02 10:52:11 -04:00
|
|
|
break unless sample = @io.gets(nil, 1024)
|
|
|
|
# extend sample if we're unsure of the line ending
|
|
|
|
if sample.end_with? encode_str("\r")
|
|
|
|
sample << (@io.gets(nil, 1) || "")
|
2007-12-24 21:46:26 -05:00
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
# try to find a standard separator
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
if sample =~ encode_re("\r\n?|\n")
|
2007-12-24 21:46:26 -05:00
|
|
|
@row_sep = $&
|
|
|
|
break
|
|
|
|
end
|
|
|
|
end
|
2011-06-02 10:52:11 -04:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
# tricky seek() clone to work around GzipReader's lack of seek()
|
|
|
|
@io.rewind
|
|
|
|
# reset back to the remembered position
|
|
|
|
while saved_pos > 1024 # avoid loading a lot of data into memory
|
|
|
|
@io.read(1024)
|
|
|
|
saved_pos -= 1024
|
|
|
|
end
|
|
|
|
@io.read(saved_pos) if saved_pos.nonzero?
|
2011-06-02 10:52:11 -04:00
|
|
|
rescue IOError # not opened for reading
|
|
|
|
# do nothing: ensure will set default
|
|
|
|
rescue NoMethodError # Zlib::GzipWriter doesn't have some IO methods
|
|
|
|
# do nothing: ensure will set default
|
|
|
|
rescue SystemCallError # pipe
|
|
|
|
# do nothing: ensure will set default
|
|
|
|
ensure
|
|
|
|
#
|
|
|
|
# set default if we failed to detect
|
|
|
|
# (stream not opened for reading, a pipe, or a single line of data)
|
|
|
|
#
|
|
|
|
@row_sep = $INPUT_RECORD_SEPARATOR if @row_sep == :auto
|
2007-12-24 21:46:26 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
@row_sep = @row_sep.to_s.encode(@encoding)
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
# establish quoting rules
|
2010-11-16 18:55:29 -05:00
|
|
|
@force_quotes = options.delete(:force_quotes)
|
|
|
|
do_quote = lambda do |field|
|
|
|
|
field = String(field)
|
|
|
|
encoded_quote = @quote_char.encode(field.encoding)
|
|
|
|
encoded_quote +
|
|
|
|
field.gsub(encoded_quote, encoded_quote * 2) +
|
|
|
|
encoded_quote
|
2007-12-24 21:46:26 -05:00
|
|
|
end
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
quotable_chars = encode_str("\r\n", @col_sep, @quote_char)
|
|
|
|
@quote = if @force_quotes
|
2007-12-24 21:46:26 -05:00
|
|
|
do_quote
|
|
|
|
else
|
|
|
|
lambda do |field|
|
|
|
|
if field.nil? # represent +nil+ fields as empty unquoted fields
|
|
|
|
""
|
|
|
|
else
|
|
|
|
field = String(field) # Stringify fields
|
|
|
|
# represent empty fields as empty quoted fields
|
|
|
|
if field.empty? or
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
field.count(quotable_chars).nonzero?
|
2007-12-24 21:46:26 -05:00
|
|
|
do_quote.call(field)
|
|
|
|
else
|
|
|
|
field # unquoted field
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
# Pre-compiles parsers and stores them by name for access during reads.
|
|
|
|
def init_parsers(options)
|
|
|
|
# store the parser behaviors
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
@skip_blanks = options.delete(:skip_blanks)
|
|
|
|
@field_size_limit = options.delete(:field_size_limit)
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
# prebuild Regexps for faster parsing
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
esc_row_sep = escape_re(@row_sep)
|
|
|
|
esc_quote = escape_re(@quote_char)
|
2007-12-24 21:46:26 -05:00
|
|
|
@parsers = {
|
2010-03-23 10:59:25 -04:00
|
|
|
# for detecting parse errors
|
|
|
|
quote_or_nl: encode_re("[", esc_quote, "\r\n]"),
|
|
|
|
nl_or_lf: encode_re("[\r\n]"),
|
|
|
|
stray_quote: encode_re( "[^", esc_quote, "]", esc_quote,
|
|
|
|
"[^", esc_quote, "]" ),
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# safer than chomp!()
|
2008-10-10 11:09:34 -04:00
|
|
|
line_end: encode_re(esc_row_sep, "\\z"),
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# illegal unquoted characters
|
2008-10-10 11:09:34 -04:00
|
|
|
return_newline: encode_str("\r\n")
|
2007-12-24 21:46:26 -05:00
|
|
|
}
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# Loads any converters requested during construction.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# If +field_name+ is set <tt>:converters</tt> (the default) field converters
|
|
|
|
# are set. When +field_name+ is <tt>:header_converters</tt> header converters
|
|
|
|
# are added instead.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
|
|
|
# The <tt>:unconverted_fields</tt> option is also actived for
|
2007-12-24 21:46:26 -05:00
|
|
|
# <tt>:converters</tt> calls, if requested.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def init_converters(options, field_name = :converters)
|
|
|
|
if field_name == :converters
|
|
|
|
@unconverted_fields = options.delete(:unconverted_fields)
|
|
|
|
end
|
|
|
|
|
|
|
|
instance_variable_set("@#{field_name}", Array.new)
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2008-06-04 05:37:38 -04:00
|
|
|
# find the correct method to add the converters
|
2007-12-24 21:46:26 -05:00
|
|
|
convert = method(field_name.to_s.sub(/ers\Z/, ""))
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
# load converters
|
|
|
|
unless options[field_name].nil?
|
|
|
|
# allow a single converter not wrapped in an Array
|
|
|
|
unless options[field_name].is_a? Array
|
|
|
|
options[field_name] = [options[field_name]]
|
|
|
|
end
|
|
|
|
# load each converter...
|
|
|
|
options[field_name].each do |converter|
|
|
|
|
if converter.is_a? Proc # custom code block
|
|
|
|
convert.call(&converter)
|
|
|
|
else # by name
|
|
|
|
convert.call(converter)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
options.delete(field_name)
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
# Stores header row settings and loads header converters, if needed.
|
|
|
|
def init_headers(options)
|
|
|
|
@use_headers = options.delete(:headers)
|
|
|
|
@return_headers = options.delete(:return_headers)
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
@write_headers = options.delete(:write_headers)
|
2007-12-24 21:46:26 -05:00
|
|
|
|
|
|
|
# headers must be delayed until shift(), in case they need a row of content
|
|
|
|
@headers = nil
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
init_converters(options, :header_converters)
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2012-11-13 21:53:02 -05:00
|
|
|
# Stores the pattern of comments to skip from the provided options.
|
|
|
|
#
|
|
|
|
# The pattern must respond to +.match+, else ArgumentError is raised.
|
2013-11-23 18:12:11 -05:00
|
|
|
# Strings are converted to a Regexp.
|
2012-11-13 21:53:02 -05:00
|
|
|
#
|
|
|
|
# See also CSV.new
|
2012-08-20 16:52:36 -04:00
|
|
|
def init_comments(options)
|
|
|
|
@skip_lines = options.delete(:skip_lines)
|
2013-11-23 18:12:11 -05:00
|
|
|
@skip_lines = Regexp.new(@skip_lines) if @skip_lines.is_a? String
|
2012-08-20 16:52:36 -04:00
|
|
|
if @skip_lines and not @skip_lines.respond_to?(:match)
|
|
|
|
raise ArgumentError, ":skip_lines has to respond to matches"
|
|
|
|
end
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# The actual work method for adding converters, used by both CSV.convert() and
|
|
|
|
# CSV.header_convert().
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# This method requires the +var_name+ of the instance variable to place the
|
|
|
|
# converters in, the +const+ Hash to lookup named converters in, and the
|
|
|
|
# normal parameters of the CSV.convert() and CSV.header_convert() methods.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def add_converter(var_name, const, name = nil, &converter)
|
|
|
|
if name.nil? # custom converter
|
|
|
|
instance_variable_get("@#{var_name}") << converter
|
|
|
|
else # named converter
|
|
|
|
combo = const[name]
|
|
|
|
case combo
|
|
|
|
when Array # combo converter
|
|
|
|
combo.each do |converter_name|
|
|
|
|
add_converter(var_name, const, converter_name)
|
|
|
|
end
|
|
|
|
else # individual named converter
|
|
|
|
instance_variable_get("@#{var_name}") << combo
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# Processes +fields+ with <tt>@converters</tt>, or <tt>@header_converters</tt>
|
|
|
|
# if +headers+ is passed as +true+, returning the converted field set. Any
|
|
|
|
# converter that changes the field into something other than a String halts
|
|
|
|
# the pipeline of conversion for that field. This is primarily an efficiency
|
|
|
|
# shortcut.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def convert_fields(fields, headers = false)
|
|
|
|
# see if we are converting headers or fields
|
|
|
|
converters = headers ? @header_converters : @converters
|
2009-03-05 22:56:38 -05:00
|
|
|
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
fields.map.with_index do |field, index|
|
2007-12-24 21:46:26 -05:00
|
|
|
converters.each do |converter|
|
2014-04-01 10:35:03 -04:00
|
|
|
break if field.nil?
|
2007-12-24 21:46:26 -05:00
|
|
|
field = if converter.arity == 1 # straight field converter
|
|
|
|
converter[field]
|
|
|
|
else # FieldInfo converter
|
|
|
|
header = @use_headers && !headers ? @headers[index] : nil
|
|
|
|
converter[field, FieldInfo.new(index, lineno, header)]
|
|
|
|
end
|
2013-12-02 00:36:00 -05:00
|
|
|
break unless field.is_a? String # short-circuit pipeline for speed
|
2007-12-24 21:46:26 -05:00
|
|
|
end
|
2007-12-25 23:56:03 -05:00
|
|
|
field # final state of each field, converted or original
|
2007-12-24 21:46:26 -05:00
|
|
|
end
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2011-05-26 09:32:40 -04:00
|
|
|
# This method is used to turn a finished +row+ into a CSV::Row. Header rows
|
2007-12-24 21:46:26 -05:00
|
|
|
# are also dealt with here, either by returning a CSV::Row with identical
|
|
|
|
# headers and fields (save that the fields do not go through the converters)
|
|
|
|
# or by reading past them to return a field row. Headers are also saved in
|
|
|
|
# <tt>@headers</tt> for use in future rows.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
# When +nil+, +row+ is assumed to be a header row not based on an actual row
|
|
|
|
# of the stream.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def parse_headers(row = nil)
|
|
|
|
if @headers.nil? # header row
|
|
|
|
@headers = case @use_headers # save headers
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# Array of headers
|
|
|
|
when Array then @use_headers
|
|
|
|
# CSV header String
|
|
|
|
when String
|
|
|
|
self.class.parse_line( @use_headers,
|
2008-10-10 11:09:34 -04:00
|
|
|
col_sep: @col_sep,
|
|
|
|
row_sep: @row_sep,
|
|
|
|
quote_char: @quote_char )
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# first row is headers
|
|
|
|
else row
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
# prepare converted and unconverted copies
|
|
|
|
row = @headers if row.nil?
|
|
|
|
@headers = convert_fields(@headers, true)
|
2013-11-23 19:44:41 -05:00
|
|
|
@headers.each { |h| h.freeze if h.is_a? String }
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2007-12-24 21:46:26 -05:00
|
|
|
if @return_headers # return headers
|
|
|
|
return self.class::Row.new(@headers, row, true)
|
|
|
|
elsif not [Array, String].include? @use_headers.class # skip to field row
|
|
|
|
return shift
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
self.class::Row.new(@headers, convert_fields(row)) # field row
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2011-05-26 09:32:40 -04:00
|
|
|
# This method injects an instance variable <tt>unconverted_fields</tt> into
|
|
|
|
# +row+ and an accessor method for +row+ called unconverted_fields(). The
|
2007-12-24 21:46:26 -05:00
|
|
|
# variable is set to the contents of +fields+.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def add_unconverted_fields(row, fields)
|
|
|
|
class << row
|
|
|
|
attr_reader :unconverted_fields
|
|
|
|
end
|
|
|
|
row.instance_eval { @unconverted_fields = fields }
|
|
|
|
row
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
2009-03-03 15:20:08 -05:00
|
|
|
# This method is an encoding safe version of Regexp::escape(). It will escape
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# any characters that would change the meaning of a regular expression in the
|
|
|
|
# encoding of +str+. Regular expression characters that cannot be transcoded
|
2009-03-03 15:20:08 -05:00
|
|
|
# to the target encoding will be skipped and no escaping will be performed if
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# a backslash cannot be transcoded.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
def escape_re(str)
|
2010-12-25 03:32:27 -05:00
|
|
|
str.gsub(@re_chars) {|c| @re_esc + c}
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# Builds a regular expression in <tt>@encoding</tt>. All +chunks+ will be
|
|
|
|
# transcoded to that encoding.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
def encode_re(*chunks)
|
|
|
|
Regexp.new(encode_str(*chunks))
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
# Builds a String in <tt>@encoding</tt>. All +chunks+ will be transcoded to
|
|
|
|
# that encoding.
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
def encode_str(*chunks)
|
2010-12-25 01:58:58 -05:00
|
|
|
chunks.map { |chunk| chunk.encode(@encoding.name) }.join('')
|
* lib/csv/csv.rb: Reworked CSV's parser and generator to be m17n. Data
is now parsed in the Encoding it is in without need for translation.
* lib/csv/csv.rb: Improved inspect() messages for better IRb support.
* lib/csv/csv.rb: Fixed header writing bug reported by Dov Murik.
* lib/csv/csv.rb: Use custom separators in parsing header Strings as
suggested by Shmulik Regev.
* lib/csv/csv.rb: Added a :write_headers option for outputting headers.
* lib/csv/csv.rb: Handle open() calls in binary mode whenever we can to
workaround a Windows issue where line-ending translation can cause an
off-by-one error in seeking back to a non-zero starting position after
auto-discovery for :row_sep as suggested by Robert Battle.
* lib/csv/csv.rb: Improved the parser to fail faster when fed some forms
of invalid CSV that can be detected without reading ahead.
* lib/csv/csv.rb: Added a :field_size_limit option to control CSV's
lookahead and prevent the parser from biting off more data than
it can chew.
* lib/csv/csv.rb: Added readers for CSV attributes: col_sep(), row_sep(),
quote_char(), field_size_limit(), converters(), unconverted_fields?(),
headers(), return_headers?(), write_headers?(), header_converters(),
skip_blanks?(), and force_quotes?().
* lib/csv/csv.rb: Cleaned up code syntax to be more inline with
Ruby 1.9 than 1.8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-20 20:39:03 -04:00
|
|
|
end
|
|
|
|
|
2009-10-15 14:19:15 -04:00
|
|
|
private
|
2010-11-16 18:55:29 -05:00
|
|
|
|
2012-08-21 00:50:18 -04:00
|
|
|
#
|
|
|
|
# Returns the encoding of the internal IO object or the +default+ if the
|
2011-06-16 18:54:53 -04:00
|
|
|
# encoding cannot be determined.
|
|
|
|
#
|
2010-12-25 04:04:33 -05:00
|
|
|
def raw_encoding(default = Encoding::ASCII_8BIT)
|
2009-10-15 14:19:15 -04:00
|
|
|
if @io.respond_to? :internal_encoding
|
|
|
|
@io.internal_encoding || @io.external_encoding
|
|
|
|
elsif @io.is_a? StringIO
|
|
|
|
@io.string.encoding
|
2009-10-15 23:04:38 -04:00
|
|
|
elsif @io.respond_to? :encoding
|
2009-10-15 14:19:15 -04:00
|
|
|
@io.encoding
|
2009-10-15 23:04:38 -04:00
|
|
|
else
|
2010-12-25 04:04:33 -05:00
|
|
|
default
|
2009-10-15 14:19:15 -04:00
|
|
|
end
|
|
|
|
end
|
2007-12-24 21:46:26 -05:00
|
|
|
end
|
|
|
|
|
2012-09-19 18:07:44 -04:00
|
|
|
# Passes +args+ to CSV::instance.
|
|
|
|
#
|
|
|
|
# CSV("CSV,data").read
|
|
|
|
# #=> [["CSV", "data"]]
|
|
|
|
#
|
|
|
|
# If a block is given, the instance is passed the block and the return value
|
|
|
|
# becomes the return value of the block.
|
|
|
|
#
|
|
|
|
# CSV("CSV,data") { |c|
|
|
|
|
# c.read.any? { |a| a.include?("data") }
|
|
|
|
# } #=> true
|
|
|
|
#
|
|
|
|
# CSV("CSV,data") { |c|
|
|
|
|
# c.read.any? { |a| a.include?("zombies") }
|
2012-09-20 03:06:06 -04:00
|
|
|
# } #=> false
|
2012-09-19 18:07:44 -04:00
|
|
|
#
|
2007-12-24 21:46:26 -05:00
|
|
|
def CSV(*args, &block)
|
|
|
|
CSV.instance(*args, &block)
|
|
|
|
end
|
|
|
|
|
2012-09-19 18:07:44 -04:00
|
|
|
class Array # :nodoc:
|
|
|
|
# Equivalent to CSV::generate_line(self, options)
|
|
|
|
#
|
|
|
|
# ["CSV", "data"].to_csv
|
|
|
|
# #=> "CSV,data\n"
|
2007-12-24 21:46:26 -05:00
|
|
|
def to_csv(options = Hash.new)
|
|
|
|
CSV.generate_line(self, options)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2012-09-19 18:07:44 -04:00
|
|
|
class String # :nodoc:
|
|
|
|
# Equivalent to CSV::parse_line(self, options)
|
|
|
|
#
|
|
|
|
# "CSV,data".parse_csv
|
|
|
|
# #=> ["CSV", "data"]
|
2007-12-24 21:46:26 -05:00
|
|
|
def parse_csv(options = Hash.new)
|
|
|
|
CSV.parse_line(self, options)
|
|
|
|
end
|
|
|
|
end
|