rest_api 0.1.1 → 0.1.2

data/README.md

@@ -266,13 +266,17 @@ And you have a RESTful url like this:
 
 *http://www.myapiurl.com/categories/2/categories*
 
-That allows you to get/post/put/delete the child categories of category 2. But if you try to do: 
+That allows you to get/post/put/delete the child categories of category 2. And if you try to do: 
 
 ```ruby
 RestApi.request.get_categories_in_categories(2)
 ```
 
-or
+It will be OK and will make a GET to:
+
+*http://www.myapiurl.com/categories/2/categories/*
+
+But if you try:
 
 ```ruby
 RestApi.request.get_categories_in_categories(:resources_params => {:categories => 2})
@@ -282,7 +286,7 @@ It will make a GET to:
 
 *http://www.myapiurl.com/categories/2/categories/2*
 
-Because the resources params arguments are linked to a resource name defined in the method call.  
+Because the resources params arguments are linked to the resource name defined in the method call.  
 
 You can turn this aroud by defining a request method and mapping the resources like this:
 

data/lib/rest_api/api/request_parser.rb

@@ -44,31 +44,32 @@ module RestApi
         end
 
         def insert_resources_params_in_tokens_array(tokens_array, resources_params)
-          resources_params_hash = {}
-          tokens_array_copy = Array.new tokens_array #copy so the original remains intact
+
+          # copy so the original remains intact (because tokens_array is a pointer)
+          tokens_array_copy = Array.new tokens_array 
+          params_insert_positions = Array.new
 
           if resources_params.is_a?(Hash)
-            resources_params_hash = resources_params
+            tokens_array_copy.each_with_index do |token, index|
+              params_insert_positions <<  {  
+                                            :param => resources_params[token.to_sym], 
+                                            :position => (index + 1)
+                                          } if resources_params.has_key? token.to_sym
+            end
           else  
-            tokens_array_copy.each_with_index do |token, index| 
-              resources_params_hash[token.to_sym] = resources_params[index] unless resources_params[index].nil?
+            resources_params.each_with_index do |param, index| 
+              params_insert_positions <<  {  
+                                            :param => param, 
+                                            :position => (index + 1)
+                                          } if (index + 1) <= tokens_array.length
             end
           end
 
-          params_insert_positions = Array.new
-          tokens_array_copy.each_with_index do |token, index|
-            params_insert_positions <<  {  
-                                          :param => resources_params_hash[token.to_sym], 
-                                          :position => (index + 1)
-                                        } if resources_params_hash.has_key? token.to_sym
-          end
-
           params_insert_positions.inject(0) do |insert_offset,insert_position_hash|
             insert_position = insert_position_hash[:position] + insert_offset
             tokens_array_copy.insert(insert_position, insert_position_hash[:param].to_s)
             insert_offset + 1
           end
-
           tokens_array_copy
         end
 

data/lib/rest_api/version.rb

@@ -1,3 +1,3 @@
 module RestApi
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/rest_api/api/request_parser_spec.rb

@@ -174,6 +174,27 @@ describe "RestApi::API - url_parser" do
       tokens_array = ["usuarios", "eventos", "carros", "festas"]
       RestApi.api::RequestParser.send(:insert_resources_params_in_tokens_array, tokens_array, [1,2,4]).should be == ["usuarios", "1", "eventos", "2", "carros", "4", "festas"]
     end
+
+    it "should accept params as an array - resources with same name" do 
+      tokens_array = ["usuarios", "usuarios"]
+      RestApi.api::RequestParser.send(:insert_resources_params_in_tokens_array, tokens_array, [1]).should be == ["usuarios", "1", "usuarios"]
+    end
+
+
+    it "should accept params as an array - ignore extra params" do 
+      tokens_array = ["usuarios", "usuarios"]
+      RestApi.api::RequestParser.send(:insert_resources_params_in_tokens_array, tokens_array, [1,5,6,7]).should be == ["usuarios", "1", "usuarios", "5"]
+    end
+
+    it "should accept params as an array - resources with same name case 2" do 
+      tokens_array = ["usuarios", "usuarios", "usuarios"]
+      RestApi.api::RequestParser.send(:insert_resources_params_in_tokens_array, tokens_array, [1]).should be == ["usuarios", "1", "usuarios", "usuarios"]
+    end
+
+    it "should accept params as an array - resources with same name case 3" do 
+      tokens_array = ["usuarios", "usuarios", "usuarios"]
+      RestApi.api::RequestParser.send(:insert_resources_params_in_tokens_array, tokens_array, [1,6]).should be == ["usuarios", "1", "usuarios", "6", "usuarios"]
+    end
   end
 
   describe "pluralize_resource" do 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest_api
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors: