activeadmin 1.4.3 → 2.0.0.rc1

data/lib/active_admin/page_dsl.rb

@@ -21,7 +21,7 @@ module ActiveAdmin
     def page_action(name, options = {}, &block)
       config.page_actions << ControllerAction.new(name, options)
       controller do
-        define_method(name, &block || Proc.new{})
+        define_method(name, &block || Proc.new {})
       end
     end
 

data/lib/active_admin/pundit_adapter.rb

@@ -4,6 +4,7 @@ require 'pundit'
 
 # Add a setting to the application to configure the pundit default policy
 ActiveAdmin::Application.inheritable_setting :pundit_default_policy, nil
+ActiveAdmin::Application.inheritable_setting :pundit_policy_namespace, nil
 
 module ActiveAdmin
 
@@ -19,7 +20,7 @@ module ActiveAdmin
     def scope_collection(collection, action = Auth::READ)
       # scoping is appliable only to read/index action
       # which means there is no way how to scope other actions
-      Pundit.policy_scope!(user, collection)
+      Pundit.policy_scope!(user, namespace(collection))
     rescue Pundit::NotDefinedError => e
       if default_policy_class && default_policy_class.const_defined?(:Scope)
         default_policy_class::Scope.new(user, collection).resolve
@@ -30,9 +31,9 @@ module ActiveAdmin
 
     def retrieve_policy(subject)
       case subject
-      when nil   then Pundit.policy!(user, resource)
-      when Class then Pundit.policy!(user, subject.new)
-      else Pundit.policy!(user, subject)
+      when nil   then Pundit.policy!(user, namespace(resource))
+      when Class then Pundit.policy!(user, namespace(subject.new))
+      else Pundit.policy!(user, namespace(subject))
       end
     rescue Pundit::NotDefinedError => e
       if default_policy_class
@@ -55,6 +56,14 @@ module ActiveAdmin
 
     private
 
+    def namespace(object)
+      if ActiveAdmin.application.pundit_policy_namespace
+        [ActiveAdmin.application.pundit_policy_namespace.to_sym, object]
+      else
+        object
+      end
+    end
+
     def default_policy_class
       ActiveAdmin.application.pundit_default_policy && ActiveAdmin.application.pundit_default_policy.constantize
     end

data/lib/active_admin/resource.rb

@@ -181,11 +181,11 @@ module ActiveAdmin
     end
 
     def association_columns
-      @association_columns ||= resource_attributes.select{ |key, value| key != value }.values
+      @association_columns ||= resource_attributes.select { |key, value| key != value }.values
     end
 
     def content_columns
-      @content_columns ||= resource_attributes.select{ |key, value| key == value }.values
+      @content_columns ||= resource_attributes.select { |key, value| key == value }.values
     end
 
     private

data/lib/active_admin/resource/action_items.rb

@@ -87,7 +87,7 @@ module ActiveAdmin
           if controller.action_methods.include?('destroy') && authorized?(ActiveAdmin::Auth::DESTROY, resource)
             localizer = ActiveAdmin::Localizers.resource(active_admin_config)
             link_to localizer.t(:delete_model), resource_path(resource), method: :delete,
-              data: {confirm: localizer.t(:delete_confirmation)}
+              data: { confirm: localizer.t(:delete_confirmation) }
           end
         end
       end

data/lib/active_admin/resource/attributes.rb

@@ -18,13 +18,13 @@ module ActiveAdmin
 
       def foreign_methods
         @foreign_methods ||= resource_class.reflect_on_all_associations.
-          select{ |r| r.macro == :belongs_to }.
-          reject{ |r| r.chain.length > 2 && !r.options[:polymorphic] }.
-          index_by{ |r| r.foreign_key.to_sym }
+          select { |r| r.macro == :belongs_to }.
+          reject { |r| r.chain.length > 2 && !r.options[:polymorphic] }.
+          index_by { |r| r.foreign_key.to_sym }
       end
 
       def reject_col?(c)
-        primary_col?(c) || sti_col?(c) || counter_cache_col?(c)
+        primary_col?(c) || sti_col?(c) || counter_cache_col?(c) || filtered_col?(c)
       end
 
       def primary_col?(c)
@@ -39,6 +39,9 @@ module ActiveAdmin
         c.name.end_with?('_count')
       end
 
+      def filtered_col?(c)
+        ActiveAdmin.application.filter_attributes.include?(c.name.to_sym)
+      end
     end
   end
 end

data/lib/active_admin/resource/menu.rb

@@ -26,9 +26,9 @@ module ActiveAdmin
         resource = self
         {
           id: resource_name.plural,
-          label: proc{ resource.plural_resource_label },
-          url:   proc{ resource.route_collection_path(params, url_options) },
-          if:    proc{ authorized?(Auth::READ, menu_resource_class) }
+          label: proc { resource.plural_resource_label },
+          url:   proc { resource.route_collection_path(params, url_options) },
+          if:    proc { authorized?(Auth::READ, menu_resource_class) }
         }
       end
 

data/lib/active_admin/resource/naming.rb

@@ -22,8 +22,8 @@ module ActiveAdmin
 
       # Returns the plural version of this resource such as "Bank Accounts"
       def plural_resource_label(options = {})
-        defaults = {count:   Helpers::I18n::PLURAL_MANY_COUNT,
-                    default: resource_label.pluralize.titleize}
+        defaults = { count:   Helpers::I18n::PLURAL_MANY_COUNT,
+                    default: resource_label.pluralize.titleize }
         resource_name.translate defaults.merge options
       end
 
@@ -46,7 +46,7 @@ module ActiveAdmin
       end
 
       def translate(options = {})
-        I18n.t i18n_key, {scope: [:activerecord, :models]}.merge(options)
+        I18n.t i18n_key, { scope: [:activerecord, :models] }.merge(options)
       end
 
       def route_key

data/lib/active_admin/resource/routes.rb

@@ -20,7 +20,11 @@ module ActiveAdmin
       end
 
       def route_edit_instance_path(resource, additional_params = {})
-        route_builder.edit_instance_path(resource, additional_params)
+        route_builder.member_action_path(:edit, resource, additional_params)
+      end
+
+      def route_member_action_path(action, resource, additional_params = {})
+        route_builder.member_action_path(action, resource, additional_params)
       end
 
       # Returns the routes prefix for this config
@@ -75,12 +79,13 @@ module ActiveAdmin
           routes.public_send route_name, *route_instance_params(instance), additional_params
         end
 
-        # @return [String] the path to the edit page of this resource
+        # @return [String] the path to the member action of this resource
+        # @param action [Symbol]
         # @param instance [ActiveRecord::Base] the instance we want the path of
         # @example "/admin/posts/1/edit"
-        def edit_instance_path(instance, additional_params = {})
+        def member_action_path(action, instance, additional_params = {})
           path = resource.resources_configuration[:self][:route_instance_name]
-          route_name = route_name(path, action: :edit)
+          route_name = route_name(path, action: action)
 
           routes.public_send route_name, *route_instance_params(instance), additional_params
         end

data/lib/active_admin/resource/scopes.rb

@@ -10,7 +10,7 @@ module ActiveAdmin
       # Returns a scope for this object by its identifier
       def get_scope_by_id(id)
         id = id.to_s
-        scopes.find{|s| s.id == id }
+        scopes.find { |s| s.id == id }
       end
 
       def default_scope(context = nil)
@@ -27,7 +27,7 @@ module ActiveAdmin
       # If you want to internationalize the scope name, you can add
       # to your i18n files a key like "active_admin.scopes.scope_method".
       def scope(*args, &block)
-        default_options = {show_count: namespace.scopes_show_count}
+        default_options = { show_count: namespace.scopes_show_count }
         options = default_options.merge(args.extract_options!)
         title = args[0] rescue nil
         method = args[1] rescue nil
@@ -36,7 +36,7 @@ module ActiveAdmin
         scope = ActiveAdmin::Scope.new(title, method, options, &block)
 
         # Finds and replaces a scope by the same name if it already exists
-        existing_scope_index = scopes.index{|existing_scope| existing_scope.id == scope.id }
+        existing_scope_index = scopes.index { |existing_scope| existing_scope.id == scope.id }
         if existing_scope_index
           scopes.delete_at(existing_scope_index)
           scopes.insert(existing_scope_index, scope)

data/lib/active_admin/resource/sidebars.rb

@@ -14,7 +14,7 @@ module ActiveAdmin
       end
 
       def sidebar_sections_for(action, render_context = nil)
-        sidebar_sections.select{|section| section.display_on?(action, render_context) }
+        sidebar_sections.select { |section| section.display_on?(action, render_context) }
           .sort_by(&:priority)
       end
 

data/lib/active_admin/resource_collection.rb

@@ -38,12 +38,12 @@ module ActiveAdmin
         r.resource_class.to_s == obj.to_s
       end ||
       if obj.respond_to? :base_class
-        resources.detect{ |r| r.resource_class.to_s == obj.base_class.to_s }
+        resources.detect { |r| r.resource_class.to_s == obj.base_class.to_s }
       end
     end
 
     def resources
-      select{ |r| r.class <= Resource } # can otherwise be a Page
+      select { |r| r.class <= Resource } # can otherwise be a Page
     end
 
     def raise_if_mismatched!(existing, given)

data/lib/active_admin/resource_controller/action_builder.rb

@@ -7,12 +7,22 @@ module ActiveAdmin
       module ClassMethods
 
         def clear_member_actions!
+          remove_action_methods(:member)
           active_admin_config.clear_member_actions!
         end
 
         def clear_collection_actions!
+          remove_action_methods(:collection)
           active_admin_config.clear_collection_actions!
         end
+
+        private
+
+        def remove_action_methods(actions_type)
+          active_admin_config.public_send("#{actions_type}_actions").each do |action|
+            remove_method action.name
+          end
+        end
       end
 
     end

data/lib/active_admin/resource_controller/resource_class_methods.rb

@@ -13,6 +13,8 @@ module ActiveAdmin
             @active_admin_config ? @active_admin_config.resource_class : nil
           end
 
+          private
+
           def resource_class
             self.class.resource_class
           end

data/lib/active_admin/resource_dsl.rb

@@ -74,6 +74,8 @@ module ActiveAdmin
 
           params.permit(*permitted_params, param_key => block ? instance_exec(&block) : args)
         end
+
+        private :permitted_params
       end
     end
 
@@ -119,7 +121,7 @@ module ActiveAdmin
     #
     #   ActiveAdmin.register Post do
     #     member_action :comments do
-    #       @post = Post.find(params[:id]
+    #       @post = Post.find(params[:id])
     #       @comments = @post.comments
     #     end
     #   end
@@ -138,7 +140,7 @@ module ActiveAdmin
 
       controller do
         before_action(only: [name]) { @page_title = title } if title
-        define_method(name, &block || Proc.new{})
+        define_method(name, &block || Proc.new {})
       end
     end
 
@@ -187,7 +189,7 @@ module ActiveAdmin
     delegate :before_save,    :after_save,    to: :controller
     delegate :before_destroy, :after_destroy, to: :controller
 
-    # This code defines both *_filter and *_action for Rails 4.0 to Rails 5 and  *_action for Rails >= 5.1
+    # This code defines both *_filter and *_action for Rails 5.0 and  *_action for Rails >= 5.1
     phases = [
       :before, :skip_before,
       :after,  :skip_after,

data/lib/active_admin/router.rb

@@ -28,7 +28,7 @@ module ActiveAdmin
 
     # Defines the routes for each resource
     def define_resources_routes
-      resources = namespaces.flat_map{ |n| n.resources.values }
+      resources = namespaces.flat_map { |n| n.resources.values }
       resources.each do |config|
         define_resource_routes(config)
       end

data/lib/active_admin/scope.rb

@@ -32,10 +32,10 @@ module ActiveAdmin
 
       if name.is_a? Proc
         raise "A string/symbol is required as the second argument if your label is a proc." unless method
-        @id = ActiveAdmin::Dependency.rails.parameterize method.to_s
+        @id = method.to_s.parameterize(separator: "_")
       else
         @scope_method ||= name.to_sym
-        @id = ActiveAdmin::Dependency.rails.parameterize name.to_s
+        @id = name.to_s.parameterize(separator: "_")
       end
 
       @scope_method               = nil        if @scope_method == :all
@@ -43,8 +43,8 @@ module ActiveAdmin
 
       @localizer        = options[:localizer]
       @show_count       = options.fetch(:show_count, true)
-      @display_if_block = options[:if]      || proc{ true }
-      @default_block    = options[:default] || proc{ false }
+      @display_if_block = options[:if]      || proc { true }
+      @default_block    = options[:default] || proc { false }
       @group            = options[:group].try(:to_sym)
     end
 

data/lib/active_admin/settings_node.rb

@@ -5,7 +5,7 @@ module ActiveAdmin
       # Never instantiated.  Variables are stored in the singleton_class.
       private_class_method :new
 
-      # @returns anonymous class with same accessors as the superclass.
+      # @return anonymous class with same accessors as the superclass.
       def build(superclass = self)
         Class.new(superclass)
       end

data/lib/active_admin/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdmin
-  VERSION = '1.4.3'
+  VERSION = '2.0.0.rc1'
 end

data/lib/active_admin/view_helpers.rb

@@ -2,7 +2,7 @@ module ActiveAdmin
   module ViewHelpers
 
     # Require all ruby files in the view helpers dir
-    Dir[File.expand_path('../view_helpers', __FILE__) + "/*.rb"].each{|f| require f }
+    Dir[File.expand_path('view_helpers', __dir__) + "/*.rb"].each { |f| require f }
 
     include ActiveAdminApplicationHelper
     include AutoLinkHelper

data/lib/active_admin/view_helpers/display_helper.rb

@@ -2,7 +2,7 @@ module ActiveAdmin
   module ViewHelpers
     module DisplayHelper
 
-      DISPLAY_NAME_FALLBACK = ->{
+      DISPLAY_NAME_FALLBACK = -> {
         name, klass = "", self.class
         name << klass.model_name.human         if klass.respond_to? :model_name
         name << " ##{send(klass.primary_key)}" if klass.respond_to? :primary_key
@@ -25,7 +25,7 @@ module ActiveAdmin
         @@display_name_methods_cache ||= {}
         @@display_name_methods_cache[resource.class] ||= begin
           methods = active_admin_application.display_name_methods - association_methods_for(resource)
-          method  = methods.detect{ |method| resource.respond_to? method }
+          method  = methods.detect { |method| resource.respond_to? method }
 
           if method != :to_s || resource.method(method).source_location
             method
@@ -69,16 +69,24 @@ module ActiveAdmin
           object.to_s
         when Date, Time
           I18n.localize object, format: active_admin_application.localize_format
+        when Array
+          format_collection(object)
         else
           if defined?(::ActiveRecord) && object.is_a?(ActiveRecord::Base) ||
              defined?(::Mongoid)      && object.class.include?(Mongoid::Document)
             auto_link object
+          elsif defined?(::ActiveRecord) && object.is_a?(ActiveRecord::Relation)
+            format_collection(object)
           else
             display_name object
           end
         end
       end
 
+      def format_collection(collection)
+        safe_join(collection.map { |item| pretty_format(item) }, ', ')
+      end
+
       def boolean_attr?(resource, attr, value)
         case value
         when TrueClass, FalseClass

data/lib/active_admin/view_helpers/download_format_links_helper.rb

@@ -1,6 +1,7 @@
 module ActiveAdmin
   module ViewHelpers
     module DownloadFormatLinksHelper
+      private
 
       def build_download_formats(download_links)
         download_links = instance_exec(&download_links) if download_links.is_a?(Proc)

data/lib/active_admin/view_helpers/method_or_proc_helper.rb

@@ -1,3 +1,5 @@
+# Utility methods for internal use.
+# @private
 module MethodOrProcHelper
   extend self
 

data/lib/active_admin/views.rb

@@ -2,7 +2,7 @@ module ActiveAdmin
   module Views
 
     # Loads all the classes in views/*.rb
-    Dir[File.expand_path('../views', __FILE__) + "/**/*.rb"].sort.each{ |f| require f }
+    Dir[File.expand_path('views', __dir__) + "/**/*.rb"].sort.each { |f| require f }
 
   end
 end

data/lib/active_admin/views/components/active_admin_form.rb

@@ -57,6 +57,12 @@ module ActiveAdmin
           end
           insert_tag(SemanticInputsProxy, form_builder, *args, &wrapped_block)
         else
+          # Set except option to prevent sensitive fields from being shown in forms by default.
+          opts = args.extract_options!
+          opts[:except] ||= []
+          ActiveAdmin.application.filter_attributes.each { |e| opts[:except] << e }
+          args << opts
+
           proxy_call_to_form(:inputs, *args, &block)
         end
       end
@@ -125,7 +131,7 @@ module ActiveAdmin
         legend = args.shift if args.first.is_a?(::String)
         legend = html_options.delete(:name) if html_options.key?(:name)
         legend_tag = legend ? "<legend><span>#{legend}</span></legend>" : ""
-        fieldset_attrs = html_options.map {|k, v| %Q{#{k}="#{v}"} }.join(" ")
+        fieldset_attrs = html_options.map { |k, v| %Q{#{k}="#{v}"} }.join(" ")
         @opening_tag = "<fieldset #{fieldset_attrs}>#{legend_tag}<ol>"
         @closing_tag = "</ol></fieldset>"
         super(*(args << html_options), &block)

data/lib/active_admin/views/components/attributes_table.rb

@@ -7,7 +7,7 @@ module ActiveAdmin
       def build(obj, *attrs)
         @collection     = Array.wrap(obj)
         @resource_class = @collection.first.class
-        options = { }
+        options = {}
         options[:for] = @collection.first if single_record?
         super(options)
         @table = table
@@ -16,7 +16,7 @@ module ActiveAdmin
       end
 
       def rows(*attrs)
-        attrs.each {|attr| row(attr) }
+        attrs.each { |attr| row(attr) }
       end
 
       def row(*args, &block)
@@ -26,7 +26,7 @@ module ActiveAdmin
         if options[:class]
           classes << options[:class]
         elsif title.present?
-          classes << "row-#{ActiveAdmin::Dependency.rails.parameterize(title.to_s)}"
+          classes << "row-#{title.to_s.parameterize(separator: "_")}"
         end
         options[:class] = classes.join(' ')