json_api_client 1.9.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26efa266b2d3eb7d2b504738b19392474c832b02
-  data.tar.gz: 5b60463dae1806e7318298cbd58ab5ce968453ae
+  metadata.gz: 8dc5a38f2bde33b9912837c82fa1fe5c9ef41c80
+  data.tar.gz: e8a926c76a1198ec9cf720fae46335e12f2c54fc
 SHA512:
-  metadata.gz: 5830accd29e4821e85a32c0d39e650cc6603882a0022f9fe8cb633ec60c3efc030cc36d6d11d931ffd10cf38b4272ff3bac3184ca1547f81fe53b8071f92bbec
-  data.tar.gz: 487d5411c3f399a737b72c0ff007076f71e92ab84b93fca19a9d3e54f9b345082358e9b98340ed7a5bfdd543f994ee4bac5be37759ace8ded75d74824b177e21
+  metadata.gz: 5d346d1b746c28b381e77a5842403808377f924feacce7d57f5f8d7ce9df4e9ccff8312a39e2313c0babc31965860e0af3c1b66648df60923af35cd2148467ad
+  data.tar.gz: 1951d5ea9ff1879cebd7f1c1fbafd25f752e2adbbdfd2f636231b23e4d16e8c282def341a5a368f282f64308c596388dc1a2eb58676bec90f3677254100aa006

data/lib/json_api_client/associations/base_association.rb

@@ -21,6 +21,13 @@ module JsonApiClient
       def from_result_set(result_set)
         result_set.to_a
       end
+
+      def load_records(data)
+        data.map do |d|
+          record_class = Utils.compute_type(klass, d["type"].classify)
+          record_class.load id: d["id"]
+        end
+      end
     end
   end
 end

data/lib/json_api_client/associations/has_one.rb

@@ -5,7 +5,12 @@ module JsonApiClient
         def from_result_set(result_set)
           result_set.first
         end
+
+        def load_records(data)
+          record_class = Utils.compute_type(klass, data["type"].classify)
+          record_class.load id: data["id"]
+        end
       end
     end
   end
-end
+end

data/lib/json_api_client/resource.rb

@@ -537,7 +537,11 @@ module JsonApiClient
     def relationship_data_for(name, relationship_definition)
       # look in included data
       if relationship_definition.key?("data")
-        return included_data_for(name, relationship_definition)
+        if relationships.attribute_changed?(name)
+          return relation_objects_for(name, relationship_definition)
+        else
+          return included_data_for(name, relationship_definition)
+        end
       end
 
       url = relationship_definition["links"]["related"]
@@ -548,6 +552,13 @@ module JsonApiClient
       nil
     end
 
+    def relation_objects_for(name, relationship_definition)
+      data = relationship_definition["data"]
+      assoc = association_for(name)
+      return if data.nil? || assoc.nil?
+      assoc.load_records(data)
+    end
+
     def method_missing(method, *args)
       relationship_definition = relationship_definition_for(method)
 

data/lib/json_api_client/version.rb

@@ -1,3 +1,3 @@
 module JsonApiClient
-  VERSION = "1.9.0"
+  VERSION = "1.10.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_api_client
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors:
 - Jeff Ching
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-25 00:00:00.000000000 Z
+date: 2019-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport