rails_admin 2.3.0 → 3.0.0.beta

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

@@ -3,13 +3,14 @@ require 'rails_admin/config/fields/types'
 require 'rails_admin/config/fields/types/file_upload'
 
 RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
-  extensions = [:name, :uid]
+  extensions = %i[name uid]
   if (properties.name.to_s =~ /^(.+)_uid$/) && defined?(::Dragonfly) && parent.abstract_model.model.respond_to?(:dragonfly_attachment_classes) && parent.abstract_model.model.dragonfly_attachment_classes.collect(&:attribute).include?(attachment_name = Regexp.last_match[1].to_sym)
     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
       next unless child_properties = parent.abstract_model.properties.detect { |p| p.name.to_s == children_column_name.to_s }
+
       children_field = fields.detect { |f| f.name == children_column_name } || RailsAdmin::Config::Fields.default_factory.call(parent, child_properties, fields)
       children_field.hide
       children_field.filterable(false)

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

@@ -3,7 +3,7 @@ require 'rails_admin/config/fields/types'
 require 'rails_admin/config/fields/types/file_upload'
 
 RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
-  extensions = [:file_name, :content_type, :file_size, :updated_at, :fingerprint]
+  extensions = %i[file_name content_type file_size updated_at fingerprint]
   model = parent.abstract_model.model
   if (properties.name.to_s =~ /^(.+)_file_name$/) && defined?(::Paperclip) && model.try(:attachment_definitions) && model.attachment_definitions.key?(attachment_name = Regexp.last_match[1].to_sym)
     field = RailsAdmin::Config::Fields::Types.load(:paperclip).new(parent, attachment_name, properties)
@@ -11,6 +11,7 @@ RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
     extensions.each do |ext|
       children_column_name = "#{attachment_name}_#{ext}".to_sym
       next unless child_properties = parent.abstract_model.properties.detect { |p| p.name.to_s == children_column_name.to_s }
+
       children_field = fields.detect { |f| f.name == children_column_name } || RailsAdmin::Config::Fields.default_factory.call(parent, child_properties, fields)
       children_field.hide
       children_field.filterable(false)

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

@@ -5,7 +5,7 @@ require 'rails_admin/config/fields/types/file_upload'
 RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
   next false unless defined?(::Shrine)
 
-  attachment_names = parent.abstract_model.model.ancestors.select { |m| m.is_a?(Shrine::Attachment) }.map { |a| a.instance_variable_get("@name") }
+  attachment_names = parent.abstract_model.model.ancestors.select { |m| m.is_a?(Shrine::Attachment) }.map { |a| a.instance_variable_get('@name') }
   next false if attachment_names.blank?
 
   attachment_name = attachment_names.detect { |a| a == properties.name.to_s.chomp('_data').to_sym }

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

@@ -12,9 +12,8 @@ module RailsAdmin
         include RailsAdmin::Config::Configurable
         include RailsAdmin::Config::Hideable
 
-        attr_reader :name, :abstract_model
+        attr_reader :name, :abstract_model, :parent, :root
         attr_accessor :section
-        attr_reader :parent, :root
 
         def initialize(parent, name)
           @parent = parent

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

@@ -29,12 +29,14 @@ module RailsAdmin
 
           def parse_value(value)
             return unless value.present?
+
             abstract_model.model.attribute_types[name.to_s].serialize(value)
           end
 
           def parse_input(params)
             value = params[name]
             return unless value
+
             params[name] = parse_input_value(value)
           end
 

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

@@ -8,11 +8,7 @@ module RailsAdmin
           RailsAdmin::Config::Fields::Types.register(self)
 
           register_instance_option :thumb_method do
-            if ::ActiveStorage::VERSION::MAJOR >= 6
-              {resize_to_limit: [100, 100]}
-            else
-              {resize: '100x100>'}
-            end
+            {resize_to_limit: [100, 100]}
           end
 
           register_instance_option :delete_method do
@@ -21,12 +17,18 @@ module RailsAdmin
 
           register_instance_option :image? do
             if value
-              value.filename.to_s.split('.').last =~ /jpg|jpeg|png|gif|svg/i
+              mime_type = Mime::Type.lookup_by_extension(value.filename.extension_without_delimiter)
+              mime_type.to_s.match?(/^image/)
             end
           end
 
+          register_instance_option :eager_load do
+            {"#{name}_attachment": :blob}
+          end
+
           def resource_url(thumb = false)
             return nil unless value
+
             if thumb && value.variable?
               thumb = thumb_method if thumb == true
               variant = value.variant(thumb)
@@ -40,7 +42,7 @@ module RailsAdmin
 
           def value
             attachment = super
-            attachment if attachment && attachment.attached?
+            attachment if attachment&.attached?
           end
         end
       end

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

@@ -38,3 +38,4 @@ require 'rails_admin/config/fields/types/froala'
 require 'rails_admin/config/fields/types/json'
 require 'rails_admin/config/fields/types/inet'
 require 'rails_admin/config/fields/types/uuid'
+require 'rails_admin/config/fields/types/citext'

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

@@ -23,28 +23,20 @@ module RailsAdmin
             nested_form ? :form_nested_one : :form_filtering_select
           end
 
-          register_instance_option :inline_add do
-            true
-          end
-
-          register_instance_option :inline_edit do
-            true
-          end
-
-          register_instance_option :eager_load? do
+          register_instance_option :eager_load do
             true
           end
 
           def associated_primary_key
-            @associated_primary_key ||= association.primary_key
+            association.primary_key
           end
 
           def selected_id
-            bindings[:object].send(foreign_key)
+            bindings[:object].send(association.key_accessor)
           end
 
           def method_name
-            nested_form ? "#{name}_attributes".to_sym : association.foreign_key
+            nested_form ? "#{name}_attributes".to_sym : super
           end
 
           def multiple?

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

@@ -6,19 +6,32 @@ module RailsAdmin
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types.register(self)
 
+          register_instance_option :labels do
+            {
+              true => %(<span class="fas fa-check"></span>),
+              false => %(<span class="fas fa-times"></span>),
+              nil => %(<span class="fas fa-minus"></span>),
+            }
+          end
+
+          register_instance_option :css_classes do
+            {
+              true => 'success',
+              false => 'danger',
+              nil => 'default',
+            }
+          end
+
+          register_instance_option :nullable? do
+            properties&.nullable?
+          end
+
           register_instance_option :view_helper do
             :check_box
           end
 
           register_instance_option :pretty_value do
-            case value
-            when nil
-              %(<span class='label label-default'>&#x2012;</span>)
-            when false
-              %(<span class='label label-danger'>&#x2718;</span>)
-            when true
-              %(<span class='label label-success'>&#x2713;</span>)
-            end.html_safe
+            %(<span class="label label-#{css_classes[form_value]}">#{labels[form_value]}</span>).html_safe
           end
 
           register_instance_option :export_value do
@@ -29,10 +42,21 @@ module RailsAdmin
             :form_boolean
           end
 
+          def form_value
+            case value
+            when true, false
+              value
+            end
+          end
+
           # Accessor for field's help text displayed below input field.
           def generic_help
             ''
           end
+
+          def parse_input(params)
+            params[name] = params[name].presence if params.key?(name)
+          end
         end
       end
     end

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

@@ -22,6 +22,7 @@ module RailsAdmin
 
           def resource_url(thumb = false)
             return nil unless (uploader = bindings[:object].send(name)).present?
+
             thumb.present? ? uploader.send(thumb).url : uploader.url
           end
         end

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

@@ -0,0 +1,13 @@
+require 'rails_admin/config/fields/types/text'
+
+module RailsAdmin
+  module Config
+    module Fields
+      module Types
+        class Citext < Text
+          RailsAdmin::Config::Fields::Types.register(:citext, self)
+        end
+      end
+    end
+  end
+end

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

@@ -15,10 +15,14 @@ module RailsAdmin
             :form_colorpicker
           end
 
+          register_instance_option :view_helper do
+            :color_field
+          end
+
           register_instance_option :color do
             if value.present?
-              if value =~ /^[0-9a-fA-F]{3,6}$/
-                '#' + value
+              if /^[0-9a-fA-F]{3,6}$/.match?(value)
+                "##{value}"
               else
                 value
               end

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

@@ -7,19 +7,16 @@ module RailsAdmin
         class Date < RailsAdmin::Config::Fields::Types::Datetime
           RailsAdmin::Config::Fields::Types.register(self)
 
+          def parse_value(value)
+            ::Date.parse(value) if value.present?
+          end
+
           register_instance_option :date_format do
             :long
           end
 
           register_instance_option :i18n_scope do
-            [:date, :formats]
-          end
-
-          register_instance_option :datepicker_options do
-            {
-              showTodayButton: true,
-              format: parser.to_momentjs,
-            }
+            %i[date formats]
           end
 
           register_instance_option :html_attributes do

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

@@ -8,47 +8,36 @@ module RailsAdmin
         class Datetime < RailsAdmin::Config::Fields::Base
           RailsAdmin::Config::Fields::Types.register(self)
 
-          def parser
-            RailsAdmin::Support::Datetime.new(strftime_format)
-          end
-
           def parse_value(value)
-            parser.parse_string(value)
+            ::Time.zone.parse(value)
           end
 
           def parse_input(params)
             params[name] = parse_value(params[name]) if params[name]
           end
 
-          def value
-            parent_value = super
-            if %w(DateTime Date Time).include?(parent_value.class.name)
-              parent_value.in_time_zone
-            else
-              parent_value
-            end
-          end
-
           register_instance_option :date_format do
             :long
           end
 
           register_instance_option :i18n_scope do
-            [:time, :formats]
+            %i[time formats]
           end
 
           register_instance_option :strftime_format do
-            begin
-              ::I18n.t(date_format, scope: i18n_scope, raise: true)
-            rescue ::I18n::ArgumentError
-              "%B %d, %Y %H:%M"
-            end
+            ::I18n.t(date_format, scope: i18n_scope, raise: true)
+          rescue ::I18n::ArgumentError
+            '%B %d, %Y %H:%M'
+          end
+
+          register_instance_option :momentjs_format do
+            RailsAdmin::Support::Datetime.to_momentjs(strftime_format)
           end
 
           register_instance_option :datepicker_options do
             {
               showTodayButton: true,
-              format: parser.to_momentjs,
+              format: momentjs_format,
             }
           end
 
@@ -63,6 +52,10 @@ module RailsAdmin
             true
           end
 
+          register_instance_option :queryable? do
+            false
+          end
+
           register_instance_option :formatted_value do
             if time = (value || default_value)
               ::I18n.l(time, format: strftime_format)
@@ -74,6 +67,10 @@ module RailsAdmin
           register_instance_option :partial do
             :form_datetime
           end
+
+          def form_value
+            value&.in_time_zone&.strftime('%FT%T') || form_default_value
+          end
         end
       end
     end

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

@@ -1,12 +1,19 @@
-require 'rails_admin/config/fields/base'
+require 'rails_admin/config/fields/types/numeric'
 
 module RailsAdmin
   module Config
     module Fields
       module Types
-        class Decimal < RailsAdmin::Config::Fields::Base
+        class Decimal < RailsAdmin::Config::Fields::Types::Numeric
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types.register(self)
+
+          register_instance_option :html_attributes do
+            {
+              required: required?,
+              step: 'any',
+            }
+          end
         end
       end
     end

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

@@ -12,7 +12,8 @@ module RailsAdmin
           register_instance_option :image? do
             false unless value
             if abstract_model.model.new.respond_to?("#{name}_name")
-              bindings[:object].send("#{name}_name").to_s.split('.').last =~ /jpg|jpeg|png|gif/i
+              mime_type = Mime::Type.lookup_by_extension(bindings[:object].send("#{name}_name").to_s.split('.').last)
+              mime_type.to_s.match?(/^image/)
             else
               true # Dragonfly really is image oriented
             end
@@ -32,6 +33,7 @@ module RailsAdmin
 
           def resource_url(thumb = false)
             return nil unless (v = value)
+
             thumb ? v.thumb(thumb).try(:url) : v.url
           end
         end

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

@@ -21,7 +21,7 @@ module RailsAdmin
 
           register_instance_option :pretty_value do
             if enum.is_a?(::Hash)
-              enum.reject { |_k, v| v.to_s != value.to_s }.keys.first.to_s.presence || value.presence || ' - '
+              enum.select { |_k, v| v.to_s == value.to_s }.keys.first.to_s.presence || value.presence || ' - '
             elsif enum.is_a?(::Array) && enum.first.is_a?(::Array)
               enum.detect { |e| e[1].to_s == value.to_s }.try(:first).to_s.presence || value.presence || ' - '
             else

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

@@ -42,7 +42,7 @@ module RailsAdmin
               if image
                 thumb_url = resource_url(thumb_method)
                 image_html = v.image_tag(thumb_url, class: 'img-thumbnail')
-                url != thumb_url ? v.link_to(image_html, url, target: '_blank', rel: 'noopener noreferrer') : image_html
+                url == thumb_url ? image_html : v.link_to(image_html, url, target: '_blank', rel: 'noopener noreferrer')
               else
                 v.link_to(link_name, url, target: '_blank', rel: 'noopener noreferrer')
               end
@@ -50,7 +50,8 @@ module RailsAdmin
           end
 
           register_instance_option :image? do
-            (url = resource_url.to_s) && url.split('.').last =~ /jpg|jpeg|png|gif|svg/i
+            mime_type = Mime::Type.lookup_by_extension(resource_url.to_s.split('.').last)
+            mime_type.to_s.match?(/^image/)
           end
 
           register_instance_option :allowed_methods do
@@ -65,7 +66,7 @@ module RailsAdmin
 
           # virtual class
           def resource_url
-            raise('not implemented')
+            raise 'not implemented'
           end
 
           def virtual?

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

@@ -1,12 +1,19 @@
-require 'rails_admin/config/fields/base'
+require 'rails_admin/config/fields/types/numeric'
 
 module RailsAdmin
   module Config
     module Fields
       module Types
-        class Float < RailsAdmin::Config::Fields::Base
+        class Float < RailsAdmin::Config::Fields::Types::Numeric
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types.register(self)
+
+          register_instance_option :html_attributes do
+            {
+              required: required?,
+              step: 'any',
+            }
+          end
         end
       end
     end

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

@@ -17,12 +17,8 @@ module RailsAdmin
             false
           end
 
-          register_instance_option :inline_add do
-            true
-          end
-
           def method_name
-            nested_form ? "#{super}_attributes".to_sym : "#{super.to_s.singularize}_ids".to_sym # name_ids
+            nested_form ? "#{name}_attributes".to_sym : super
           end
 
           # Reader for validation errors of the bound object

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

@@ -17,24 +17,12 @@ module RailsAdmin
             (o = value) && o.send(associated_model_config.object_label_method)
           end
 
-          register_instance_option :inline_add do
-            true
-          end
-
-          register_instance_option :inline_edit do
-            true
-          end
-
-          def editable?
-            (nested_form || abstract_model.model.new.respond_to?("#{name}_id=")) && super
-          end
-
           def selected_id
             value.try :id
           end
 
           def method_name
-            nested_form ? "#{name}_attributes".to_sym : "#{name}_id".to_sym
+            nested_form ? "#{name}_attributes".to_sym : super
           end
 
           def multiple?

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

@@ -1,17 +1,13 @@
-require 'rails_admin/config/fields/base'
+require 'rails_admin/config/fields/types/numeric'
 
 module RailsAdmin
   module Config
     module Fields
       module Types
-        class Integer < RailsAdmin::Config::Fields::Base
+        class Integer < RailsAdmin::Config::Fields::Types::Numeric
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types.register(self)
 
-          register_instance_option :view_helper do
-            :number_field
-          end
-
           register_instance_option :sort_reverse? do
             serial?
           end

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

@@ -9,11 +9,7 @@ module RailsAdmin
 
           class ActiveStorageAttachment < RailsAdmin::Config::Fields::Types::MultipleFileUpload::AbstractAttachment
             register_instance_option :thumb_method do
-              if ::ActiveStorage::VERSION::MAJOR >= 6
-                {resize_to_limit: [100, 100]}
-              else
-                {resize: '100x100>'}
-              end
+              {resize_to_limit: [100, 100]}
             end
 
             register_instance_option :delete_value do
@@ -22,12 +18,14 @@ module RailsAdmin
 
             register_instance_option :image? do
               if value
-                value.filename.to_s.split('.').last =~ /jpg|jpeg|png|gif|svg/i
+                mime_type = Mime::Type.lookup_by_extension(value.filename.extension_without_delimiter)
+                mime_type.to_s.match?(/^image/)
               end
             end
 
             def resource_url(thumb = false)
               return nil unless value
+
               if thumb && value.variable?
                 variant = value.variant(thumb_method)
                 Rails.application.routes.url_helpers.rails_blob_representation_path(
@@ -46,6 +44,10 @@ module RailsAdmin
           register_instance_option :delete_method do
             "remove_#{name}" if bindings[:object].respond_to?("remove_#{name}")
           end
+
+          register_instance_option :eager_load do
+            {"#{name}_attachments": :blob}
+          end
         end
       end
     end

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

@@ -22,6 +22,7 @@ module RailsAdmin
 
             def resource_url(thumb = false)
               return nil unless value
+
               thumb.present? ? value.send(thumb).url : value.url
             end
           end

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

@@ -36,7 +36,7 @@ module RailsAdmin
                 if image
                   thumb_url = resource_url(thumb_method)
                   image_html = v.image_tag(thumb_url, class: 'img-thumbnail')
-                  url != thumb_url ? v.link_to(image_html, url, target: '_blank', rel: 'noopener noreferrer') : image_html
+                  url == thumb_url ? image_html : v.link_to(image_html, url, target: '_blank', rel: 'noopener noreferrer')
                 else
                   display_value = value.respond_to?(:filename) ? value.filename : value
                   v.link_to(display_value, url, target: '_blank', rel: 'noopener noreferrer')
@@ -45,11 +45,12 @@ module RailsAdmin
             end
 
             register_instance_option :image? do
-              (url = resource_url.to_s) && url.split('.').last =~ /jpg|jpeg|png|gif|svg/i
+              mime_type = Mime::Type.lookup_by_extension(resource_url.to_s.split('.').last)
+              mime_type.to_s.match?(/^image/)
             end
 
             def resource_url(_thumb = false)
-              raise('not implemented')
+              raise 'not implemented'
             end
           end
 

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

@@ -0,0 +1,18 @@
+require 'rails_admin/config/fields/base'
+
+module RailsAdmin
+  module Config
+    module Fields
+      module Types
+        class Numeric < RailsAdmin::Config::Fields::Base
+          # Register field type for the type loader
+          RailsAdmin::Config::Fields::Types.register(self)
+
+          register_instance_option :view_helper do
+            :number_field
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -45,12 +45,13 @@ module RailsAdmin
             [children_fields]
           end
 
-          register_instance_option :eager_load? do
+          register_instance_option :eager_load do
             false
           end
 
           def associated_collection(type)
             return [] if type.blank?
+
             config = RailsAdmin.config(type)
             config.abstract_model.all.collect do |object|
               [object.send(config.object_label_method), object.id]
@@ -58,7 +59,7 @@ module RailsAdmin
           end
 
           def associated_model_config
-            @associated_model_config ||= association.klass.collect { |type| RailsAdmin.config(type) }.select { |config| !config.excluded? }
+            @associated_model_config ||= association.klass.collect { |type| RailsAdmin.config(type) }.reject(&:excluded?)
           end
 
           def polymorphic_type_collection

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

@@ -20,7 +20,7 @@ module RailsAdmin
           end
 
           def generic_help
-            text = (required? ? I18n.translate('admin.form.required') : I18n.translate('admin.form.optional')) + '. '
+            text = "#{required? ? I18n.translate('admin.form.required') : I18n.translate('admin.form.optional')}. "
             if valid_length.present? && valid_length[:is].present?
               text += "#{I18n.translate('admin.form.char_length_of').capitalize} #{valid_length[:is]}."
             else