rails_admin 1.4.3 → 2.0.0.beta

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

@@ -0,0 +1,27 @@
+require 'rails_admin/config/fields'
+require 'rails_admin/config/fields/types'
+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") }
+  next false if attachment_names.blank?
+
+  attachment_name = attachment_names.detect { |a| a == properties.name.to_s.chomp('_data').to_sym }
+  next false unless attachment_name
+
+  field = RailsAdmin::Config::Fields::Types.load(:shrine).new(parent, attachment_name, properties)
+  fields << field
+
+  data_field_name = "#{attachment_name}_data".to_sym
+  child_properties = parent.abstract_model.properties.detect { |p| p.name == data_field_name }
+  next true unless child_properties
+
+  children_field = fields.detect { |f| f.name == data_field_name } || RailsAdmin::Config::Fields.default_factory.call(parent, child_properties, fields)
+  children_field.hide unless field == children_field
+  children_field.filterable(false) unless field == children_field
+
+  field.children_fields([data_field_name])
+  true
+end

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

@@ -0,0 +1,31 @@
+require 'rails_admin/config/fields/base'
+require 'rails_admin/config/fields/types/text'
+
+module RailsAdmin
+  module Config
+    module Fields
+      module Types
+        class ActionText < RailsAdmin::Config::Fields::Types::Text
+          # Register field type for the type loader
+          RailsAdmin::Config::Fields::Types.register(self)
+
+          register_instance_option :version do
+            '1.1.1'
+          end
+
+          register_instance_option :css_location do
+            "https://cdnjs.cloudflare.com/ajax/libs/trix/#{version}/trix.css"
+          end
+
+          register_instance_option :js_location do
+            "https://cdnjs.cloudflare.com/ajax/libs/trix/#{version}/trix.js"
+          end
+
+          register_instance_option :partial do
+            :form_action_text
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -29,15 +29,7 @@ module RailsAdmin
 
           def parse_value(value)
             return unless value.present?
-            if ::Rails.version >= '5'
-              abstract_model.model.attribute_types[name.to_s].serialize(value)
-            else
-              # Depending on the colum type and AR version, we might get a
-              # string or an integer, so we need to handle both cases.
-              enum.fetch(value) do
-                type_cast_value(value)
-              end
-            end
+            abstract_model.model.attribute_types[name.to_s].serialize(value)
           end
 
           def parse_input(params)
@@ -53,19 +45,11 @@ module RailsAdmin
         private
 
           def parse_input_value(value)
-            if ::Rails.version >= '5'
-              abstract_model.model.attribute_types[name.to_s].deserialize(value)
-            else
-              enum.invert[type_cast_value(value)]
-            end
+            abstract_model.model.attribute_types[name.to_s].deserialize(value)
           end
 
           def type_cast_value(value)
-            if ::Rails.version >= '4.2'
-              abstract_model.model.column_types[name.to_s].type_cast_from_user(value)
-            else
-              abstract_model.model.column_types[name.to_s].type_cast(value)
-            end
+            abstract_model.model.column_types[name.to_s].type_cast_from_user(value)
           end
         end
       end

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

@@ -24,6 +24,7 @@ module RailsAdmin
           def resource_url(thumb = false)
             return nil unless value
             if thumb && value.variable?
+              thumb = thumb_method if thumb == true
               variant = value.variant(thumb)
               Rails.application.routes.url_helpers.rails_blob_representation_path(
                 variant.blob.signed_id, variant.variation.key, variant.blob.filename, only_path: true

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

@@ -1,3 +1,4 @@
+require 'rails_admin/config/fields/types/action_text'
 require 'rails_admin/config/fields/types/active_record_enum'
 require 'rails_admin/config/fields/types/active_storage'
 require 'rails_admin/config/fields/types/belongs_to_association'
@@ -26,6 +27,7 @@ require 'rails_admin/config/fields/types/string'
 require 'rails_admin/config/fields/types/hidden'
 require 'rails_admin/config/fields/types/text'
 require 'rails_admin/config/fields/types/serialized'
+require 'rails_admin/config/fields/types/shrine'
 require 'rails_admin/config/fields/types/time'
 require 'rails_admin/config/fields/types/timestamp'
 require 'rails_admin/config/fields/types/color'

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

@@ -8,6 +8,10 @@ module RailsAdmin
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types.register(self)
 
+          register_instance_option :version do
+            '4.11.4'
+          end
+
           # If you want to have a different toolbar configuration for CKEditor
           # create your own custom config.js and override this configuration
           register_instance_option :config_js do
@@ -21,16 +25,12 @@ module RailsAdmin
 
           # Use this if you want to point to a cloud instances of the base CKeditor
           register_instance_option :base_location do
-            "#{Rails.application.config.assets.prefix}/ckeditor/"
+            "https://cdnjs.cloudflare.com/ajax/libs/ckeditor/#{version}/"
           end
 
           register_instance_option :partial do
             :form_ck_editor
           end
-
-          [:base_location, :config_js, :location].each do |key|
-            register_deprecated_instance_option :"ckeditor_#{key}", key
-          end
         end
       end
     end

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

@@ -16,31 +16,29 @@ module RailsAdmin
             }
           end
 
+          register_instance_option :version do
+            '5.46.0'
+          end
+
           # Pass the location of the theme and mode for Codemirror
           register_instance_option :assets do
             {
-              mode: ::ActionController::Base.helpers.asset_path('codemirror/modes/css.js'),
-              theme: ::ActionController::Base.helpers.asset_path('codemirror/themes/night.css'),
+              mode: "https://cdnjs.cloudflare.com/ajax/libs/codemirror/#{version}/mode/css/css.min.js",
+              theme: "https://cdnjs.cloudflare.com/ajax/libs/codemirror/#{version}/theme/night.min.css",
             }
           end
 
-          # Use this if you want to point to a cloud instances of CodeMirror
           register_instance_option :js_location do
-            ::ActionController::Base.helpers.asset_path('codemirror.js')
+            "https://cdnjs.cloudflare.com/ajax/libs/codemirror/#{version}/codemirror.min.js"
           end
 
-          # Use this if you want to point to a cloud instances of CodeMirror
           register_instance_option :css_location do
-            ::ActionController::Base.helpers.asset_path('codemirror.css')
+            "https://cdnjs.cloudflare.com/ajax/libs/codemirror/#{version}/codemirror.min.css"
           end
 
           register_instance_option :partial do
             :form_code_mirror
           end
-
-          [:assets, :config, :css_location, :js_location].each do |key|
-            register_deprecated_instance_option :"codemirror_#{key}", key
-          end
         end
       end
     end

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

@@ -8,28 +8,26 @@ module RailsAdmin
           # 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
+          # See https://www.froala.com/wysiwyg-editor/docs/options
           register_instance_option :config_options do
             nil
           end
 
+          register_instance_option :version do
+            '2.9.5'
+          end
+
           register_instance_option :css_location do
-            ActionController::Base.helpers.asset_path('froala_editor.min.css')
+            "https://cdnjs.cloudflare.com/ajax/libs/froala-editor/#{version}/css/froala_editor.min.css"
           end
 
           register_instance_option :js_location do
-            ActionController::Base.helpers.asset_path('froala_editor.min.js')
+            "https://cdnjs.cloudflare.com/ajax/libs/froala-editor/#{version}/js/froala_editor.min.js"
           end
 
           register_instance_option :partial do
             :form_froala
           end
-
-          [:config_options, :css_location, :js_location].each do |key|
-            register_deprecated_instance_option :"froala_#{key}", key
-          end
         end
       end
     end

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

@@ -0,0 +1,48 @@
+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 value.is_a?(Hash)
+
+                if value.key?(:thumb)
+                  :thumb
+                elsif value.key?(:thumbnail)
+                  :thumbnail
+                else
+                  value.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
+            "cached_#{name}_data" if bindings[:object].respond_to?("cached_#{name}_data")
+          end
+
+          def resource_url(thumb = nil)
+            return nil unless value
+
+            if value.is_a?(Hash)
+              value[thumb || value.keys.first].url
+            else
+              value.url
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -14,13 +14,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/text.rb

@@ -8,24 +8,6 @@ module RailsAdmin
           # 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/wysihtml5.rb

@@ -10,26 +10,30 @@ module RailsAdmin
 
           # 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/model.rb

@@ -44,7 +44,8 @@ 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
@@ -87,7 +88,7 @@ module RailsAdmin
 
       register_instance_option :navigation_label do
         @navigation_label ||= begin
-          if (parent_module = abstract_model.model.parent) != Object
+          if (parent_module = abstract_model.model.try(:module_parent) || abstract_model.model.try!(:parent)) != Object
             parent_module.to_s
           end
         end

data/lib/rails_admin/config/proxyable.rb

@@ -2,7 +2,19 @@ require 'rails_admin/config/proxyable/proxy'
 module RailsAdmin
   module Config
     module Proxyable
-      attr_accessor :bindings
+      def bindings
+        Thread.current[:rails_admin_bindings] ||= {}
+        Thread.current[:rails_admin_bindings][self]
+      end
+
+      def bindings=(new_bindings)
+        Thread.current[:rails_admin_bindings] ||= {}
+        if new_bindings.nil?
+          Thread.current[:rails_admin_bindings].delete(self)
+        else
+          Thread.current[:rails_admin_bindings][self] = new_bindings
+        end
+      end
 
       def with(bindings = {})
         RailsAdmin::Config::Proxyable::Proxy.new(self, bindings)

data/lib/rails_admin/config/proxyable/proxy.rb

@@ -2,8 +2,6 @@ module RailsAdmin
   module Config
     module Proxyable
       class Proxy < BasicObject
-        attr_reader :bindings
-
         def initialize(object, bindings = {})
           @object = object
           @bindings = bindings
@@ -21,12 +19,12 @@ module RailsAdmin
 
         def method_missing(name, *args, &block)
           if @object.respond_to?(name)
-            reset = @object.instance_variable_get('@bindings')
+            reset = @object.bindings
             begin
-              @object.instance_variable_set('@bindings', @bindings)
+              @object.bindings = @bindings
               response = @object.__send__(name, *args, &block)
             ensure
-              @object.instance_variable_set('@bindings', reset)
+              @object.bindings = reset
             end
             response
           else

data/lib/rails_admin/config/sections/list.rb

@@ -24,6 +24,10 @@ module RailsAdmin
           false
         end
 
+        register_instance_option :search_by do
+          nil
+        end
+
         register_instance_option :sort_by do
           parent.abstract_model.primary_key
         end
@@ -39,6 +43,25 @@ module RailsAdmin
         register_instance_option :row_css_class do
           ''
         end
+
+        register_instance_option :sidescroll do
+          nil
+        end
+
+        def sidescroll_frozen_columns
+          global_config = RailsAdmin::Config.sidescroll
+          model_config = sidescroll
+          enabled = model_config.nil? ? global_config : model_config
+          if enabled
+            num_frozen = model_config[:num_frozen_columns] if model_config.is_a?(Hash)
+            unless num_frozen
+              num_frozen = global_config[:num_frozen_columns] if global_config.is_a?(Hash)
+              num_frozen ||= 3 # by default, freeze checkboxes, links & first property (usually primary key / id?)
+              num_frozen -= 1 unless checkboxes? # model config should be explicit about this, only adjust if using global config
+            end
+            num_frozen
+          end
+        end
       end
     end
   end