api_resource 0.6.20 → 0.6.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2af71db2c3a963841ab839ade45d05ebb66d361d
-  data.tar.gz: 60c676ba2a79c483c9be7e4f9668eeb4e001ef90
+  metadata.gz: 36c5282462a20c9ac625c83f0c8b0c4135c459de
+  data.tar.gz: cb4fc1a93be1e17ec2e7eaa78e4e4d9206c79211
 SHA512:
-  metadata.gz: 1c1ca6670e7d3d8141dec91c9efc617084b8b97bc32f9ea7bde82f7f917fdb457dc99dae65806553a94e291b97e3f5a5186a5f05377d80c32c995c7e1dcc0a3c
-  data.tar.gz: cef0c28c031cfa715ea50ce1b892aa2e8f05ae0db52ef54eb9a97ef84d406305db60234c72ef8c939f3ae4786c9d48f94f1e8e12fa0d37a676a0b2dd037cf0bb
+  metadata.gz: b051f1d5e8e30d08560ce740386431a8ce4afe39927e79e5b2a732fd562bf307f42d08589e86cdb7b32ed2850d2108965297cb657a7096f394042e45f814675e
+  data.tar.gz: a00eb0d1a846aa56090cae8ccbae5874051647dbcb45d71428d744a6270632b7aed705648dbc82cf253b00a01708fdacf76ddc7b3c89c187ce0aaa61f87220c0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    api_resource (0.6.19)
+    api_resource (0.6.20)
       activemodel
       colorize
       differ
@@ -40,7 +40,7 @@ GEM
     activesupport (3.2.10)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    arel (3.0.3)
+    arel (3.0.2)
     builder (3.0.4)
     byebug (2.3.0)
       columnize (~> 0.3.6)

data/lib/api_resource/associations/association_proxy.rb

@@ -24,7 +24,13 @@ module ApiResource
 
         id_method_name = self.foreign_key_name(assoc_name)
         associated_class = opts[:class_name] || assoc_name.to_s.classify
+        remote_proxy = false
 
+        # This is a terrible hack to hold us over until
+        # we have a real association system
+        if self.name.demodulize =~ /RemoteObjectProxy$/
+          remote_proxy = true
+        end
         # pass this along
         opts[:name] = assoc_name
 
@@ -61,7 +67,14 @@ module ApiResource
             end
             @attributes_cache[:#{id_method_name}] = val
             # write_attribute(:#{id_method_name}, val)
-            @attributes[:#{id_method_name}] = val
+            # Active record uses string attributes key
+            # Here's a terrible hack for the time being
+            if #{remote_proxy}
+              @attributes['#{id_method_name}'] = val
+            else
+              # and we use symbol attribute keys
+              @attributes[:#{id_method_name}] = val
+            end
           end
 
         EOE

data/lib/api_resource/connection.rb

@@ -67,12 +67,12 @@ module ApiResource
     end
 
     def delete(path, headers = self.headers)
-      request(:delete, path, build_request_headers(headers, :delete, self.site.merge(path)))
+      request(:delete, path, {}, build_request_headers(headers, :delete, self.site.merge(path)))
       return true
     end
 
     def head(path, headers = self.headers)
-      request(:head, path, build_request_headers(headers, :head, self.site.merge(path)))
+      request(:head, path, {}, build_request_headers(headers, :head, self.site.merge(path)))
     end
 
     # make a put request

data/lib/api_resource/mocks.rb

@@ -183,6 +183,10 @@ module ApiResource
         @path, @query = path.split("?")
         @path, @format = @path.split(".")
 
+        if opts[:body].present? && !opts[:body].is_a?(String)
+          raise "#{opts[:body]} must be passed as a String"
+        end
+
         # if we have params, it is a MockRequest definition
         if opts[:params]
           @params = opts[:params]
@@ -245,46 +249,42 @@ module ApiResource
       cattr_accessor :requests
       self.requests = []
 
-      #   body?       methods
-      { true  => %w(post put get),
-        false => %w(delete head) }.each do |has_body, methods|
-        methods.each do |method|
-          # def post(path, body, headers)
-          #   request = ApiResource::Request.new(:post, path, body, headers)
-          #   self.class.requests << request
-          #   if response = LifebookerClient::Mocks.find_response(request)
-          #     response
-          #   else
-          #     raise InvalidRequestError.new("Could not find a response
-          #     recorded for #{request.to_s} - Responses recorded are: -
-          #       #{inspect_responses}")
-          #   end
-          # end
-          instance_eval <<-EOE, __FILE__, __LINE__ + 1
-            def #{method}(path, #{'body, ' if has_body}headers)
-              opts = {:headers => headers}
-              #{"opts[:body] = body" if has_body}
-              request = MockRequest.new(:#{method}, path, opts)
-              self.requests << request
-              if response = Mocks.find_response(request)
-                response[:response].tap{|resp|
-                  resp.generate_response(
-                    request.params
-                      .with_indifferent_access
-                      .merge(response[:params].with_indifferent_access)
-                  )
-                }
-              else
-                raise ApiResource::ResourceNotFound.new(
-                  MockResponse.new({}, {:headers => {"Content-type" => "application/json"}, :status_code => 404}),
-                  :message => "\nCould not find a response recorded for \#{request.pretty_inspect}\n" +
-                  "Potential Responses Are:\n" +
-                  "\#{Array.wrap(Mocks.responses_for_path(request.path)[:responses]).collect(&:first).pretty_inspect}"
+      %w(delete get head post put).each do |method|
+        # def post(path, body, headers)
+        #   request = ApiResource::Request.new(:post, path, body, headers)
+        #   self.class.requests << request
+        #   if response = LifebookerClient::Mocks.find_response(request)
+        #     response
+        #   else
+        #     raise InvalidRequestError.new("Could not find a response
+        #     recorded for #{request.to_s} - Responses recorded are: -
+        #       #{inspect_responses}")
+        #   end
+        # end
+        instance_eval <<-EOE, __FILE__, __LINE__ + 1
+          def #{method}(path, body, headers)
+            opts = {:headers => headers}
+            opts[:body] = body
+            request = MockRequest.new(:#{method}, path, opts)
+            self.requests << request
+            if response = Mocks.find_response(request)
+              response[:response].tap{|resp|
+                resp.generate_response(
+                  request.params
+                    .with_indifferent_access
+                    .merge(response[:params].with_indifferent_access)
                 )
-              end
+              }
+            else
+              raise ApiResource::ResourceNotFound.new(
+                MockResponse.new({}, {:headers => {"Content-type" => "application/json"}, :status_code => 404}),
+                :message => "\nCould not find a response recorded for \#{request.pretty_inspect}\n" +
+                "Potential Responses Are:\n" +
+                "\#{Array.wrap(Mocks.responses_for_path(request.path)[:responses]).collect(&:first).pretty_inspect}"
+              )
             end
-          EOE
-        end
+          end
+        EOE
       end
     end
   end

data/lib/api_resource/version.rb

@@ -1,3 +1,3 @@
 module ApiResource
-  VERSION = "0.6.20"
+  VERSION = "0.6.21"
 end

data/spec/lib/connection_spec.rb

@@ -26,7 +26,7 @@ describe Connection do
 
   it "should set the Lifebooker-Token if one is present for DELETE requests" do
     token = Kernel.rand(100000).to_s
-    ApiResource::Mocks::Connection.expects(:delete).with("/test_resources/1.json", {"Accept"=>"application/json", 'Lifebooker-Token' => "#{token}"}).returns(ApiResource::Mocks::MockResponse.new({}))
+    ApiResource::Mocks::Connection.expects(:delete).with("/test_resources/1.json", {}, {"Accept"=>"application/json", 'Lifebooker-Token' => "#{token}"}).returns(ApiResource::Mocks::MockResponse.new({}))
 
     ApiResource::Base.token = token
 
@@ -35,7 +35,7 @@ describe Connection do
 
   it "should set the Lifebooker-Token if one is present for :head requests" do
     token = Kernel.rand(100000).to_s
-    ApiResource::Mocks::Connection.expects(:head).with("/test_resources/1.json", {"Accept"=>"application/json", 'Lifebooker-Token' => "#{token}"}).returns(ApiResource::Mocks::MockResponse.new({}))
+    ApiResource::Mocks::Connection.expects(:head).with("/test_resources/1.json", {}, {"Accept"=>"application/json", 'Lifebooker-Token' => "#{token}"}).returns(ApiResource::Mocks::MockResponse.new({}))
 
     ApiResource::Base.token = token
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: api_resource
 version: !ruby/object:Gem::Version
-  version: 0.6.20
+  version: 0.6.21
 platform: ruby
 authors:
 - Ethan Langevin
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2013-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake