tumblr_client 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4597029c0d9e24e9a0f7ebc7f3b79cf829ee287
-  data.tar.gz: cbe00d9e8edcae2fc2f22cef6a9979bedc945736
+  metadata.gz: ecc8127a8745bb00c34c509915e7b1dea17fe217
+  data.tar.gz: 43d700b7291553832d8cfc228d375086b59199a4
 SHA512:
-  metadata.gz: 09c14d78f573c2370b50d85ab1221c8f97388108d8712f578d1efa2406149d30e7fb9a6bf7b173478507df7d7c31f4bfc9aad628ab548072fcf92dcd89ac36d9
-  data.tar.gz: 04ecbad123bc8274c1f8ec9d62b8597388f7f9e670409d755342131114e85e756bfc2bb35d3ce139a8889c77a53e564471639a79cebc273682c964a49d04b5bf
+  metadata.gz: 5f97c3e68ea50118213909b6c22175ede8f1477ac0a2d7e92e6ae413e05ebaec0918944d2446da7c18ac69ec1e8db826f3940944a1e3fb61d8694442ada43001
+  data.tar.gz: 944090428837163fd7e4973bbe3ffbd7a7cd2a059a8e73b4577a1bb522da72c8726f4d699cfa0ee6b6a9479713d3f22511c93eab0fbb8d65827e1307dc11921b

data/lib/tumblr/request.rb

@@ -43,7 +43,10 @@ module Tumblr
       if [201, 200].include?(response.status)
         response.body['response']
       else
-        response.body['meta']
+        # surface the meta alongside response
+        res = response.body['meta'] || {}
+        res.merge! response.body['response'] if response.body['response'].is_a?(Hash)
+        res
       end
     end
 

data/lib/tumblr/version.rb

@@ -1,5 +1,5 @@
 module Tumblr
 
-  VERSION = '0.7.3'
+  VERSION = '0.7.4'
 
 end

data/spec/examples/request_spec.rb

@@ -22,9 +22,15 @@ describe Tumblr::Request do
 
     context 'with an error response' do
 
-      it 'should return the meta object' do
+      it 'should return the meta object (merged with response)' do
         meta = { :message => 'ohno' }
-        response = OpenStruct.new(:status => 401, :body => { 'meta' => meta })
+        response = OpenStruct.new(:status => 401, :body => { 'meta' => meta, 'response' => { :also => 'hi' } })
+        client.respond(response).should == { :message => 'ohno', :also => 'hi' }
+      end
+
+      it 'should return the meta object even when response is nil' do
+        meta = { :message => 'ohno' }
+        response = OpenStruct.new(:status => 401, :body => { 'meta' => meta, 'response' => nil })
         client.respond(response).should == meta
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tumblr_client
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - John Bunting
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-29 00:00:00.000000000 Z
+date: 2013-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday