api-resource 0.3.1 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a3e80d387ce02c31b964baf0af8c7b05727d567
-  data.tar.gz: 04640fa12119b4360510ce960e1f086169d193a4
+  metadata.gz: d12c1f0d2bfa63f06021846af93ce43caa9b513c
+  data.tar.gz: 988a25712ce86f55beff42464da754d2d368648f
 SHA512:
-  metadata.gz: ea767642dc77ae6826f2db89c8e3dfef7207064b7725fe230e2887f84cfd035f0d848e687d57761851d76c17ac4ae1c6871c8a050d4f16a2569ec9851e76ee54
-  data.tar.gz: 526cf4bc2c812d20e138d0e01271937b6382ea417fb43ef23dc5c5bd81b7630ba0650682631441d5c0c0721911a4739812472bf651133bc3cefcf8a74443cfa3
+  metadata.gz: 6e3d9f2c3dc5cb3a22e15f434dbfb600b6c019a7d8ca3e0b3eaf24ea6245826b989908d2dee3923d1c7b81530f2ae55ecf9101caf856089c8ee31291e750e813
+  data.tar.gz: 9a80b9bf3a460a9a4a8370d428abf75534aac82bfddac9312abd487a95132a0f96851badb696b4e566e220c34c9266829f6fcc7418e735f01a0c6b6fee0ccc25

data/lib/api-resource/resource.rb

@@ -34,7 +34,7 @@ module ApiResource
     def self.find(id)
       result = client(:get, {}, resource_name, id)
       json   = JSON.parse(result)
-      self.new(json['data'])
+      self.new(json['data'] || json)
     end
 
     def self.all
@@ -60,15 +60,23 @@ module ApiResource
           send("#{key}=", value)
         else
           # check for embedded resource
-          next unless value.is_a?(Hash) && value['data']
-          child_class = self.class.load_class((value['meta'] && value['meta']['type']) || key)
+          if value.is_a?(Hash)
+            meta = value['meta']
+            data = value['data'] || value
+          elsif value.is_a?(Array)
+            meta = nil
+            data = value
+          else
+            next
+          end
+          puts meta
+          child_class = self.class.load_class((meta && meta['type']) || key)
           next unless child_class
-          data = value['data']
           if data.is_a?(Hash)
             child_value = child_class.new(data)
             define_singleton_method(key) { child_value }
           elsif data.is_a?(Array)
-            child_values = ResourceCollection.new(data, value['meta'], child_class)
+            child_values = ResourceCollection.new(data, meta, child_class)
             define_singleton_method(key) { child_values }
           end
         end

data/lib/api-resource/version.rb

@@ -1,3 +1,3 @@
 module ApiResource
-  VERSION = '0.3.1'
+  VERSION = '0.3.5'
 end

data/spec/resource_spec.rb

@@ -19,12 +19,18 @@ RSpec.describe ApiResource::Resource do
   def check_returned_array(type, expected, actual)
     expect(actual).to be_a Enumerable
     actual.each { |e| expect(e).to be_a type }
-    expect(actual.map { |e| e.attributes }).to match (expected[:data])
+    expect(actual.map { |e| e.attributes }).to match ((expected.is_a?(Hash) && expected[:data]) || expected)
   end
 
   def check_returned_object(type, expected, actual, *except)
     expect(actual).to be_a(type)
-    expect(actual.attributes).to match(expected[:data].except(*except))
+    expect(actual.attributes).to match((expected[:data] || expected).except(*except))
+  end
+
+  def req(verb, path, resource)
+    stub_request(verb, "#{BlogResource.base_url}#{path}").
+        with(headers: { 'Accept' => 'application/json' }).
+        to_return(status: 200, body: resource.to_json)
   end
 
   before do
@@ -33,25 +39,26 @@ RSpec.describe ApiResource::Resource do
                                    { id: 38, title: 'Bonjour!' }] }
   end
   context '#find' do
-
-    it 'creates the resource when found' do
-      expected_value = { data: { id: 1257, title: 'Hello' } }
+    def check_found_resource(expected_value)
+      expected_value = { id: 1257, title: 'Hello' }
       resource_id    = 3
-      stub_request(:get, "#{Blog.base_url}/blogs/#{resource_id}").
-          with(headers: { 'Accept' => 'application/json' }).
-          to_return(status: 200, body: expected_value.to_json)
+      req(:get, "/blogs/#{resource_id}", expected_value)
       result = Blog.find(resource_id)
       check_returned_object(Blog, expected_value, result)
     end
+
+    it 'creates resource with data rooted json' do
+      check_found_resource(data: { id: 1257, title: 'Hello' })
+    end
+    it 'creates resource with un-rooted json' do
+      check_found_resource(id: 1257, title: 'Hello')
+    end
   end
 
   context '#all' do
 
     it 'fetches all resources' do
-      stub_request(:get, "#{Blog.base_url}/blogs").
-          with(headers: { 'Accept' => 'application/json' }).
-          to_return(status: 200, body: @expected_resources.to_json)
-
+      req(:get, '/blogs', @expected_resources)
       result = Blog.all
       check_returned_array(Blog, @expected_resources, result)
     end
@@ -60,10 +67,7 @@ RSpec.describe ApiResource::Resource do
   context '#where' do
 
     it 'fetches resourced filtered by query string with GET' do
-      stub_request(:get, "#{Blog.base_url}/blogs?title=hello+world&tags%5B%5D=hello&tags%5B%5D=first&tags%5B%5D=greeting").
-          with(headers: { 'Accept' => 'application/json' }).
-          to_return(status: 200, body: @expected_resources.to_json)
-
+      req(:get, '/blogs?title=hello+world&tags%5B%5D=hello&tags%5B%5D=first&tags%5B%5D=greeting', @expected_resources)
       result = Blog.where(title: 'hello world', tags: ['hello', 'first', 'greeting'])
       check_returned_array(Blog, @expected_resources, result)
     end
@@ -83,97 +87,67 @@ RSpec.describe ApiResource::Resource do
 
     it 'fetches resource nested with parent resource' do
       resource_id = 3
-
-      stub_request(:get, "#{Blog.base_url}/tags/#{resource_id}/blogs").
-          with(headers: { 'Accept' => 'application/json' }).
-          to_return(status: 200, body: @expected_resources.to_json)
-
+      req(:get, "/tags/#{resource_id}/blogs", @expected_resources)
       result = Blog.by_tag(resource_id)
       check_returned_array(Blog, @expected_resources, result)
     end
   end
 
   context '#child_ressources' do
+    before do
+      @blog          = { data: { id: 1257, title: 'Tarte a la creme' } }
+      @tags_data     = [{ id: 33, name: 'food' }, { id: 39, name: 'cuisine' }]
+      @category_data = { id: 33, name: 'Hobbies' }
+    end
     context 'has_many' do
-      it 'defines a method and parses resources from inlined json array' do
-        resource_values = { data: {
-            id:   1257, title: 'Tarte a la creme',
-            tags: { data: [{ id: 33, name: 'food' }, { id: 39, name: 'cuisine' }] }
-        } }
+      def check_has_many(relation_name, relation_values)
+        resource_values = @blog.merge(data: { relation_name => relation_values })
         resource_id     = 3
-
-        stub_request(:get, "#{Blog.base_url}/blogs/#{resource_id}").
-            with(headers: { 'Accept' => 'application/json' }).
-            to_return(status: 200, body: resource_values.to_json)
-
+        req(:get, "/blogs/#{resource_id}", resource_values)
         blog = Blog.find(resource_id)
-        check_returned_object(Blog, resource_values, blog, :tags)
-        check_returned_array(Tag, resource_values[:data][:tags], blog.tags)
+        check_returned_object(Blog, resource_values, blog, relation_name)
+        expect(blog).to respond_to(relation_name)
+        check_returned_array(Tag, relation_values, blog.send(relation_name))
+        yield blog if block_given?
       end
 
-      it 'override type and retrieve meta info' do
-        resource_values = {
-            data: {
-                id:            1257,
-                title:         'Tarte a la creme',
-                my_sweet_tags: {
-                    data: [{ id: 33, name: 'food' }, { id: 39, name: 'cuisine' }],
-                    meta: { type: :tags, page: 3, per_page: 50, total: 102 }
-                }
-            }
-        }
-        resource_id     = 3
-
-        stub_request(:get, "#{Blog.base_url}/blogs/#{resource_id}").
-            with(headers: { 'Accept' => 'application/json' }).
-            to_return(status: 200, body: resource_values.to_json)
-
-        blog = Blog.find(resource_id)
-        check_returned_object(Blog, resource_values, blog, :my_sweet_tags)
-        check_returned_array(Tag, resource_values[:data][:my_sweet_tags], blog.my_sweet_tags)
-
-        expect(blog.my_sweet_tags.page).to eq(3)
-        expect(blog.my_sweet_tags.per_page).to eq(50)
-        expect(blog.my_sweet_tags.total).to eq(102)
+      it 'gets data rooted inlined array' do
+        check_has_many(:tags, data: @tags_data)
+      end
+      it 'gets un-rooted inlined array' do
+        check_has_many(:tags, @tags_data)
       end
-    end
-
-    it 'has_one association with inlined json' do
-      resource_values = { data: {
-          id:       1257, title: 'Tarte a la creme',
-          category: { data: { id: 33, name: 'Hobbies' } }
-      } }
-      resource_id     = 3
-
-      stub_request(:get, "#{Blog.base_url}/blogs/#{resource_id}").
-          with(headers: { 'Accept' => 'application/json' }).
-          to_return(status: 200, body: resource_values.to_json)
 
-      blog = Blog.find(resource_id)
-      check_returned_object(Blog, resource_values, blog, :category)
-      check_returned_object(Category, resource_values[:data][:category], blog.category)
+      it 'override type with meta.type and retrieve other meta.* info' do
+        check_has_many(:my_sweet_tags,
+                       data: [{ id: 33, name: 'food' }, { id: 39, name: 'cuisine' }],
+                       meta: { type: :tags, page: 3, per_page: 50, total: 102 }) do |blog|
+          expect(blog.my_sweet_tags.page).to eq(3)
+          expect(blog.my_sweet_tags.per_page).to eq(50)
+          expect(blog.my_sweet_tags.total).to eq(102)
+        end
+      end
     end
+    context 'has_one' do
+      def check_has_one(relation_name, relation_values)
+        resource_values = @blog.merge(data: { relation_name => relation_values })
+        resource_id     = 3
+        req(:get, "/blogs/#{resource_id}", resource_values)
+        blog = Blog.find(resource_id)
+        check_returned_object(Blog, resource_values, blog, relation_name)
+        expect(blog).to respond_to(relation_name)
+        check_returned_object(Category, relation_values, blog.send(relation_name))
+      end
 
-    it 'override type from meta' do
-      resource_values = {
-          data: {
-              id:            1257,
-              title:         'Tarte a la creme',
-              main_category: {
-                  data: { id: 33, name: 'Hobbies' },
-                  meta: { type: :category }
-              }
-          }
-      }
-      resource_id     = 3
-
-      stub_request(:get, "#{Blog.base_url}/blogs/#{resource_id}").
-          with(headers: { 'Accept' => 'application/json' }).
-          to_return(status: 200, body: resource_values.to_json)
-
-      blog = Blog.find(resource_id)
-      check_returned_object(Blog, resource_values, blog, :main_category)
-      check_returned_object(Category, resource_values[:data][:main_category], blog.main_category)
+      it 'gets data rooted inlined json' do
+        check_has_one(:category, data: @category_data)
+      end
+      it 'gets un-rooted inlined json' do
+        check_has_one(:category, @category_data)
+      end
+      it 'override type from meta' do
+        check_has_one(:main_category, data: { id: 33, name: 'Hobbies' }, meta: { type: :category })
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: api-resource
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.5
 platform: ruby
 authors:
 - Chaker Nakhli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple-hmac