activeadmin 1.4.2 → 2.3.0

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/belongs_to.rb

@@ -14,8 +14,13 @@ module ActiveAdmin
       # The resource which initiated this relationship
       attr_reader :owner
 
+      # The name of the relation
+      attr_reader :target_name
+
       def initialize(owner, target_name, options = {})
-        @owner, @target_name, @options = owner, target_name, options
+        @owner = owner
+        @target_name = target_name
+        @options = options
       end
 
       # Returns the target resource class or raises an exception if it doesn't exist

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/model.rb

@@ -0,0 +1,15 @@
+module ActiveAdmin
+  class Model
+    def initialize(resource, record)
+      @record = record
+
+      if resource
+        @record.extend(resource.resource_name_extension)
+      end
+    end
+
+    def to_model
+      @record
+    end
+  end
+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
@@ -105,7 +110,7 @@ module ActiveAdmin
         # @return params to pass to instance path
         def route_instance_params(instance)
           if nested?
-            [instance.public_send(belongs_to_name).to_param, instance.to_param]
+            [instance.public_send(belongs_to_target_name).to_param, instance.to_param]
           else
             instance.to_param
           end
@@ -118,11 +123,19 @@ module ActiveAdmin
         end
 
         def nested?
-          resource.belongs_to? && resource.belongs_to_config.required?
+          resource.belongs_to? && belongs_to_config.required?
+        end
+
+        def belongs_to_target_name
+          belongs_to_config.target_name
         end
 
         def belongs_to_name
-          resource.belongs_to_config.target.resource_name.singular if nested?
+          belongs_to_config.target.resource_name.singular
+        end
+
+        def belongs_to_config
+          resource.belongs_to_config
         end
 
         def routes

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.rb

@@ -1,6 +1,7 @@
 require 'active_admin/resource_controller/action_builder'
 require 'active_admin/resource_controller/data_access'
 require 'active_admin/resource_controller/decorators'
+require 'active_admin/resource_controller/polymorphic_routes'
 require 'active_admin/resource_controller/scoping'
 require 'active_admin/resource_controller/streaming'
 require 'active_admin/resource_controller/sidebars'
@@ -18,6 +19,7 @@ module ActiveAdmin
     include ActionBuilder
     include Decorators
     include DataAccess
+    include PolymorphicRoutes
     include Scoping
     include Streaming
     include Sidebars

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/polymorphic_routes.rb

@@ -0,0 +1,36 @@
+require "active_admin/resource"
+require "active_admin/resource/model"
+
+module ActiveAdmin
+  class ResourceController < BaseController
+    module PolymorphicRoutes
+      def polymorphic_url(record_or_hash_or_array, options = {})
+        super(map_named_resources_for(record_or_hash_or_array), options)
+      end
+
+      def polymorphic_path(record_or_hash_or_array, options = {})
+        super(map_named_resources_for(record_or_hash_or_array), options)
+      end
+
+      private
+
+      def map_named_resources_for(record_or_hash_or_array)
+        return record_or_hash_or_array unless record_or_hash_or_array.is_a?(Array)
+
+        record_or_hash_or_array.map { |record| to_named_resource(record) }
+      end
+
+      def to_named_resource(record)
+        if record.is_a?(resource_class)
+          return ActiveAdmin::Model.new(active_admin_config, record)
+        end
+
+        if record.is_a?(parent.class)
+          return ActiveAdmin::Model.new(active_admin_config.belongs_to_config.resource, record)
+        end
+
+        record
+      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_controller/scoping.rb

@@ -15,7 +15,7 @@ module ActiveAdmin
       # Collection can be scoped conditionally with an :if or :unless proc.
       def begin_of_association_chain
         return nil unless active_admin_config.scope_to?(self)
-        StringSymbolOrProcSetting.new(active_admin_config.scope_to_method).value(self)
+        MethodOrProcHelper.render_in_context(self, active_admin_config.scope_to_method)
       end
 
       # Overriding from InheritedResources::BaseHelpers

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
@@ -131,14 +133,14 @@ module ActiveAdmin
     # action.
     #
     def action(set, name, options = {}, &block)
-      warn "Warning: method `#{name}` already defined" if controller.method_defined?(name)
+      warn "Warning: method `#{name}` already defined in #{controller.name}" if controller.method_defined?(name)
 
       set << ControllerAction.new(name, options)
       title = options.delete(:title)
 
       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

@@ -4,7 +4,8 @@ module ActiveAdmin
     attr_reader :namespaces, :router
 
     def initialize(router:, namespaces:)
-      @router, @namespaces = router, namespaces
+      @router = router
+      @namespaces = namespaces
     end
 
     def apply
@@ -28,7 +29,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

@@ -28,23 +28,27 @@ module ActiveAdmin
     #   # => Scope with the group :status
     #
     def initialize(name, method = nil, options = {}, &block)
-      @name, @scope_method = name, method.try(:to_sym)
+      @name = name
+      @scope_method = method.try(:to_sym)
 
       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
-      @scope_method, @scope_block = nil, block if block_given?
+      @scope_method = nil if @scope_method == :all
+      if block_given?
+        @scope_method = nil
+        @scope_block = block
+      end
 
       @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/sidebar_section.rb

@@ -6,7 +6,9 @@ module ActiveAdmin
     attr_accessor :name, :options, :block
 
     def initialize(name, options = {}, &block)
-      @name, @options, @block = name.to_s, options, block
+      @name = name.to_s
+      @options = options
+      @block = block
       normalize_display_options!
     end
 

data/lib/active_admin/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdmin
-  VERSION = '1.4.2'
+  VERSION = '2.3.0'
 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