activeadmin 1.4.3 → 2.0.0.rc1

data/lib/active_admin/batch_actions/controller.rb

@@ -22,7 +22,7 @@ module ActiveAdmin
       end
 
       def current_batch_action
-        active_admin_config.batch_actions.detect{ |action| action.sym.to_s == params[:batch_action] }
+        active_admin_config.batch_actions.detect { |action| action.sym.to_s == params[:batch_action] }
       end
 
       COLLECTION_APPLIES = [

data/lib/active_admin/batch_actions/resource_extension.rb

@@ -57,8 +57,8 @@ module ActiveAdmin
       def add_default_batch_action
         destroy_options = {
           priority: 100,
-          confirm: proc{ I18n.t('active_admin.batch_actions.delete_confirmation', plural_model: active_admin_config.plural_resource_label.downcase) },
-          if: proc{ controller.action_methods.include?('destroy') && authorized?(ActiveAdmin::Auth::DESTROY, active_admin_config.resource_class) }
+          confirm: proc { I18n.t('active_admin.batch_actions.delete_confirmation', plural_model: active_admin_config.plural_resource_label.downcase) },
+          if: proc { controller.action_methods.include?('destroy') && authorized?(ActiveAdmin::Auth::DESTROY, active_admin_config.resource_class) }
         }
 
         add_batch_action :destroy, proc { I18n.t('active_admin.delete') }, destroy_options do |selected_ids|
@@ -84,7 +84,7 @@ module ActiveAdmin
 
     attr_reader :block, :title, :sym
 
-    DEFAULT_CONFIRM_MESSAGE = proc{ I18n.t 'active_admin.batch_actions.default_confirmation' }
+    DEFAULT_CONFIRM_MESSAGE = proc { I18n.t 'active_admin.batch_actions.default_confirmation' }
 
     # Create a Batch Action
     #
@@ -133,7 +133,7 @@ module ActiveAdmin
     # Returns the display if block. If the block was not explicitly defined
     # a default block always returning true will be returned.
     def display_if_block
-      @options[:if] || proc{ true }
+      @options[:if] || proc { true }
     end
 
     # Used for sorting

data/lib/active_admin/callbacks.rb

@@ -75,7 +75,7 @@ module ActiveAdmin
 
           # def run_create_callbacks
           define_method "run_#{name}_callbacks" do |*args, &block|
-            self.class.send("before_#{name}_callbacks").each{ |cbk| run_callback(cbk, *args) }
+            self.class.send("before_#{name}_callbacks").each { |cbk| run_callback(cbk, *args) }
             value = block.try :call
             self.class.send("after_#{name}_callbacks").each { |cbk| run_callback(cbk, *args) }
             return value

data/lib/active_admin/csv_builder.rb

@@ -50,7 +50,7 @@ module ActiveAdmin
       csv << bom if bom
 
       if column_names
-        csv << CSV.generate_line(columns.map{ |c| encode c.name, options }, csv_options)
+        csv << CSV.generate_line(columns.map { |c| encode c.name, options }, csv_options)
       end
 
       ActiveRecord::Base.uncached do

data/lib/active_admin/dependency.rb

@@ -1,7 +1,7 @@
 module ActiveAdmin
   module Dependency
     module Requirements
-      DEVISE = '>= 3.2', '< 5'
+      DEVISE = '>= 4.0', '< 5'
     end
 
     # Provides a clean interface to check for gem dependencies at runtime.
@@ -55,10 +55,6 @@ module ActiveAdmin
       Matcher.new name.to_s
     end
 
-    def self.rails5?
-      rails >= '5.x'
-    end
-
     class Matcher
       attr_reader :name
 
@@ -94,78 +90,6 @@ module ActiveAdmin
         info = spec ? "#{spec.name} #{spec.version}" : '(missing)'
         "<ActiveAdmin::Dependency::Matcher for #{info}>"
       end
-
-      def adapter
-        @adapter ||= Adapter.const_get(@name.camelize).new self
-      end
-
-      def method_missing(method, *args, &block)
-        if respond_to_missing?(method)
-          adapter.send method, *args, &block
-        else
-          super
-        end
-      end
-
-      def respond_to_missing?(method, include_private = false)
-        adapter.respond_to?(method) || super
-      rescue NameError
-        # 🐾
-      end
-    end
-
-    # Dependency adapters provide an easy way to wrap the conditional logic
-    # necessary to support multiple versions of a gem.
-    #
-    # ActiveAdmin::Dependency.rails.adapter.parameterize 'a b'
-    # => 'a_b'
-    #
-    # ActiveAdmin::Dependency.rails.parameterize 'a b'
-    # => 'a_b'
-    #
-    # ActiveAdmin::Dependency.devise.adapter
-    # -> NameError: uninitialized constant ActiveAdmin::Dependency::Adapter::Devise
-    #
-    module Adapter
-      class Base
-        def initialize(version)
-          @version = version
-        end
-      end
-
-      class Rails < Base
-        def optional_belongs_to_flag
-          if Dependency.rails5?
-            { optional: true }
-          else
-            { required: false }
-          end
-        end
-
-        def parameterize(string)
-          if Dependency.rails5?
-            string.parameterize separator: '_'
-          else
-            string.parameterize '_'
-          end
-        end
-
-        def redirect_back(controller, fallback_location)
-          controller.instance_exec do
-            if Dependency.rails5?
-              redirect_back fallback_location: fallback_location
-            elsif controller.request.headers.key? 'HTTP_REFERER'
-              redirect_to :back
-            else
-              redirect_to fallback_location
-            end
-          end
-        end
-
-        def render_key
-          Dependency.rails5? ? :body : :text
-        end
-      end
     end
 
   end

data/lib/active_admin/dsl.rb

@@ -83,14 +83,7 @@ module ActiveAdmin
     #                         this action item on.
     #                 :except: A single or array of controller actions not to
     #                          display this action item on.
-    def action_item(name = nil, options = {}, &block)
-      if name.is_a?(Hash)
-        options = name
-        name = nil
-      end
-
-      Deprecation.warn "using `action_item` without a name is deprecated! Use `action_item(:edit)`." unless name
-
+    def action_item(name, options = {}, &block)
       config.add_action_item(name, options, &block)
     end
 

data/lib/active_admin/error.rb

@@ -22,7 +22,7 @@ module ActiveAdmin
   class ErrorLoading < Error
     # Locates the most recent file and line from the caught exception's backtrace.
     def find_cause(folder, backtrace)
-      backtrace.grep(/\/(#{folder}\/.*\.rb):(\d+)/){ [$1, $2] }.first
+      backtrace.grep(/\/(#{folder}\/.*\.rb):(\d+)/) { [$1, $2] }.first
     end
   end
 

data/lib/active_admin/filters/active_filter.rb

@@ -28,7 +28,9 @@ module ActiveAdmin
       def label
         # TODO: to remind us to go back to the simpler str.downcase once we support ruby >= 2.4 only.
         translated_predicate = predicate_name.mb_chars.downcase.to_s
-        if filter_label
+        if filter_label && filter_label.is_a?(Proc)
+          "#{filter_label.call} #{translated_predicate}"
+        elsif filter_label
           "#{filter_label} #{translated_predicate}"
         elsif related_class
           "#{related_class_name} #{translated_predicate}"

data/lib/active_admin/filters/active_sidebar.rb

@@ -5,7 +5,7 @@ module ActiveAdmin
     class ActiveSidebar < ActiveAdmin::SidebarSection
 
       def initialize
-        super I18n.t("active_admin.search_status.headline"), sidebar_options
+        super 'search_status', sidebar_options
       end
 
       def block
@@ -39,6 +39,10 @@ module ActiveAdmin
         end
       end
 
+      def title
+        I18n.t("active_admin.search_status.headline")
+      end
+
       protected
 
       def sidebar_options

data/lib/active_admin/filters/forms.rb

@@ -48,8 +48,8 @@ module ActiveAdmin
       def active_admin_filters_form_for(search, filters, options = {})
         defaults = { builder: ActiveAdmin::Filters::FormBuilder,
                      url: collection_path,
-                     html: {class: 'filter_form'} }
-        required = { html: {method: :get},
+                     html: { class: 'filter_form' } }
+        required = { html: { method: :get },
                      as: :q }
         options  = defaults.deep_merge(options).deep_merge(required)
 

data/lib/active_admin/filters/formtastic_addons.rb

@@ -37,7 +37,7 @@ module ActiveAdmin
       end
 
       def polymorphic_foreign_type?(method)
-        klass.reflect_on_all_associations.select{ |r| r.macro == :belongs_to && r.options[:polymorphic] }
+        klass.reflect_on_all_associations.select { |r| r.macro == :belongs_to && r.options[:polymorphic] }
           .map(&:foreign_type).include? method.to_s
       end
 

data/lib/active_admin/filters/resource_extension.rb

@@ -123,10 +123,10 @@ module ActiveAdmin
       # Returns a default set of filters for the associations
       def default_association_filters
         if resource_class.respond_to?(:reflect_on_all_associations)
-          poly, not_poly = resource_class.reflect_on_all_associations.partition{ |r| r.macro == :belongs_to && r.options[:polymorphic] }
+          poly, not_poly = resource_class.reflect_on_all_associations.partition { |r| r.macro == :belongs_to && r.options[:polymorphic] }
 
           # remove deeply nested associations
-          not_poly.reject!{ |r| r.chain.length > 2 }
+          not_poly.reject! { |r| r.chain.length > 2 }
 
           filters = poly.map(&:foreign_type) + not_poly.map(&:name)
           filters.map &:to_sym
@@ -140,7 +140,7 @@ module ActiveAdmin
       end
 
       def filters_sidebar_section
-        ActiveAdmin::SidebarSection.new :filters, only: :index, if: ->{ active_admin_config.filters.any? } do
+        ActiveAdmin::SidebarSection.new :filters, only: :index, if: -> { active_admin_config.filters.any? } do
           active_admin_filters_form_for assigns[:search], active_admin_config.filters
         end
       end

data/lib/active_admin/form_builder.rb

@@ -20,7 +20,7 @@ module ActiveAdmin
     self.input_class_finder = ::Formtastic::InputClassFinder
     self.action_class_finder = ::Formtastic::ActionClassFinder
 
-    def cancel_link(url = {action: "index"}, html_options = {}, li_attrs = {})
+    def cancel_link(url = { action: "index" }, html_options = {}, li_attrs = {})
       li_attrs[:class] ||= "cancel"
       li_content = template.link_to I18n.t('active_admin.cancel'), url, html_options
       template.content_tag(:li, li_content, li_attrs)
@@ -111,7 +111,7 @@ module ActiveAdmin
         end
       elsif allow_destroy?(form_builder.object)
         form_builder.input(:_destroy, as: :boolean,
-                            wrapper_html: {class: 'has_many_delete'},
+                            wrapper_html: { class: 'has_many_delete' },
                             label: I18n.t('active_admin.has_many_delete'))
       end
 
@@ -163,7 +163,7 @@ module ActiveAdmin
         class: class_string,
         for_options: { child_index: placeholder }
       }
-      html = template.capture{ __getobj__.send(:inputs_for_nested_attributes, opts, &form_block) }
+      html = template.capture { __getobj__.send(:inputs_for_nested_attributes, opts, &form_block) }
       text = new_record.is_a?(String) ? new_record : I18n.t('active_admin.has_many_new', model: assoc_name.human)
 
       template.link_to text, '#', class: "button has_many_add", data: {

data/lib/active_admin/generators/boilerplate.rb

@@ -34,7 +34,7 @@ module ActiveAdmin
       end
 
       def form_inputs
-        attributes.reject{|a| %w(id created_at updated_at).include? a}.map{ |a| form_input(a) }.join("\n")
+        attributes.reject { |a| %w(id created_at updated_at).include? a }.map { |a| form_input(a) }.join("\n")
       end
 
       def form_input(name)

data/lib/active_admin/helpers/scope_chain.rb

@@ -1,5 +1,6 @@
 module ActiveAdmin
   module ScopeChain
+    private
     # Scope an ActiveRecord::Relation chain
     #
     # Example:

data/lib/active_admin/inputs/datepicker_input.rb

@@ -19,7 +19,7 @@ module ActiveAdmin
       private
       def datepicker_options
         options = self.options.fetch(:datepicker_options, {})
-        options = Hash[options.map{ |k, v| [k.to_s.camelcase(:lower), v] }]
+        options = Hash[options.map { |k, v| [k.to_s.camelcase(:lower), v] }]
         { datepicker_options: options }
       end
     end

data/lib/active_admin/inputs/filters/base/search_method_select.rb

@@ -57,8 +57,8 @@ module ActiveAdmin
 
           def current_filter
             @current_filter ||= begin
-              methods = filters.map{ |f| "#{method}_#{f}" }
-              methods.detect{ |m| @object.public_send m } || methods.first
+              methods = filters.map { |f| "#{method}_#{f}" }
+              methods.detect { |m| @object.public_send m } || methods.first
             end
           end
 

data/lib/active_admin/menu_item.rb

@@ -50,7 +50,7 @@ module ActiveAdmin
       @url            = options[:url]          || '#'
       @priority       = options[:priority]     || 10
       @html_options   = options[:html_options] || {}
-      @should_display = options[:if]           || proc{true}
+      @should_display = options[:if]           || proc { true }
       @parent         = options[:parent]
 
       yield(self) if block_given? # Builder style syntax

data/lib/active_admin/namespace.rb

@@ -150,8 +150,8 @@ module ActiveAdmin
       if logout_link_path
         html_options = html_options.reverse_merge(method: logout_link_method || :get)
         menu.add id: 'logout', priority: priority, html_options: html_options,
-          label: ->{ I18n.t 'active_admin.logout' },
-          url:   ->{ render_or_call_method_or_proc_on self, active_admin_namespace.logout_link_path },
+          label: -> { I18n.t 'active_admin.logout' },
+          url:   -> { render_or_call_method_or_proc_on self, active_admin_namespace.logout_link_path },
           if:    :current_active_admin_user?
       end
     end

data/lib/active_admin/namespace_settings.rb

@@ -17,16 +17,19 @@ module ActiveAdmin
     # Set the site title image displayed in the main layout (has precendence over :site_title)
     register :site_title_image, "", :string_symbol_or_proc
 
+    # Add to the site head
+    register :head, "", :string_symbol_or_proc
+
     # Set the site footer text (defaults to Powered by ActiveAdmin text with version)
     register :footer, "", :string_symbol_or_proc
 
     # Set a favicon
     register :favicon, false
 
-    # Additional meta tags to place in head of logged in pages.
+    # Additional meta tags to place in head of logged in pages
     register :meta_tags, {}
 
-    # Additional meta tags to place in head of logged out pages.
+    # Additional meta tags to place in head of logged out pages
     register :meta_tags_for_logged_out_pages, { robots: "noindex, nofollow" }
 
     # The view factory to use to generate all the view classes. Take
@@ -53,10 +56,10 @@ module ActiveAdmin
     # Whether filters are enabled
     register :filters, true
 
-    # The namespace root.
+    # The namespace root
     register :root_to, 'dashboard#index'
 
-    # Options that a passed to root_to.
+    # Options that are passed to root_to
     register :root_to_options, {}
 
     # Options passed to the routes, i.e. { path: '/custom' }

data/lib/active_admin/orm/active_record/comments.rb

@@ -64,21 +64,21 @@ ActiveAdmin.after_load do |app|
         def create
           create! do |success, failure|
             success.html do
-              ActiveAdmin::Dependency.rails.redirect_back self, active_admin_root
+              redirect_back fallback_location: active_admin_root
             end
             failure.html do
               flash[:error] = I18n.t 'active_admin.comments.errors.empty_text'
-              ActiveAdmin::Dependency.rails.redirect_back self, active_admin_root
+              redirect_back fallback_location: active_admin_root
             end
           end
 
           def destroy
             destroy! do |success, failure|
               success.html do
-                ActiveAdmin::Dependency.rails.redirect_back self, active_admin_root
+                redirect_back fallback_location: active_admin_root
               end
               failure.html do
-                ActiveAdmin::Dependency.rails.redirect_back self, active_admin_root
+                redirect_back fallback_location: active_admin_root
               end
             end
           end

data/lib/active_admin/orm/active_record/comments/comment.rb

@@ -3,7 +3,7 @@ module ActiveAdmin
 
     self.table_name = "#{table_name_prefix}active_admin_comments#{table_name_suffix}"
 
-    belongs_to :resource, { polymorphic: true }.merge(ActiveAdmin::Dependency.rails.optional_belongs_to_flag)
+    belongs_to :resource, polymorphic: true, optional: true
     belongs_to :author,   polymorphic: true
 
     validates_presence_of :body, :namespace, :resource
@@ -18,7 +18,7 @@ module ActiveAdmin
     def self.find_for_resource_in_namespace(resource, namespace)
       where(
         resource_type: resource_type(resource),
-        resource_id:   resource,
+        resource_id:   resource.id,
         namespace:     namespace.to_s
       ).order(ActiveAdmin.application.namespaces[namespace.to_sym].comments_order)
     end

data/lib/active_admin/orm/active_record/comments/views/active_admin_comments.rb

@@ -11,10 +11,12 @@ module ActiveAdmin
         attr_accessor :resource
 
         def build(resource)
-          @resource = resource
-          @comments = ActiveAdmin::Comment.find_for_resource_in_namespace(resource, active_admin_namespace.name).includes(:author).page(params[:page])
-          super(title, for: resource)
-          build_comments
+          if authorized?(ActiveAdmin::Auth::READ, ActiveAdmin::Comment)
+            @resource = resource
+            @comments = active_admin_authorization.scope_collection(ActiveAdmin::Comment.find_for_resource_in_namespace(resource, active_admin_namespace.name).includes(:author).page(params[:page]))
+            super(title, for: resource)
+            build_comments
+          end
         end
 
         protected
@@ -32,7 +34,10 @@ module ActiveAdmin
           end
 
           text_node paginate @comments
-          build_comment_form
+
+          if authorized?(ActiveAdmin::Auth::CREATE, ActiveAdmin::Comment)
+            build_comment_form
+          end
         end
 
         def build_comment(comment)