forest_admin_datasource_mongoid 1.22.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 075d89743d3b55de774a366182fe99514c00541162d14f8a5291ef3eceb35ebd
-  data.tar.gz: 379682e6263a1455758733dd2160fd6b18a571b1a5c5c302964033af2d58e997
+  metadata.gz: ad4d7aa1026727336745fcc9095544d5393bb79cd1d682a86695e0dcbcdd9e87
+  data.tar.gz: 4aa57abededdb49cbb6f594f99fdc3d7e7f2d6ef85f8e57df7aeeafbbe68b62b
 SHA512:
-  metadata.gz: 80e4f725dd94340ce6fd61002074188b279fe77659d7249a21f5e59e992fcc76b84238ac0d84e1e9adc2d164bb793d8b709817a246c7e8d3dbd8eba5ba2b478d
-  data.tar.gz: 1e151e24a1e4bb64fe52e12a185071ff6a3a6ea8ec275a388ed95c63625768de4eab8ee3dc6bba9ebd02bb25852cb0f95bc692a8baab1cba1a42edf7da4b7331
+  metadata.gz: f877f111b692e58d048997f1afb7eb462f842dbdf9049b1ac09546d73e8efeaa7987d908027058fe1a3ff10d1937d1a60cb480fe586a240fde5a86c1b1c370b3
+  data.tar.gz: e3038174309f72a8b276d26049f2535f69887d545ad66d7a9670cb198653019df2f8d6f993c79dd5bd29a95756e09f7222b034fd53bcff624f75cb0a4d5b6d6b

data/forest_admin_datasource_mongoid.gemspec

@@ -34,13 +34,5 @@ admin work on any Ruby application."
 
   spec.add_dependency "mongoid", ">= 9.0"
   spec.add_dependency "activesupport", ">= 6.1"
-  spec.add_dependency "base64"
-  spec.add_dependency "benchmark"
-  spec.add_dependency "bigdecimal"
-  spec.add_dependency "cgi"
-  spec.add_dependency "csv"
-  spec.add_dependency "logger"
-  spec.add_dependency "mutex_m"
-  spec.add_dependency "ostruct"
   spec.add_dependency "zeitwerk", "~> 2.3"
 end

data/lib/forest_admin_datasource_mongoid/parser/relation.rb

@@ -4,12 +4,10 @@ module ForestAdminDatasourceMongoid
       def get_polymorphic_types(relation_name)
         types = {}
 
-        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
+        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
           end
         end
 

data/lib/forest_admin_datasource_mongoid/parser/validation.rb

@@ -4,35 +4,33 @@ 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?
 
-        parse_column_validators(model._validators[column.name.to_sym], column)
-      end
-
-      def before_validation_callback?(model)
+        validations = []
+        # NOTICE: Do not consider validations if a before_validation Active Records
+        #         Callback is detected.
         default_callback_excluded = [:normalize_changed_in_place_attributes]
-        model._validation_callbacks.any? do |callback|
-          !default_callback_excluded.include?(callback.filter) && callback.kind == :before
-        end
-      end
+        return validations if model._validation_callbacks
+                                   .reject { |callback| default_callback_excluded.include?(callback.filter) }
+                                   .map(&:kind).include?(:before)
 
-      def parse_column_validators(validators, column)
-        validations = []
-        validators.each do |validator|
-          next if validator.options[:if] || validator.options[:unless] || validator.options[:on]
+        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]
 
-          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)
+            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
         end
+
         validations
       end
 

data/lib/forest_admin_datasource_mongoid/utils/add_null_values.rb

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

data/lib/forest_admin_datasource_mongoid/utils/helpers.rb

@@ -5,8 +5,7 @@ module ForestAdminDatasourceMongoid
       # @example
       # unnest(['firstname', 'book.title', 'book.author'], 'book') == ['title', 'author']
       def unnest(strings, prefix)
-        prefix_with_dot = "#{prefix}."
-        strings.filter_map { |field| field[(prefix.size + 1)..] if field.start_with?(prefix_with_dot) }
+        strings.select { |field| field.start_with?("#{prefix}.") }.map { |field| field[(prefix.size + 1)..] }
       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?(':')
-            fields.merge(list_paths(condition_tree.field))
+            list_paths(condition_tree.field).each { |field| fields << field }
           end
         end
 

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_datasource_mongoid
 version: !ruby/object:Gem::Version
-  version: 1.22.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-01-22 00:00:00.000000000 Z
+date: 2025-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -39,118 +39,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '6.1'
-- !ruby/object:Gem::Dependency
-  name: base64
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: benchmark
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bigdecimal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: cgi
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: csv
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: logger
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mutex_m
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: ostruct
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement