restful_resource 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b63bd74149e842a3d3c1593186507f226559045f
-  data.tar.gz: 2df40c1661f47a33e6db3234186e5a1aeb944818
+  metadata.gz: fa53e7f3d911a813da5c422ed9caab2cb57814b2
+  data.tar.gz: 8b94707bb2dc21e8d76cf56571a0aadee616fa9f
 SHA512:
-  metadata.gz: 7c870acbb5512f0062cbfd6f4e6169b745e700a95fe704cf7e3e6168414f4ebe5daeb48df87bdbdf8c4b4684c5eec3204d004f01ec663ec23eae5d7ceafc73e7
-  data.tar.gz: 82b50df9044b356a6d0dc1b612b101360c36261cb09ff535bec8dab895647647562610ed2446f274b3c02472901535a0db09bdb112c57a5732895688b00bc33a
+  metadata.gz: 734519cb8a122bc2e5fa5ae0a9f5dda9a4f34cd29831f0289431c968e3482e3ce086e11755f40bc7a9f67d8dc481c5848a6b8206aaba543a72081313de4cda4d
+  data.tar.gz: 02df5ab226f3368ac23ef39fdb7e23f948dc7e1ab311db4510d4015bdfb8859c5c761f9409794b393a0c5ddd01c58422bbbff867cbe48d038f58ac28d5f1499f

data/lib/restful_resource/base.rb

@@ -4,20 +4,33 @@ module RestfulResource
       @url = url
     end
 
-    def self.url(params={})
+    def self.processed_url_and_params(params={})
       url = @url
-      params.keys.each do |key|
-        url = url.gsub(':'+key.to_s, params[key].to_s)
+      other_params = params.clone
+      missing_params = []
+
+      url_params = url.scan(/:([A-Za-z][^\/]*)/).flatten
+      url_params.each do |key|
+        value = other_params.delete(key.to_sym)
+        if value.nil?
+          missing_params << key
+        else
+          url = url.gsub(':'+key.to_s, value.to_s)
+        end
       end
 
-      url_params = url.scan(/:([A-Za-z][^\/]*)/)
-      if url_params.any?
-        raise ParameterMissingError.new(url_params)
+      if missing_params.any?
+        raise ParameterMissingError.new(missing_params)
       end
 
-      url
+      [url, other_params]
     end
 
+    def self.url(params={})
+      processed_url_and_params(params).first
+    end
+
+
     def self.has_one(nested_resource_type)
       klass = nested_resource_type.to_s.camelize.safe_constantize
       klass = OpenStruct if (klass.nil? || klass.superclass != RestResource)
@@ -81,7 +94,8 @@ module RestfulResource
     end
 
     def self.all(params = {})
-      response = RestClient.get("#{url}", params: params)
+      url, other_params = processed_url_and_params(params)
+      response = RestClient.get("#{url}", params: other_params)
       paginate_response(response)
     end
 

data/lib/restful_resource/version.rb

@@ -1,3 +1,3 @@
 module RestfulResource
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/restful_resource/base_spec.rb

@@ -53,10 +53,7 @@ describe RestfulResource::Base do
 
   context "#all" do
     it "should provide a paginated result if response contains rest pagination headers" do
-      response = [{ id: 1, name: 'Arsenal'}, { id: 2, name: 'Chelsea' }].to_json 
-      allow(response).to receive(:headers) { 
-        {:links => '<http://api.carwow.co.uk/teams.json?page=6>;rel="last",<http://api.carwow.co.uk/teams.json?page=2>;rel="next"'}
-      }
+      response = response_with_page_information()
       stub_get('http://api.carwow.co.uk/teams', response)
 
       teams = Team.all
@@ -75,12 +72,27 @@ describe RestfulResource::Base do
     expect(example.surname).to eq 'Santoro'
   end
 
+  it "should use some params for the url and other for the query string" do
+    stub_get('http://api.carwow.co.uk/teams/15/players', response_with_page_information,
+             {name_like: 'Ars'})
+
+    players = Player.all(team_id: 15, name_like: 'Ars')
+  end
+
   private
   def stub_get(url, fake_response, params = {})
     expect(RestClient).to receive(:get).
                           with(url, params: params).
                           and_return(fake_response)
   end
+
+  def response_with_page_information
+    response = [{ id: 1, name: 'Arsenal'}, { id: 2, name: 'Chelsea' }].to_json 
+    allow(response).to receive(:headers) { 
+      {:links => '<http://api.carwow.co.uk/teams.json?page=6>;rel="last",<http://api.carwow.co.uk/teams.json?page=2>;rel="next"'}
+    }
+    response
+  end
 end
 
 class Team < RestfulResource::Base

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restful_resource
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - David Santoro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-06 00:00:00.000000000 Z
+date: 2014-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler