diff options
| author | Janko Marohnić <janko.marohnic@gmail.com> | 2019-02-23 23:10:20 +0100 |
|---|---|---|
| committer | Janko Marohnić <janko.marohnic@gmail.com> | 2019-02-23 23:36:58 +0100 |
| commit | 32b2942946edba6a288c6b992109598eeb626964 (patch) | |
| tree | ac6aa4447d664d47e809e3a309425fe8281eac5e /actionpack | |
| parent | 9118a8f3f89b067b56088409f9f1e99271864a93 (diff) | |
| download | rails-32b2942946edba6a288c6b992109598eeb626964.tar.gz rails-32b2942946edba6a288c6b992109598eeb626964.tar.bz2 rails-32b2942946edba6a288c6b992109598eeb626964.zip | |
Restore UploadedFile compatibility with IO.copy_stream
In https://github.com/rails/rails/pull/28676 the `#to_path` method was
added to `ActionDispatch::Http::UploadedFile`. This broke usage with
`IO.copy_stream`:
source = ActionDispatch::Http::UploadedFile.new(...)
IO.copy_stream(source, destination)
# ~> TypeError: can't convert ActionDispatch::Http::UploadedFile to IO (ActionDispatch::Http::UploadedFile#to_io gives Tempfile)
Normally `IO.copy_stream` just calls `#read` on the source object.
However, when `#to_path` is defined, `IO.copy_stream` calls `#to_io` in
order to retrieve the raw `File` object. In that case it trips up,
because `ActionDispatch::Http::UploadedFile#to_io` returned a `Tempfile`
object, which is not an `IO` subclass.
We fix this by having `#to_io` return an actual `File` object.
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_dispatch/http/upload.rb | 5 | ||||
| -rw-r--r-- | actionpack/test/dispatch/uploaded_file_test.rb | 15 |
2 files changed, 17 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/http/upload.rb b/actionpack/lib/action_dispatch/http/upload.rb index 827f022ca2..0da8f5c14e 100644 --- a/actionpack/lib/action_dispatch/http/upload.rb +++ b/actionpack/lib/action_dispatch/http/upload.rb @@ -20,7 +20,6 @@ module ActionDispatch # A +Tempfile+ object with the actual uploaded file. Note that some of # its interface is available directly. attr_accessor :tempfile - alias :to_io :tempfile # A string with the headers of the multipart request. attr_accessor :headers @@ -84,6 +83,10 @@ module ActionDispatch def eof? @tempfile.eof? end + + def to_io + @tempfile.to_io + end end end end diff --git a/actionpack/test/dispatch/uploaded_file_test.rb b/actionpack/test/dispatch/uploaded_file_test.rb index e71c5cc629..03e5274541 100644 --- a/actionpack/test/dispatch/uploaded_file_test.rb +++ b/actionpack/test/dispatch/uploaded_file_test.rb @@ -2,6 +2,7 @@ require "abstract_unit" require "tempfile" +require "stringio" module ActionDispatch class UploadedFileTest < ActiveSupport::TestCase @@ -49,10 +50,10 @@ module ActionDispatch assert_equal tf, uf.tempfile end - def test_to_io_returns_tempfile + def test_to_io_returns_file tf = Tempfile.new uf = Http::UploadedFile.new(tempfile: tf) - assert_equal tf, uf.to_io + assert_equal tf.to_io, uf.to_io end def test_delegates_path_to_tempfile @@ -115,5 +116,15 @@ module ActionDispatch uf = Http::UploadedFile.new(tempfile: tf) assert_equal tf.to_path, uf.to_path end + + def test_io_copy_stream + tf = Tempfile.new + tf << "thunderhorse" + tf.rewind + uf = Http::UploadedFile.new(tempfile: tf) + result = StringIO.new + IO.copy_stream(uf, result) + assert_equal "thunderhorse", result.string + end end end |