flexirest 1.3.30 → 1.3.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f486c610e559403248c73cd363d61cef2cc6189
-  data.tar.gz: 4c9dbe026c0ca6a04957882f88cd06ffb530b294
+  metadata.gz: fcf49e613a33a734a49d4e4c363e34dd7dda7621
+  data.tar.gz: 15be49cb1ebeed32f1930c2b63798523de0323e3
 SHA512:
-  metadata.gz: 515563435824f29cd71526ba447b5eaa5c8408d44cddef0690cf71354d8e4b2c99841cef905095879f5cb707b5fa31a7b2014904180bad3f2fa272029405d6d4
-  data.tar.gz: 306bb5c6193a912a0404895b090385617a9c16644a2c371ce0b0febc27512e75ff64828277a55d15a4fa2055bdad43b82472b65c44c675171d9a419385af6ea0
+  metadata.gz: 2029a279a42b2c222736e5e7ad81ef13a74f043ba003bb02335e065bd2924853d386413ee2bc48ad8bc9fc81d41bcba5546c03c10d6a443d6e1082bd6eeb46b6
+  data.tar.gz: ec66f6352df44de47c8420cfcbfa323cc42807ff3f89893dfca94de84f4f1074f0ceb75d8234ffa087986b381fd45ef4b32868f0fea80ea46b634438c7391916

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.3.31
+
+Bugfix:
+
+- Working with later versions of Faraday where the response seems to have lost response_headers
+
 ## 1.3.30
 
 Bugfix:

data/lib/flexirest/request.rb

@@ -195,7 +195,7 @@ module Flexirest
           if verbose?
             Flexirest::Logger.debug "  Response"
             Flexirest::Logger.debug "  << Status : #{response_env.status}"
-            response_env.response_headers.each do |k,v|
+            (response_env.response_headers || response_env.try(:response).try(:headers)).each do |k,v|
               Flexirest::Logger.debug "  << #{k} : #{v}"
             end
             Flexirest::Logger.debug "  << Body:\n#{response_env.body}"
@@ -500,8 +500,8 @@ module Flexirest
     end
 
     def hal_response?
-      _, content_type = @response.response_headers.detect{|k,v| k.downcase == "content-type"}
-      faked_response = @response.response_headers.detect{|k,v| k.downcase == "x-arc-faked-response"}
+      _, content_type = (@response.response_headers || @response.try(:response).try(:headers)).detect{|k,v| k.downcase == "content-type"}
+      faked_response = (@response.response_headers || @response.try(:response).try(:headers)).detect{|k,v| k.downcase == "x-arc-faked-response"}
       if content_type && content_type.respond_to?(:each)
         content_type.each do |ct|
           return true if ct[%r{application\/hal\+json}i]
@@ -561,11 +561,13 @@ module Flexirest
     end
 
     def is_json_response?
-      @response.response_headers['Content-Type'].nil? || @response.response_headers['Content-Type'].include?('json')
+      headers = (@response.response_headers || @response.try(:response).try(:headers))
+      headers['Content-Type'].nil? || headers['Content-Type'].include?('json')
     end
 
     def is_xml_response?
-      @response.response_headers['Content-Type'].include?('xml')
+      headers = (@response.response_headers || @response.try(:response).try(:headers))
+      headers['Content-Type'].include?('xml')
     end
 
     def generate_new_object(options={})
@@ -605,8 +607,8 @@ module Flexirest
       else
         result = new_object(body, @overridden_name)
         result._status = @response.status
-        result._headers = @response.response_headers
-        result._etag = @response.response_headers['ETag']
+        result._headers = (@response.response_headers || @response.try(:response).try(:headers))
+        result._etag = result._headers['ETag']
         if !object_is_class? && options[:mutable] != false
           @object._copy_from(result)
           @object._clean!

data/lib/flexirest/version.rb

@@ -1,3 +1,3 @@
 module Flexirest
-  VERSION = "1.3.30"
+  VERSION = "1.3.31"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flexirest
 version: !ruby/object:Gem::Version
-  version: 1.3.30
+  version: 1.3.31
 platform: ruby
 authors:
 - Andy Jeffries
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-22 00:00:00.000000000 Z
+date: 2017-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -298,7 +298,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: This gem is for accessing REST services in a flexible way.  ActiveResource