shutl_resource 1.5.2 → 1.5.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzQzZjljYzZjYmY0MjVkMmEzZTFmODIyMDU2N2UyMzQwN2I3YmVkOA==
+    MGEwZDkwNmM0YzExYmFjYTc1ZGFmMmE3Y2JhOWQzYzFkODk2MmYyMQ==
   data.tar.gz: !binary |-
-    ZDRmODZkZTMxMWI1MjA5NWUxMzEwN2U4ZDRjODE3OGIyOWZjMGYxZA==
+    Zjg2NzY5YjU0NTYyMWRmZjM5YTg5MDQ1NTIxZWU5ZjVkNmNlNDljOQ==
 SHA512:
   metadata.gz: !binary |-
-    ZTgwMDY2ODUyN2E4ZGM1Y2ZkNGRjNGRkYzcxNmM4ZTAwMDRmYjhlMDI4OWUz
-    MmRjMDc3MGYyMzFhN2I3ZWVlOTkzYmFlNTQ1NDZjNjc3NjQ3ZWEyNzk3ZWNh
-    ZTEwYjdhNDc2OTgwMTkxOGRiNDAwYmJlYjhlZjkwOTY5NWYwZjY=
+    MjY2ZTk3ZmY4NWJhYzk2YjE0NThiNzFiYTkyOTBmMTQ3ODk4YjBhYzcxYWFl
+    Yzk2MTJkNWVjYWE2YTM0N2FlMTkwYmUyZjMyODkwOWM2NzI5MWY2ZGY0N2Ri
+    ZjcxZGQ1ODFmNjU4Y2I5MDk5YzI5OTgwZjNhOGY3MTFiNGQ4MDM=
   data.tar.gz: !binary |-
-    OGZhMDY5NDZkMDA2MDAzMDAyNTBiYTIzZWQyZGFiZWM1N2QyZTY1MzQzNDI5
-    OTZjOWE0Mjg4N2I5NjNjNTM2ZjYyNGExODcxZGQ1OTExNzU2NThlNWJjYmVk
-    Zjk1MTY0NGNhMDhjM2QyYTkwYWI2NTQ5Y2JkZTdlOGU1YTk5MjE=
+    ZDNiYjg1YzM0ZTM5NDBjZTI0ODE5ZjIyZTU5NTFmZjgxMjFlMmJhYjM3MTY0
+    N2U2MjAwNTg4NjVkZTlkNzM0YzhkODg5MmFjMTVjZjg0YWIxOGIwZDNiMmJl
+    ZmFkMDNmZTQyNzBjMDllMDhiMjYzMDllZDdmNmNjZmEwODVjODQ=

data/lib/shutl/resource/errors.rb

@@ -10,16 +10,15 @@ end
 # The correct solution to this would be to remove this exception from the gem
 # and handle specifically in a QuoteCollection resource in for example the
 # 'shutl' gem.
-Shutl::NoQuotesGenerated  = Class.new Shutl::Resource::Error
-
-Shutl::BadRequest         = Class.new Shutl::Resource::Error
-Shutl::UnauthorizedAccess = Class.new Shutl::Resource::Error
-Shutl::ForbiddenAccess    = Class.new Shutl::Resource::Error
-Shutl::ResourceNotFound   = Class.new Shutl::Resource::Error
-Shutl::ResourceConflict   = Class.new Shutl::Resource::Error
-Shutl::ResourceGone       = Class.new Shutl::Resource::Error
-Shutl::ResourceInvalid    = Class.new Shutl::Resource::Error
-Shutl::ServerError        = Class.new Shutl::Resource::Error
-Shutl::ServiceUnavailable = Class.new Shutl::Resource::Error
-
-
+unless Shutl.const_defined?('NoQuotesGenerated')
+  Shutl::NoQuotesGenerated  = Class.new Shutl::Resource::Error
+  Shutl::BadRequest         = Class.new Shutl::Resource::Error
+  Shutl::UnauthorizedAccess = Class.new Shutl::Resource::Error
+  Shutl::ForbiddenAccess    = Class.new Shutl::Resource::Error
+  Shutl::ResourceNotFound   = Class.new Shutl::Resource::Error
+  Shutl::ResourceConflict   = Class.new Shutl::Resource::Error
+  Shutl::ResourceGone       = Class.new Shutl::Resource::Error
+  Shutl::ResourceInvalid    = Class.new Shutl::Resource::Error
+  Shutl::ServerError        = Class.new Shutl::Resource::Error
+  Shutl::ServiceUnavailable = Class.new Shutl::Resource::Error
+end

data/lib/shutl/resource/rest_class_methods.rb

@@ -323,7 +323,7 @@ module Shutl::Resource
       args, url = replace_args_from_pattern! args, url
 
       url = URI.escape url
-      params = params.except(:headers, :auth, :from)
+      params = params.except(:headers, :auth, :from, 'headers', 'auth', 'from')
       unless params.empty?
         url += '?' + params.entries.map do |key, value|
           URI::encode "#{key}=#{value}"

data/lib/shutl/resource/version.rb

@@ -1,5 +1,5 @@
 module Shutl
   module Resource
-    VERSION = '1.5.2'
+    VERSION = '1.5.3'
   end
 end

data/spec/remote_url_spec.rb

@@ -80,6 +80,24 @@ describe Shutl::Resource::Rest do
         request.should have_been_requested
       end
 
+      it 'should not send the auth param' do
+        request = stub_request(:get, 'http://host/nested/10/resources?arg1=val1&arg2=val2').
+          to_return(body: '{"nested_resources": []}', headers: headers)
+
+        NestedResource.all(parent_id: 10, arg1: 'val1', arg2: 'val2', auth: 'token')
+
+        request.should have_been_requested
+      end
+
+      it 'should not send the auth param with an indexed by string hash' do
+        request = stub_request(:get, 'http://host/nested/10/resources?arg1=val1&arg2=val2').
+          to_return(body: '{"nested_resources": []}', headers: headers)
+
+        NestedResource.all('parent_id' => 10, 'arg1' => 'val1', 'arg2' => 'val2', 'auth' => 'token')
+
+        request.should have_been_requested
+      end
+
       it 'should support the params with invalid uri name' do
         request = stub_request(:get, 'http://host/nested/10/resources?arg1=val1&arg%2B2=val2').
           to_return(body: '{"nested_resources": []}', headers: headers)

data/spec/rest_resource_spec.rb

@@ -485,14 +485,4 @@ describe Shutl::Resource::Rest do
          subject.respond_to?(:foo).should be_false
       end
     end
-
-    describe 'parses successfuly a quote' do
-      let(:attrs) do
-       {"id"=>"5283836fe4b074c20bb4f4e1-1384351475", "created_at"=>"2013-11-13T13:49+00:00", "valid_until"=>"2013-11-13T14:15+00:00", "basket_value"=>999, "distance"=>12.1, "total_weight"=>nil, "time_zone"=>"America/Chicago", "merchant"=>{"id"=>"ebay_us", "name"=>"eBay US", "shutl_account_number"=>"", "notify_updates"=>true, "notification_endpoint"=>"https://triton-alpha.ebay.com/delivery-events-qa/shutl", "hide_customer_phone_from_carrier"=>false}, "pickup_location"=>{"notes"=>"", "address"=>{"company_name"=>"eBay US", "name"=>"", "line_1"=>"929 W Belmont Ave", "line_2"=>"", "county_or_state"=>"IL", "city"=>"Chicago", "postcode"=>"60657", "country"=>"US"}, "contact"=>{"name"=>"eBay US", "email"=>"email@example.com", "phone"=>"+1 7734720500"}}, "delivery_location"=>{"address"=>{"company_name"=>"", "name"=>"Dean Chen", "line_1"=>"500 S Central Ave", "line_2"=>"", "county_or_state"=>"IL", "city"=>"Chicago", "postcode"=>"60644", "country"=>"US"}, "contact"=>{"name"=>"Dean Chen", "email"=>"zhuichen@ebay.com", "phone"=>"+1 7840536666"}}, "carrier"=>{"id"=>"united_express_systems", "name"=>"United Express Systems", "shutl_account_number"=>"", "time_zone"=>"America/Chicago", "booking_api"=>{"manual"=>false, "url"=>"http://localhost:5000", "client_key"=>"4B91C40C7480A75069790A69AE97A56A", "client_id"=>"674611e57f"}, "vehicle"=>{"id"=>"small_van", "name"=>"Small van", "reference"=>"MiniVan"}, "out_of_hours_notification"=>{}}, "times"=>{"pickup_start"=>"2013-11-13T14:15+00:00", "pickup_finish"=>"2013-11-13T17:00+00:00", "delivery_start"=>"2013-11-13T17:00+00:00", "delivery_finish"=>"2013-11-13T18:00+00:00", "delivery_sla_buffer"=>900, "sliding_amount"=>0}, "prices"=>{"merchant"=>3075, "customer"=>3075, "carrier"=>2563}, "products"=>[]}
-      end
-
-      subject { TestRest.new attrs }
-
-      its(:prices) { should_not be_empty }
-    end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shutl_resource
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - David Rouchy