Merge branch 'fix-action-dispatch-filename' of https://github.com/zherr/httparty into zherr-fix-action-dispatch-filename

Changelog.md

@@ -1,6 +1,7 @@
 ## master
 
 * [Process dynamic headers before making actual request](https://github.com/jnunemaker/httparty/pull/606)
+* [Fix multipart uploads with ActionDispatch::Http::UploadedFile TempFile by using original_filename](https://github.com/jnunemaker/httparty/pull/598)
 
 ## 0.16.2
 

lib/httparty/request/body.rb

@@ -34,7 +34,7 @@ module HTTParty
           memo += %(Content-Disposition: form-data; name="#{key}")
           # value.path is used to support ActionDispatch::Http::UploadedFile
           # https://github.com/jnunemaker/httparty/pull/585
-          memo += %(; filename="#{File.basename(value.path)}") if file?(value)
+          memo += %(; filename="#{determine_file_name(value)}") if file?(value)
           memo += "\r\n"
           memo += "Content-Type: application/octet-stream\r\n" if file?(value)
           memo += "\r\n"
@@ -73,6 +73,10 @@ module HTTParty
         end
       end
 
+      def determine_file_name(object)
+        object.respond_to?(:original_filename) ? object.original_filename : File.basename(object.path)
+      end
+
       attr_reader :params, :query_string_normalizer
     end
   end

spec/httparty/connection_adapter_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+require 'spec_helper'
 
 RSpec.describe HTTParty::ConnectionAdapter do
   describe "initialization" do

spec/httparty/cookie_hash_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '../spec_helper'))
+require 'spec_helper'
 
 RSpec.describe HTTParty::CookieHash do
   before(:each) do

spec/httparty/exception_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+require 'spec_helper'
 
 RSpec.describe HTTParty::Error do
   subject { described_class }

spec/httparty/hash_conversions_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 RSpec.describe HTTParty::HashConversions do
   describe ".to_params" do
     it "creates a params string from a hash" do

spec/httparty/logger/apache_formatter_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
+require 'spec_helper'
 
 RSpec.describe HTTParty::Logger::ApacheFormatter do
   let(:subject) { described_class.new(logger_double, :info) }

spec/httparty/logger/curl_formatter_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
+require 'spec_helper'
 
 RSpec.describe HTTParty::Logger::CurlFormatter do
   describe "#format" do

spec/httparty/logger/logger_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
+require 'spec_helper'
 
 RSpec.describe HTTParty::Logger do
   describe ".build" do

spec/httparty/net_digest_auth_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+require 'spec_helper'
 
 RSpec.describe Net::HTTPHeader::DigestAuthenticator do
   def setup_digest(response)
@@ -19,7 +19,7 @@ RSpec.describe Net::HTTPHeader::DigestAuthenticator do
 
   context 'Net::HTTPHeader#digest_auth' do
     let(:headers) {
-      (Class.new do 
+      (Class.new do
         include Net::HTTPHeader
         def initialize
           @header = {}
@@ -27,25 +27,25 @@ RSpec.describe Net::HTTPHeader::DigestAuthenticator do
           @method = 'GET'
         end
       end).new
-    } 
+    }
 
     let(:response){
-      (Class.new do 
+      (Class.new do
         include Net::HTTPHeader
         def initialize
           @header = {}
-          self['WWW-Authenticate'] = 
+          self['WWW-Authenticate'] =
           'Digest realm="testrealm@host.com", qop="auth,auth-int", nonce="dcd98b7102dd2f0e8b11d0f600bfb0c093", opaque="5ccc069c403ebaf9f0171e9517f40e41"'
         end
       end).new
     }
 
-    it 'should set the authorization header' do 
+    it 'should set the authorization header' do
       expect(headers['authorization']).to be_nil
       headers.digest_auth('user','pass', response)
       expect(headers['authorization']).to_not be_empty
-    end 
-  end 
+    end
+  end
 
   context "with a cookie value in the response header" do
     before do
@@ -228,18 +228,18 @@ RSpec.describe Net::HTTPHeader::DigestAuthenticator do
       expect(authorization_header).to include(%(response="#{request_digest}"))
     end
   end
-  
+
   context "with algorithm specified" do
     before do
       @digest = setup_digest({
                               'www-authenticate' => 'Digest realm="myhost@testrealm.com", nonce="NONCE", qop="auth", algorithm=MD5'
                              })
     end
-    
+
     it "should recognise algorithm was specified" do
       expect( @digest.send :algorithm_present? ).to be(true)
     end
-    
+
     it "should set the algorithm header" do
       expect(authorization_header).to include('algorithm="MD5"')
     end
@@ -251,20 +251,20 @@ RSpec.describe Net::HTTPHeader::DigestAuthenticator do
                               'www-authenticate' => 'Digest realm="myhost@testrealm.com", nonce="NONCE", qop="auth", algorithm=MD5-sess'
                              })
     end
-    
+
     it "should recognise algorithm was specified" do
       expect( @digest.send :algorithm_present? ).to be(true)
     end
-    
+
     it "should set the algorithm header" do
       expect(authorization_header).to include('algorithm="MD5-sess"')
     end
-    
+
     it "should set response using md5-sess algorithm" do
       request_digest = "md5(md5(md5(Mufasa:myhost@testrealm.com:Circle Of Life):NONCE:md5(deadbeef)):NONCE:00000001:md5(deadbeef):auth:md5(GET:/dir/index.html))"
       expect(authorization_header).to include(%(response="#{request_digest}"))
     end
-    
+
   end
-  
+
 end

spec/httparty/parser_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+require 'spec_helper'
 
 RSpec.describe HTTParty::Parser do
   describe ".SupportedFormats" do

spec/httparty/request/body_spec.rb

@@ -1,4 +1,5 @@
-require_relative '../../spec_helper'
+require 'spec_helper'
+require 'tempfile'
 
 RSpec.describe HTTParty::Request::Body do
   describe '#call' do
@@ -18,26 +19,30 @@ RSpec.describe HTTParty::Request::Body do
 
       context 'when params has file' do
         before do
-          allow(HTTParty::Request::MultipartBoundary).
-            to receive(:generate).and_return("------------------------c772861a5109d5ef")
+          allow(HTTParty::Request::MultipartBoundary)
+            .to receive(:generate).and_return("------------------------c772861a5109d5ef")
         end
 
+        let(:file) { File.open('spec/fixtures/tiny.gif') }
         let(:params) do
           {
             user: {
-              avatar: File.open('spec/fixtures/tiny.gif'),
+              avatar: file,
               first_name: 'John',
               last_name: 'Doe',
               enabled: true
             }
           }
         end
+        let(:expected_file_name) { 'tiny.gif' }
+        let(:expected_file_contents) { "GIF89a\u0001\u0000\u0001\u0000\u0000\xFF\u0000,\u0000\u0000\u0000\u0000\u0001\u0000\u0001\u0000\u0000\u0002\u0000;" }
+        let(:expected_content_type) { 'application/octet-stream' }
         let(:multipart_params) do
           "--------------------------c772861a5109d5ef\r\n" \
-          "Content-Disposition: form-data; name=\"user[avatar]\"; filename=\"tiny.gif\"\r\n" \
-          "Content-Type: application/octet-stream\r\n" \
+          "Content-Disposition: form-data; name=\"user[avatar]\"; filename=\"#{expected_file_name}\"\r\n" \
+          "Content-Type: #{expected_content_type}\r\n" \
           "\r\n" \
-          "GIF89a\u0001\u0000\u0001\u0000\u0000\xFF\u0000,\u0000\u0000\u0000\u0000\u0001\u0000\u0001\u0000\u0000\u0002\u0000;\r\n" \
+          "#{expected_file_contents}\r\n" \
           "--------------------------c772861a5109d5ef\r\n" \
           "Content-Disposition: form-data; name=\"user[first_name]\"\r\n" \
           "\r\n" \
@@ -54,6 +59,17 @@ RSpec.describe HTTParty::Request::Body do
         end
 
         it { is_expected.to eq multipart_params }
+
+        context 'file object responds to original_filename' do
+          let(:some_temp_file) { Tempfile.new('some_temp_file.gif') }
+          let(:expected_file_name) { "some_temp_file.gif" }
+          let(:expected_file_contents) { "Hello" }
+          let(:file) { double(:mocked_action_dispatch, path: some_temp_file.path, original_filename: 'some_temp_file.gif', read: expected_file_contents) }
+
+          before { some_temp_file.write('Hello') }
+
+          it { is_expected.to eq multipart_params }
+        end
       end
     end
   end

spec/httparty/request_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+require 'spec_helper'
 
 RSpec.describe HTTParty::Request do
   before do

spec/httparty/response_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+require 'spec_helper'
 
 RSpec.describe HTTParty::Response do
   before do
@@ -78,11 +78,11 @@ RSpec.describe HTTParty::Response do
     }.to raise_error(NameError, /HTTParty\:\:Response/)
   end
 
-  it 'does raise an error about itself when invoking a method that does not exist' do 
+  it 'does raise an error about itself when invoking a method that does not exist' do
     expect {
       HTTParty::Response.new(@request_object, @response_object, @parsed_response).qux
     }.to raise_error(NoMethodError, /HTTParty\:\:Response/)
-  end 
+  end
 
   it "returns response headers" do
     response = HTTParty::Response.new(@request_object, @response_object, @parsed_response)
@@ -131,21 +131,21 @@ RSpec.describe HTTParty::Response do
 
   context 'response is array' do
     let(:response_value) { [{'foo' => 'bar'}, {'foo' => 'baz'}] }
-    let(:response) { HTTParty::Response.new(@request_object, @response_object, lambda { response_value }) } 
-    it "should be able to iterate" do 
+    let(:response) { HTTParty::Response.new(@request_object, @response_object, lambda { response_value }) }
+    it "should be able to iterate" do
       expect(response.size).to eq(2)
       expect {
         response.each { |item| }
       }.to_not raise_error
     end
 
-    it 'should respond to array methods' do       
-      expect(response).to respond_to(:bsearch, :compact, :cycle, :delete, :each, :flatten, :flatten!, :compact, :join)    
+    it 'should respond to array methods' do
+      expect(response).to respond_to(:bsearch, :compact, :cycle, :delete, :each, :flatten, :flatten!, :compact, :join)
     end
 
     it 'should equal the string response object body' do
-      expect(response.to_s).to eq(@response_object.body.to_s)    
-    end    
+      expect(response.to_s).to eq(@response_object.body.to_s)
+    end
 
     it 'should display the same as an array' do
       a = StringIO.new
@@ -153,7 +153,7 @@ RSpec.describe HTTParty::Response do
       response_value.display(b)
       response.display(a)
 
-      expect(a.string).to eq(b.string)    
+      expect(a.string).to eq(b.string)
     end
   end
 
@@ -294,27 +294,27 @@ RSpec.describe HTTParty::Response do
 
   describe "headers" do
     let (:empty_headers) { HTTParty::Response::Headers.new }
-    let (:some_headers_hash) do 
+    let (:some_headers_hash) do
       {'Cookie' => 'bob',
       'Content-Encoding' => 'meow'}
-    end 
-    let (:some_headers) do 
+    end
+    let (:some_headers) do
        HTTParty::Response::Headers.new.tap do |h|
          some_headers_hash.each_pair do |k,v|
            h[k] = v
          end
       end
     end
-    it "can initialize without headers" do 
+    it "can initialize without headers" do
       expect(empty_headers).to eq({})
     end
 
     it 'always equals itself' do
-      expect(empty_headers).to eq(empty_headers) 
+      expect(empty_headers).to eq(empty_headers)
       expect(some_headers).to eq(some_headers)
     end
 
-    it 'does not equal itself when not equivalent' do 
+    it 'does not equal itself when not equivalent' do
       expect(empty_headers).to_not eq(some_headers)
     end
 

spec/httparty/ssl_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+require 'spec_helper'
 
 RSpec.describe HTTParty::Request do
   context "SSL certificate verification" do

spec/httparty_spec.rb

@@ -1,5 +1,3 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
-
 RSpec.describe HTTParty do
   before(:each) do
     @klass = Class.new