rails_admin 2.0.0.beta → 2.0.0.rc

data/lib/rails_admin/config/actions/index.rb

@@ -49,7 +49,7 @@ module RailsAdmin
               format.json do
                 output = begin
                   if params[:compact]
-                    primary_key_method = @association ? @association.associated_primary_key : @model_config.abstract_model.primary_key
+                    primary_key_method = @model_config.abstract_model.primary_key
                     label_method = @model_config.object_label_method
                     @objects.collect { |o| {id: o.send(primary_key_method).to_s, label: o.send(label_method).to_s} }
                   else

data/lib/rails_admin/config/actions/new.rb

@@ -36,9 +36,7 @@ module RailsAdmin
               sanitize_params_for!(request.xhr? ? :modal : :create)
 
               @object.set_attributes(params[@abstract_model.param_key])
-              @authorization_adapter && @authorization_adapter.attributes_for(:create, @abstract_model).each do |name, value|
-                @object.send("#{name}=", value)
-              end
+              @authorization_adapter && @authorization_adapter.authorize(:create, @abstract_model, @object)
 
               if @object.save
                 @auditing_adapter && @auditing_adapter.create_object(@object, @abstract_model, _current_user)

data/lib/rails_admin/config/fields.rb

@@ -82,7 +82,6 @@ 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'

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

@@ -78,7 +78,7 @@ module RailsAdmin
 
         # Reader for associated primary key
         def associated_primary_key
-          @associated_primary_key ||= association.primary_key
+          @associated_primary_key ||= associated_model_config.abstract_model.primary_key
         end
 
         # Reader for the association's key

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

@@ -1,11 +1,10 @@
-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
+        class ActionText < Text
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types.register(self)
 

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

@@ -12,7 +12,6 @@ require 'rails_admin/config/fields/types/enum'
 require 'rails_admin/config/fields/types/file_upload'
 require 'rails_admin/config/fields/types/paperclip'
 require 'rails_admin/config/fields/types/carrierwave'
-require 'rails_admin/config/fields/types/refile'
 require 'rails_admin/config/fields/types/multiple_file_upload'
 require 'rails_admin/config/fields/types/multiple_active_storage'
 require 'rails_admin/config/fields/types/multiple_carrierwave'

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

@@ -1,10 +1,10 @@
-require 'rails_admin/config/fields/base'
+require 'rails_admin/config/fields/types/text'
 
 module RailsAdmin
   module Config
     module Fields
       module Types
-        class CKEditor < RailsAdmin::Config::Fields::Types::Text
+        class CKEditor < Text
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types.register(self)
 

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

@@ -1,10 +1,10 @@
-require 'rails_admin/config/fields/base'
+require 'rails_admin/config/fields/types/text'
 
 module RailsAdmin
   module Config
     module Fields
       module Types
-        class CodeMirror < RailsAdmin::Config::Fields::Types::Text
+        class CodeMirror < Text
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types.register(self)
 

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

@@ -1,10 +1,10 @@
-require 'rails_admin/config/fields/base'
+require 'rails_admin/config/fields/types/string_like'
 
 module RailsAdmin
   module Config
     module Fields
       module Types
-        class Color < RailsAdmin::Config::Fields::Base
+        class Color < StringLike
           RailsAdmin::Config::Fields::Types.register(self)
 
           register_instance_option :pretty_value do

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

@@ -23,6 +23,10 @@ module RailsAdmin
             nil
           end
 
+          register_instance_option :cache_value do
+            bindings[:object].public_send(cache_method) if cache_method
+          end
+
           register_instance_option :export_value do
             resource_url.to_s
           end
@@ -34,9 +38,9 @@ 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 ? v.link_to(image_html, url, target: '_blank', rel: 'noopener noreferrer') : image_html
               else
-                v.link_to(value, url, target: '_blank')
+                v.link_to(value, url, target: '_blank', rel: 'noopener noreferrer')
               end
             end
           end

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

@@ -1,10 +1,10 @@
-require 'rails_admin/config/fields/base'
+require 'rails_admin/config/fields/types/text'
 
 module RailsAdmin
   module Config
     module Fields
       module Types
-        class Froala < RailsAdmin::Config::Fields::Types::Text
+        class Froala < Text
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types.register(self)
 

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

@@ -1,10 +1,10 @@
-require 'rails_admin/config/fields/base'
+require 'rails_admin/config/fields/types/string_like'
 
 module RailsAdmin
   module Config
     module Fields
       module Types
-        class Hidden < RailsAdmin::Config::Fields::Base
+        class Hidden < StringLike
           RailsAdmin::Config::Fields::Types.register(self)
 
           register_instance_option :view_helper do

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

@@ -12,7 +12,7 @@ module RailsAdmin
               {resize: '100x100>'}
             end
 
-            register_instance_option :delete_key do
+            register_instance_option :delete_value do
               value.id
             end
 

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

@@ -12,8 +12,12 @@ module RailsAdmin
               @thumb_method ||= ((versions = value.versions.keys).detect { |k| k.in?([:thumb, :thumbnail, 'thumb', 'thumbnail']) } || versions.first.to_s)
             end
 
-            register_instance_option :delete_key do
-              value.file.identifier
+            register_instance_option :keep_value do
+              value.cache_name || value.identifier
+            end
+
+            register_instance_option :delete_value do
+              value.file.filename
             end
 
             def resource_url(thumb = false)
@@ -27,7 +31,15 @@ module RailsAdmin
           end
 
           register_instance_option :cache_method do
-            "#{name}_cache"
+            "#{name}_cache" unless ::CarrierWave::VERSION >= '2'
+          end
+
+          register_instance_option :keep_method do
+            name if ::CarrierWave::VERSION >= '2'
+          end
+
+          register_instance_option :reorderable? do
+            ::CarrierWave::VERSION >= '2'
           end
 
           register_instance_option :delete_method do

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

@@ -19,10 +19,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,9 +36,9 @@ 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 ? v.link_to(image_html, url, target: '_blank', rel: 'noopener noreferrer') : image_html
                 else
-                  v.link_to(value, url, target: '_blank')
+                  v.link_to(value, url, target: '_blank', rel: 'noopener noreferrer')
                 end
               end
             end
@@ -67,6 +73,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/polymorphic_association.rb

@@ -78,6 +78,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/shrine.rb

@@ -29,7 +29,11 @@ module RailsAdmin
           end
 
           register_instance_option :cache_method do
-            "cached_#{name}_data" if bindings[:object].respond_to?("cached_#{name}_data")
+            name
+          end
+
+          register_instance_option :cache_value do
+            bindings[:object].public_send("cached_#{name}_data") if bindings[:object].respond_to?("cached_#{name}_data")
           end
 
           def resource_url(thumb = nil)

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

@@ -1,10 +1,10 @@
-require 'rails_admin/config/fields/base'
+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)
 

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

@@ -1,10 +1,10 @@
-require 'rails_admin/config/fields/base'
+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

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

@@ -0,0 +1,19 @@
+require 'rails_admin/config/fields/base'
+
+module RailsAdmin
+  module Config
+    module Fields
+      module Types
+        class StringLike < RailsAdmin::Config::Fields::Base
+          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,10 +1,10 @@
-require 'rails_admin/config/fields/base'
+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)
 

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

@@ -1,10 +1,10 @@
-require 'rails_admin/config/fields/base'
+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)
 

data/lib/rails_admin/extensions/cancancan/authorization_adapter.rb

@@ -2,38 +2,62 @@ module RailsAdmin
   module Extensions
     module CanCanCan
       # This adapter is for the CanCanCan[https://github.com/CanCanCommunity/cancancan] authorization library.
-      class AuthorizationAdapter < RailsAdmin::Extensions::CanCan::AuthorizationAdapter
+      class AuthorizationAdapter
+        module ControllerExtension
+          def current_ability
+            # use _current_user instead of default current_user so it works with
+            # whatever current user method is defined with RailsAdmin
+            @current_ability ||= @ability.new(_current_user)
+          end
+        end
+
+        # See the +authorize_with+ config method for where the initialization happens.
+        def initialize(controller, ability = ::Ability)
+          @controller = controller
+          @controller.instance_variable_set '@ability', ability
+          @controller.extend ControllerExtension
+          @controller.current_ability.authorize! :access, :rails_admin
+        end
+
+        # This method is called in every controller action and should raise an exception
+        # when the authorization fails. The first argument is the name of the controller
+        # action as a symbol (:create, :bulk_delete, etc.). The second argument is the
+        # AbstractModel instance that applies. The third argument is the actual model
+        # instance if it is available.
         def authorize(action, abstract_model = nil, model_object = nil)
           return unless action
-          subject = model_object || abstract_model && abstract_model.model
-          if authorized_for_dashboard_in_legacy_way?(action)
-            subject
-          else
-            @controller.current_ability.authorize!(*resolve_with_compatibility(action, subject))
-          end
+          action, subject = resolve_action_and_subject(action, abstract_model, model_object)
+          @controller.current_ability.authorize!(action, subject)
         end
 
+        # This method is called primarily from the view to determine whether the given user
+        # has access to perform the action on a given model. It should return true when authorized.
+        # This takes the same arguments as +authorize+. The difference is that this will
+        # return a boolean whereas +authorize+ will raise an exception when not authorized.
         def authorized?(action, abstract_model = nil, model_object = nil)
           return unless action
-          subject = model_object || abstract_model && abstract_model.model
-          authorized_for_dashboard_in_legacy_way?(action, true) ||
-            @controller.current_ability.can?(*resolve_with_compatibility(action, subject))
+          action, subject = resolve_action_and_subject(action, abstract_model, model_object)
+          @controller.current_ability.can?(action, subject)
         end
 
-      private
+        # This is called when needing to scope a database query. It is called within the list
+        # and bulk_delete/destroy actions and should return a scope which limits the records
+        # to those which the user can perform the given action on.
+        def query(action, abstract_model)
+          abstract_model.model.accessible_by(@controller.current_ability, action)
+        end
 
-        def authorized_for_dashboard_in_legacy_way?(action, silent = false)
-          return false unless action == :dashboard
-          legacy_ability = @controller.current_ability.permissions[:can][:dashboard]
-          if legacy_ability && (legacy_ability.empty? || legacy_ability.all?(&:empty?))
-            ActiveSupport::Deprecation.warn('RailsAdmin CanCanCan Ability with `can :dashboard` is old and support will be removed in the next major release, use `can :read, :dashboard` instead. See https://github.com/sferik/rails_admin/issues/2901') unless silent
-            true
-          else
-            false
-          end
+        # This is called in the new/create actions to determine the initial attributes for new
+        # records. It should return a hash of attributes which match what the user
+        # is authorized to create.
+        def attributes_for(action, abstract_model)
+          @controller.current_ability.attributes_for(action, abstract_model && abstract_model.model)
         end
 
-        def resolve_with_compatibility(action, subject)
+      private
+
+        def resolve_action_and_subject(action, abstract_model, model_object)
+          subject = model_object || abstract_model && abstract_model.model
           if subject
             [action, subject]
           else

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

@@ -119,7 +119,10 @@ module RailsAdmin
           versions = versions.order(sort_reverse == 'true' ? "#{sort} DESC" : sort)
           versions = all ? versions : versions.send(Kaminari.config.page_method_name, current_page).per(per_page)
           paginated_proxies = Kaminari.paginate_array([], total_count: versions.try(:total_count) || versions.count)
-          paginated_proxies = paginated_proxies.send(Kaminari.config.page_method_name, current_page).per(per_page)
+          paginated_proxies = paginated_proxies.send(
+            paginated_proxies.respond_to?(Kaminari.config.page_method_name) ? Kaminari.config.page_method_name : :page,
+            current_page,
+          ).per(per_page)
           versions.each do |version|
             paginated_proxies << VersionProxy.new(version, @user_class)
           end

data/lib/rails_admin/version.rb

@@ -3,7 +3,7 @@ module RailsAdmin
     MAJOR = 2
     MINOR = 0
     PATCH = 0
-    PRE = 'beta'.freeze
+    PRE = 'rc'.freeze
 
     class << self
       # @return [String]