api-resource 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db46a506b98a3f2140ff615dabe2e4fe147c683b
-  data.tar.gz: d4b4d7176000df6b5467cd3b02b291732e81b346
+  metadata.gz: 1b43230ab4592f487f3ced50d5148946ad42811c
+  data.tar.gz: bf945dbe477665f5ae40e0e8a8d40416d14b7952
 SHA512:
-  metadata.gz: 04d9e92da052db48f4208748f128f32bb999278efd4c289d9434ab2947418bc0d7f656e82d34954a26ff3e4b2acf2cb73a0a7577a31ef4340a32dd84b858f719
-  data.tar.gz: 6b03d44984962528ec13cc08bbdd7aa1d69af6b3e887bf9fcb59fc0f9ccb337163c08bc442ddfb06d67ebb5746b268185b34eee1becd0ee09f2007f96acbcbc7
+  metadata.gz: d78d747c15f45145f9f4cc89b5816f4973a1cba477b08ad5479af57c4fdfb10ae4f7f4a9df0da23bcb4156d90a2ac9faca3c85372de58df6f0fff74798a8d46e
+  data.tar.gz: 201e9c121ab99db3182c3f76941e5c8689c9153b69a3c69d63c1fa0745fc7702bf2cdf137a397672447ded96b76cee3215b0f4eeb839b10a9eba8c3149c907a3

data/lib/api-resource/resource.rb

@@ -60,23 +60,23 @@ module ApiResource
       self.class.resource_path = path
     end
 
-    def self.find(id, options={})
-      result = client(:get, options, resource_path, id)
+    def self.find(id, params={})
+      result = client(:get, params, resource_path, id)
       json   = JSON.parse(result)
       self.new(json['data'] || json)
     end
 
-    def self.all(method=:get)
-      self.where({}, method)
+    def self.all
+      self.where({})
     end
 
-    def self.all_pages(options={})
-      options  = { page: 1, per_page: default_per_page }.merge(options)
-      per_page = options[:per_page].to_i
-      page     = options[:page].to_i
+    def self.all_pages(params={})
+      params  = { page: 1, per_page: default_per_page }.merge(params)
+      per_page = params[:per_page].to_i
+      page     = params[:page].to_i
       begin
-        options[:page] = page
-        result         = self.where(options)
+        params[:page] = page
+        result         = self.where(params)
         total_count    = result.try :total_count
         arr            = result.to_a
         count          = arr.length
@@ -85,8 +85,8 @@ module ApiResource
       end while true
     end
 
-    def self.where(options, method=:get)
-      result = client(method, options, resource_path)
+    def self.where(params)
+      result = client(:get, params, resource_path)
       create_resource_collection(result)
     end
 
@@ -110,7 +110,7 @@ module ApiResource
     end
 
     def destroy!(options={})
-      self.submit_resource(resource_path, false, options[:id_attr], :delete)
+      submit_resource(resource_path, false, options[:id_attr], :delete)
       self
     end
 
@@ -162,9 +162,9 @@ module ApiResource
     def self.method_missing(m, *args, &_)
       case (m)
         when /^by_(.+)/
-          resource_path = self.resource_path
+          resource_path = build_url($1.pluralize, args[0], self.resource_path)
           Class.new(self) do
-            self.resource_path = build_url($1.pluralize, args[0], resource_path)
+            self.resource_path = resource_path
           end
         else
           super
@@ -174,13 +174,23 @@ module ApiResource
     def method_missing(m, *args, &_)
       case m
         when /^by_(.+)/
-          begin
-            original_path      = resource_path
-            self.resource_path = self.class.build_url($1, args[0], resource_path)
-            yield(self) if block_given?
-          ensure
-            self.resource_path = original_path
-          end
+          resource_path = self.class.build_url($1.pluralize, args[0], self.resource_path)
+          Class.new do
+            def initialize(proxied, resource_path)
+              @proxied = proxied
+              @resource_path = resource_path
+            end
+
+            def method_missing(m, *args, &block)
+              begin
+                old_resource_path = @proxied.resource_path
+                @proxied.resource_path = @resource_path
+                @proxied.public_send(m, *args, &block)
+              ensure
+                @proxied.resource_path = old_resource_path
+              end
+            end
+          end.new(self, resource_path)
         else
           super
       end

data/lib/api-resource/version.rb

@@ -1,3 +1,3 @@
 module ApiResource
-  VERSION = '0.6.1'
+  VERSION = '0.7.0'
 end

data/spec/resource_spec.rb

@@ -20,23 +20,6 @@ RSpec.describe ApiResource::Resource do
     end
   end
 
-  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.is_a?(Hash) && expected[:data]) || expected)
-  end
-
-  def check_returned_object(type, expected, actual, *except)
-    expect(actual).to be_a(type)
-    expect(actual.try(:attributes) || actual).to match((expected[:data] || expected).except(*except))
-  end
-
-  def req(verb, path, resource, status=200, params=nil)
-    stub_request(verb, "#{BlogApi::Resource.base_url}#{path}").
-        with(headers: { 'Accept' => 'application/json' }, body: params).
-        to_return(status: status, body: resource.is_a?(String) || resource.blank? ? resource : resource.to_json)
-  end
-
   before do
     @expected_resources = { data: [{ id: 1257, title: 'Hello' },
                                    { id: 33, title: 'World' },
@@ -65,7 +48,7 @@ RSpec.describe ApiResource::Resource do
 
   context '::find' do
     let(:blog_attrs) { { id: 1257, title: 'Hello' } }
-    let(:extra_params) { { foo: 3, bar: 'baz' }}
+    let(:extra_params) { { foo: 3, bar: 'baz' } }
 
     def check_found_resource(returned_data, extra_params={})
       resource_id = blog_attrs[:id]
@@ -77,7 +60,7 @@ RSpec.describe ApiResource::Resource do
 
     it 'creates resource from data rooted json' do
       check_found_resource(data: blog_attrs)
-      check_found_resource({data: blog_attrs}, extra_params)
+      check_found_resource({ data: blog_attrs }, extra_params)
     end
 
     it 'creates resource from un-rooted json' do
@@ -96,20 +79,10 @@ RSpec.describe ApiResource::Resource do
   end
 
   context '::where' do
-
+    let(:query_params) { { title: 'hello world', tags: ['hello', 'first', 'greeting'] } }
     it 'fetches resourced filtered by query string with GET' do
-      req(:get, '/blogs?title=hello+world&tags%5B%5D=hello&tags%5B%5D=first&tags%5B%5D=greeting', @expected_resources)
-      result = BlogApi::Blog.where(title: 'hello world', tags: ['hello', 'first', 'greeting'])
-      check_returned_array(BlogApi::Blog, @expected_resources, result)
-    end
-
-    it 'fetches resources filtered by query string with POST' do
-      stub_request(:post, "#{BlogApi::Blog.base_url}/blogs").
-          with(headers: { 'Accept' => 'application/json', 'Content-Type' => 'application/x-www-form-urlencoded' },
-               body:    'title=hello%20world&tags[]=hello&tags[]=first&tags[]=greeting').
-          to_return(status: 200, body: @expected_resources.to_json)
-
-      result = BlogApi::Blog.where({ title: 'hello world', tags: ['hello', 'first', 'greeting'] }, :post)
+      req(:get, "/blogs?#{query_params.to_param}", @expected_resources)
+      result = BlogApi::Blog.where(query_params)
       check_returned_array(BlogApi::Blog, @expected_resources, result)
     end
 
@@ -241,7 +214,7 @@ RSpec.describe ApiResource::Resource do
         user_id        = 'ux345'
 
         stub     = req(:post, "/users/#{user_id}/blogs", expected_value, 201, blog_attrs.except(:id))
-        returned = blog.by_users(user_id, &:save!)
+        returned = blog.by_user(user_id).save!
         check_returned_object(BlogApi::Blog, expected_value, blog)
         expect(returned).to eq(blog)
         expect(blog.id).to eq(blog_id)
@@ -253,7 +226,7 @@ RSpec.describe ApiResource::Resource do
         user_id = 'ux345'
 
         stub     = req(:put, "/users/#{user_id}/blogs/#{blog_id}", nil, 204, blog_attrs.except(:id))
-        returned = blog.by_users(user_id, &:save!)
+        returned = blog.by_user(user_id).save!
         expect(returned).to eq(blog)
         expect(blog.id).to eq(blog_id)
         expect(stub).to have_been_requested
@@ -285,7 +258,7 @@ RSpec.describe ApiResource::Resource do
     end
 
     let(:sign_up_data) { { email: 'user@example.com', password: 'pass', password_confirmation: 'pass', name: 'Joe' } }
-    let (:sign_up) { SignUp.new(sign_up_data) }
+    let(:sign_up) { SignUp.new(sign_up_data) }
 
     before do
 

data/spec/spec_helper.rb

@@ -86,3 +86,23 @@ RSpec.configure do |config|
   # as the one that triggered the failure.
   Kernel.srand config.seed
 end
+
+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.is_a?(Hash) && expected[:data]) || expected)
+end
+
+def check_returned_object(type, expected, actual, *except)
+  expect(actual).to be_a(type)
+  expect(actual.try(:attributes) || actual).to match((expected[:data] || expected).except(*except))
+end
+
+def req(method, path, returned_resource, status=200, params=nil)
+  response_body = returned_resource.is_a?(String) || returned_resource.blank? ?
+      returned_resource :
+      returned_resource.to_json
+  stub_request(method, "#{BlogApi::Resource.base_url}#{path}").
+      with(headers: { 'Accept' => 'application/json' }, body: params).
+      to_return(status: status, body: response_body)
+end

metadata

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