shutl_resource 1.5.4 → 1.5.5

data/lib/shutl/resource/rest_class_methods.rb

@@ -21,9 +21,8 @@ module Shutl::Resource
     end
 
     def find(args = {}, params = {})
-      params = args if @singular_resource
-
       if @singular_resource
+        params = args
         url    = singular_member_url params
       elsif !args.kind_of?(Hash)
         id   = args
@@ -196,8 +195,8 @@ module Shutl::Resource
       args
     end
 
-    def singular_member_url params={}
-      generate_url! "/#{@resource_name}", params
+    def singular_member_url params
+      generate_url! "/#{@resource_name}", {}, params
     end
 
     def member_url *args
@@ -230,10 +229,10 @@ module Shutl::Resource
         'User-Agent'    => "Shutl Resource Gem v#{Shutl::Resource::VERSION}"
       }
     end
-    
+
     def header_options params
       header_opts = params[:headers] || {}
-      header_opts.merge!(authorization: "Bearer #{params[:auth]}") if params[:auth] 
+      header_opts.merge!(authorization: "Bearer #{params[:auth]}") if params[:auth]
       header_opts.merge!(from: current_user_email(params))         if current_user_email(params)
       header_opts
     end
@@ -250,7 +249,7 @@ module Shutl::Resource
       end
     end
 
-    def header_name header_key 
+    def header_name header_key
       header_key.split(%r{\_|\-}).map {|e| e.capitalize }.join("-")
     end
 

data/lib/shutl/resource/version.rb

@@ -1,5 +1,5 @@
 module Shutl
   module Resource
-    VERSION = '1.5.4'
+    VERSION = '1.5.5'
   end
 end

data/spec/rest_resource_spec.rb

@@ -13,34 +13,54 @@ describe Shutl::Resource::Rest do
     context "with a singular resource" do
       let(:resource) { TestSingularResource.new }
 
-      before do
-        @request = stub_request(:get, 'http://host/test_singular_resource').
-          to_return(:status  => 200,
-                    :body    => '{"test_singular_resource": { "a": "a", "b": 2 }}',
-                    :headers => headers)
+      let(:response) do
+        {
+          status:  200,
+          body:    '{"test_singular_resource": { "a": "a", "b": 2 }}',
+          headers: headers
+        }
       end
 
-      it 'queries the endpoint' do
-        TestSingularResource.find(auth: "some auth")
-        @request.should have_been_requested
-      end
+      context 'without params' do
+        before do
+          @request = stub_request(:get, 'http://host/test_singular_resource').
+            with(headers: {'Authorization'=>'Bearer some auth'}).to_return(response)
+        end
 
-      it 'should parse the result of the body to create an object' do
-        resource = TestSingularResource.find(auth: "some auth")
+        it 'queries the endpoint' do
+          TestSingularResource.find(auth: "some auth")
+          @request.should have_been_requested
+        end
 
-        resource.should_not be_nil
-        resource.should be_kind_of TestSingularResource
-      end
+        it 'should parse the result of the body to create an object' do
+          resource = TestSingularResource.find(auth: "some auth")
 
-      it 'should assign the attributes based on the json returned' do
-        resource = TestSingularResource.find(auth: "some auth")
+          resource.should_not be_nil
+          resource.should be_kind_of TestSingularResource
+        end
+
+        it 'should assign the attributes based on the json returned' do
+          resource = TestSingularResource.find(auth: "some auth")
+
+          resource.a.should == 'a'
+          resource.b.should == 2
+        end
 
-        resource.a.should == 'a'
-        resource.b.should == 2
+        it 'always responsd to id even if there is no attribute' do
+          resource.id.should be_nil
+        end
       end
 
-      it 'always responsd to id even if there is no attribute' do
-        resource.id.should be_nil
+      describe 'with params' do
+        before do
+          @request = stub_request(:get, 'http://host/test_singular_resource?param=value').
+            with(headers: {'Authorization'=>'Bearer some auth'}).to_return(response)
+        end
+
+        it 'adds the params to the url' do
+          TestSingularResource.find(param: 'value', auth: 'some auth')
+          @request.should have_been_requested
+        end
       end
     end
 
@@ -385,9 +405,9 @@ describe Shutl::Resource::Rest do
 
       it "should override the email with 'from' option" do
         request = stub_request(:post, 'http://host/test_rests').with(headers: headers.merge(from: 'new@example.com')).to_return(:status => 200)
-        TestRest.create({}, from: 'new@example.com')     
+        TestRest.create({}, from: 'new@example.com')
 
-        request.should have_been_requested   
+        request.should have_been_requested
       end
 
       it "should be thread-safe" do
@@ -395,14 +415,14 @@ describe Shutl::Resource::Rest do
           sleep 0.5
           Shutl::Resource::RestClassMethods.from_user = 'thread1 user'
           stub_request(:post, 'http://host/test_rests').with(headers: headers.merge(from: 'thread1 user')).to_return(:status => 200)
-          TestRest.create     
+          TestRest.create
         end
 
         t2 = Thread.new do
           Shutl::Resource::RestClassMethods.from_user = 'thread2 user'
           sleep 1
           stub_request(:post, 'http://host/test_rests').with(headers: headers.merge(from: 'thread2 user')).to_return(:status => 200)
-          TestRest.create     
+          TestRest.create
         end
 
         t1.join; t2.join
@@ -521,7 +541,7 @@ describe Shutl::Resource::Rest do
         test_resource = TestRest.new
         test_resource.update!({a: 'a', b: 'b'}, {from: 'new@example.com'})
 
-        request.should have_been_requested   
+        request.should have_been_requested
       end
 
       it "should be thread-safe" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shutl_resource
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-18 00:00:00.000000000 Z
+date: 2014-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shutl_auth