ddy_remote_resource 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a258ef2eff87f5be59c4093c6828fc2e0731690
-  data.tar.gz: 7f57020b0b01dad3bdb83f9de6f065e8c9fbf3c4
+  metadata.gz: a83306ed9f8641a5842e6b886a0fad7ac91898f9
+  data.tar.gz: c47d38be2244a886ba8afaae18aa54f8953436be
 SHA512:
-  metadata.gz: 95d6b936bdbb2f51688872015867a5f8f5adf5c825ef75c73f451717805284c934ceeb2e4fb2f0de44b622628690ad9757662b0854e0a24f321385060de7b8d2
-  data.tar.gz: 52d4ec2f67b9be0f016c07d9471ac9451b6df1bb873f6a071df23453932ddbe861a6263eb60a72a61c100e64feddb37978f06f0c428296349b3181b15869760f
+  metadata.gz: d6f5cc8d3bbd70527df5337af6ec8e9ba4ac8257a34d683772654fc79e170a0a43629fa5985c3ba7cf7db9907fe53fbb86bb431dc5257783bc08a2949ab4e530
+  data.tar.gz: d29ffc3ad4f221bf3bc756aa0a1935de98fdb8f06da14bad8e745304e04214e2a3076827abce3b59be56bfefef967da9b22edcfe194494f92b49aa1e193246eb

data/lib/remote_resource/builder.rb

@@ -19,9 +19,9 @@ module RemoteResource
       end
 
       def build_collection(collection, options = {})
-        if collection.is_a?(Array)
-          RemoteResource::Collection.new(self, collection, options)
-        end
+        collection.is_a?(Array) || raise(ArgumentError, '`collection` must be an Array')
+
+        RemoteResource::Collection.new(self, collection, options)
       end
     end
 

data/lib/remote_resource/response.rb

@@ -44,13 +44,20 @@ module RemoteResource
 
     def attributes
       @attributes ||= begin
-        root_element = @connection_options[:root_element]
+        root_element = @connection_options[:root_element].to_s
+        data         = nil
 
         if root_element.present?
-          parsed_body.try(:key?, root_element.to_s) && parsed_body[root_element.to_s]
+          data = parsed_body.try(:key?, root_element) && parsed_body[root_element]
         else
-          parsed_body
-        end.presence || {}
+          data = parsed_body
+        end
+
+        if data.is_a?(Array)
+          data
+        else
+          data.presence || {}
+        end
       end
     end
 

data/lib/remote_resource/version.rb

@@ -1,3 +1,3 @@
 module RemoteResource
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.0.2'.freeze
 end

data/spec/integration/all_spec.rb

@@ -80,6 +80,36 @@ RSpec.describe '.all' do
     end
   end
 
+  describe 'with an empty response' do
+    let(:response_body) do
+      {
+        data: []
+      }
+    end
+
+    let!(:expected_request) do
+      mock_request = stub_request(:get, 'https://www.example.com/posts.json')
+      mock_request.with(query: nil, body: nil, headers: expected_default_headers)
+      mock_request.to_return(status: 200, body: response_body.to_json)
+      mock_request
+    end
+
+    it 'performs the correct HTTP GET request' do
+      Post.all
+      expect(expected_request).to have_been_requested
+    end
+
+    it 'builds the correct collection of resources' do
+      posts = Post.all
+
+      aggregate_failures do
+        expect(posts).to respond_to :each
+        expect(posts.to_a).to eql []
+        expect(posts.size).to eql 0
+      end
+    end
+  end
+
   describe 'with connection_options[:params]' do
     let!(:expected_request) do
       mock_request = stub_request(:get, 'https://www.example.com/posts.json')

data/spec/integration/naming_spec.rb

@@ -96,7 +96,7 @@ RSpec.describe 'connection_options for naming' do
   end
 
   describe 'connection_options[:path_postfix]' do
-    let(:response_body) do
+    let(:response_body_singular) do
       {
         data: {
           id:         12,
@@ -108,15 +108,29 @@ RSpec.describe 'connection_options for naming' do
       }
     end
 
+    let(:response_body_collection) do
+      {
+        data: [
+                {
+                  id:         12,
+                  title:      'Aliquam lobortis',
+                  body:       'Lorem ipsum dolor sit amet, consectetur adipiscing elit.',
+                  featured:   false,
+                  created_at: Time.new(2015, 10, 4, 9, 30, 0),
+                }
+              ]
+      }
+    end
+
     let!(:expected_request_singular) do
       mock_request = stub_request(:get, 'https://www.example.com/posts/12/featured.json')
-      mock_request.to_return(status: 200, body: response_body.to_json)
+      mock_request.to_return(status: 200, body: response_body_singular.to_json)
       mock_request
     end
 
     let!(:expected_request_collection) do
       mock_request = stub_request(:get, 'https://www.example.com/posts/featured.json')
-      mock_request.to_return(status: 200, body: response_body.to_json)
+      mock_request.to_return(status: 200, body: response_body_collection.to_json)
       mock_request
     end
 

data/spec/integration/where_spec.rb

@@ -94,6 +94,36 @@ RSpec.describe '.where' do
     end
   end
 
+  describe 'with an empty response' do
+    let(:response_body) do
+      {
+        data: []
+      }
+    end
+
+    let!(:expected_request) do
+      mock_request = stub_request(:get, 'https://www.example.com/posts.json')
+      mock_request.with(query: { pseudonym: 'pseudonym' }, body: nil, headers: expected_default_headers)
+      mock_request.to_return(status: 200, body: response_body.to_json)
+      mock_request
+    end
+
+    it 'performs the correct HTTP GET request' do
+      Post.where({ pseudonym: 'pseudonym' })
+      expect(expected_request).to have_been_requested
+    end
+
+    it 'builds the correct collection of resources' do
+      posts = Post.where({ pseudonym: 'pseudonym' })
+
+      aggregate_failures do
+        expect(posts).to respond_to :each
+        expect(posts.to_a).to eql []
+        expect(posts.size).to eql 0
+      end
+    end
+  end
+
   describe 'with a 404 response' do
     let!(:expected_request) do
       mock_request = stub_request(:get, 'https://www.example.com/posts.json')

data/spec/lib/remote_resource/builder_spec.rb

@@ -144,11 +144,11 @@ RSpec.describe RemoteResource::Builder do
     end
 
     context 'when the given collection is NOT an Array' do
-      it 'returns nil' do
+      it 'returns an empty Array' do
         aggregate_failures do
-          expect(dummy_class.build_collection(nil)).to be_nil
-          expect(dummy_class.build_collection({})).to be_nil
-          expect(dummy_class.build_collection('')).to be_nil
+          expect { dummy_class.build_collection(nil) }.to raise_error(ArgumentError, '`collection` must be an Array')
+          expect { dummy_class.build_collection({}) }.to raise_error(ArgumentError, '`collection` must be an Array')
+          expect { dummy_class.build_collection('') }.to raise_error(ArgumentError, '`collection` must be an Array')
         end
       end
     end

data/spec/lib/remote_resource/response_spec.rb

@@ -141,6 +141,14 @@ RSpec.describe RemoteResource::Response do
       end
     end
 
+    context 'when the parsed response body is an empty Array' do
+      let(:connection_response) { Typhoeus::Response.new(mock: true, code: 200, body: [].to_json, headers: { 'Content-Type' => 'application/json', 'Server' => 'nginx/1.4.6 (Ubuntu)' }) }
+
+      it 'returns an empty Array' 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)' }) }
 

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.1' }
+  it { is_expected.to eql '1.0.2' }
 end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddy_remote_resource
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Jan van der Pas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-07 00:00:00.000000000 Z
+date: 2017-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler