forest_admin_datasource_active_record 1.45.1 → 1.45.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb2d630600116a2cc26631fa350213ec683295247c0633a8ead5e03ffa0222d5
-  data.tar.gz: 6d8715c1b02954bea75edf654ab5d757ee3b3853778b45c4533bf4ef81be3075
+  metadata.gz: dc1197c09a580dd96b9ad3c9966560332df92ce4ffe97922e6d57967c883b4c9
+  data.tar.gz: 8e8de31895904e2c9bd2820f23148d2cc8e8357d4667fd97b55502ce0d56dc47
 SHA512:
-  metadata.gz: 64fa06775c9f9366de9c6e3002c36803db9d94e5368b6be87d673cec289fa5d81489d424fc96017d59f35da28d61e8a83af4b9608bfd857a0354eba1a6f15f09
-  data.tar.gz: 298f5e132565b05b3f460ed8c27b2145680145088c2534ec4cbcc31622fe6ba089514cc566fad82c9f731cff0628337b56f6aa2914f0376ab476279d5c60e711
+  metadata.gz: 45d04f5fbc9f9dcb16933f007a1fd3e240df3534f970cce7173c071bfe1e557f3e79d9f22f2e7860fb1a58b9298ef739218b3dd83ef5c117a1f3845268eae58b
+  data.tar.gz: 734ba95d343b8a85daadd567379f2428d3bb16a6950f3cdeaa751a9a40e7fba9756c27d7395a071450a171cecdee1443edb197b4fdc24b7913633576471aec47

data/forest_admin_datasource_active_record.gemspec

@@ -39,6 +39,7 @@ admin work on any Ruby application."
   spec.add_dependency "bigdecimal"
   spec.add_dependency "cgi"
   spec.add_dependency "csv"
+  spec.add_dependency "forest_admin_datasource_toolkit", ">= #{ForestAdminDatasourceActiveRecord::VERSION}"
   spec.add_dependency "logger"
   spec.add_dependency "mutex_m"
   spec.add_dependency "ostruct"

data/lib/forest_admin_datasource_active_record/collection.rb

@@ -28,7 +28,8 @@ module ForestAdminDatasourceActiveRecord
       query = Utils::Query.new(self, projection, filter)
       records = query.get
 
-      records.map { |record| Utils::ActiveRecordSerializer.new(record, query.joined_relations).to_hash(projection) }
+      serializer = Utils::ActiveRecordSerializer.new(projection, query.joined_relations)
+      records.map { |record| serializer.serialize(record) }
     end
 
     def aggregate(_caller, filter, aggregation, limit = nil)
@@ -37,7 +38,7 @@ module ForestAdminDatasourceActiveRecord
 
     def create(_caller, data)
       Utils::ErrorHandler.handle_errors(:create) do
-        Utils::ActiveRecordSerializer.new(@model.create!(data)).to_hash(ProjectionFactory.all(self))
+        Utils::ActiveRecordSerializer.new(ProjectionFactory.all(self)).serialize(@model.create!(data))
       end
     end
 

data/lib/forest_admin_datasource_active_record/utils/active_record_serializer.rb

@@ -2,73 +2,85 @@ module ForestAdminDatasourceActiveRecord
   module Utils
     # Relations in `joined_relations` (see Query#collect_joined_selects) are hydrated from the flat
     # row's aliased columns; every other relation is read from its preloaded ActiveRecord association.
-    ActiveRecordSerializer = Struct.new(:object, :joined_relations) do
-      def to_hash(projection)
-        hash_object(object, projection)
+    class ActiveRecordSerializer
+      ONE_ASSOCIATIONS = %i[has_one belongs_to].freeze
+      MANY_ASSOCIATIONS = %i[has_many has_and_belongs_to_many].freeze
+
+      def initialize(projection, joined_relations = nil)
+        @tree = ForestAdminDatasourceToolkit::Components::Query::ProjectionTree.build(projection || ForestAdminDatasourceToolkit::Components::Query::Projection.new)
+        @joined_relations = joined_relations || {}
+        @join_aliases = @joined_relations.values.flat_map { |meta| meta[:columns].values }.uniq
+        @polymorphic_belongs_to = {}
+        @target_models = {}
       end
 
-      def hash_object(object, projection = nil, path: [])
+      def serialize(object)
+        hash_object(object, object, @tree)
+      end
+
+      def target_model(root_model, relation_path)
+        @target_models.fetch([root_model, relation_path]) do |key|
+          @target_models[key] = resolve_target_model(root_model, relation_path)
+        end
+      end
+
+      private
+
+      def hash_object(root, object, tree, path: [])
         return if object.nil?
 
         # root keeps all its selected columns (attributes + FKs); a related record is restricted to
         # its projected columns, matching the JOINed hydration
-        hash = path.empty? || projection.nil? ? base_attributes(object) : projected_columns(object, projection)
+        hash = path.empty? ? base_attributes(object) : projected_columns(object, tree)
         hash = normalize_polymorphic_types(object.class, hash)
 
-        serialize_associations(object, projection, hash, path) if projection
+        serialize_associations(root, object, tree, hash, path)
 
         hash
       end
 
       def base_attributes(object)
-        return object.attributes if join_aliases.empty?
+        return object.attributes if @join_aliases.empty?
 
-        object.attributes.except(*join_aliases)
+        object.attributes.except(*@join_aliases)
       end
 
-      def projected_columns(object, projection)
-        projection.columns.to_h { |column| [column, object[column]] }
+      def projected_columns(object, tree)
+        tree.columns.to_h { |column| [column, object[column]] }
       end
 
-      def serialize_associations(object, projection, hash, path)
-        one_associations = %i[has_one belongs_to]
-        many_associations = %i[has_many has_and_belongs_to_many]
-
-        projection.relations.each_key do |association_name|
+      def serialize_associations(root, object, tree, hash, path)
+        tree.relations.each do |association_name, sub_tree|
           relation_path = path + [association_name]
 
-          if joined_relation?(relation_path)
-            hash[association_name] = hash_joined_relation(projection.relations[association_name], relation_path)
+          if @joined_relations.key?(relation_path.join('.'))
+            hash[association_name] = hash_joined_relation(root, sub_tree, relation_path)
             next
           end
 
           association = object.class.reflect_on_association(association_name.to_sym)
           next if association.nil?
 
-          if one_associations.include?(association.macro)
-            hash[association_name] = hash_object(
-              object.send(association_name),
-              projection.relations[association_name],
-              path: relation_path
-            )
-          elsif many_associations.include?(association.macro)
+          if ONE_ASSOCIATIONS.include?(association.macro)
+            hash[association_name] = hash_object(root, object.send(association_name), sub_tree, path: relation_path)
+          elsif MANY_ASSOCIATIONS.include?(association.macro)
             hash[association_name] = object.send(association_name).map do |item|
-              hash_object(item, projection.relations[association_name], path: relation_path)
+              hash_object(root, item, sub_tree, path: relation_path)
             end
           end
         end
       end
 
       # Reads a JOINed relation's columns from the aliases on the root object (not a nested one).
-      def hash_joined_relation(projection, relation_path)
-        meta = joined_relations[relation_path.join('.')]
-        return nil if object[meta[:pk_alias]].nil?
+      def hash_joined_relation(root, tree, relation_path)
+        meta = @joined_relations[relation_path.join('.')]
+        return nil if root[meta[:pk_alias]].nil?
 
         hash = {}
-        projection.columns.each { |column| hash[column] = object[meta[:columns][column]] }
-        hash = normalize_polymorphic_types(target_model(relation_path), hash)
-        projection.relations.each_key do |nested_name|
-          hash[nested_name] = hash_joined_relation(projection.relations[nested_name], relation_path + [nested_name])
+        tree.columns.each { |column| hash[column] = root[meta[:columns][column]] }
+        hash = normalize_polymorphic_types(target_model(root.class, relation_path), hash)
+        tree.relations.each do |nested_name, nested_tree|
+          hash[nested_name] = hash_joined_relation(root, nested_tree, relation_path + [nested_name])
         end
 
         hash
@@ -88,19 +100,16 @@ module ForestAdminDatasourceActiveRecord
         hash
       end
 
-      # Target model of a JOINed relation path (only belongs_to / has_one :through are ever JOINed).
-      def target_model(relation_path)
-        relation_path.reduce(object.class) do |model, name|
+      def resolve_target_model(root_model, relation_path)
+        relation_path.reduce(root_model) do |model, name|
           model&.reflect_on_association(name.to_sym)&.klass
         end
       rescue NameError
         nil
       end
 
-      private
-
       def polymorphic_belongs_to(model_class)
-        (@polymorphic_belongs_to ||= {})[model_class] ||=
+        @polymorphic_belongs_to[model_class] ||=
           model_class.reflect_on_all_associations(:belongs_to).select(&:polymorphic?)
       end
 
@@ -110,14 +119,6 @@ module ForestAdminDatasourceActiveRecord
           "in model '#{model_class.name}': #{error.message}. Keeping the stored value."
         )
       end
-
-      def joined_relation?(relation_path)
-        !joined_relations.nil? && joined_relations.key?(relation_path.join('.'))
-      end
-
-      def join_aliases
-        @join_aliases ||= (joined_relations || {}).values.flat_map { |meta| meta[:columns].values }.uniq
-      end
     end
   end
 end

data/lib/forest_admin_datasource_active_record/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceActiveRecord
-  VERSION = "1.45.1"
+  VERSION = "1.45.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_datasource_active_record
 version: !ruby/object:Gem::Version
-  version: 1.45.1
+  version: 1.45.2
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-10-10 00:00:00.000000000 Z
+date: 2026-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -109,6 +109,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: forest_admin_datasource_toolkit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.45.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.45.2
 - !ruby/object:Gem::Dependency
   name: logger
   requirement: !ruby/object:Gem::Requirement