httparty 0.16.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b3d9cd5bf2c8c65e7c422ee6424b08fabde5bee
-  data.tar.gz: c5e5164791c0c4ab0c1dca1ad1b87385b382d36a
+  metadata.gz: '08b40cc11bb3f226a66cc268ecc924e0c340880e'
+  data.tar.gz: 73c74369eefec097816a367683a353a2c37fad19
 SHA512:
-  metadata.gz: 27268caca0723458d76464e7e510eb737feb425a9a9f2007337d9f1e12976b0bfb5c39850a5654f990fe66d1f7a4a53d2de4de80b57bfd670e470c9269c25b1f
-  data.tar.gz: 3c7360f0232df51be5491f3c98bba7998b9321c42a5a845680be055b7929edc024a4a9fdad7aad14501ea3dba8875a5d9debfd24ba31e6a9779accf2e1935a9f
+  metadata.gz: e6dd1403411ae60aac6f7380dea7c6788c6a605fe76b58177803d761eb1cd4282773d19e5ea6ca590ed67d93cf64ac03868880c0d90578d9550178a3daf3c53a
+  data.tar.gz: aa62e154f5059e7baad7c4618e7e2c23097d34f259154b783052a42cfb77e22bba5d7012c65d6369bbb5511685f7461943adf209f2956ed45bac02c4ce1453c9

data/.travis.yml

@@ -1,9 +1,10 @@
 language: ruby
 rvm:
   - 2.0.0
-  - 2.1.8
-  - 2.2.4
-  - 2.3.0
-  - 2.4.1
+  - 2.1.10
+  - 2.2.9
+  - 2.3.6
+  - 2.4.3
+  - 2.5.0
 bundler_args: --without development
 before_install: gem install bundler

data/Changelog.md

@@ -1,3 +1,9 @@
+## 0.16.1
+
+* [Parse content with application/hal+json content type as JSON](https://github.com/jnunemaker/httparty/pull/573)
+* [Convert objects to string when concatenating in multipart stuff](https://github.com/jnunemaker/httparty/pull/575)
+* [Fix multipart to set its header even when other headers are provided](https://github.com/jnunemaker/httparty/pull/576)
+
 ## 0.16.0
 
 * [Add multipart support](https://github.com/jnunemaker/httparty/pull/569)

data/lib/httparty/hash_conversions.rb

@@ -47,15 +47,14 @@ module HTTParty
         normalized_keys << [key.to_s, value]
       end
 
-
       stack.each do |parent, hash|
-        hash.each do |key, value|
-          if value.respond_to?(:to_hash)
-            stack << ["#{parent}[#{key}]", value.to_hash]
-          elsif value.respond_to?(:to_ary)
-            value.to_ary.each { |v| normalized_keys << normalize_keys("#{parent}[#{key}][]", v).flatten }
+        hash.each do |child_key, child_value|
+          if child_value.respond_to?(:to_hash)
+            stack << ["#{parent}[#{child_key}]", child_value.to_hash]
+          elsif child_value.respond_to?(:to_ary)
+            child_value.to_ary.each { |v| normalized_keys << normalize_keys("#{parent}[#{child_key}][]", v).flatten }
           else
-            normalized_keys << normalize_keys("#{parent}[#{key}]", value).flatten
+            normalized_keys << normalize_keys("#{parent}[#{child_key}]", child_value).flatten
           end
         end
       end

data/lib/httparty/parser.rb

@@ -42,6 +42,7 @@ module HTTParty
       'application/xml'             => :xml,
       'application/json'            => :json,
       'application/vnd.api+json'    => :json,
+      'application/hal+json'        => :json,
       'text/json'                   => :json,
       'application/javascript'      => :plain,
       'text/javascript'             => :plain,

data/lib/httparty/request.rb

@@ -205,15 +205,6 @@ module HTTParty
       @raw_request = http_method.new(request_uri(uri))
       @raw_request.body_stream = options[:body_stream] if options[:body_stream]
 
-      if options[:body]
-        body = Body.new(options[:body], query_string_normalizer: query_string_normalizer)
-        if body.multipart?
-          content_type = "multipart/form-data; boundary=#{body.boundary}"
-          @raw_request.initialize_http_header('Content-Type' => content_type)
-        end
-        @raw_request.body = body.call
-      end
-
       if options[:headers].respond_to?(:to_hash)
         headers_hash = options[:headers].to_hash
 
@@ -227,6 +218,15 @@ module HTTParty
         end
       end
 
+      if options[:body]
+        body = Body.new(options[:body], query_string_normalizer: query_string_normalizer)
+        if body.multipart?
+          content_type = "multipart/form-data; boundary=#{body.boundary}"
+          @raw_request['Content-Type'] = content_type
+        end
+        @raw_request.body = body.call
+      end
+
       if options[:basic_auth] && send_authorization_header?
         @raw_request.basic_auth(username, password)
         @credentials_sent = true

data/lib/httparty/request/body.rb

@@ -36,7 +36,7 @@ module HTTParty
           memo += "\r\n"
           memo += "Content-Type: application/octet-stream\r\n" if file?(value)
           memo += "\r\n"
-          memo += file?(value) ? value.read : value
+          memo += file?(value) ? value.read : value.to_s
           memo += "\r\n"
         end
 

data/lib/httparty/version.rb

@@ -1,3 +1,3 @@
 module HTTParty
-  VERSION = "0.16.0"
+  VERSION = "0.16.1"
 end

data/spec/httparty/connection_adapter_spec.rb

@@ -32,9 +32,12 @@ RSpec.describe HTTParty::ConnectionAdapter do
   end
 
   describe ".call" do
+    let(:uri) { URI 'http://www.google.com' }
+    let(:options) { { foo: :bar } }
+
     it "generates an HTTParty::ConnectionAdapter instance with the given uri and options" do
-      expect(HTTParty::ConnectionAdapter).to receive(:new).with(@uri, @options).and_return(double(connection: nil))
-      HTTParty::ConnectionAdapter.call(@uri, @options)
+      expect(HTTParty::ConnectionAdapter).to receive(:new).with(uri, options).and_return(double(connection: nil))
+      HTTParty::ConnectionAdapter.call(uri, options)
     end
 
     it "calls #connection on the connection adapter" do
@@ -42,7 +45,7 @@ RSpec.describe HTTParty::ConnectionAdapter do
       connection = double('Connection')
       expect(adapter).to receive(:connection).and_return(connection)
       allow(HTTParty::ConnectionAdapter).to receive_messages(new: adapter)
-      expect(HTTParty::ConnectionAdapter.call(@uri, @options)).to be connection
+      expect(HTTParty::ConnectionAdapter.call(uri, options)).to be connection
     end
   end
 

data/spec/httparty/net_digest_auth_spec.rb

@@ -23,6 +23,8 @@ RSpec.describe Net::HTTPHeader::DigestAuthenticator do
         include Net::HTTPHeader
         def initialize
           @header = {}
+          @path = '/'
+          @method = 'GET'
         end
       end).new
     } 

data/spec/httparty/parser_spec.rb

@@ -27,10 +27,10 @@ RSpec.describe HTTParty::Parser do
     end
 
     it "returns the SupportedFormats constant for subclasses" do
-      class MyParser < HTTParty::Parser
-        SupportedFormats = {"application/atom+xml" => :atom}
-      end
-      expect(MyParser.formats).to eq({"application/atom+xml" => :atom})
+      klass = Class.new(HTTParty::Parser)
+      klass::SupportedFormats = { "application/atom+xml" => :atom }
+
+      expect(klass.formats).to eq({"application/atom+xml" => :atom})
     end
   end
 

data/spec/httparty/request/body_spec.rb

@@ -27,7 +27,8 @@ RSpec.describe HTTParty::Request::Body do
             user: {
               avatar: File.open('spec/fixtures/tiny.gif'),
               first_name: 'John',
-              last_name: 'Doe'
+              last_name: 'Doe',
+              enabled: true
             }
           }
         end
@@ -45,6 +46,10 @@ RSpec.describe HTTParty::Request::Body do
           "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
 

data/spec/httparty/request_spec.rb

@@ -342,6 +342,27 @@ RSpec.describe HTTParty::Request do
         expect(CGI.unescape(body)).to eq("foo=bar&foo=baz&page=1")
       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')}
+        @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'}
+          @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
+      end
+    end
   end
 
   describe 'http' do
@@ -379,6 +400,12 @@ RSpec.describe HTTParty::Request do
       end
     end
 
+    it 'should handle application/hal+json' do
+      ["application/hal+json", "application/hal+json; charset=iso8859-1"].each do |ct|
+        expect(@request.send(:format_from_mimetype, ct)).to eq(:json)
+      end
+    end
+
     it 'should handle application/json' do
       ["application/json", "application/json; charset=iso8859-1"].each do |ct|
         expect(@request.send(:format_from_mimetype, ct)).to eq(:json)
@@ -585,7 +612,7 @@ RSpec.describe HTTParty::Request do
           stub_request(:get, 'http://api.foo.com/v2')
             .to_return(body: '<hash><foo>bar</foo></hash>')
           body = ""
-          response = @request.perform { |chunk| body += chunk }
+          @request.perform { |chunk| body += chunk }
           expect(body.length).to eq(27)
         end
 

data/spec/httparty/response_spec.rb

@@ -66,7 +66,7 @@ RSpec.describe HTTParty::Response do
         subject { described_class.new(request, @response_object, @parsed_response) }
 
         it 'does not throw exception' do
-          expect{ subject }.not_to raise_error(HTTParty::ResponseError)
+          expect{ subject }.not_to raise_error
         end
       end
     end

data/spec/httparty_spec.rb

@@ -358,11 +358,12 @@ RSpec.describe HTTParty do
 
     it "raises UnsupportedFormat when the parser cannot handle the format" do
       @klass.format :json
-      class MyParser < HTTParty::Parser
-        SupportedFormats = {}
-      end unless defined?(MyParser)
+
+      parser_class = Class.new(HTTParty::Parser)
+      parser_class::SupportedFormats = {}
+
       expect do
-        @klass.parser MyParser
+        @klass.parser parser_class
       end.to raise_error(HTTParty::UnsupportedFormat)
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httparty
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.1
 platform: ruby
 authors:
 - John Nunemaker
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-13 00:00:00.000000000 Z
+date: 2018-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_xml
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Makes http fun! Also, makes consuming restful web services dead easy.