ddy_remote_resource 1.0.0.rc4 → 1.0.0.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bccfcf5609907813018b9d01ee5c73c5e114a000
-  data.tar.gz: 459e6e2e2378a785bf9e7ed9248113c713d26429
+  metadata.gz: d688cecc3f4a1d713c2527d47a99cf88f81c9bfb
+  data.tar.gz: 11a9c8c67d6ed14e4aa46dd9de09079204ca0507
 SHA512:
-  metadata.gz: 71e2e8d6c00dfb31b27671c7d13c2057b90863f75bfd12e65986a53a9bb7240a1db85ef15a25357fbc4d808b35285973ad86b1921c85a311637b4ae162afb9d7
-  data.tar.gz: 9d87d498ff3d0585abadacee169f7419c44af52a16c2af24ca62275da16e1bb9c72bf2a2c4f379a524895150edac78c3f938ead42af4aa838917fe090e045e82
+  metadata.gz: dc32aaed683143cf08c8a96b80adcf41d98a369cd7313ae1eabf9a527a0c9e861f41d468621b1518582d686593e097ce8e27209ae2ddbfbeaacb53cd0c4779aa
+  data.tar.gz: 1e47f7498e9f70cff6b708d73f1e1af8189e88c3c50b422989c33abecdec0beb7ac733877d244b9b5283ba65b508dd96997d085a5f02dd1db33e3db17c629578

data/lib/remote_resource/response.rb

@@ -45,7 +45,7 @@ module RemoteResource
         root_element = @connection_options[:root_element]
 
         if root_element.present?
-          parsed_body[root_element.to_s]
+          parsed_body.try(:key?, root_element.to_s) && parsed_body[root_element.to_s]
         else
           parsed_body
         end.presence || {}
@@ -53,11 +53,11 @@ module RemoteResource
     end
 
     def errors
-      @errors ||= parsed_body['errors'].presence || attributes['errors'].presence || {}
+      @errors ||= parsed_body.try(:key?, 'errors') && parsed_body['errors'].presence || attributes.try(:key?, 'errors') && attributes['errors'].presence || {}
     end
 
     def meta
-      @meta ||= parsed_body['meta'].presence || {}
+      @meta ||= parsed_body.try(:key?, 'meta') && parsed_body['meta'].presence || {}
     end
 
   end

data/lib/remote_resource/version.rb

@@ -1,3 +1,3 @@
 module RemoteResource
-  VERSION = '1.0.0.rc4'.freeze
+  VERSION = '1.0.0.rc5'.freeze
 end

data/spec/lib/remote_resource/response_spec.rb

@@ -130,6 +130,17 @@ RSpec.describe RemoteResource::Response do
       end
     end
 
+    context 'when connection_options[:root_element] is present and the parsed response body has NO keys' do
+      let(:connection_options) do
+        { root_element: :data, collection: true }
+      end
+      let(:connection_response) { Typhoeus::Response.new(mock: true, code: 200, body: [{ id: 12, name: 'Mies' }].to_json, headers: { 'Content-Type' => 'application/json', 'Server' => 'nginx/1.4.6 (Ubuntu)' }) }
+
+      it 'returns an empty Hash' do
+        expect(response.attributes).to eql({})
+      end
+    end
+
     context 'when the parsed response body is NOT present' do
       let(:connection_response) { Typhoeus::Response.new(mock: true, code: 500, body: '', headers: { 'Content-Type' => 'application/json', 'Server' => 'nginx/1.4.6 (Ubuntu)' }) }
 
@@ -164,6 +175,25 @@ RSpec.describe RemoteResource::Response do
         expect(response.errors).to eql({})
       end
     end
+
+    context 'when the parsed response body does NOT contain keys' do
+      let(:connection_response) { Typhoeus::Response.new(mock: true, code: 200, body: [{ id: 12, name: 'Mies' }].to_json, headers: { 'Content-Type' => 'application/json', 'Server' => 'nginx/1.4.6 (Ubuntu)' }) }
+
+      it 'returns an empty Hash' do
+        expect(response.errors).to eql({})
+      end
+    end
+
+    context 'when the attributes do NOT contain keys, e.g. when connection_options[:root_element] is present' do
+      let(:connection_options) do
+        { root_element: :data, collection: true }
+      end
+      let(:connection_response) { Typhoeus::Response.new(mock: true, code: 200, body: { data: [{ id: 12, name: 'Mies' }] }.to_json, headers: { 'Content-Type' => 'application/json', 'Server' => 'nginx/1.4.6 (Ubuntu)' }) }
+
+      it 'returns an empty Hash' do
+        expect(response.errors).to eql({})
+      end
+    end
   end
 
   describe '#meta' do
@@ -183,6 +213,14 @@ RSpec.describe RemoteResource::Response do
         expect(response.meta).to eql({})
       end
     end
+
+    context 'when the parsed response body does NOT contain keys' do
+      let(:connection_response) { Typhoeus::Response.new(mock: true, code: 200, body: [{ id: 12, name: 'Mies' }].to_json, headers: { 'Content-Type' => 'application/json', 'Server' => 'nginx/1.4.6 (Ubuntu)' }) }
+
+      it 'returns an empty Hash' do
+        expect(response.meta).to eql({})
+      end
+    end
   end
 
 end

data/spec/lib/remote_resource/version_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 RSpec.describe RemoteResource::VERSION do
-  it { is_expected.to eql '1.0.0.rc4' }
+  it { is_expected.to eql '1.0.0.rc5' }
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddy_remote_resource
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc4
+  version: 1.0.0.rc5
 platform: ruby
 authors:
 - Jan van der Pas