httparty 0.16.2 → 0.16.3

data/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
@@ -185,8 +185,8 @@ RSpec.describe Net::HTTPHeader::DigestAuthenticator do
   context "with http basic auth response when net digest auth expected" do
     it "should not fail" do
       @digest = setup_digest({
-                               'www-authenticate' => 'WWW-Authenticate: Basic realm="testrealm.com""'
-                           })
+        'www-authenticate' => 'WWW-Authenticate: Basic realm="testrealm.com""'
+      })
 
       expect(authorization_header).to include("Digest")
     end
@@ -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'
-                             })
+        '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
@@ -248,23 +248,23 @@ RSpec.describe Net::HTTPHeader::DigestAuthenticator do
   context "with md5-sess algorithm specified" do
     before do
       @digest = setup_digest({
-                              'www-authenticate' => 'Digest realm="myhost@testrealm.com", nonce="NONCE", qop="auth", algorithm=MD5-sess'
-                             })
+        '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

data/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

data/spec/httparty/request/body_spec.rb

@@ -1,8 +1,11 @@
-require_relative '../../spec_helper'
+require 'spec_helper'
+require 'tempfile'
 
 RSpec.describe HTTParty::Request::Body do
   describe '#call' do
-    subject { described_class.new(params).call }
+    let(:options) { {} }
+
+    subject { described_class.new(params, options).call }
 
     context 'when params is string' do
       let(:params) { 'name=Bob%20Jones' }
@@ -18,26 +21,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) { 'image/gif' }
         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 +61,48 @@ RSpec.describe HTTParty::Request::Body do
         end
 
         it { is_expected.to eq multipart_params }
+
+        context 'when passing multipart as an option' do
+          let(:options) { { force_multipart: true } }
+          let(:params) do
+            {
+              user: {
+                first_name: 'John',
+                last_name: 'Doe',
+                enabled: true
+              }
+            }
+          end
+          let(:multipart_params) do
+            "--------------------------c772861a5109d5ef\r\n" \
+            "Content-Disposition: form-data; name=\"user[first_name]\"\r\n" \
+            "\r\n" \
+            "John\r\n" \
+            "--------------------------c772861a5109d5ef\r\n" \
+            "Content-Disposition: form-data; name=\"user[last_name]\"\r\n" \
+            "\r\n" \
+            "Doe\r\n" \
+            "--------------------------c772861a5109d5ef\r\n" \
+            "Content-Disposition: form-data; name=\"user[enabled]\"\r\n" \
+            "\r\n" \
+            "true\r\n" \
+            "--------------------------c772861a5109d5ef--\r\n"
+          end
+
+          it { is_expected.to eq multipart_params }
+
+        end
+
+        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

data/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
@@ -73,7 +73,7 @@ RSpec.describe HTTParty::Request do
       expect(request.parser).to eq(my_parser)
     end
 
-    it "sets connection_adapter to HTTPParty::ConnectionAdapter" do
+    it "sets connection_adapter to HTTParty::ConnectionAdapter" do
       request = HTTParty::Request.new(Net::HTTP::Get, 'http://google.com')
       expect(request.connection_adapter).to eq(HTTParty::ConnectionAdapter)
     end
@@ -343,22 +343,35 @@ RSpec.describe HTTParty::Request do
       end
     end
 
-    context "when body is multipart" do
-      it "sets header Content-Type: multipart/form-data; boundary=" do
-        @request.options[:body] = {file: File.open(File::NULL, 'r')}
+    context "when mulipart" do
+      subject(:headers) do
         @request.send(:setup_raw_request)
         headers = @request.instance_variable_get(:@raw_request).each_header.to_a
-        headers = Hash[*headers.flatten]  # Ruby 2.0 doesn't have Array#to_h
-        expect(headers['content-type']).to match(%r{^multipart/form-data; boundary=---})
+        Hash[*headers.flatten]  # Ruby 2.0 doesn't have Array#to_h
       end
 
-      context "and header Content-Type is provided" do
-        it "overwrites the header to: multipart/form-data; boundary=" do
+      context "when body contains file" do
+        it "sets header Content-Type: multipart/form-data; boundary=" do
           @request.options[:body] = {file: File.open(File::NULL, 'r')}
-          @request.options[:headers] = {'Content-Type' => 'application/x-www-form-urlencoded'}
-          @request.send(:setup_raw_request)
-          headers = @request.instance_variable_get(:@raw_request).each_header.to_a
-          headers = Hash[*headers.flatten]  # Ruby 2.0 doesn't have Array#to_h
+
+          expect(headers['content-type']).to match(%r{^multipart/form-data; boundary=---})
+        end
+
+        context "and header Content-Type is provided" do
+          it "overwrites the header to: multipart/form-data; boundary=" do
+            @request.options[:body] = {file: File.open(File::NULL, 'r')}
+            @request.options[:headers] = {'Content-Type' => 'application/x-www-form-urlencoded'}
+
+            expect(headers['content-type']).to match(%r{^multipart/form-data; boundary=---})
+          end
+        end
+      end
+
+      context 'when mulipart option is provided' do
+        it "sets header Content-Type: multipart/form-data; boundary=" do
+          @request.options[:body] = { text: 'something' }
+          @request.options[:multipart] = true
+
           expect(headers['content-type']).to match(%r{^multipart/form-data; boundary=---})
         end
       end
@@ -788,6 +801,16 @@ RSpec.describe HTTParty::Request do
           expect(@request.perform.parsed_response).to eq({"hash" => {"foo" => "bar"}})
         end
 
+        it "should be handled by LOCK transparently" do
+          @request.http_method = Net::HTTP::Lock
+          expect(@request.perform.parsed_response).to eq({"hash" => {"foo" => "bar"}})
+        end
+
+        it "should be handled by UNLOCK transparently" do
+          @request.http_method = Net::HTTP::Unlock
+          expect(@request.perform.parsed_response).to eq({"hash" => {"foo" => "bar"}})
+        end
+
         it "should keep track of cookies between redirects" do
           @redirect['Set-Cookie'] = 'foo=bar; name=value; HTTPOnly'
           @request.perform
@@ -914,6 +937,16 @@ RSpec.describe HTTParty::Request do
         expect(@request.perform.parsed_response).to eq({"hash" => {"foo" => "bar"}})
       end
 
+      it "should be handled by LOCK transparently" do
+        @request.http_method = Net::HTTP::Lock
+        expect(@request.perform.parsed_response).to eq({"hash" => {"foo" => "bar"}})
+      end
+
+      it "should be handled by UNLOCK transparently" do
+        @request.http_method = Net::HTTP::Unlock
+        expect(@request.perform.parsed_response).to eq({"hash" => {"foo" => "bar"}})
+      end
+
       it "should keep track of cookies between redirects" do
         @redirect['Set-Cookie'] = 'foo=bar; name=value; HTTPOnly'
         @request.perform
@@ -1052,6 +1085,16 @@ RSpec.describe HTTParty::Request do
       expect(@request.perform.code).to eq(304)
     end
 
+    it "should be handled by LOCK transparently" do
+      @request.http_method = Net::HTTP::Lock
+      expect(@request.perform.code).to eq(304)
+    end
+
+    it "should be handled by UNLOCK transparently" do
+      @request.http_method = Net::HTTP::Unlock
+      expect(@request.perform.code).to eq(304)
+    end
+
     it 'should not log the redirection' do
       logger_double = double
       expect(logger_double).to receive(:info).once
@@ -1123,6 +1166,18 @@ RSpec.describe HTTParty::Request do
           expect(@request.perform.parsed_response).to eq({"hash" => {"foo" => "bar"}})
         end
 
+        it "should be handled by LOCK transparently" do
+          @request.http_method = Net::HTTP::Lock
+          expect(@request.perform.parsed_response).to eq({"hash" => {"foo" => "bar"}})
+        end
+
+        it "should be handled by UNLOCK transparently" do
+          @request.http_method = Net::HTTP::Unlock
+          expect(@request.perform.parsed_response).to eq({"hash" => {"foo" => "bar"}})
+        end
+
+
+
         it "should keep track of cookies between redirects" do
           @redirect['Set-Cookie'] = 'foo=bar; name=value; HTTPOnly'
           @request.perform

data/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 
-       HTTParty::Response::Headers.new.tap do |h|
-         some_headers_hash.each_pair do |k,v|
-           h[k] = v
-         end
+    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
 
@@ -344,4 +344,16 @@ RSpec.describe HTTParty::Response do
       expect(inspect).to include("content-length")
     end
   end
+
+  describe 'marshalling' do
+    before { RSpec::Mocks.space.proxy_for(@response_object).remove_stub(:body) }
+
+    specify do
+      marshalled = Marshal.load(Marshal.dump(@response))
+
+      expect(marshalled.headers).to eq @response.headers
+      expect(marshalled.body).to eq @response.body
+      expect(marshalled.code).to eq @response.code
+    end
+  end
 end