rails_admin 1.4.2 → 3.1.2

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsAdmin
   module Config
     module Fields
@@ -19,10 +21,16 @@ module RailsAdmin
               nil
             end
 
-            register_instance_option :delete_key do
+            register_instance_option :keep_value do
               nil
             end
 
+            register_instance_option :delete_value do
+              nil
+            end
+
+            register_deprecated_instance_option :delete_key, :delete_value
+
             register_instance_option :pretty_value do
               if value.presence
                 v = bindings[:view]
@@ -30,19 +38,21 @@ 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') : image_html
+                  url == thumb_url ? image_html : v.link_to(image_html, url, target: '_blank', rel: 'noopener noreferrer')
                 else
-                  v.link_to(value, url, target: '_blank')
+                  display_value = value.respond_to?(:filename) ? value.filename : value
+                  v.link_to(display_value, url, target: '_blank', rel: 'noopener noreferrer')
                 end
               end
             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
 
@@ -67,6 +77,14 @@ module RailsAdmin
             nil
           end
 
+          register_instance_option :keep_method do
+            nil
+          end
+
+          register_instance_option :reorderable? do
+            false
+          end
+
           register_instance_option :export_value do
             attachments.map(&:resource_url).map(&:to_s).join(',')
           end

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

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+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 :filter_operators do
+            %w[default between] + (required? ? [] : %w[_separator _not_null _null])
+          end
+
+          register_instance_option :view_helper do
+            :number_field
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/base'
 require 'rails_admin/config/fields/types/file_upload'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/string'
 
 module RailsAdmin
@@ -13,7 +15,11 @@ module RailsAdmin
           end
 
           def parse_input(params)
-            params[name] = params[name].presence
+            if params[name].present?
+              params[name] = params[name]
+            else
+              params.delete(name)
+            end
           end
 
           register_instance_option :formatted_value do

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/belongs_to_association'
 
 module RailsAdmin
@@ -45,12 +47,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 +61,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
@@ -78,6 +81,13 @@ module RailsAdmin
           def value
             bindings[:object].send(association.name)
           end
+
+          def parse_input(params)
+            if (type_value = params[association.foreign_type.to_sym]).present?
+              config = associated_model_config.find { |c| type_value == c.abstract_model.model.name }
+              params[association.foreign_type.to_sym] = config.abstract_model.base_class.name if config
+            end
+          end
         end
       end
     end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/text'
 
 module RailsAdmin

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

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require 'rails_admin/config/fields/types/file_upload'
+
+module RailsAdmin
+  module Config
+    module Fields
+      module Types
+        class Shrine < RailsAdmin::Config::Fields::Types::FileUpload
+          RailsAdmin::Config::Fields::Types.register(self)
+
+          register_instance_option :thumb_method do
+            unless defined? @thumb_method
+              @thumb_method = begin
+                next nil unless bindings[:object].respond_to?("#{name}_derivatives")
+
+                derivatives = bindings[:object].public_send("#{name}_derivatives")
+
+                if derivatives.key?(:thumb)
+                  :thumb
+                elsif derivatives.key?(:thumbnail)
+                  :thumbnail
+                else
+                  derivatives.keys.first
+                end
+              end
+            end
+            @thumb_method
+          end
+
+          register_instance_option :delete_method do
+            "remove_#{name}" if bindings[:object].respond_to?("remove_#{name}")
+          end
+
+          register_instance_option :cache_method do
+            name if bindings[:object].try("cached_#{name}_data")
+          end
+
+          register_instance_option :cache_value do
+            bindings[:object].try("cached_#{name}_data")
+          end
+
+          register_instance_option :link_name do
+            value.original_filename
+          end
+
+          def resource_url(thumb = nil)
+            return nil unless value
+
+            thumb && bindings[:object].public_send(:"#{name}", thumb).try(:url) || value.url
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,10 +1,12 @@
-require 'rails_admin/config/fields/base'
+# frozen_string_literal: true
+
+require 'rails_admin/config/fields/types/text'
 
 module RailsAdmin
   module Config
     module Fields
       module Types
-        class SimpleMDE < RailsAdmin::Config::Fields::Types::Text
+        class SimpleMDE < Text
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types.register(self)
 
@@ -14,13 +16,16 @@ module RailsAdmin
             nil
           end
 
-          # Use this if you want to point to a cloud instance of the base SimpleMDE
+          register_instance_option :version do
+            '1.11.2'
+          end
+
           register_instance_option :js_location do
-            "#{Rails.application.config.assets.prefix}/simplemde.min.js"
+            "https://cdnjs.cloudflare.com/ajax/libs/simplemde/#{version}/simplemde.min.js"
           end
 
           register_instance_option :css_location do
-            "#{Rails.application.config.assets.prefix}/simplemde.min.css"
+            "https://cdnjs.cloudflare.com/ajax/libs/simplemde/#{version}/simplemde.min.css"
           end
 
           register_instance_option :partial do

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

@@ -1,10 +1,12 @@
-require 'rails_admin/config/fields/base'
+# frozen_string_literal: true
+
+require 'rails_admin/config/fields/types/string_like'
 
 module RailsAdmin
   module Config
     module Fields
       module Types
-        class String < RailsAdmin::Config::Fields::Base
+        class String < StringLike
           RailsAdmin::Config::Fields::Types.register(self)
 
           def input_size
@@ -20,7 +22,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

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'rails_admin/config/fields/base'
+
+module RailsAdmin
+  module Config
+    module Fields
+      module Types
+        class StringLike < RailsAdmin::Config::Fields::Base
+          register_instance_option :filter_operators do
+            %w[_discard like not_like is starts_with ends_with] + (required? ? [] : %w[_separator _present _blank])
+          end
+
+          register_instance_option :treat_empty_as_nil? do
+            properties.try(:nullable?)
+          end
+
+          def parse_input(params)
+            params[name] = params[name].presence if params.key?(name) && treat_empty_as_nil?
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,31 +1,15 @@
-require 'rails_admin/config/fields/base'
+# frozen_string_literal: true
+
+require 'rails_admin/config/fields/types/string_like'
 
 module RailsAdmin
   module Config
     module Fields
       module Types
-        class Text < RailsAdmin::Config::Fields::Base
+        class Text < StringLike
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types.register(self)
 
-          [:ckeditor, :ckeditor_base_location, :ckeditor_config_js, :ckeditor_location].each do |key|
-            register_deprecated_instance_option key do
-              raise("The 'field(:foo){ ckeditor true }' style DSL is deprecated. Please use 'field :foo, :ck_editor' instead.")
-            end
-          end
-
-          [:codemirror, :codemirror_assets, :codemirror_config, :codemirror_css_location, :codemirror_js_location].each do |key|
-            register_deprecated_instance_option key do
-              raise("The 'field(:foo){ codemirror true }' style DSL is deprecated. Please use 'field :foo, :code_mirror' instead.")
-            end
-          end
-
-          [:bootstrap_wysihtml5, :bootstrap_wysihtml5_config_options, :bootstrap_wysihtml5_css_location, :bootstrap_wysihtml5_js_location].each do |key|
-            register_deprecated_instance_option key do
-              raise("The 'field(:foo){ bootstrap_wysihtml5 true }' style DSL is deprecated. Please use 'field :foo, :wysihtml5' instead.")
-            end
-          end
-
           register_instance_option :html_attributes do
             {
               required: required?,

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/datetime'
 
 module RailsAdmin
@@ -8,10 +10,20 @@ module RailsAdmin
           RailsAdmin::Config::Fields::Types.register(self)
 
           def parse_value(value)
-            parent_value = super(value)
-            return unless parent_value
-            value_with_tz = parent_value.in_time_zone
-            ::DateTime.parse(value_with_tz.strftime('%Y-%m-%d %H:%M:%S'))
+            abstract_model.model.type_for_attribute(name.to_s).serialize(super)&.change(year: 2000, month: 1, day: 1)
+          end
+
+          register_instance_option :filter_operators do
+            %w[default between] + (required? ? [] : %w[_separator _not_null _null])
+          end
+
+          register_instance_option :datepicker_options do
+            {
+              allowInput: true,
+              altFormat: flatpickr_format,
+              enableTime: true,
+              noCalendar: true,
+            }
           end
 
           register_instance_option :strftime_format do

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/datetime'
 
 module RailsAdmin
@@ -7,10 +9,6 @@ module RailsAdmin
         class Timestamp < RailsAdmin::Config::Fields::Types::Datetime
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types.register(self)
-
-          @format = :long
-          @i18n_scope = [:time, :formats]
-          @js_plugin_options = {}
         end
       end
     end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/types/string'
 
 module RailsAdmin

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

@@ -1,35 +1,41 @@
-require 'rails_admin/config/fields/base'
+# frozen_string_literal: true
+
+require 'rails_admin/config/fields/types/text'
 
 module RailsAdmin
   module Config
     module Fields
       module Types
-        class Wysihtml5 < RailsAdmin::Config::Fields::Types::Text
+        class Wysihtml5 < Text
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types.register(self)
 
           # If you want to have a different toolbar configuration for wysihtml5
           # you can use a Ruby hash to configure these options:
-          # https://github.com/jhollingworth/bootstrap-wysihtml5/#advanced
+          # https://github.com/bootstrap-wysiwyg/bootstrap3-wysiwyg
           register_instance_option :config_options do
-            nil
+            {
+              toolbar: {
+                fa: true,
+              },
+            }
+          end
+
+          register_instance_option :version do
+            '0.3.3'
           end
 
           register_instance_option :css_location do
-            ActionController::Base.helpers.asset_path('bootstrap-wysihtml5/index.css')
+            "https://cdnjs.cloudflare.com/ajax/libs/bootstrap3-wysiwyg/#{version}/bootstrap3-wysihtml5.min.css"
           end
 
           register_instance_option :js_location do
-            ActionController::Base.helpers.asset_path('bootstrap-wysihtml5/index.js')
+            "https://cdnjs.cloudflare.com/ajax/libs/bootstrap3-wysiwyg/#{version}/bootstrap3-wysihtml5.all.min.js"
           end
 
           register_instance_option :partial do
             :form_wysihtml5
           end
-
-          [:config_options, :css_location, :js_location].each do |key|
-            register_deprecated_instance_option :"bootstrap_wysihtml5_#{key}", key
-          end
         end
       end
     end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/core_ext/string/inflections'
 require 'rails_admin/config/fields'
 require 'rails_admin/config/fields/association'
@@ -9,7 +11,7 @@ module RailsAdmin
         @@registry = {}
 
         def self.load(type)
-          @@registry[type.to_sym] || raise("Unsupported field datatype: #{type}")
+          @@registry.fetch(type.to_sym) { raise "Unsupported field datatype: #{type}" }
         end
 
         def self.register(type, klass = nil)

data/lib/rails_admin/config/fields.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsAdmin
   module Config
     module Fields
@@ -20,7 +22,7 @@ module RailsAdmin
 
       # Registry of field factories.
       #
-      # Field factory is an anonymous function that recieves the parent object,
+      # Field factory is an anonymous function that receives the parent object,
       # an array of field properties and an array of fields already instantiated.
       #
       # If the factory returns true then that property will not be run through
@@ -50,13 +52,15 @@ module RailsAdmin
         parent.abstract_model.properties.each do |properties|
           # Unless a previous factory has already loaded current field as well
           next if fields.detect { |f| f.name == properties.name }
+
           # Loop through factories until one returns true
           @@registry.detect { |factory| factory.call(parent, properties, fields) }
         end
         # Load fields for all associations (relations)
-        parent.abstract_model.associations.select { |a| a.type != :belongs_to }.each do |association| # :belongs_to are created by factory for belongs_to fields
+        parent.abstract_model.associations.reject { |a| a.type == :belongs_to }.each do |association| # :belongs_to are created by factory for belongs_to fields
           # Unless a previous factory has already loaded current field as well
           next if fields.detect { |f| f.name == association.name }
+
           # Loop through factories until one returns true
           @@registry.detect { |factory| factory.call(parent, association, fields) }
         end
@@ -82,6 +86,7 @@ require 'rails_admin/config/fields/factories/devise'
 require 'rails_admin/config/fields/factories/paperclip'
 require 'rails_admin/config/fields/factories/dragonfly'
 require 'rails_admin/config/fields/factories/carrierwave'
-require 'rails_admin/config/fields/factories/refile'
 require 'rails_admin/config/fields/factories/active_storage'
+require 'rails_admin/config/fields/factories/shrine'
+require 'rails_admin/config/fields/factories/action_text'
 require 'rails_admin/config/fields/factories/association'

data/lib/rails_admin/config/groupable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/group'
 
 module RailsAdmin

data/lib/rails_admin/config/has_description.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsAdmin
   module Config
     # Provides accessor and autoregistering of model's description.

data/lib/rails_admin/config/has_fields.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsAdmin
   module Config
     # Provides accessors and autoregistering of model's fields.
@@ -8,9 +10,7 @@ module RailsAdmin
 
         # some fields are hidden by default (belongs_to keys, has_many associations in list views.)
         # unhide them if config specifically defines them
-        if field
-          field.show unless field.instance_variable_get("@#{field.name}_registered").is_a?(Proc)
-        end
+        field.show if field && !field.instance_variable_get("@#{field.name}_registered").is_a?(Proc)
         # Specify field as virtual if type is not specifically set and field was not
         # found in default stack
         if field.nil? && type.nil?
@@ -39,17 +39,18 @@ module RailsAdmin
         field
       end
 
-      # configure a field without adding it.
+      # configure field(s) from the default group in a section without changing the original order.
       def configure(name, type = nil, &block)
-        field(name, type, false, &block)
+        [*name].each { |field_name| field(field_name, type, false, &block) }
       end
 
-      # include fields by name and apply an optionnal block to each (through a call to fields),
+      # include fields by name and apply an optional block to each (through a call to fields),
       # or include fields by conditions if no field names
       def include_fields(*field_names, &block)
         if field_names.empty?
           _fields.select { |f| f.instance_eval(&block) }.each do |f|
             next if f.defined
+
             f.defined = true
             f.order = _fields.count(&:defined)
           end
@@ -117,6 +118,10 @@ module RailsAdmin
         all_fields.collect { |f| f.with(bindings) }.select(&:visible?).sort_by { |f| [f.order, i += 1] } # stable sort, damn
       end
 
+      def possible_fields
+        _fields(true)
+      end
+
     protected
 
       # Raw fields.
@@ -126,7 +131,7 @@ module RailsAdmin
         return @_fields if @_fields
         return @_ro_fields if readonly && @_ro_fields
 
-        if self.class == RailsAdmin::Config::Sections::Base
+        if instance_of?(RailsAdmin::Config::Sections::Base)
           @_ro_fields = @_fields = RailsAdmin::Config::Fields.factory(self)
         else
           # parent is RailsAdmin::Config::Model, recursion is on Section's classes

data/lib/rails_admin/config/has_groups.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/fields/group'
 
 module RailsAdmin
@@ -16,7 +18,7 @@ module RailsAdmin
 
       # Reader for groups that are marked as visible
       def visible_groups
-        parent.groups.collect { |f| f.section = self; f.with(bindings) }.select(&:visible?).select do |g| # rubocop:disable Semicolon
+        parent.groups.collect { |f| f.section = self; f.with(bindings) }.select(&:visible?).select do |g| # rubocop:disable Style/Semicolon
           g.visible_fields.present?
         end
       end

data/lib/rails_admin/config/hideable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsAdmin
   module Config
     # Defines a visibility configuration
@@ -16,7 +18,7 @@ module RailsAdmin
 
       # Writer to hide object.
       def hide(&block)
-        visible block ? proc { false == instance_eval(&block) } : false
+        visible block ? proc { instance_eval(&block) == false } : false
       end
 
       # Writer to show field.

data/lib/rails_admin/config/inspectable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsAdmin
   module Config
     module Inspectable
@@ -30,9 +32,7 @@ module RailsAdmin
       end
 
       def set_named_instance_variables
-        unless defined?(self.class::NAMED_INSTANCE_VARIABLES)
-          self.class.const_set('NAMED_INSTANCE_VARIABLES', [])
-        end
+        self.class.const_set('NAMED_INSTANCE_VARIABLES', []) unless defined?(self.class::NAMED_INSTANCE_VARIABLES)
       end
     end
   end