rest-in-peace 1.1.1 → 1.2.0

data/README.md

@@ -87,8 +87,8 @@ class Resource
   end
 end
 
-resource = Resource.find(1) # calls "GET /rip/1"
-resource = Resource.find_on_other(42, 1337) # calls "GET /other/42/rip/1337"
+resource = Resource.find(id: 1) # calls "GET /rip/1"
+resource = Resource.find_on_other(other_id: 42, id: 1337) # calls "GET /other/42/rip/1337"
 ```
 
 #### Pagination

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.2.0

data/lib/rest_in_peace/definition_proxy/collection_method_definitions.rb

@@ -10,19 +10,8 @@ module RESTinPeace
 
       def get(method_name, url_template, default_params = {})
         @target.rip_registry[:collection] << { method: :get, name: method_name, url: url_template }
-        @target.send(:define_singleton_method, method_name) do |*args|
-          if args.last.is_a?(Hash)
-            params = default_params.merge(args.pop)
-          else
-            params = default_params.dup
-          end
-
-          if args.any?
-            tokens = RESTinPeace::TemplateSanitizer.new(url_template, {}).tokens
-            tokens.each do |token|
-              params.merge!(token.to_sym => args.shift)
-            end
-          end
+        @target.send(:define_singleton_method, method_name) do |given_params|
+          params = default_params.merge(given_params)
 
           call = RESTinPeace::ApiCall.new(api, url_template, self, params)
           call.extend(params.delete(:paginate_with)) if params[:paginate_with]

data/spec/rest_in_peace/definition_proxy/collection_method_definitions_spec.rb

@@ -41,7 +41,7 @@ describe RESTinPeace::DefinitionProxy::CollectionMethodDefinitions do
           expect(api_call_double).to_not receive(:extend)
 
           subject.get(:find, '/a/:id', default_params)
-          target.find(1)
+          target.find(id: 1)
         end
       end
 
@@ -50,30 +50,12 @@ describe RESTinPeace::DefinitionProxy::CollectionMethodDefinitions do
           expect(api_call_double).to receive(:extend)
 
           subject.get(:find, '/a/:id', default_params.merge(paginate_with: Module))
-          target.find(1)
+          target.find(id: 1)
         end
       end
 
       describe 'parameter and arguments handling' do
-        it 'converts the parameters' do
-          expect(RESTinPeace::ApiCall).to receive(:new).
-            with(target.api, '/a/:id', target, {id: 1}).
-            and_return(api_call_double)
-
-          subject.get(:find, '/a/:id', default_params)
-          target.find(1)
-        end
-
-        it 'handles mixed parameters' do
-          expect(RESTinPeace::ApiCall).to receive(:new).
-            with(target.api, '/a/:id', target, id: 1, embed: %w(extra_field1)).
-            and_return(api_call_double)
-
-          subject.get(:find, '/a/:id', default_params)
-          target.find(1, embed: %w(extra_field1))
-        end
-
-        it 'appends the given attributes' do
+        it 'uses the given attributes' do
           expect(RESTinPeace::ApiCall).to receive(:new).
             with(target.api, '/a', target, {name: 'daniele', last_name: 'in der o'}).
             and_return(api_call_double)
@@ -85,7 +67,7 @@ describe RESTinPeace::DefinitionProxy::CollectionMethodDefinitions do
         it 'does not modify the default params' do
           default_params = { per_page: 250 }
           subject.get(:find, '/a/:id', default_params)
-          target.find(1)
+          target.find(id: 1)
           expect(default_params).to eq({ per_page: 250 })
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest-in-peace
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors: