jpie 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca98d7927dfa30e20390066f51aae1a468287cebefc663d9f597da31b32ed621
-  data.tar.gz: ae87502673d1d04a991ce28acdc1e64fa434f6a357dd424b86b4158b9904f4e2
+  metadata.gz: 654010b56dc91dbc6edffc3c54891d7d6cb7eab738f685cbbe0e793aa9d26b13
+  data.tar.gz: d400665267796d760e1051697a46bb067c414142be5372e1abb2ac1254e8aaa7
 SHA512:
-  metadata.gz: 5a3cb096bfcf3f94279d2942f286556f3e97e4b5cab8028838c7f4d2b25bd581282ef71da6110e755f984dea45cfbbe824cfb44d1f958ac98bf2610774015eea
-  data.tar.gz: 4c70ef1b739652c73ca5d5f04e25a3152b09a382cbe9a714fb9d844fafe60354930db43139fb265024cff0fc1b2f24331dfb3b0deff72cd3d2ee1c28b0d3ec61
+  metadata.gz: a4081700e8daa2cd9e4b209d7cf2d1d0464b44d3678fb9095adc995fe5e075ad5fa00b64af8bc7bdb9a53177f64ba74e999e85f61d56c9c82d2908bede76b579
+  data.tar.gz: 6c786599fbfda71820206e62c17dbbb9ed86d28858ae905293b20a9426e3cf64da76dba69c8ffaa7dfff5193f4e42ba203a09ba635943f8ac6212cea95bdfada

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jpie (1.1.3)
+    jpie (1.2.0)
       actionpack (~> 8.0, >= 8.0.0)
       rails (~> 8.0, >= 8.0.0)
 

data/lib/json_api/controllers/concerns/resource_actions/preloading.rb

@@ -49,15 +49,15 @@ module JSONAPI
       end
 
       def preload_collection(includes)
-        return model_class.all if includes.empty?
+        return resource_class.records if includes.empty?
 
-        model_class.all.includes(includes)
+        resource_class.records.includes(includes)
       end
 
       def preload_single(includes)
-        return model_class.find(params[:id]) if includes.empty?
+        return resource_class.records.find(params[:id]) if includes.empty?
 
-        model_class.includes(includes).find(params[:id])
+        resource_class.records.includes(includes).find(params[:id])
       end
     end
   end

data/lib/json_api/controllers/concerns/resource_actions/resource_loading.rb

@@ -10,15 +10,27 @@ module JSONAPI
       def load_jsonapi_resource
         @resource_name = params[:resource_type]&.singularize
         @jsonapi_namespace = params[:jsonapi_namespace].presence
-        @resource_class = JSONAPI::ResourceLoader.find(@resource_name, namespace: @jsonapi_namespace) if @resource_name
-        @model_class = @resource_class.model_class if @resource_class
-        @resource = @model_class.find(params[:id]) if params[:id] && @model_class
+        load_resource_and_model_class
+        load_resource_record
       rescue JSONAPI::ResourceLoader::MissingResourceClass
         @resource_class = nil
       rescue ActiveRecord::RecordNotFound
         render_record_not_found
       end
 
+      def load_resource_and_model_class
+        return unless @resource_name
+
+        @resource_class = JSONAPI::ResourceLoader.find(@resource_name, namespace: @jsonapi_namespace)
+        @model_class = @resource_class.model_class if @resource_class
+      end
+
+      def load_resource_record
+        return unless params[:id] && @resource_class
+
+        @resource = @resource_class.records.find(params[:id])
+      end
+
       def render_record_not_found
         render_jsonapi_error(
           status: 404,

data/lib/json_api/controllers/concerns/resource_actions.rb

@@ -34,7 +34,7 @@ module JSONAPI
     end
 
     def index
-      scope = apply_authorization_scope(@preloaded_resources || model_class.all, action: :index)
+      scope = apply_authorization_scope(@preloaded_resources || resource_class.records, action: :index)
       query = build_query(scope)
       @total_count = query.total_count
       @pagination_applied = query.pagination_applied

data/lib/json_api/resources/concerns/model_class_helpers.rb

@@ -50,6 +50,10 @@ module JSONAPI
         rescue StandardError
           safe_model_class
         end
+
+        def records
+          model_class.all
+        end
       end
     end
   end

data/lib/json_api/serialization/concerns/includes_serialization.rb

@@ -46,8 +46,20 @@ module JSONAPI
           return get_active_storage_records(current_record, association_name)
         end
 
-        related = current_record.public_send(association_name)
-        Array(related)
+        get_association_records(current_record, association_name)
+      end
+
+      def get_association_records(current_record, association_name)
+        association = current_record.association(association_name)
+        related_klass = association.klass
+        return [] if related_klass.blank?
+
+        build_scoped_relation(related_klass, association).to_a
+      end
+
+      def build_scoped_relation(related_klass, association)
+        related_base_scope = ResourceLoader.find_for_model(related_klass).records
+        related_base_scope.merge(association.scope)
       end
 
       def get_active_storage_records(current_record, association_name)

data/lib/json_api/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JSONAPI
-  VERSION = "1.1.3"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jpie
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - Emil Kampp