shutl_resource 1.5.1 → 1.5.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzAyN2EwMWRhNjYwOWUxYjIzNWYwZWY0ZDcyZWI4YTlhOWVlNDZhZA==
+    MzQzZjljYzZjYmY0MjVkMmEzZTFmODIyMDU2N2UyMzQwN2I3YmVkOA==
   data.tar.gz: !binary |-
-    ZmQ3MGQ0ZTY2MWFjNGYzMjlmM2FjMjg0ZjAxYTE2ZjM5ZDYxZDM0Mg==
+    ZDRmODZkZTMxMWI1MjA5NWUxMzEwN2U4ZDRjODE3OGIyOWZjMGYxZA==
 SHA512:
   metadata.gz: !binary |-
-    OTIzN2YyYzI0ZWU4YTNhYWZlYzc0ZTU1MDE2MGQ3MDkzYjk5MzM2ZDVhNjNm
-    ZGM2MWNlNzRjZGQ4YmQzNWRlOGQ3ZDgyZWFhNTE1YmNkMTk5MTY5YjY0ZDgw
-    MTY2OTQyZDJhNzI3YjdkY2E0ODhlYWRlMmZjYjU0MDE3N2Y0ZjE=
+    ZTgwMDY2ODUyN2E4ZGM1Y2ZkNGRjNGRkYzcxNmM4ZTAwMDRmYjhlMDI4OWUz
+    MmRjMDc3MGYyMzFhN2I3ZWVlOTkzYmFlNTQ1NDZjNjc3NjQ3ZWEyNzk3ZWNh
+    ZTEwYjdhNDc2OTgwMTkxOGRiNDAwYmJlYjhlZjkwOTY5NWYwZjY=
   data.tar.gz: !binary |-
-    NmQwYWY0MWJkMGEzZjcxYWI5NjNlMjEzNDdiMThmNGU1N2IxODYzZGY1ZTRl
-    NDhjZmE1NmYwOTI0YzFjZDlmMWVhOTJhOWM2ZTFjYzYyOGIzNjM1ZGZjMzUw
-    MTQzOTQxYWY1MzQwMmI5ZGZkY2YyNjMwMzAxYTIyODdiMTBiMzE=
+    OGZhMDY5NDZkMDA2MDAzMDAyNTBiYTIzZWQyZGFiZWM1N2QyZTY1MzQzNDI5
+    OTZjOWE0Mjg4N2I5NjNjNTM2ZjYyNGExODcxZGQ1OTExNzU2NThlNWJjYmVk
+    Zjk1MTY0NGNhMDhjM2QyYTkwYWI2NTQ5Y2JkZTdlOGU1YTk5MjE=

data/lib/shutl/resource/rest.rb

@@ -23,26 +23,26 @@ module Shutl::Resource
     end
 
     def as_json(_)
-      attributes
+      resource_attributes
     end
 
     def to_json(options = nil)
       {
-        :"#{prefix}" => attributes
+        :"#{prefix}" => resource_attributes
       }.to_json(options)
     end
 
     def update_attributes(attrs)
       attrs.each do |a, v|
-        unless String(a) == 'id' && attributes.include?('id')
+        unless String(a) == 'id' && resource_attributes.include?('id')
           a = 'id' if String(a) == 'new_id'
-          attributes.update String(a) => v
+          resource_attributes[String(a)] = v
         end
       end
     end
 
     def update!(attrs, headers = {})
-      new_attributes = attributes.merge attrs
+      new_attributes = resource_attributes.merge attrs
       update_attributes(self.class.add_resource_id_to new_attributes)
       save(headers)
     end
@@ -56,12 +56,13 @@ module Shutl::Resource
     end
 
     def method_missing(method, *args, &block)
-        return attributes[String(args.first)] if method.to_s == '[]'
-        attributes.fetch(String(method)) { super }
+        return resource_attributes['id'] if String(method) == 'id'
+        return resource_attributes[String(args.first)] if method.to_s == '[]'
+        resource_attributes.fetch(String(method)) { super }
     end
 
     def respond_to? method
-      attributes.has_key?(String(method)) ? true : super
+        resource_attributes.has_key?(String(method)) ? true : super
     end
 
     def next_resource
@@ -77,11 +78,18 @@ module Shutl::Resource
     end
 
     def resource_id
-      instance_variable_get :"@#{self.class.resource_id_name}"
+      self.instance_variable_get :"@#{self.class.resource_id_name}"
     end
 
     def attributes
-      @attributes ||= {}
+      resource_attributes
+    end
+
+    def resource_attributes
+      unless self.instance_variables.include?(:@resource_attributes)
+        self.instance_variable_set(:@resource_attributes, {})
+      end
+      self.instance_variable_get :@resource_attributes
     end
 
     protected

data/lib/shutl/resource/version.rb

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

data/spec/rest_resource_spec.rb

@@ -38,6 +38,10 @@ describe Shutl::Resource::Rest do
         resource.a.should == 'a'
         resource.b.should == 2
       end
+
+      it 'always responsd to id even if there is no attribute' do
+        resource.id.should be_nil
+      end
     end
 
     context 'pagination' do
@@ -481,4 +485,14 @@ 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.1
+  version: 1.5.2
 platform: ruby
 authors:
 - David Rouchy