1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* lib/csv.rb (CSV::foreach, CSV#initialize): fixed passing options.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30355 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-12-25 07:44:50 +00:00
parent b4876f5e04
commit 9a907880f0
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/csv.rb
View File

@ -1335,9 +1335,9 @@ class CSV
# find the +options+ Hash # find the +options+ Hash
options = if args.last.is_a? Hash then args.pop else Hash.new end options = if args.last.is_a? Hash then args.pop else Hash.new end
# default to a binary open mode # default to a binary open mode
args << "rb" if args.size == 1 args << "rb" if args.size == 1 and !options.key?(:mode)
# wrap a File opened with the remaining +args+ # wrap a File opened with the remaining +args+
csv = new(File.open(*args), options) csv = new(File.open(*args, options), options)
# handle blocks like Ruby's open(), not like the CSV library # handle blocks like Ruby's open(), not like the CSV library
if block_given? if block_given?
@ -1561,7 +1561,11 @@ class CSV
# create the IO object we will read from # create the IO object we will read from
@io = data.is_a?(String) ? StringIO.new(data) : data @io = data.is_a?(String) ? StringIO.new(data) : data
# honor the IO encoding if we can, otherwise default to ASCII-8BIT # honor the IO encoding if we can, otherwise default to ASCII-8BIT
@encoding = options.delete(:internal_encoding) || options.delete(:encoding) || @encoding = options.delete(:internal_encoding) ||
(case encoding = options.delete(:encoding)
when Encoding; encoding
when /\A[^:]+/; $1
end) ||
raw_encoding || Encoding.default_internal || raw_encoding || Encoding.default_internal ||
Encoding.default_external Encoding.default_external
# #
@ -1579,6 +1583,9 @@ class CSV
init_converters(options) init_converters(options)
init_headers(options) init_headers(options)
options.delete(:encoding)
options.delete(:internal_encoding)
options.delete(:external_encoding)
unless options.empty? unless options.empty?
raise ArgumentError, "Unknown options: #{options.keys.join(', ')}." raise ArgumentError, "Unknown options: #{options.keys.join(', ')}."
end end