retrieve assigned relationship record via association getter method

with caching

Author: senid231

lib/json_api_client/associations/base_association.rb

@@ -21,6 +21,13 @@ def data(url)
       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

lib/json_api_client/associations/has_one.rb

@@ -5,7 +5,12 @@ class Association < BaseAssociation
         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

lib/json_api_client/resource.rb

@@ -537,7 +537,11 @@ def included_data_for(name, relationship_definition)
     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 @@ def relationship_data_for(name, relationship_definition)
       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)
 

test/unit/creation_test.rb

@@ -367,7 +367,7 @@ def test_access_loaded_relationship_instance
         .to_return(headers: {content_type: 'application/vnd.api+json'}, body: {
             data: {
                 type: 'skill_levels',
-                id: '1',
+                id: '2',
                 attributes: {
                     title: 'pro'
                 }
@@ -383,7 +383,7 @@ def test_access_loaded_relationship_instance
     # test that object is cached and not recreated each time
     assert_equal user.skill_level.object_id, user.skill_level.object_id
 
-    user.relationships.skill_level = SkillLevel.find(2).first
+    user.skill_level = SkillLevel.find(2).first
     assert_equal '2', user.skill_level.id
   end