httparty 0.15.6 → 0.15.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1263475e1be2f8d5150af07865061bc509a4bcc
-  data.tar.gz: d531b6ddb71d9f04945f4136f519743e4f04e7d2
+  metadata.gz: 8dd9a56f1d2f44c1625e80e31683c4e14d333495
+  data.tar.gz: 41a140c3370a9ce0bceaaff0c07fa1ac32491660
 SHA512:
-  metadata.gz: 07f2e819d9dd8892682d445dcd0f24e4b90f5d7f3bdbd763ffcb00da32602a5caf4b4da7b8b41df291500a7a0e67fac8bf8169b8cc37c398dbab93fff3da7957
-  data.tar.gz: ea815b4c8982649e4927d3a83ab82faeb7bea6be4a5e8d459072c5fa5b7db55506f705eacf6bda1d32b3a7892c65a059da72e29fbb0e233e882f9734165cbb51
+  metadata.gz: 14861c965bdad3631ee5e4ae9e51e044e65f30d5884ce32571e0add19c1fb7ba8962e6119e40cc112928744477c4187ca01e7bd2c8764d7a8f2c69609d1ffbeb
+  data.tar.gz: 2918c91eef01e6f88a6d7cb905998d35a9c18589835cad7b5668ba47a2f549fd1dc15d6db08e73b031701fcd8021d955971e82707e3b8d9d37610da1de4eba6d

data/Changelog.md

@@ -1,3 +1,16 @@
+## 0.15.7
+
+Fixed
+
+* [Add Response#pretty_print | Restore documented behavior](https://github.com/jnunemaker/httparty/pull/570)
+* [Add ability to parse response from JSONAPI ](https://github.com/jnunemaker/httparty/pull/553)
+
+## 0.15.6
+
+Fixed
+
+* [Encoding and content type stuff](https://github.com/jnunemaker/httparty/pull/543)
+
 ## 0.15.5
 
 Fixed

data/README.md

@@ -1,6 +1,6 @@
 # httparty
 
-Makes http fun again!
+Makes http fun again!  Ain't no party like a httparty, because a httparty don't stop.
 
 ## Install
 

data/lib/httparty/cookie_hash.rb

@@ -16,6 +16,6 @@ class HTTParty::CookieHash < Hash #:nodoc:
   end
 
   def to_cookie_string
-    reject { |k, v| CLIENT_COOKIES.include?(k.to_s.downcase) }.collect { |k, v| "#{k}=#{v}" }.join("; ")
+    select { |k, v| !CLIENT_COOKIES.include?(k.to_s.downcase) }.collect { |k, v| "#{k}=#{v}" }.join("; ")
   end
 end

data/lib/httparty/parser.rb

@@ -38,16 +38,17 @@ module HTTParty
   # @abstract Read the Custom Parsers section for more information.
   class Parser
     SupportedFormats = {
-      'text/xml'               => :xml,
-      'application/xml'        => :xml,
-      'application/json'       => :json,
-      'text/json'              => :json,
-      'application/javascript' => :plain,
-      'text/javascript'        => :plain,
-      'text/html'              => :html,
-      'text/plain'             => :plain,
-      'text/csv'               => :csv,
-      'application/csv'        => :csv,
+      'text/xml'                    => :xml,
+      'application/xml'             => :xml,
+      'application/json'            => :json,
+      'application/vnd.api+json'    => :json,
+      'text/json'                   => :json,
+      'application/javascript'      => :plain,
+      'text/javascript'             => :plain,
+      'text/html'                   => :html,
+      'text/plain'                  => :plain,
+      'text/csv'                    => :csv,
+      'application/csv'             => :csv,
       'text/comma-separated-values' => :csv
     }
 

data/lib/httparty/request.rb

@@ -276,8 +276,10 @@ module HTTParty
     end
 
     def encode_with_ruby_encoding(body, charset)
+      # NOTE: This will raise an argument error if the
+      # charset does not exist
       encoding = Encoding.find(charset)
-      body.force_encoding(charset)
+      body.force_encoding(encoding.to_s)
     rescue ArgumentError
       body
     end

data/lib/httparty/response.rb

@@ -67,6 +67,14 @@ module HTTParty
       end
     end
 
+    def pretty_print(pp)
+      if !parsed_response.nil? && parsed_response.respond_to?(:pretty_print)
+        parsed_response.pretty_print(pp)
+      else
+        super
+      end
+    end
+
     def display(port=$>)
       if !parsed_response.nil? && parsed_response.respond_to?(:display)
         parsed_response.display(port)

data/lib/httparty/version.rb

@@ -1,3 +1,3 @@
 module HTTParty
-  VERSION = "0.15.6"
+  VERSION = "0.15.7"
 end

data/spec/httparty/request_spec.rb

@@ -373,6 +373,12 @@ RSpec.describe HTTParty::Request do
       end
     end
 
+    it 'should handle application/vnd.api+json' do
+      ["application/vnd.api+json", "application/vnd.api+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)

data/spec/httparty/response_spec.rb

@@ -40,8 +40,8 @@ RSpec.describe HTTParty::Response do
       expect(@response.code).to eq(@response_object.code)
     end
 
-    it "should set code as a Fixnum" do
-      expect(@response.code).to be_an_instance_of(Fixnum)
+    it "should set code as an Integer" do
+      expect(@response.code).to be_a(Integer)
     end
 
     context 'when raise_on is supplied' do

metadata

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