rails_admin 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33d3dadad1730dcd25eec2e13d09c6f46e8b580c
-  data.tar.gz: 2f14072f95732283cf691142d80c65a47335e31e
+  metadata.gz: 361208518b5b304581718ddc22d54ee97adcbaad
+  data.tar.gz: 807e4d91a69a5377444885331a087e25ab65c891
 SHA512:
-  metadata.gz: b820c08a510d01a62f8e6ba65b48ea6c2c37243b5202bb86e51f74303bd1ff370789259623d3b8aaaf41d19c6408fc0d694ed3f4f20c76ae24e034d1f4991724
-  data.tar.gz: 22557c8d0ab68e47e48be789f7b813a32f50af4e2f194c7710d71557b105c14af9fd6956c4aeecc6aca889ab5d404493dc1a6c8ad0cf7488542cae812ac52070
+  metadata.gz: 40e5f564f367ad3c53220737654301ff01df27ef448044d1d933397e3ac28d6fb2559e0dc6cfb4bbfe57cbc71194dcab9ea46ffcc263d3d71949a8935126f30a
+  data.tar.gz: b08875e67144b03c5ab98789772067f6e3765c2e93e1d226800b742e68f685cbe5a829c04d35123560e98e80dcb2babbba9b1cb6b1c97a0fd2983968c461b436

data/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'appraisal', '>= 2.0'
-gem 'rails', '~> 5.1.0'
+gem 'rails'
 gem 'haml'
 gem 'devise'
 
@@ -9,7 +9,7 @@ group :active_record do
   gem 'paper_trail'
 
   platforms :ruby, :mswin, :mingw do
-    gem 'mysql2', '~> 0.3.14'
+    gem 'mysql2', '>= 0.3.14'
     gem 'sqlite3', '>= 1.3'
   end
 end
@@ -19,8 +19,6 @@ group :development, :test do
 end
 
 group :test do
-  gem 'cancan', '>= 1.6'
-  gem 'cancancan', '~> 1.12.0'
   gem 'carrierwave', '>= 0.8'
   gem 'coveralls'
   gem 'database_cleaner', ['>= 1.2', '!= 1.4.0', '!= 1.5.0']

data/README.md

@@ -2,17 +2,17 @@
 
 [![Gem Version](https://img.shields.io/gem/v/rails_admin.svg)][gem]
 [![Build Status](https://img.shields.io/travis/sferik/rails_admin.svg)][travis]
-[![Dependency Status](https://img.shields.io/gemnasium/sferik/rails_admin.svg)][gemnasium]
-[![Code Climate](https://img.shields.io/codeclimate/github/sferik/rails_admin.svg)][codeclimate]
 [![Coverage Status](https://img.shields.io/coveralls/sferik/rails_admin.svg)][coveralls]
 [![Inline docs](http://inch-ci.org/github/sferik/rails_admin.svg)][inch]
+[![Code Climate](https://codeclimate.com/github/sferik/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
 [travis]: https://travis-ci.org/sferik/rails_admin
-[gemnasium]: https://gemnasium.com/sferik/rails_admin
-[codeclimate]: https://codeclimate.com/github/sferik/rails_admin
 [coveralls]: https://coveralls.io/r/sferik/rails_admin
 [inch]: http://inch-ci.org/github/sferik/rails_admin
+[codeclimate]: https://codeclimate.com/github/sferik/rails_admin
+[semver]: https://dependabot.com/compatibility-score.html?dependency-name=rails_admin&package-manager=bundler&version-scheme=semver
 
 RailsAdmin is a Rails engine that provides an easy-to-use interface for managing your data.
 

data/app/assets/javascripts/rails_admin/jquery-ui.js.erb

@@ -0,0 +1,8 @@
+<% require_asset "jquery-ui/effect" %>
+<% if Jquery::Ui::Rails::JQUERY_UI_VERSION >= '1.12' %>
+  <% require_asset "jquery-ui/widgets/sortable" %>
+  <% require_asset "jquery-ui/widgets/autocomplete" %>
+<% else %>
+  <% require_asset "jquery-ui/sortable" %>
+  <% require_asset "jquery-ui/autocomplete" %>
+<% end %>

data/app/assets/javascripts/rails_admin/ra.filter-box.js

@@ -157,7 +157,11 @@
           break;
       }
 
+      var filterContainerId = field_name + '-' + index + '-filter-container';
+      $('p#' + filterContainerId).remove();
+
       var $content = $('<p>')
+        .attr('id', filterContainerId)
         .addClass('filter form-search')
         .append(
           $('<span class="label label-info form-label"></span>')

data/app/assets/javascripts/rails_admin/ra.widgets.coffee

@@ -70,6 +70,23 @@ $(document).on 'rails_admin.dom_ready', (e, content) ->
       else
         image_container.hide()
 
+    # multiple-fileupload-preview
+
+    content.find('[data-multiple-fileupload]').change ->
+      input = this
+      $("#" + input.id).parent().children(".preview").remove()
+      for file in input.files
+        ext = file.name.split('.').pop().toLowerCase()
+        if $.inArray(ext, ['gif','png','jpg','jpeg','bmp']) == -1
+          continue
+        image_container = $('<img />').addClass('preview').addClass('img-thumbnail')
+        do (image_container) ->
+          reader = new FileReader()
+          reader.onload = (e) ->
+            image_container.attr "src", e.target.result
+          reader.readAsDataURL file
+          $("#" + input.id).parent().append($('<div></div>').addClass('preview').append(image_container))
+
     # filtering-multiselect
 
     content.find('[data-filteringmultiselect]').each ->

data/app/assets/javascripts/rails_admin/rails_admin.js

@@ -1,9 +1,7 @@
 //=  require 'jquery'
 //=  require 'jquery_ujs'
 //=  require 'jquery.remotipart'
-//=  require 'jquery-ui/effect'
-//=  require 'jquery-ui/sortable'
-//=  require 'jquery-ui/autocomplete'
+//=  require 'rails_admin/jquery-ui'
 //=  require 'rails_admin/moment-with-locales'
 //=  require 'rails_admin/bootstrap-datetimepicker'
 //=  require 'rails_admin/jquery.colorpicker'

data/app/views/rails_admin/main/_form_file_upload.html.haml

@@ -1,4 +1,4 @@
-- file = form.object.send(field.method_name).presence
+- file = field.value
 
 .toggle{style: ('display:none;' if file && field.delete_method && form.object.send(field.delete_method) == '1')}
   - if value = field.pretty_value

data/app/views/rails_admin/main/_form_multiple_file_upload.html.haml

@@ -0,0 +1,14 @@
+- field.attachments.each_with_index do |attachment, i|
+  .toggle
+    = attachment.pretty_value
+    - if field.delete_method
+      %a.btn.btn-info.btn-remove-image{href: '#', :'data-toggle' => 'button', role: 'button', onclick: "$(this).siblings('[type=checkbox]').click(); $(this).parent('.toggle').toggle('slow'); jQuery(this).toggleClass('btn-danger btn-info'); return false;"}
+        %i.icon-white.icon-trash
+        = I18n.t('admin.actions.delete.menu').capitalize + " #{field.label.downcase} ##{i + 1}"
+
+    = form.check_box(field.delete_method, {multiple:true, style: 'display:none;'}, attachment.delete_key, nil)
+
+= form.file_field(field.name, field.html_attributes.reverse_merge({ data: { :"multiple-fileupload" => true }, multiple: true }))
+
+- if field.cache_method
+  = form.hidden_field(field.cache_method)

data/lib/rails_admin/adapters/active_record.rb

@@ -155,6 +155,8 @@ module RailsAdmin
           case @type
           when :boolean
             boolean_unary_operators
+          when :integer, :decimal, :float
+            numeric_unary_operators
           else
             generic_unary_operators
           end
@@ -181,6 +183,7 @@ module RailsAdmin
             '_not_empty' => ["(#{@column} IS NOT NULL)"],
           )
         end
+        alias_method :numeric_unary_operators, :boolean_unary_operators
 
         def range_filter(min, max)
           if min && max

data/lib/rails_admin/adapters/mongoid.rb

@@ -83,7 +83,7 @@ module RailsAdmin
       end
 
       def embedded?
-        model.relations.values.detect { |a| a.macro.to_sym == :embedded_in }
+        associations.detect { |a| a.macro == :embedded_in }
       end
 
       def cyclic?
@@ -150,7 +150,7 @@ module RailsAdmin
 
       def parse_collection_name(column)
         collection_name, column_name = column.split('.')
-        if [:embeds_one, :embeds_many].include?(model.relations[collection_name].try(:macro).try(:to_sym))
+        if associations.detect { |a| a.name == collection_name.to_sym }.try(:embeds?)
           [table_name, column]
         else
           [collection_name, column_name]

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

@@ -7,6 +7,7 @@ module RailsAdmin
         def initialize(object)
           super
           object.associations.each do |name, association|
+            association = Association.new(association, object.class)
             if [:has_many, :references_many].include? association.macro
               instance_eval <<-RUBY, __FILE__, __LINE__ + 1
                 def #{name.to_s.singularize}_ids
@@ -28,9 +29,7 @@ RUBY
                 def #{name}_id=(item_id)
                   item = (#{association.klass}.find(item_id) rescue nil)
                   return unless item
-                  unless persisted?
-                    item.update_attribute('#{association.foreign_key}', id)
-                  end
+                  item.update_attribute('#{association.foreign_key}', id) unless persisted?
                   super item.id
                 end
 RUBY

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

@@ -45,7 +45,7 @@ module RailsAdmin
         end
 
         def foreign_key
-          return unless [:embeds_one, :embeds_many].exclude?(macro.to_sym)
+          return if embeds?
           association.foreign_key.to_sym rescue nil
         end
 
@@ -82,7 +82,7 @@ module RailsAdmin
 
         def nested_options
           nested = nested_attributes_options.try { |o| o[name] }
-          if !nested && [:embeds_one, :embeds_many].include?(macro.to_sym) && !association.cyclic
+          if !nested && [:embeds_one, :embeds_many].include?(macro.to_sym) && !cyclic?
             raise <<-MSG.gsub(/^\s+/, '')
             Embbeded association without accepts_nested_attributes_for can't be handled by RailsAdmin,
             because embedded model doesn't have top-level access.
@@ -96,13 +96,24 @@ module RailsAdmin
           true
         end
 
+        def macro
+          association.try(:macro) || association.class.name.split('::').last.underscore.to_sym
+        end
+
+        def embeds?
+          [:embeds_one, :embeds_many].include?(macro)
+        end
+
       private
 
         def inverse_of_field
           association.respond_to?(:inverse_of_field) && association.inverse_of_field
         end
 
-        delegate :macro, :options, to: :association, prefix: false
+        def cyclic?
+          association.respond_to?(:cyclic?) ? association.cyclic? : association.cyclic
+        end
+
         delegate :nested_attributes_options, to: :model, prefix: false
         delegate :polymorphic_parents, to: RailsAdmin::AbstractModel
       end

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

@@ -70,8 +70,8 @@ module RailsAdmin
       private
 
         def object_field_type
-          if [:belongs_to, :referenced_in, :embedded_in].
-             include?(model.relations.values.detect { |r| r.foreign_key.try(:to_sym) == name }.try(:macro).try(:to_sym))
+          association = Association.new model.relations.values.detect { |r| r.try(:foreign_key).try(:to_sym) == name }, model
+          if [:belongs_to, :referenced_in, :embedded_in].include?(association.macro)
             :bson_object_id
           else
             :string

data/lib/rails_admin/config.rb

@@ -207,7 +207,7 @@ module RailsAdmin
 
       # pool of all found model names from the whole application
       def models_pool
-        excluded = (excluded_models.collect(&:to_s) + %w(RailsAdmin::History PaperTrail::Version PaperTrail::VersionAssociation))
+        excluded = (excluded_models.collect(&:to_s) + %w(RailsAdmin::History PaperTrail::Version PaperTrail::VersionAssociation ActiveStorage::Attachment ActiveStorage::Blob))
 
         (viable_models - excluded).uniq.sort
       end
@@ -304,6 +304,14 @@ module RailsAdmin
         @registry.delete(key)
       end
 
+      # Reset all models configuration
+      # Used to clear all configurations when reloading code in development.
+      # @see RailsAdmin::Engine
+      # @see RailsAdmin::Config.registry
+      def reset_all_models
+        @registry = {}
+      end
+
       # Get all models that are configured as visible sorted by their weight and label.
       #
       # @see RailsAdmin::Config::Hideable

data/lib/rails_admin/config/fields.rb

@@ -83,4 +83,5 @@ 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/association'

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

@@ -0,0 +1,30 @@
+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|
+  if defined?(::ActiveStorage) && properties.is_a?(RailsAdmin::Adapters::ActiveRecord::Association) && (match = /\A(.+)_attachments?\Z/.match properties.name) && properties.klass.to_s == 'ActiveStorage::Attachment'
+    name = match[1]
+    field = RailsAdmin::Config::Fields::Types.load(
+      properties.type == :has_many ? :multiple_active_storage : :active_storage,
+    ).new(parent, name, properties)
+    fields << field
+    associations =
+      if properties.type == :has_many
+        ["#{name}_attachments".to_sym, "#{name}_blobs".to_sym]
+      else
+        ["#{name}_attachment".to_sym, "#{name}_blob".to_sym]
+      end
+    children_fields = associations.map do |child_name|
+      next unless child_association = parent.abstract_model.associations.detect { |p| p.name.to_sym == child_name }
+      child_field = fields.detect { |f| f.name == child_name } || RailsAdmin::Config::Fields.default_factory.call(parent, child_association, fields)
+      child_field.hide unless field == child_field
+      child_field.filterable(false) unless field == child_field
+      child_field.name
+    end.flatten.compact
+    field.children_fields(children_fields)
+    true
+  else
+    false
+  end
+end

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

@@ -6,7 +6,9 @@ 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]
-    field = RailsAdmin::Config::Fields::Types.load(:carrierwave).new(parent, attachment_name, properties)
+    field = RailsAdmin::Config::Fields::Types.load(
+      [:serialized, :json].include?(properties.type) ? :multiple_carrierwave : :carrierwave,
+    ).new(parent, attachment_name, properties)
     fields << field
     children_fields = []
     columns.each do |children_column_name|

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

@@ -0,0 +1,44 @@
+require 'rails_admin/config/fields/types/file_upload'
+
+module RailsAdmin
+  module Config
+    module Fields
+      module Types
+        class ActiveStorage < RailsAdmin::Config::Fields::Types::FileUpload
+          RailsAdmin::Config::Fields::Types.register(self)
+
+          register_instance_option :thumb_method do
+            {resize: '100x100>'}
+          end
+
+          register_instance_option :delete_method do
+            "remove_#{name}" if bindings[:object].respond_to?("remove_#{name}")
+          end
+
+          register_instance_option :image? do
+            if value
+              value.filename.to_s.split('.').last =~ /jpg|jpeg|png|gif|svg/i
+            end
+          end
+
+          def resource_url(thumb = false)
+            return nil unless value
+            if thumb && value.variable?
+              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
+              )
+            else
+              Rails.application.routes.url_helpers.rails_blob_path(value, only_path: true)
+            end
+          end
+
+          def value
+            attachment = super
+            attachment if attachment && attachment.attached?
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,4 +1,5 @@
 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'
 require 'rails_admin/config/fields/types/boolean'
 require 'rails_admin/config/fields/types/bson_object_id'
@@ -11,6 +12,9 @@ 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'
 require 'rails_admin/config/fields/types/float'
 require 'rails_admin/config/fields/types/has_and_belongs_to_many_association'
 require 'rails_admin/config/fields/types/has_many_association'

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

@@ -19,19 +19,19 @@ module RailsAdmin
           # Pass the location of the theme and mode for Codemirror
           register_instance_option :assets do
             {
-              mode: '/assets/codemirror/modes/css.js',
-              theme: '/assets/codemirror/themes/night.css',
+              mode: ::ActionController::Base.helpers.asset_path('codemirror/modes/css.js'),
+              theme: ::ActionController::Base.helpers.asset_path('codemirror/themes/night.css'),
             }
           end
 
           # Use this if you want to point to a cloud instances of CodeMirror
           register_instance_option :js_location do
-            '/assets/codemirror.js'
+            ::ActionController::Base.helpers.asset_path('codemirror.js')
           end
 
           # Use this if you want to point to a cloud instances of CodeMirror
           register_instance_option :css_location do
-            '/assets/codemirror.css'
+            ::ActionController::Base.helpers.asset_path('codemirror.css')
           end
 
           register_instance_option :partial do

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

@@ -36,7 +36,7 @@ module RailsAdmin
                 image_html = v.image_tag(thumb_url, class: 'img-thumbnail')
                 url != thumb_url ? v.link_to(image_html, url, target: '_blank') : image_html
               else
-                v.link_to(nil, url, target: '_blank')
+                v.link_to(value, url, target: '_blank')
               end
             end
           end

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

@@ -0,0 +1,49 @@
+require 'rails_admin/config/fields/types/multiple_file_upload'
+
+module RailsAdmin
+  module Config
+    module Fields
+      module Types
+        class MultipleActiveStorage < RailsAdmin::Config::Fields::Types::MultipleFileUpload
+          RailsAdmin::Config::Fields::Types.register(self)
+
+          class ActiveStorageAttachment < RailsAdmin::Config::Fields::Types::MultipleFileUpload::AbstractAttachment
+            register_instance_option :thumb_method do
+              {resize: '100x100>'}
+            end
+
+            register_instance_option :delete_key do
+              value.id
+            end
+
+            register_instance_option :image? do
+              if value
+                value.filename.to_s.split('.').last =~ /jpg|jpeg|png|gif|svg/i
+              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(
+                  variant.blob.signed_id, variant.variation.key, variant.blob.filename, only_path: true
+                )
+              else
+                Rails.application.routes.url_helpers.rails_blob_path(value, only_path: true)
+              end
+            end
+          end
+
+          register_instance_option :attachment_class do
+            ActiveStorageAttachment
+          end
+
+          register_instance_option :delete_method do
+            "remove_#{name}" if bindings[:object].respond_to?("remove_#{name}")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,44 @@
+require 'rails_admin/config/fields/types/multiple_file_upload'
+
+module RailsAdmin
+  module Config
+    module Fields
+      module Types
+        class MultipleCarrierwave < RailsAdmin::Config::Fields::Types::MultipleFileUpload
+          RailsAdmin::Config::Fields::Types.register(self)
+
+          class CarrierwaveAttachment < RailsAdmin::Config::Fields::Types::MultipleFileUpload::AbstractAttachment
+            register_instance_option :thumb_method do
+              @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
+            end
+
+            def resource_url(thumb = false)
+              return nil unless value
+              thumb.present? ? value.send(thumb).url : value.url
+            end
+          end
+
+          register_instance_option :attachment_class do
+            CarrierwaveAttachment
+          end
+
+          register_instance_option :cache_method do
+            "#{name}_cache"
+          end
+
+          register_instance_option :delete_method do
+            "delete_#{name}" if bindings[:object].respond_to?("delete_#{name}")
+          end
+
+          def value
+            bindings[:object].send(name)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,110 @@
+module RailsAdmin
+  module Config
+    module Fields
+      module Types
+        class MultipleFileUpload < RailsAdmin::Config::Fields::Base
+          RailsAdmin::Config::Fields::Types.register(self)
+
+          class AbstractAttachment
+            include RailsAdmin::Config::Proxyable
+            include RailsAdmin::Config::Configurable
+
+            attr_reader :value
+
+            def initialize(value)
+              @value = value
+            end
+
+            register_instance_option :thumb_method do
+              nil
+            end
+
+            register_instance_option :delete_key do
+              nil
+            end
+
+            register_instance_option :pretty_value do
+              if value.presence
+                v = bindings[:view]
+                url = resource_url
+                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
+                else
+                  v.link_to(value, url, target: '_blank')
+                end
+              end
+            end
+
+            register_instance_option :image? do
+              (url = resource_url.to_s) && url.split('.').last =~ /jpg|jpeg|png|gif|svg/i
+            end
+
+            def resource_url(_thumb = false)
+              raise('not implemented')
+            end
+          end
+
+          def initialize(*args)
+            super
+            @attachment_configurations = []
+          end
+
+          register_instance_option :attachment_class do
+            AbstractAttachment
+          end
+
+          register_instance_option :partial do
+            :form_multiple_file_upload
+          end
+
+          register_instance_option :cache_method do
+            nil
+          end
+
+          register_instance_option :delete_method do
+            nil
+          end
+
+          register_instance_option :export_value do
+            attachments.map(&:resource_url).map(&:to_s).join(',')
+          end
+
+          register_instance_option :pretty_value do
+            bindings[:view].safe_join attachments.map(&:pretty_value), ' '
+          end
+
+          register_instance_option :allowed_methods do
+            [method_name, cache_method, delete_method].compact
+          end
+
+          register_instance_option :html_attributes do
+            {
+              required: required? && !value.present?,
+            }
+          end
+
+          def attachment(&block)
+            @attachment_configurations << block
+          end
+
+          def attachments
+            Array(value).map do |attached|
+              attachment = attachment_class.new(attached)
+              @attachment_configurations.each do |config|
+                attachment.instance_eval(&config)
+              end
+              attachment.with(bindings)
+            end
+          end
+
+          # virtual class
+          def virtual?
+            true
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rails_admin/config/has_fields.rb

@@ -130,7 +130,7 @@ module RailsAdmin
           @_ro_fields = @_fields = RailsAdmin::Config::Fields.factory(self)
         else
           # parent is RailsAdmin::Config::Model, recursion is on Section's classes
-          @_ro_fields ||= parent.send(self.class.superclass.to_s.underscore.split('/').last)._fields(true).freeze
+          @_ro_fields ||= parent.send(self.class.superclass.to_s.underscore.split('/').last)._fields(true).clone.freeze
         end
         readonly ? @_ro_fields : (@_fields ||= @_ro_fields.collect(&:clone))
       end

data/lib/rails_admin/engine.rb

@@ -24,10 +24,26 @@ module RailsAdmin
     end
 
     initializer 'RailsAdmin setup middlewares' do |app|
+      app.config.session_store :cookie_store
+      app.config.middleware.use ActionDispatch::Cookies
       app.config.middleware.use ActionDispatch::Flash
+      app.config.middleware.use ActionDispatch::Session::CookieStore, app.config.session_options
+      app.config.middleware.use Rack::MethodOverride
       app.config.middleware.use Rack::Pjax
     end
 
+    initializer 'RailsAdmin reload config in development' do
+      if Rails.application.config.cache_classes
+        if defined?(ActiveSupport::Reloader)
+          ActiveSupport::Reloader.before_class_unload do
+            RailsAdmin::Config.reset_all_models
+          end
+          # else
+          # For Rails 4 not implemented
+        end
+      end
+    end
+
     rake_tasks do
       Dir[File.join(File.dirname(__FILE__), '../tasks/*.rake')].each { |f| load f }
     end

data/lib/rails_admin/extensions/cancancan.rb

@@ -1,3 +1,3 @@
 require 'rails_admin/extensions/cancancan/authorization_adapter'
 
-RailsAdmin.add_extension(:cancan, RailsAdmin::Extensions::CanCanCan, authorization: true)
+RailsAdmin.add_extension(:cancancan, RailsAdmin::Extensions::CanCanCan, authorization: true)

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

@@ -2,51 +2,43 @@ module RailsAdmin
   module Extensions
     module CanCanCan
       # This adapter is for the CanCanCan[https://github.com/CanCanCommunity/cancancan] authorization library.
-      class AuthorizationAdapter
-        # 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.
+      class AuthorizationAdapter < RailsAdmin::Extensions::CanCan::AuthorizationAdapter
         def authorize(action, abstract_model = nil, model_object = nil)
-          @controller.current_ability.authorize!(action, model_object || abstract_model && abstract_model.model) if action
+          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
         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)
-          @controller.current_ability.can?(action, model_object || abstract_model && abstract_model.model) if action
+          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))
         end
 
-        # 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
+      private
 
-        # 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)
+        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
         end
 
-        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)
+        def resolve_with_compatibility(action, subject)
+          if subject
+            [action, subject]
+          else
+            # For :dashboard compatibility
+            [:read, action]
           end
         end
       end

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

@@ -43,7 +43,7 @@ module RailsAdmin
         # 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)
-          @controller.policy_scope(abstract_model.model.all)
+          @controller.send(:policy_scope, abstract_model.model.all)
         rescue ::Pundit::NotDefinedError
           abstract_model.model.all
         end
@@ -59,7 +59,7 @@ module RailsAdmin
       private
 
         def policy(record)
-          @controller.policy(record)
+          @controller.send(:policy, record)
         rescue ::Pundit::NotDefinedError
           ::ApplicationPolicy.new(@controller.send(:pundit_user), record)
         end

data/lib/rails_admin/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Erik Michaels-Ober
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-18 00:00:00.000000000 Z
+date: 2018-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -106,16 +106,22 @@ dependencies:
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -305,6 +311,7 @@ files:
 - app/assets/javascripts/rails_admin/bootstrap/bootstrap-typeahead.js
 - app/assets/javascripts/rails_admin/bootstrap/bootstrap.js
 - app/assets/javascripts/rails_admin/custom/ui.coffee
+- app/assets/javascripts/rails_admin/jquery-ui.js.erb
 - app/assets/javascripts/rails_admin/jquery.colorpicker.js
 - app/assets/javascripts/rails_admin/jquery.pjax.js
 - app/assets/javascripts/rails_admin/ra.filter-box.js
@@ -442,6 +449,7 @@ files:
 - app/views/rails_admin/main/_form_filtering_multiselect.html.haml
 - app/views/rails_admin/main/_form_filtering_select.html.haml
 - app/views/rails_admin/main/_form_froala.html.haml
+- app/views/rails_admin/main/_form_multiple_file_upload.html.haml
 - app/views/rails_admin/main/_form_nested_many.html.haml
 - app/views/rails_admin/main/_form_nested_one.html.haml
 - app/views/rails_admin/main/_form_polymorphic_association.html.haml
@@ -500,6 +508,7 @@ files:
 - lib/rails_admin/config/fields.rb
 - lib/rails_admin/config/fields/association.rb
 - lib/rails_admin/config/fields/base.rb
+- lib/rails_admin/config/fields/factories/active_storage.rb
 - lib/rails_admin/config/fields/factories/association.rb
 - lib/rails_admin/config/fields/factories/carrierwave.rb
 - lib/rails_admin/config/fields/factories/devise.rb
@@ -511,6 +520,7 @@ files:
 - lib/rails_admin/config/fields/group.rb
 - lib/rails_admin/config/fields/types.rb
 - lib/rails_admin/config/fields/types/active_record_enum.rb
+- lib/rails_admin/config/fields/types/active_storage.rb
 - lib/rails_admin/config/fields/types/all.rb
 - lib/rails_admin/config/fields/types/belongs_to_association.rb
 - lib/rails_admin/config/fields/types/boolean.rb
@@ -534,6 +544,9 @@ files:
 - lib/rails_admin/config/fields/types/inet.rb
 - lib/rails_admin/config/fields/types/integer.rb
 - lib/rails_admin/config/fields/types/json.rb
+- lib/rails_admin/config/fields/types/multiple_active_storage.rb
+- lib/rails_admin/config/fields/types/multiple_carrierwave.rb
+- lib/rails_admin/config/fields/types/multiple_file_upload.rb
 - lib/rails_admin/config/fields/types/paperclip.rb
 - lib/rails_admin/config/fields/types/password.rb
 - lib/rails_admin/config/fields/types/polymorphic_association.rb