-
Notifications
You must be signed in to change notification settings - Fork 115
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Allow CSV.open with StringIO argument #302
Merged
Merged
Changes from 12 commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
caf27c8
Allow CSV.foreach with StringIO argument
MarcPer fb8740c
When a StringIO is passed as argument to CSV.open, create a new one i…
MarcPer 374788f
Declares test that uses ractor
MarcPer b5bcbb0
Add test for StringIO with non-zero pos
MarcPer 7a0d386
Read full StringIO content in CSV.open, handle BOM by default
MarcPer 88d1c77
Simplify tests and use more descriptive variable names
MarcPer dbc6e35
Simplify foreach test
MarcPer 1157cf3
Remove garbage
kou f17e72d
Remove unnecesary StringIO check when closing CSV in CSV#open
MarcPer ad3fcd4
Skip Windows BOM bypass if opening a StringIO
MarcPer e089151
Don't run StringIO tests in Ruby versions < 2.7
MarcPer e499e6c
Use StringIO options only in Ruby >= 2.7
MarcPer f2d5b92
Raise error when unsupported options are given to open a StringIO
MarcPer 74a9e0d
Initialize StringIO without options in Ruby < 2.7
MarcPer 3f94fb4
Adhere to existing code conventions
MarcPer 5bab5e2
Adjust style
kou File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we always use an empty
file_opts
for Ruby 2.7 or earlier instead?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This doesn't work because
CSV#open
still adds keys tofile_opts
here:csv/lib/csv.rb
Lines 1586 to 1589 in bb93c28
For Ruby < 2.7, if
file_opts
is not empty, we getTypeError: no implicit conversion of Hash into String
.I like that something fails if
options
is given toCSV#open
when it's not supported, as opposed to simply ignoring it, the way I did it, but then the error should be ideally more clear than what the oldStringIO
returns. I can go that route, by rescuing theTypeError
, and raising another exception with a clearer message. In any case, thefile_opts[:universal_newline] ||= false
would still have to be removed for< 2.7
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, sorry.
I agree with you but can we use
raise ... unless file_opts.empty?
for it instead of rescuing theTypeError
?I agree with you.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It turns out passing an empty
file_opts
doesn't work either. I've noticed this quirk from the interpreter in Ruby 2.6:To address that, I've changed the
StringIO
initialization in Ruby < 2.7, so that it:CSV.new
ArgumentError
if anything else is passed asoptions
toCSV.open
StringIO
without keyword arguments.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK. Let's use the approach.