httparty 0.15.3 → 0.15.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79fe2cddc91ec18f47159ed37d6f30b7a87b12ca
-  data.tar.gz: 6cbcf133a62890a8ce58667478b7c1f3e5a449fb
+  metadata.gz: 719a35806296e11c532ef8d283a1e8548da74cc6
+  data.tar.gz: 3f4b75c1eb74d848567010da60fe02cf12d6eeeb
 SHA512:
-  metadata.gz: 38a54d1d643875d108d1f77f3d7d6a8f1132eec84048e3eed2f44dacec6b5aeea360581496dc22c3d3d4cea375c4616cd51cf4e68e8f317f482ce1120e151424
-  data.tar.gz: 0200edc00c38b810a16dd5ff25bd5342d941fd7f6b38df2308414ad5dc16249fa79a013fe307e0496951ec07069e554c99fb50ff554669532bc158e0ef64cc4e
+  metadata.gz: f37c05926db73533186f453bd7b1b258b7e1da0bd6ec11baf7a46f56a5679ca34e3d2645837747a5343c12c2dfbb036e86b8ef33a4f59544657a98ab362ac6fe
+  data.tar.gz: 1fe1275d5477089a7c501ca6dbb15cf2db55f85ca92b49d2fa3ceb7d35429d764a9bdd3b1cff66ec20a6d79901bb8c91dde5f9ded3abf0fa1c2f23047f6fe969

data/Changelog.md

@@ -1,3 +1,10 @@
+## 0.15.4
+
+Fixed
+
+* Prevent gsub errors with different encodings.
+* Prevent passing nil to encode_body.
+
 ## 0.15.3
 
 Fixed

data/lib/httparty/parser.rb

@@ -101,6 +101,9 @@ module HTTParty
       return nil if body.nil?
       return nil if body == "null"
       return nil if body.valid_encoding? && body.strip.empty?
+      if body.valid_encoding? && body.encoding == Encoding::UTF_8
+        body.gsub!(/\A#{UTF8_BOM}/, '')
+      end
       if supports_format?
         parse_supported_format
       else
@@ -117,7 +120,7 @@ module HTTParty
     UTF8_BOM = "\xEF\xBB\xBF".freeze
 
     def json
-      JSON.parse(body.gsub(/\A#{UTF8_BOM}/, ''), :quirks_mode => true, :allow_nan => true)
+      JSON.parse(body, :quirks_mode => true, :allow_nan => true)
     end
 
     def csv

data/lib/httparty/request.rb

@@ -60,7 +60,7 @@ module HTTParty
         connection_adapter: ConnectionAdapter
       }.merge(o)
       self.path = path
-      set_basic_auth_from_uri      
+      set_basic_auth_from_uri
     end
 
     def path=(uri)
@@ -151,18 +151,18 @@ module HTTParty
           chunked_body = chunks.join
         end
       end
-      
-      
+
+
       handle_host_redirection if response_redirects?
       result = handle_unauthorized
       result ||= handle_response(chunked_body, &block)
-      result      
+      result
     end
 
     def handle_unauthorized(&block)
       return unless digest_auth? && response_unauthorized? && response_has_digest_auth_challenge?
       return if @credentials_sent
-      @credentials_sent = true      
+      @credentials_sent = true
       perform(&block)
     end
 
@@ -210,9 +210,9 @@ module HTTParty
       @raw_request.body_stream = options[:body_stream] if options[:body_stream]
       if options[:headers].respond_to?(:to_hash)
         headers_hash = options[:headers].to_hash
-        
+
         @raw_request.initialize_http_header(headers_hash)
-        # If the caller specified a header of 'Accept-Encoding', assume they want to 
+        # If the caller specified a header of 'Accept-Encoding', assume they want to
         # deal with encoding of content. Disable the internal logic in Net:HTTP
         # that handles encoding, if the platform supports it.
         if @raw_request.respond_to?(:decode_content) && (headers_hash.key?('Accept-Encoding') || headers_hash.key?('accept-encoding'))
@@ -220,10 +220,10 @@ module HTTParty
           @raw_request['accept-encoding'] = @raw_request['accept-encoding']
         end
       end
-      if options[:basic_auth] && send_authorization_header?        
+      if options[:basic_auth] && send_authorization_header?
         @raw_request.basic_auth(username, password)
         @credentials_sent = true
-      end 
+      end
       setup_digest_auth if digest_auth? && response_unauthorized? && response_has_digest_auth_challenge?
     end
 
@@ -240,7 +240,7 @@ module HTTParty
     end
 
     def setup_digest_auth
-      @raw_request.digest_auth(username, password, last_response)      
+      @raw_request.digest_auth(username, password, last_response)
     end
 
     def query_string(uri)
@@ -278,9 +278,9 @@ module HTTParty
     def encode_with_ruby_encoding(body, charset)
       if !body.nil? && Encoding.name_list.include?(charset)
         body.force_encoding(charset)
-      else 
+      else
         body
-      end 
+      end
     end
 
     def assume_utf16_is_big_endian
@@ -347,7 +347,7 @@ module HTTParty
         perform(&block)
       else
         body ||= last_response.body
-        body = encode_body(body)
+        body = body.nil? ? body : encode_body(body)
         Response.new(self, last_response, lambda { parse_response(body) }, body: body)
       end
     end
@@ -367,7 +367,7 @@ module HTTParty
     end
 
     def send_authorization_header?
-      !@changed_hosts      
+      !@changed_hosts
     end
 
     def response_redirects?
@@ -388,7 +388,7 @@ module HTTParty
       cookies_hash = HTTParty::CookieHash.new
       cookies_hash.add_cookies(options[:headers].to_hash['Cookie']) if options[:headers] && options[:headers].to_hash['Cookie']
       response.get_fields('Set-Cookie').each { |cookie| cookies_hash.add_cookies(cookie) }
-      
+
       options[:headers] ||= {}
       options[:headers]['Cookie'] = cookies_hash.to_cookie_string
     end

data/lib/httparty/version.rb

@@ -1,3 +1,3 @@
 module HTTParty
-  VERSION = "0.15.3"
+  VERSION = "0.15.4"
 end

data/spec/httparty/parser_spec.rb

@@ -108,6 +108,13 @@ RSpec.describe HTTParty::Parser do
       allow(@parser).to receive_messages(body: "\xEF\xBB\xBF\{\"hi\":\"yo\"\}")
       expect(@parser.parse).to eq({"hi"=>"yo"})
     end
+
+    it "parses ascii 8bit encoding" do
+      allow(@parser).to receive_messages(
+        body: "{\"currency\":\"\xE2\x82\xAC\"}".force_encoding('ASCII-8BIT')
+      )
+      expect(@parser.parse).to eq({"currency" => "€"})
+    end
   end
 
   describe "#supports_format?" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httparty
 version: !ruby/object:Gem::Version
-  version: 0.15.3
+  version: 0.15.4
 platform: ruby
 authors:
 - John Nunemaker
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-16 00:00:00.000000000 Z
+date: 2017-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_xml