Merge pull request #585 from mcls/master

Support ActionDispatch::Http::UploadedFile again
jnunemaker · Mar 30, 2018 · e91c120 · e91c120
2 parents db8df8c + 0719036
commit e91c120
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,7 @@
+## Unreleased
+
+* [Support ActionDispatch::Http::UploadedFile again](https://github.com/jnunemaker/httparty/pull/585)
+
 ## 0.16.1
 
 * [Parse content with application/hal+json content type as JSON](https://github.com/jnunemaker/httparty/pull/573)

diff --git a/lib/httparty/request/body.rb b/lib/httparty/request/body.rb
@@ -32,7 +32,7 @@ def generate_multipart
         multipart = normalized_params.inject('') do |memo, (key, value)|
           memo += "--#{boundary}\r\n"
           memo += %(Content-Disposition: form-data; name="#{key}")
-          memo += %(; filename="#{File.basename(value)}") if file?(value)
+          memo += %(; filename="#{File.basename(value.path)}") if file?(value)
           memo += "\r\n"
           memo += "Content-Type: application/octet-stream\r\n" if file?(value)
           memo += "\r\n"