spyke 1.8.8 → 1.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e04b56075f974a364cfaf6a44a25969ed1e8e730
-  data.tar.gz: 3c8ca7d4e89e05d38ddd0d8bfe9cc1ef7872c5c2
+  metadata.gz: 0b73653b9952f7257a838b16b11abc70770ce471
+  data.tar.gz: 3f753f7c24bcaad6bc5365a2721a28e5b1df99fc
 SHA512:
-  metadata.gz: 3be8168169455f6458669224e6b488f13a7eccbfba2e08b632f047e3d1be9327b12d7e2c0b34f692d28e5106c647767672b45ea7cdc74760a85f70a775b6cd26
-  data.tar.gz: 554aabbd1b06e666b76d6334a85089d0d03f707256209e204ece5e4043ea10e5ac1277626601d191ad69e48e145dd47d61ce5214da88dcde065c29cbd27425b3
+  metadata.gz: 40e9090eed648f8a51d6af63ad3e1476b9d64e5e054cd90c42810952670c747e3cc1af14af3ba0b31dedf981257b097b368c6225ca9f00d136ab1fd3b197e815
+  data.tar.gz: 97b830a87cbec15d5f4c74226b0a60841b81b9b9e46a6e60a6b3c4ca0d27f19331845c58ccf3a2d9bbc7103d588b9fbbc48d613c95415e2be0dc8a55dd6a51b9

data/lib/spyke/associations/association.rb

@@ -15,17 +15,6 @@ module Spyke
         find_one # Override for plural associations that return an association object
       end
 
-      def find_one
-        result = super
-        update_parent(result) if result
-      end
-
-      def find_some
-        result = super
-        update_parent(result) if result.any?
-        result
-      end
-
       def assign_nested_attributes(attributes)
         update_parent new(attributes)
       end
@@ -55,15 +44,15 @@ module Spyke
         end
 
         def fetch_embedded
-          if embedded_params
-            Result.new(data: embedded_params)
+          if embedded
+            Result.new(data: embedded)
           elsif !uri
             Result.new(data: nil)
           end
         end
 
-        def embedded_params
-          @embedded_params ||= parent.attributes.to_params[name]
+        def embedded
+          parent.attributes[name]
         end
 
         def update_parent(value)

data/lib/spyke/associations/has_many.rb

@@ -24,7 +24,7 @@ module Spyke
 
         def combine_with_existing(incoming)
           return incoming unless primary_keys_present_in_existing?
-          combined = embedded_params + incoming
+          combined = embedded_attributes + incoming
           group_by_primary_key(combined).flat_map do |primary_key, hashes|
             if primary_key.present?
               hashes.reduce(:merge)
@@ -39,13 +39,17 @@ module Spyke
         end
 
         def primary_keys_present_in_existing?
-          embedded_params && embedded_params.any? { |attr| attr.has_key?('id') }
+          embedded_attributes && embedded_attributes.any? { |attr| attr.has_key?('id') }
         end
 
         def clear_existing!
           update_parent []
         end
 
+        def embedded_attributes
+          @embedded_attributes ||= parent.attributes.to_params[name]
+        end
+
         def add_to_parent(record)
           parent.attributes[name] ||= []
           parent.attributes[name] << record

data/lib/spyke/http.rb

@@ -20,11 +20,11 @@ module Spyke
       end
 
       def new_instance_from_result(result)
-        new result.data if result.data
+        new_or_return result.data if result.data
       end
 
       def new_collection_from_result(result)
-        Collection.new Array(result.data).map { |record| new(record) }, result.metadata
+        Collection.new Array(result.data).map { |record| new_or_return(record) }, result.metadata
       end
 
       def uri(uri_template = nil)
@@ -60,6 +60,14 @@ module Spyke
           end
         end
 
+        def new_or_return(attributes_or_object)
+          if attributes_or_object.is_a?(Spyke::Base)
+            attributes_or_object
+          else
+            new attributes_or_object
+          end
+        end
+
         def superclass_uri
           superclass.uri.dup.freeze if superclass != Base
         end
@@ -82,7 +90,7 @@ module Spyke
     end
 
     def uri
-      Path.new(@uri_template, attributes)
+      Path.new(@uri_template, attributes) if @uri_template
     end
 
     private

data/lib/spyke/version.rb

@@ -1,3 +1,3 @@
 module Spyke
-  VERSION = '1.8.8'
+  VERSION = '1.8.9'
 end

data/test/associations_test.rb

@@ -184,7 +184,7 @@ module Spyke
 
       assert_equal %w{ Salt }, recipe.ingredients.map(&:name)
       assert_equal({ 'recipe' => { 'groups' => [{ 'recipe_id' => 1, 'ingredients' => [{ 'group_id' => nil, 'name' => 'Salt' }] }] } }, recipe.to_params)
-      assert_equal({ 'group' => { 'recipe_id' => 1, 'ingredients' => [{ 'group_id' => nil, 'name' => 'Salt' }] } }, recipe.groups.first.to_params)
+      assert_equal({ 'group' => { 'ingredients' => [{ 'group_id' => nil, 'name' => 'Salt' }] } }, recipe.groups.first.to_params)
     end
 
     def test_deep_build_has_many_association_with_scope
@@ -377,6 +377,18 @@ module Spyke
       assert_equal %w{ Salt Spoon }, recipe.ingredients.map(&:name)
     end
 
+    def test_not_caching_result_with_different_params
+      endpoint_1 = stub_request(:get, 'http://sushi.com/recipes/1/groups/1').to_return_json(result: { id: 1 })
+      endpoint_2 = stub_request(:get, 'http://sushi.com/recipes/1/groups/2').to_return_json(result: { id: 2 })
+
+      recipe = Recipe.new(id: 1)
+      recipe.groups.find(1)
+      recipe.groups.find(2)
+
+      assert_requested endpoint_1, times: 1
+      assert_requested endpoint_2, times: 1
+    end
+
     def test_namespaced_model
       tip_endpoint = stub_request(:get, 'http://sushi.com/tips/1').to_return_json(result: { id: 1 })
       likes_endpoint = stub_request(:get, 'http://sushi.com/tips/1/likes')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spyke
 version: !ruby/object:Gem::Version
-  version: 1.8.8
+  version: 1.8.9
 platform: ruby
 authors:
 - Jens Balvig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-23 00:00:00.000000000 Z
+date: 2015-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport