forest_admin_datasource_mongoid 1.19.1 → 1.19.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecbc7d98b9624c6ab77f695543d8a471da4342dbbb98006c790a6b2960321ed4
-  data.tar.gz: e209e57f676275351c20c992b8447746a2be207cff273629cf5cb170bd5a3f99
+  metadata.gz: b27ac1b878a98f85863c4f7ada5ce6cf2622f15c326487509c3d73d4a6964d35
+  data.tar.gz: 1246128bdb1f69f137c978402b0268530593a7369e40b24507d1270ead86cebe
 SHA512:
-  metadata.gz: e0af1afe82728cae0db55b62d31e65936b6b4a05ed6b3bab2c1ec24be00c315d9f3a9262b322bc6235e89088237cc855d5d4b48bf5a87f829314f21f300820d3
-  data.tar.gz: '05586d83d941b69b879fd3a8b6272d27104e603cb2bc85fd83fb96358abfca96d81f4a8b05973aebac67baa4bc03549f5a4f33cc5e56c59ffa02d833ba433882'
+  metadata.gz: 6e3e496fb16697f1513b1f0c5241cfc97c6110621bbced44f852ef6ecca207641affcf856768417d27f79f0480c06d9579b97bbee2086bdf253ceacaa7eeb98f
+  data.tar.gz: c4389a71350ac95b3015b2cee66581d0039e0e4ad132f01f543525915dadbcbb7940520f6f62ff823fa0fe5323b7e612e9ad9e25b341fa2d25c500733781556e

data/lib/forest_admin_datasource_mongoid/parser/relation.rb

@@ -4,10 +4,12 @@ module ForestAdminDatasourceMongoid
       def get_polymorphic_types(relation_name)
         types = {}
 
-        ObjectSpace.each_object(Class).select { |klass| klass < Mongoid::Document }.each do |model|
-          if model.relations.any? { |_, relation| relation.options[:as] == relation_name.to_sym }
-            primary_key = model.fields.keys.find { |key| model.fields[key].options[:as] == :id } || :_id
-            types[model.name.gsub('::', '__')] = primary_key.to_s
+        ObjectSpace.each_object(Class).each do |klass|
+          next unless klass < Mongoid::Document
+
+          if klass.relations.any? { |_, relation| relation.options[:as] == relation_name.to_sym }
+            primary_key = klass.fields.keys.find { |key| klass.fields[key].options[:as] == :id } || :_id
+            types[klass.name.gsub('::', '__')] = primary_key.to_s
           end
         end
 

data/lib/forest_admin_datasource_mongoid/parser/validation.rb

@@ -4,33 +4,35 @@ module ForestAdminDatasourceMongoid
       include ForestAdminDatasourceToolkit::Components::Query::ConditionTree
       def get_validations(model, column)
         return [] if column.is_a?(Hash)
+        return [] if before_validation_callback?(model)
+        return [] unless model._validators? && model._validators[column.name.to_sym].size.positive?
 
-        validations = []
-        # NOTICE: Do not consider validations if a before_validation Active Records
-        #         Callback is detected.
+        parse_column_validators(model._validators[column.name.to_sym], column)
+      end
+
+      def before_validation_callback?(model)
         default_callback_excluded = [:normalize_changed_in_place_attributes]
-        return validations if model._validation_callbacks
-                                   .reject { |callback| default_callback_excluded.include?(callback.filter) }
-                                   .map(&:kind).include?(:before)
+        model._validation_callbacks.any? do |callback|
+          !default_callback_excluded.include?(callback.filter) && callback.kind == :before
+        end
+      end
 
-        if model._validators? && model._validators[column.name.to_sym].size.positive?
-          model._validators[column.name.to_sym].each do |validator|
-            # NOTICE: Do not consider conditional validations
-            next if validator.options[:if] || validator.options[:unless] || validator.options[:on]
+      def parse_column_validators(validators, column)
+        validations = []
+        validators.each do |validator|
+          next if validator.options[:if] || validator.options[:unless] || validator.options[:on]
 
-            case validator.class.to_s
-            when Mongoid::Validatable::PresenceValidator.to_s
-              validations << { operator: Operators::PRESENT }
-            when ActiveModel::Validations::NumericalityValidator.to_s
-              validations = parse_numericality_validator(validator, validations)
-            when Mongoid::Validatable::LengthValidator.to_s
-              validations = parse_length_validator(validator, validations, column)
-            when Mongoid::Validatable::FormatValidator.to_s
-              validations = parse_format_validator(validator, validations)
-            end
+          case validator.class.to_s
+          when Mongoid::Validatable::PresenceValidator.to_s
+            validations << { operator: Operators::PRESENT }
+          when ActiveModel::Validations::NumericalityValidator.to_s
+            validations = parse_numericality_validator(validator, validations)
+          when Mongoid::Validatable::LengthValidator.to_s
+            validations = parse_length_validator(validator, validations, column)
+          when Mongoid::Validatable::FormatValidator.to_s
+            validations = parse_format_validator(validator, validations)
           end
         end
-
         validations
       end
 

data/lib/forest_admin_datasource_mongoid/utils/add_null_values.rb

@@ -28,11 +28,13 @@ module ForestAdminDatasourceMongoid
           result[field_prefix] ||= nil
         end
 
-        nested_prefixes = projection.select { |field| field.include?(':') }.map { |field| field.split(':').first }.uniq
+        nested_prefixes = projection.filter_map { |field| field.split(':').first if field.include?(':') }.uniq
 
         nested_prefixes.each do |nested_prefix|
-          child_paths = projection.filter { |field| field.start_with?("#{nested_prefix}:") }
-                                  .map { |field| field[(nested_prefix.size + 1)..] }
+          prefix_with_colon = "#{nested_prefix}:"
+          child_paths = projection.filter_map do |field|
+            field[(nested_prefix.size + 1)..] if field.start_with?(prefix_with_colon)
+          end
 
           next unless result[nested_prefix] && !result[nested_prefix].nil?
 

data/lib/forest_admin_datasource_mongoid/utils/helpers.rb

@@ -5,7 +5,8 @@ module ForestAdminDatasourceMongoid
       # @example
       # unnest(['firstname', 'book.title', 'book.author'], 'book') == ['title', 'author']
       def unnest(strings, prefix)
-        strings.select { |field| field.start_with?("#{prefix}.") }.map { |field| field[(prefix.size + 1)..] }
+        prefix_with_dot = "#{prefix}."
+        strings.filter_map { |field| field[(prefix.size + 1)..] if field.start_with?(prefix_with_dot) }
       end
 
       def escape(str)

data/lib/forest_admin_datasource_mongoid/utils/pipeline/filter_generator.rb

@@ -76,7 +76,7 @@ module ForestAdminDatasourceMongoid
           if condition_tree.is_a? Nodes::ConditionTreeBranch
             condition_tree.conditions.each { |condition| list_fields_used_in_filter_tree(condition, fields) }
           elsif condition_tree&.field&.include?(':')
-            list_paths(condition_tree.field).each { |field| fields << field }
+            fields.merge(list_paths(condition_tree.field))
           end
         end
 

data/lib/forest_admin_datasource_mongoid/utils/pipeline/lookup_generator.rb

@@ -35,23 +35,25 @@ module ForestAdminDatasourceMongoid
           return {} if options[:include] && !options[:include].include?(name)
           return {} if options[:exclude]&.include?(name)
 
-          projection.filter { |field| field.include?('@@@') }
-                    .map { |field_name| "#{name}.#{field_name.tr(":", ".")}" }
-                    .each_with_object({}) do |curr, acc|
-                      acc[curr] = "$#{curr.gsub("@@@", ".")}"
-                    end
+          projection.each_with_object({}) do |field_name, acc|
+            next unless field_name.include?('@@@')
+
+            curr = "#{name}.#{field_name.tr(":", ".")}"
+            acc[curr] = "$#{curr.gsub("@@@", ".")}"
+          end
         end
 
         def self.lookup_relation(current_path, schema_stack, name, projection, options)
-          models = ObjectSpace
-                   .each_object(Class)
-                   .select { |klass| klass < Mongoid::Document && klass.name && !klass.name.start_with?('Mongoid::') }
-                   .to_h { |klass| [klass.name, klass] }
+          models = ObjectSpace.each_object(Class).with_object({}) do |klass, hash|
+            next unless klass < Mongoid::Document && klass.name && !klass.name.start_with?('Mongoid::')
+
+            hash[klass.name] = klass
+          end
 
           as = current_path ? "#{current_path}.#{name}" : name
 
-          last_schema = schema_stack[schema_stack.length - 1]
-          previous_schema = schema_stack.slice(0..(schema_stack.length - 1))
+          last_schema = schema_stack.last
+          previous_schema = schema_stack
 
           return {} if options[:include] && !options[:include].include?(as)
           return {} if options[:exclude]&.include?(as)

data/lib/forest_admin_datasource_mongoid/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceMongoid
-  VERSION = "1.19.1"
+  VERSION = "1.19.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_datasource_mongoid
 version: !ruby/object:Gem::Version
-  version: 1.19.1
+  version: 1.19.3
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-12-24 00:00:00.000000000 Z
+date: 2026-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid