effective_resources 2.18.4 → 2.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6afb7b75d0b3a67f0522248e685bb8fb2fa973d6110e4ab5371c6579457eab1b
-  data.tar.gz: 46b6e23e7fc14d623af21227175aa9c74fc4e5ace265b193e1522e293fa97946
+  metadata.gz: 02dcf459be067c9b55f9ab488cbcc9f5fd34c88549c9fc3c58db5f5668496062
+  data.tar.gz: c0ba59be147cb88eba96c420685dcafee9e8cc48098ab9a8c878b0cf670eb1db
 SHA512:
-  metadata.gz: 2daa3b7acc0596210380e8a6026e92691eb0a1a89591cb5c3aeda0601a740c7790630f2da1213fe31190948071b5319dad46bed18279603e6abbb48dc379153d
-  data.tar.gz: ad76dbb446443fef1516bcfddbe9d35124157061eb41ed90d4520520b834c29ed670905f74cf4273c75d676707bfc014fd7b267e51fc68c772d501f9246e8ec9
+  metadata.gz: bf45b4e61e486e8df1927c6f0b61e2c965ddd1c6c56a2a99386c6813616b81cc541d59193699d422db76f17cbd3dccf2800ec4397e367be2db46e1a7054bd9b7
+  data.tar.gz: a980a5d995bc8b7294e01debdd1ca7cfa5d5efc59d3462666677c2d1156f33e33471f188b1add2a6afd7759a965da5fae082bf31f825456caf6582af5fcb2478

data/app/controllers/concerns/effective/crud_controller.rb

@@ -83,7 +83,14 @@ module Effective
 
     def resource_scope
       relation = effective_resource.relation
-      relation.try(:deep) || relation
+
+      # Apply jit_preloader if present
+      if defined?(JitPreloader) && EffectiveResources.use_jit_preloader
+        relation.includes_values = [] # Removes any previously defined .includes()
+        relation.jit_preload
+      else
+        (relation.try(:deep) || relation)
+      end
     end
 
     def resource_name # 'thing'

data/app/models/effective/resources/instance.rb

@@ -13,7 +13,7 @@ module Effective
       end
 
       # called by effective_trash and effective_logging
-      def instance_attributes(only: nil, except: nil)
+      def instance_attributes(only: nil, except: nil, associations: true)
         return {} unless instance.present?
 
         # Build up our only and except
@@ -34,43 +34,45 @@ module Effective
           attributes[association.name] = instance.send(association.name).to_s
         end
 
-        # Grab the instance attributes of each nested resource
-        nested_resources.each do |association|
-          next if except.present? && except.include?(association.name)
-          next unless only.blank? || only.include?(association.name)
+        if associations 
+          # Grab the instance attributes of each nested resource
+          nested_resources.each do |association|
+            next if except.present? && except.include?(association.name)
+            next unless only.blank? || only.include?(association.name)
 
-          next if association.options[:through]
+            next if association.options[:through]
 
-          attributes[association.name] ||= {}
+            attributes[association.name] ||= {}
 
-          Array(instance.send(association.name)).each_with_index do |child, index|
-            next unless child.present?
+            Array(instance.send(association.name)).each_with_index do |child, index|
+              next unless child.present?
 
-            resource = Effective::Resource.new(child)
-            attributes[association.name][index] = resource.instance_attributes(only: only, except: except)
+              resource = Effective::Resource.new(child)
+              attributes[association.name][index] = resource.instance_attributes(only: only, except: except)
+            end
           end
-        end
 
-        (action_texts + has_ones).each do |association|
-          next if except.present? && except.include?(association.name)
-          next unless only.blank? || only.include?(association.name)
+          (action_texts + has_ones).each do |association|
+            next if except.present? && except.include?(association.name)
+            next unless only.blank? || only.include?(association.name)
 
-          attributes[association.name] = instance.send(association.name).to_s
-        end
+            attributes[association.name] = instance.send(association.name).to_s
+          end
 
-        has_manys.each do |association|
-          next if except.present? && except.include?(association.name)
-          next unless only.blank? || only.include?(association.name)
+          has_manys.each do |association|
+            next if except.present? && except.include?(association.name)
+            next unless only.blank? || only.include?(association.name)
 
-          next if BLACKLIST.include?(association.name)
-          attributes[association.name] = instance.send(association.name).map { |obj| obj.to_s }
-        end
+            next if BLACKLIST.include?(association.name)
+            attributes[association.name] = instance.send(association.name).map { |obj| obj.to_s }
+          end
 
-        has_and_belongs_to_manys.each do |association|
-          next if except.present? && except.include?(association.name)
-          next unless only.blank? || only.include?(association.name)
+          has_and_belongs_to_manys.each do |association|
+            next if except.present? && except.include?(association.name)
+            next unless only.blank? || only.include?(association.name)
 
-          attributes[association.name] = instance.send(association.name).map { |obj| obj.to_s }
+            attributes[association.name] = instance.send(association.name).map { |obj| obj.to_s }
+          end
         end
 
         attributes.delete_if { |_, value| value.blank? }

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.18.4'.freeze
+  VERSION = '2.19.0'.freeze
 end

data/lib/effective_resources.rb

@@ -7,6 +7,8 @@ require 'effective_resources/effective_gem'
 module EffectiveResources
   MAILER_SUBJECT_PROC = Proc.new { |action, subject, resource, opts = {}| subject }
 
+  mattr_accessor :use_jit_preloader
+
   def self.config_keys
     [
       :authorization_method, :default_submits,
@@ -18,8 +20,7 @@ module EffectiveResources
 
   # We use the newer syntax for serialize calls in rails 7.1 but it changes behaviour
   def self.serialize_with_coder?
-    false
-    #Gem::Version.new(Gem.loaded_specs['rails'].version.to_s) >= Gem::Version.new('7')
+    Gem::Version.new(Gem.loaded_specs['rails'].version.to_s) >= Gem::Version.new('7.1')
   end
 
   def self.authorized?(controller, action, resource)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.18.4
+  version: 2.19.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-29 00:00:00.000000000 Z
+date: 2023-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails