rails_admin 3.1.1 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32f625ca21a5c94c2fc91766ae74ef690a92ff7f882068b70d617ad7b1e1ff3a
-  data.tar.gz: ed3af9f17b3277f11a4b17db9beffe03d80294b453bb086d7aa819c46ce9cc1d
+  metadata.gz: 03f798619ca0b106577088ff39d25d4103d7096198ff66244f4381023033398b
+  data.tar.gz: d3bae813acd97182810f9c6ef09fc295888d706810adc314e7992854f7679d84
 SHA512:
-  metadata.gz: 2ad917ef318789585952a8e82084d3042960037a441ce1197f752f036e4f581107c37b0dab9466627fbe60e3f22e03d9a62f9af2f92ab9d77b1f5e02cfc85167
-  data.tar.gz: 02225217c1f2997fccfce31605d494bdc5668778482ccb8c84231cf431efaafa4a830988526c1bfae88cac4a0342d41d1d7bd10b9507a8c60c2da2f1131d3250
+  metadata.gz: 5ee60d19acc72d93e8b14c7e568ff924ea54558f9de807845cbd278230dc852d119c332b9866b673aea0757cb3f380d6c5abd09af4c71119626cf47c4cd67e6f
+  data.tar.gz: 74de744e2e07902613ebc9be3975ff6d68aaa7b4e4d38b2b7c0e59b30a5e3c3313331208f911a73419ec6551f98e1e7b2ad67976cbc7a0887f547444436e5ffb

data/Gemfile

@@ -14,7 +14,7 @@ group :active_record do
 
   platforms :ruby, :mswin, :mingw, :x64_mingw do
     gem 'mysql2', '>= 0.3.14'
-    gem 'sqlite3', '>= 1.3'
+    gem 'sqlite3', '~> 1.3'
   end
 end
 
@@ -29,7 +29,7 @@ group :test do
   gem 'database_cleaner-active_record', '>= 2.0', require: false
   gem 'database_cleaner-mongoid', '>= 2.0', require: false
   gem 'dragonfly', '~> 1.0'
-  gem 'factory_bot', '>= 4.2'
+  gem 'factory_bot', '>= 4.2', '!= 6.4.5'
   gem 'generator_spec', '>= 0.8'
   gem 'launchy', '>= 2.2'
   gem 'mini_magick', '>= 3.4'

data/README.md

@@ -1,13 +1,13 @@
 # RailsAdmin
 
 [![Gem Version](https://img.shields.io/gem/v/rails_admin.svg)][gem]
-[![Build Status](https://img.shields.io/github/workflow/status/railsadminteam/rails_admin/Test)][ghactions]
+[![Build Status](https://github.com/railsadminteam/rails_admin/actions/workflows/test.yml/badge.svg)][ghactions]
 [![Coverage Status](https://img.shields.io/coveralls/railsadminteam/rails_admin.svg)][coveralls]
 [![Code Climate](https://codeclimate.com/github/railsadminteam/rails_admin.svg)][codeclimate]
 [![SemVer](https://api.dependabot.com/badges/compatibility_score?dependency-name=rails_admin&package-manager=bundler&version-scheme=semver)][semver]
 
 [gem]: https://rubygems.org/gems/rails_admin
-[ghactions]: https://github.com/railsadminteam/rails_admin/actions
+[ghactions]: https://github.com/railsadminteam/rails_admin/actions/workflows/test.yml
 [coveralls]: https://coveralls.io/r/railsadminteam/rails_admin
 [codeclimate]: https://codeclimate.com/github/railsadminteam/rails_admin
 [semver]: https://dependabot.com/compatibility-score.html?dependency-name=rails_admin&package-manager=bundler&version-scheme=semver
@@ -98,6 +98,8 @@ This library aims to support and is [tested against][ghactions] the following Ru
 - Ruby 2.6
 - Ruby 2.7
 - Ruby 3.0
+- Ruby 3.1
+- Ruby 3.2
 - [JRuby][]
 
 [jruby]: http://jruby.org/

data/app/views/layouts/rails_admin/_head.html.erb

@@ -19,8 +19,8 @@
   <%= stylesheet_link_tag "rails_admin.css", media: :all, data: {'turbo-track': 'reload'} %>
   <%= javascript_inline_importmap_tag(RailsAdmin::Engine.importmap.to_json(resolver: self)) %>
   <%= javascript_importmap_module_preload_tags(RailsAdmin::Engine.importmap) %>
-  <%= javascript_importmap_shim_nonce_configuration_tag %>
-  <%= javascript_importmap_shim_tag %>
+  <%= javascript_importmap_shim_nonce_configuration_tag if respond_to? :javascript_importmap_shim_nonce_configuration_tag %>
+  <%= javascript_importmap_shim_tag if respond_to? :javascript_importmap_shim_tag %>
   <%= # Preload jQuery and make it global, unless jQuery UI fails to initialize
       tag.script "import jQuery from 'jquery'; window.jQuery = jQuery;".html_safe, type: "module" %>
   <%= javascript_import_module_tag 'rails_admin' %>

data/app/views/rails_admin/main/index.html.erb

@@ -133,7 +133,7 @@
               <% end %>
               <% properties.map{ |property| property.bind(:object, object) }.each do |property| %>
                 <% value = property.pretty_value %>
-                <td class="<%= [property.sticky? && 'sticky', property.css_class, property.type_css_class].select(&:present?).join(' ') %>" title="<%= strip_tags(value.to_s) %>">
+                <td class="<%= [property.sticky? && 'sticky', property.css_class, property.type_css_class].select(&:present?).join(' ') %>" title="<%= value %>">
                   <%= value %>
                 </td>
               <% end %>

data/lib/generators/rails_admin/importmap_formatter.rb

@@ -11,7 +11,7 @@ module RailsAdmin
     end
 
     def format
-      imports = packager.import("rails_admin@#{RailsAdmin::Version.js}")
+      imports = packager.import("rails_admin@#{RailsAdmin::Version.js}", from: 'jspm.io')
 
       # Use ESM compatible version to work around https://github.com/cljsjs/packages/issues/1579
       imports['@popperjs/core'].gsub!('lib/index.js', 'dist/esm/popper.js')

data/lib/rails_admin/adapters/active_record/association.rb

@@ -71,9 +71,9 @@ module RailsAdmin
         def key_accessor
           case type
           when :has_many, :has_and_belongs_to_many
-            "#{name.to_s.singularize}_ids".to_sym
+            :"#{name.to_s.singularize}_ids"
           when :has_one
-            "#{name}_id".to_sym
+            :"#{name}_id"
           else
             foreign_key
           end

data/lib/rails_admin/adapters/active_record.rb

@@ -172,7 +172,7 @@ module RailsAdmin
       # "0055" is the filter index, no use here. o is the operator, v the value
       def filter_scope(scope, filters, fields = config.list.fields.select(&:filterable?))
         filters.each_pair do |field_name, filters_dump|
-          filters_dump.each do |_, filter_dump|
+          filters_dump.each_value do |filter_dump|
             wb = WhereBuilder.new(scope)
             field = fields.detect { |f| f.name.to_s == field_name }
             value = parse_field_value(field, filter_dump[:v])
@@ -256,7 +256,8 @@ module RailsAdmin
 
         def build_statement_for_boolean
           return ["(#{@column} IS NULL OR #{@column} = ?)", false] if %w[false f 0].include?(@value)
-          return ["(#{@column} = ?)", true] if %w[true t 1].include?(@value)
+
+          ["(#{@column} = ?)", true] if %w[true t 1].include?(@value)
         end
 
         def column_for_value(value)

data/lib/rails_admin/adapters/active_record.rb.bak

@@ -0,0 +1,348 @@
+# frozen_string_literal: true
+
+require 'active_record'
+require 'rails_admin/adapters/active_record/association'
+require 'rails_admin/adapters/active_record/model_extension'
+require 'rails_admin/adapters/active_record/property'
+
+module RailsAdmin
+  module Adapters
+    module ActiveRecord
+      DISABLED_COLUMN_TYPES = %i[tsvector blob binary spatial hstore geometry].freeze
+
+      def model_with_extension
+        @model_with_extension ||=
+          begin
+            klass = Class.new(model) do
+              include ModelExtension
+            end
+            klass.instance_eval <<-RUBY, __FILE__, __LINE__+1
+              def name
+                "#{@model_name.to_s}"
+              end
+            RUBY
+            klass
+          end
+      end
+
+      def new(params = {})
+        model_with_extension.new(params)
+      end
+
+      def get(id, scope = nil)
+        scope = model_with_extension.merge(scope || scoped)
+        scope.where(primary_key => id).first
+      end
+
+      def scoped
+        model_with_extension.all
+      end
+
+      def first(options = {}, scope = nil)
+        all(options, scope).first
+      end
+
+      def all(options = {}, scope = nil)
+        scope = model_with_extension.merge(scope || scoped)
+        scope = scope.includes(options[:include]) if options[:include]
+        scope = scope.limit(options[:limit]) if options[:limit]
+        scope = bulk_scope(scope, options) if options[:bulk_ids]
+        scope = query_scope(scope, options[:query]) if options[:query]
+        scope = filter_scope(scope, options[:filters]) if options[:filters]
+        scope = scope.send(Kaminari.config.page_method_name, options[:page]).per(options[:per]) if options[:page] && options[:per]
+        scope = sort_scope(scope, options) if options[:sort]
+        scope
+      end
+
+      def count(options = {}, scope = nil)
+        all(options.merge(limit: false, page: false), scope).count(:all)
+      end
+
+      def destroy(objects)
+        Array.wrap(objects).each(&:destroy)
+      end
+
+      def associations
+        model.reflect_on_all_associations.collect do |association|
+          Association.new(association, model)
+        end
+      end
+
+      def properties
+        columns = model.columns.reject do |c|
+          c.type.blank? ||
+            DISABLED_COLUMN_TYPES.include?(c.type.to_sym) ||
+            c.try(:array)
+        end
+        columns.collect do |property|
+          Property.new(property, model)
+        end
+      end
+
+      def base_class
+        model.base_class
+      end
+
+      delegate :primary_key, :table_name, to: :model, prefix: false
+
+      def quoted_table_name
+        model.quoted_table_name
+      end
+
+      def quote_column_name(name)
+        model.connection.quote_column_name(name)
+      end
+
+      def encoding
+        adapter =
+          if ::ActiveRecord::Base.respond_to?(:connection_db_config)
+            ::ActiveRecord::Base.connection_db_config.configuration_hash[:adapter]
+          else
+            ::ActiveRecord::Base.connection_config[:adapter]
+          end
+        case adapter
+        when 'postgresql'
+          ::ActiveRecord::Base.connection.select_one("SELECT ''::text AS str;").values.first.encoding
+        when 'mysql2'
+          if RUBY_ENGINE == 'jruby'
+            ::ActiveRecord::Base.connection.select_one("SELECT '' AS str;").values.first.encoding
+          else
+            ::ActiveRecord::Base.connection.raw_connection.encoding
+          end
+        when 'oracle_enhanced'
+          ::ActiveRecord::Base.connection.select_one('SELECT dummy FROM DUAL').values.first.encoding
+        else
+          ::ActiveRecord::Base.connection.select_one("SELECT '' AS str;").values.first.encoding
+        end
+      end
+
+      def embedded?
+        false
+      end
+
+      def cyclic?
+        false
+      end
+
+      def adapter_supports_joins?
+        true
+      end
+
+    private
+
+      def bulk_scope(scope, options)
+        scope.where(primary_key => options[:bulk_ids])
+      end
+
+      def sort_scope(scope, options)
+        direction = options[:sort_reverse] ? :asc : :desc
+        case options[:sort]
+        when String, Symbol
+          scope.reorder("#{options[:sort]} #{direction}")
+        when Array
+          scope.reorder(options[:sort].zip(Array.new(options[:sort].size) { direction }).to_h)
+        when Hash
+          scope.reorder(options[:sort].map { |table_name, column| "#{table_name}.#{column}" }.
+            zip(Array.new(options[:sort].size) { direction }).to_h)
+        else
+          raise ArgumentError.new("Unsupported sort value: #{options[:sort]}")
+        end
+      end
+
+      class WhereBuilder
+        def initialize(scope)
+          @statements = []
+          @values = []
+          @tables = []
+          @scope = scope
+        end
+
+        def add(field, value, operator)
+          field.searchable_columns.flatten.each do |column_infos|
+            statement, value1, value2 = StatementBuilder.new(column_infos[:column], column_infos[:type], value, operator, @scope.connection.adapter_name).to_statement
+            @statements << statement if statement.present?
+            @values << value1 unless value1.nil?
+            @values << value2 unless value2.nil?
+            table, column = column_infos[:column].split('.')
+            @tables.push(table) if column
+          end
+        end
+
+        def build
+          scope = @scope.where(@statements.join(' OR '), *@values)
+          scope = scope.references(*@tables.uniq) if @tables.any?
+          scope
+        end
+      end
+
+      def query_scope(scope, query, fields = config.list.fields.select(&:queryable?))
+        if config.list.search_by
+          scope.send(config.list.search_by, query)
+        else
+          wb = WhereBuilder.new(scope)
+          fields.each do |field|
+            value = parse_field_value(field, query)
+            wb.add(field, value, field.search_operator)
+          end
+          # OR all query statements
+          wb.build
+        end
+      end
+
+      # filters example => {"string_field"=>{"0055"=>{"o"=>"like", "v"=>"test_value"}}, ...}
+      # "0055" is the filter index, no use here. o is the operator, v the value
+      def filter_scope(scope, filters, fields = config.list.fields.select(&:filterable?))
+        filters.each_pair do |field_name, filters_dump|
+          filters_dump.each_value do |filter_dump|
+            wb = WhereBuilder.new(scope)
+            field = fields.detect { |f| f.name.to_s == field_name }
+            value = parse_field_value(field, filter_dump[:v])
+
+            wb.add(field, value, (filter_dump[:o] || RailsAdmin::Config.default_search_operator))
+            # AND current filter statements to other filter statements
+            scope = wb.build
+          end
+        end
+        scope
+      end
+
+      def build_statement(column, type, value, operator)
+        StatementBuilder.new(column, type, value, operator, model.connection.adapter_name).to_statement
+      end
+
+      class StatementBuilder < RailsAdmin::AbstractModel::StatementBuilder
+        def initialize(column, type, value, operator, adapter_name)
+          super column, type, value, operator
+          @adapter_name = adapter_name
+        end
+
+      protected
+
+        def unary_operators
+          case @type
+          when :boolean
+            boolean_unary_operators
+          when :uuid
+            uuid_unary_operators
+          when :integer, :decimal, :float
+            numeric_unary_operators
+          else
+            generic_unary_operators
+          end
+        end
+
+      private
+
+        def generic_unary_operators
+          {
+            '_blank' => ["(#{@column} IS NULL OR #{@column} = '')"],
+            '_present' => ["(#{@column} IS NOT NULL AND #{@column} != '')"],
+            '_null' => ["(#{@column} IS NULL)"],
+            '_not_null' => ["(#{@column} IS NOT NULL)"],
+            '_empty' => ["(#{@column} = '')"],
+            '_not_empty' => ["(#{@column} != '')"],
+          }
+        end
+
+        def boolean_unary_operators
+          generic_unary_operators.merge(
+            '_blank' => ["(#{@column} IS NULL)"],
+            '_empty' => ["(#{@column} IS NULL)"],
+            '_present' => ["(#{@column} IS NOT NULL)"],
+            '_not_empty' => ["(#{@column} IS NOT NULL)"],
+          )
+        end
+        alias_method :numeric_unary_operators, :boolean_unary_operators
+        alias_method :uuid_unary_operators, :boolean_unary_operators
+
+        def range_filter(min, max)
+          if min && max && min == max
+            ["(#{@column} = ?)", min]
+          elsif min && max
+            ["(#{@column} BETWEEN ? AND ?)", min, max]
+          elsif min
+            ["(#{@column} >= ?)", min]
+          elsif max
+            ["(#{@column} <= ?)", max]
+          end
+        end
+
+        def build_statement_for_type
+          case @type
+          when :boolean                   then build_statement_for_boolean
+          when :integer, :decimal, :float then build_statement_for_integer_decimal_or_float
+          when :string, :text, :citext    then build_statement_for_string_or_text
+          when :enum                      then build_statement_for_enum
+          when :belongs_to_association    then build_statement_for_belongs_to_association
+          when :uuid                      then build_statement_for_uuid
+          end
+        end
+
+        def build_statement_for_boolean
+          case @value
+          when 'false', 'f', '0'
+            ["(#{@column} IS NULL OR #{@column} = ?)", false]
+          when 'true', 't', '1'
+            ["(#{@column} = ?)", true]
+          end
+        end
+
+        def column_for_value(value)
+          ["(#{@column} = ?)", value]
+        end
+
+        def build_statement_for_belongs_to_association
+          return if @value.blank?
+
+          ["(#{@column} = ?)", @value.to_i] if @value.to_i.to_s == @value
+        end
+
+        def build_statement_for_string_or_text
+          return if @value.blank?
+
+          return ["(#{@column} = ?)", @value] if ['is', '='].include?(@operator)
+
+          @value = @value.mb_chars.downcase unless %w[postgresql postgis].include? ar_adapter
+
+          @value =
+            case @operator
+            when 'default', 'like', 'not_like'
+              "%#{@value}%"
+            when 'starts_with'
+              "#{@value}%"
+            when 'ends_with'
+              "%#{@value}"
+            else
+              return
+            end
+
+          if %w[postgresql postgis].include? ar_adapter
+            if @operator == 'not_like'
+              ["(#{@column} NOT ILIKE ?)", @value]
+            else
+              ["(#{@column} ILIKE ?)", @value]
+            end
+          elsif @operator == 'not_like'
+            ["(LOWER(#{@column}) NOT LIKE ?)", @value]
+          else
+            ["(LOWER(#{@column}) LIKE ?)", @value]
+          end
+        end
+
+        def build_statement_for_enum
+          return if @value.blank?
+
+          ["(#{@column} IN (?))", Array.wrap(@value)]
+        end
+
+        def build_statement_for_uuid
+          column_for_value(@value) if /\A[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}\z/.match?(@value.to_s)
+        end
+
+        def ar_adapter
+          @adapter_name.downcase
+        end
+      end
+    end
+  end
+end

data/lib/rails_admin/adapters/mongoid/association.rb

@@ -92,9 +92,9 @@ module RailsAdmin
         def key_accessor
           case macro.to_sym
           when :has_many
-            "#{name.to_s.singularize}_ids".to_sym
+            :"#{name.to_s.singularize}_ids"
           when :has_one
-            "#{name}_id".to_sym
+            :"#{name}_id"
           when :embedded_in, :embeds_one, :embeds_many
             nil
           else

data/lib/rails_admin/adapters/mongoid/bson.rb

@@ -21,6 +21,7 @@ module RailsAdmin
               Moped::Errors::InvalidObjectId
               BSON::ObjectId::Invalid
               BSON::InvalidObjectId
+              BSON::Error::InvalidObjectId
             ].exclude?(e.class.to_s)
           end
         end

data/lib/rails_admin/adapters/mongoid.rb

@@ -31,6 +31,7 @@ module RailsAdmin
           Mongoid::Errors::InvalidFind
           Moped::Errors::InvalidObjectId
           BSON::InvalidObjectId
+          BSON::Error::InvalidObjectId
         ].exclude?(e.class.to_s)
       end
 
@@ -152,7 +153,7 @@ module RailsAdmin
         statements = []
 
         filters.each_pair do |field_name, filters_dump|
-          filters_dump.each do |_, filter_dump|
+          filters_dump.each_value do |filter_dump|
             field = fields.detect { |f| f.name.to_s == field_name }
             next unless field
 
@@ -251,7 +252,8 @@ module RailsAdmin
 
         def build_statement_for_boolean
           return {@column => false} if %w[false f 0].include?(@value)
-          return {@column => true} if %w[true t 1].include?(@value)
+
+          {@column => true} if %w[true t 1].include?(@value)
         end
 
         def column_for_value(value)

data/lib/rails_admin/config/fields/base.rb

@@ -357,7 +357,7 @@ module RailsAdmin
 
         def generic_field_help
           model = abstract_model.model_name.underscore
-          model_lookup = "admin.help.#{model}.#{name}".to_sym
+          model_lookup = :"admin.help.#{model}.#{name}"
           translated = I18n.translate(model_lookup, help: generic_help, default: [generic_help])
           (translated.is_a?(Hash) ? translated.to_a.first[1] : translated).html_safe
         end

data/lib/rails_admin/config/fields/factories/active_storage.rb

@@ -13,9 +13,9 @@ RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
     fields << field
     associations =
       if properties.type == :has_many
-        ["#{name}_attachments".to_sym, "#{name}_blobs".to_sym]
+        [:"#{name}_attachments", :"#{name}_blobs"]
       else
-        ["#{name}_attachment".to_sym, "#{name}_blob".to_sym]
+        [:"#{name}_attachment", :"#{name}_blob"]
       end
     children_fields = associations.map do |child_name|
       child_association = parent.abstract_model.associations.detect { |p| p.name.to_sym == child_name }

data/lib/rails_admin/config/fields/factories/carrierwave.rb

@@ -7,7 +7,7 @@ require 'rails_admin/config/fields/types/file_upload'
 RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
   model = parent.abstract_model.model
   if defined?(::CarrierWave) && model.is_a?(CarrierWave::Mount) && model.uploaders.include?(attachment_name = properties.name.to_s.chomp('_file_name').to_sym)
-    columns = [model.uploader_options[attachment_name][:mount_on] || attachment_name, "#{attachment_name}_content_type".to_sym, "#{attachment_name}_file_size".to_sym]
+    columns = [model.uploader_options[attachment_name][:mount_on] || attachment_name, :"#{attachment_name}_content_type", :"#{attachment_name}_file_size"]
     field = RailsAdmin::Config::Fields::Types.load(
       %i[serialized json].include?(properties.type) ? :multiple_carrierwave : :carrierwave,
     ).new(parent, attachment_name, properties)

data/lib/rails_admin/config/fields/factories/dragonfly.rb

@@ -10,7 +10,7 @@ RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
     field = RailsAdmin::Config::Fields::Types.load(:dragonfly).new(parent, attachment_name, properties)
     children_fields = []
     extensions.each do |ext|
-      children_column_name = "#{attachment_name}_#{ext}".to_sym
+      children_column_name = :"#{attachment_name}_#{ext}"
       child_properties = parent.abstract_model.properties.detect { |p| p.name.to_s == children_column_name.to_s }
       next unless child_properties
 

data/lib/rails_admin/config/fields/factories/paperclip.rb

@@ -11,7 +11,7 @@ RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
     field = RailsAdmin::Config::Fields::Types.load(:paperclip).new(parent, attachment_name, properties)
     children_fields = []
     extensions.each do |ext|
-      children_column_name = "#{attachment_name}_#{ext}".to_sym
+      children_column_name = :"#{attachment_name}_#{ext}"
       child_properties = parent.abstract_model.properties.detect { |p| p.name.to_s == children_column_name.to_s }
       next unless child_properties
 

data/lib/rails_admin/config/fields/factories/shrine.rb

@@ -16,7 +16,7 @@ RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
   field = RailsAdmin::Config::Fields::Types.load(:shrine).new(parent, attachment_name, properties)
   fields << field
 
-  data_field_name = "#{attachment_name}_data".to_sym
+  data_field_name = :"#{attachment_name}_data"
   child_properties = parent.abstract_model.properties.detect { |p| p.name == data_field_name }
   next true unless child_properties
 

data/lib/rails_admin/config/fields/types/belongs_to_association.rb

@@ -38,7 +38,7 @@ module RailsAdmin
           end
 
           def method_name
-            nested_form ? "#{name}_attributes".to_sym : super
+            nested_form ? :"#{name}_attributes" : super
           end
 
           def multiple?

data/lib/rails_admin/config/fields/types/has_many_association.rb

@@ -20,7 +20,7 @@ module RailsAdmin
           end
 
           def method_name
-            nested_form ? "#{name}_attributes".to_sym : super
+            nested_form ? :"#{name}_attributes" : super
           end
 
           # Reader for validation errors of the bound object

data/lib/rails_admin/config/fields/types/has_one_association.rb

@@ -28,7 +28,7 @@ module RailsAdmin
           end
 
           def method_name
-            nested_form ? "#{name}_attributes".to_sym : super
+            nested_form ? :"#{name}_attributes" : super
           end
 
           def multiple?

data/lib/rails_admin/config/model.rb

@@ -48,7 +48,9 @@ module RailsAdmin
       end
 
       def excluded?
-        @excluded ||= !RailsAdmin::AbstractModel.all.collect(&:model_name).include?(abstract_model.try(:model_name))
+        return @excluded if defined?(@excluded)
+
+        @excluded = !RailsAdmin::AbstractModel.all.collect(&:model_name).include?(abstract_model.try(:model_name))
       end
 
       def object_label

data/lib/rails_admin/config.rb

@@ -364,23 +364,22 @@ module RailsAdmin
 
     private
 
-      def lchomp(base, arg)
-        base.to_s.reverse.chomp(arg.to_s.reverse).reverse
-      end
-
       def viable_models
         included_models.collect(&:to_s).presence || begin
           @@system_models ||= # memoization for tests
             ([Rails.application] + Rails::Engine.subclasses.collect(&:instance)).flat_map do |app|
               (app.paths['app/models'].to_a + app.config.eager_load_paths).collect do |load_path|
                 Dir.glob(app.root.join(load_path)).collect do |load_dir|
+                  path_prefix = "#{app.root.join(load_dir)}/"
                   Dir.glob("#{load_dir}/**/*.rb").collect do |filename|
                     # app/models/module/class.rb => module/class.rb => module/class => Module::Class
-                    lchomp(filename, "#{app.root.join(load_dir)}/").chomp('.rb').camelize
+                    filename.delete_prefix(path_prefix).chomp('.rb').camelize
                   end
                 end
               end
             end.flatten.reject { |m| m.starts_with?('Concerns::') } # rubocop:disable Style/MultilineBlockChain
+
+          @@system_models + @registry.keys.collect(&:to_s)
         end
       end
 

data/lib/rails_admin/extensions/paper_trail/auditing_adapter.rb

@@ -146,7 +146,7 @@ module RailsAdmin
           versions = object.nil? ? versions_for_model(model) : object.public_send(model.model.versions_association_name)
           versions = versions.where('event LIKE ?', "%#{query}%") if query.present?
           versions = versions.order(sort)
-          versions = all ? versions : versions.send(Kaminari.config.page_method_name, current_page).per(per_page)
+          versions = versions.send(Kaminari.config.page_method_name, current_page).per(per_page) unless all
           paginated_proxies = Kaminari.paginate_array([], total_count: versions.try(:total_count) || versions.count)
           paginated_proxies = paginated_proxies.send(
             paginated_proxies.respond_to?(Kaminari.config.page_method_name) ? Kaminari.config.page_method_name : :page,

data/lib/rails_admin/support/csv_converter.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # frozen_string_literal: true
 
 require 'csv'

data/lib/rails_admin/version.rb

@@ -4,7 +4,7 @@ module RailsAdmin
   class Version
     MAJOR = 3
     MINOR = 1
-    PATCH = 1
+    PATCH = 3
     PRE = nil
 
     class << self

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rails_admin",
-  "version": "3.1.1",
+  "version": "3.1.3",
   "description": "RailsAdmin is a Rails engine that provides an easy-to-use interface for managing your data.",
   "homepage": "https://github.com/railsadminteam/rails_admin",
   "license": "MIT",

data/src/rails_admin/ui.js

@@ -88,7 +88,7 @@ import I18n from "./i18n";
   $(document).ready(triggerDomReady);
   document.addEventListener("turbo:render", triggerDomReady);
 
-  document.addEventListener("rails_admin.dom_ready", function () {
+  document.addEventListener("rails_admin.dom_ready", function (event) {
     $(".nav.nav-pills li.active").removeClass("active");
     $(
       '.nav.nav-pills li[data-model="' + $(".page-header").data("model") + '"]'
@@ -129,6 +129,12 @@ import I18n from "./i18n";
     $("a[data-method]").on("click", function (event) {
       window.Turbo.session.drive = false;
     });
+
+    // Trigger via jQuery for compatibility with existing user codes
+    $(document).trigger(
+      "rails_admin.dom_ready",
+      event.detail ? [event.detail] : null
+    );
   });
 
   $(document).on("click", ".bulk-link", function (event) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.3
 platform: ruby
 authors:
 - Erik Michaels-Ober
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-18 00:00:00.000000000 Z
+date: 2024-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel-serializers-xml
@@ -195,6 +195,7 @@ files:
 - lib/rails_admin.rb
 - lib/rails_admin/abstract_model.rb
 - lib/rails_admin/adapters/active_record.rb
+- lib/rails_admin/adapters/active_record.rb.bak
 - lib/rails_admin/adapters/active_record/association.rb
 - lib/rails_admin/adapters/active_record/object_extension.rb
 - lib/rails_admin/adapters/active_record/property.rb
@@ -466,7 +467,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Admin for Rails