spyke 5.2.0 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9124e2e536f848aee4a144556f24e0ccad5515e5
-  data.tar.gz: c1f33a42164811126c79b044b54265de252ddade
+  metadata.gz: 00c19525c5f1a175a8bb69815c18493d61a0ae9c
+  data.tar.gz: f3b903bd7a4ae21e974fe3a1a77e75adff7c104a
 SHA512:
-  metadata.gz: 7f34c8c2f7b875e742ea9ed51b28d2518af3f62561978683374ea7956082403bd980b54aa176adb6dbb43b97c11c3e23599120d49b540ea9096395ad70c545b9
-  data.tar.gz: b087f095780cbd94b6d7a620eb8ef87a589978837130dd9d3471292ea65285f8609996ff199885a67d44ceda15fc9c2070b3679efcb6505921bcca580fdf4942
+  metadata.gz: 23693dddb0c0b1f7f5afc44b7015de2eb4e1fbd28ae847685690ddf0f5c957a1f0cee01e63566827f987ee95d84aab6ea1b9019145f98ba3aaa397a53fbe899b
+  data.tar.gz: 10d722d8f55f915520a2c95a42e9545afe712599a6a8c8859674ded1f7548582f759eee2f285a18882aaa691aeda55b2eb7f0d9ee4cacbae4f9a4c667442a92f

data/lib/spyke/associations/association.rb

@@ -44,14 +44,14 @@ module Spyke
         end
 
         def fetch_embedded
-          if embedded
-            Result.new(data: embedded)
+          if embedded_data
+            Result.new(data: embedded_data)
           elsif !uri
             Result.new(data: nil)
           end
         end
 
-        def embedded
+        def embedded_data
           parent.attributes[name]
         end
 

data/lib/spyke/associations/belongs_to.rb

@@ -4,8 +4,23 @@ module Spyke
       def initialize(*args)
         super
         @options.reverse_merge!(uri: "#{@name.to_s.pluralize}/:#{primary_key}", foreign_key: "#{klass.model_name.element}_id")
-        @params[primary_key] = parent.try(foreign_key)
+        @params[primary_key] = primary_key_value
       end
+
+      def find_one
+        return unless fetchable?
+        super
+      end
+
+      private
+
+        def fetchable?
+          (primary_key_value || embedded_data).present?
+        end
+
+        def primary_key_value
+          parent.try(foreign_key)
+        end
     end
   end
 end

data/lib/spyke/version.rb

@@ -1,3 +1,3 @@
 module Spyke
-  VERSION = '5.2.0'
+  VERSION = '5.3.0'
 end

data/test/associations_test.rb

@@ -438,6 +438,11 @@ module Spyke
       assert_requested user_endpoint
     end
 
+    def test_return_nil_for_missing_id_for_belongs_to
+      recipe = Recipe.new(id: 1, user_id: nil)
+      assert_nil recipe.user
+    end
+
     def test_custom_primary_key_for_has_many
       stub_request(:get, 'http://sushi.com/comments/1').to_return_json(result: { users: [{ id: 1 }] })
       comment = Comment.find(1)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spyke
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.3.0
 platform: ruby
 authors:
 - Jens Balvig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-26 00:00:00.000000000 Z
+date: 2018-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport