From c95bb944eaddd060355ff24626781d5958d309c9 Mon Sep 17 00:00:00 2001
From: Sebas Jimenez <sebastian@envoy.com>
Date: Wed, 10 Aug 2022 22:07:45 -0700
Subject: [PATCH 1/2] Use the associations to lookup relationship class

---
 lib/json_api_client/utils.rb  |  5 +++
 test/unit/association_test.rb | 72 +++++++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+)

diff --git a/lib/json_api_client/utils.rb b/lib/json_api_client/utils.rb
index e91e566b..121550d4 100644
--- a/lib/json_api_client/utils.rb
+++ b/lib/json_api_client/utils.rb
@@ -7,6 +7,11 @@ def self.compute_type(klass, type_name)
       # the type_name is an absolute reference.
       return type_name.constantize if type_name.match(/^::/)
 
+      # Check the klass association definitions
+      association_klass_match = klass.associations.find { |a| a.attr_name.to_s.singularize == type_name.underscore }
+      association_klass = association_klass_match.options[:class] if association_klass_match
+      return association_klass if association_klass
+
       # Build a list of candidates to search for
       candidates = []
       klass.name.scan(/::|$/) { candidates.unshift "#{$`}::#{type_name}" }
diff --git a/test/unit/association_test.rb b/test/unit/association_test.rb
index 2c01b1e2..198cdb75 100644
--- a/test/unit/association_test.rb
+++ b/test/unit/association_test.rb
@@ -89,6 +89,20 @@ class Employee < TestResource
   has_one :chief, klass: 'Employee'
 end
 
+module CrossNamespaceTwo
+  class Nail < TestResource
+    property :size
+  end
+end
+
+module CrossNamespaceOne
+  class Hammer < TestResource
+    property :brand
+
+    has_many :nails, class: CrossNamespaceTwo::Nail
+  end
+end
+
 class AssociationTest < MiniTest::Test
 
   def test_default_properties_no_changes
@@ -1070,4 +1084,62 @@ def test_does_not_load_include_from_dataset
     assert_nil(records.first.chief)
   end
 
+  def test_cross_namespace_resource_references
+    stub_request(:get, 'http://example.com/hammers?include=nails')
+        .to_return(
+            headers: {
+                content_type: 'application/vnd.api+json'
+            }, body: {
+            data: [
+                {
+                  id: '1',
+                  type: 'hammers',
+                  attributes: {
+                      brand: 'Hardware Store'
+                  },
+                  relationships: {
+                    nails: { data: [{id: '2', type: 'nails'}] }
+                  }
+                },
+                {
+                  id: '2',
+                  type: 'hammers',
+                  attributes: {
+                      brand: 'Hardware Store'
+                  },
+                  relationships: {
+                    nails: { data: [{id: '3', type: 'nails'}] }
+                  }
+                }
+            ],
+            included: [
+                {
+                  id: '2',
+                  type: 'nails',
+                  attributes: {
+                      size: 10
+                  }
+                },
+                {
+                  id: '3',
+                  type: 'nails',
+                  attributes: {
+                      size: 8
+                  }
+              }
+            ]
+        }.to_json)
+    
+    records = CrossNamespaceOne::Hammer.includes(:nails).to_a
+
+    assert_equal(2, records.size)
+    assert_equal('1', records.first.id)
+    assert_equal('2', records.second.id)
+    assert_equal('2', records.first.nails.first.id)
+    assert_equal('3', records.second.nails.first.id)
+
+    assert_equal(1, records.first.nails.size)
+    assert_equal(1, records.second.nails.size)
+  end
+
 end

From 50b05aba227955a21805e94f9711379308881c89 Mon Sep 17 00:00:00 2001
From: Sebastian Jimenez <sebasjimenezv@gmail.com>
Date: Mon, 5 Jun 2023 21:33:06 -0700
Subject: [PATCH 2/2] Changelog update

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 353ff818..7c32af12 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+## 1.23.0
+- [#403](https://github.com/JsonApiClient/json_api_client/pull/403) - Feature: Use the association options to lookup relationship class
+
 ## 1.21.1
 - [#404](https://github.com/JsonApiClient/json_api_client/pull/404) - Expose NotFound json errors
 - [#378](https://github.com/JsonApiClient/json_api_client/pull/378) - Add the ability to create a subclass of JsonApiClient::Resource to have a modified id method