activeadmin 1.0.0.pre4 → 2.4.0

data/lib/active_admin/abstract_view_factory.rb

@@ -1,15 +1,19 @@
 module ActiveAdmin
-  class AbstractViewFactory
-    @@default_views = {}
+  class AbstractViewFactory < SettingsNode
 
     def self.register(view_hash)
       view_hash.each do |view_key, view_class|
-        @@default_views[view_key] = view_class
+        super view_key, view_class
+        add_writer(view_key)
+        send "#{view_key}=", view_class
       end
     end
 
-    def initialize
-      @views = {}
+    def self.add_writer(name)
+      define_singleton_method("#{name}=") do |value|
+        value.builder_method name
+        instance_variable_set :"@#{name}", value
+      end
     end
 
     # Register a new view key with the view factory
@@ -25,61 +29,19 @@ module ActiveAdmin
     #                     another_view: OtherViewClass
     #
     def register(view_hash)
-      view_hash.each do |view_key, view_class|
-        @views[view_key] = view_class
-      end
+      self.class.register view_hash
     end
 
     def default_for(key)
-      @@default_views[key.to_sym]
-    end
-
-    def has_key?(key)
-      @views.has_key?(key.to_sym) || @@default_views.has_key?(key.to_sym)
+      self.class.send key
     end
 
     def [](key)
-      get_view_for_key(key)
+      send key
     end
 
     def []=(key, value)
-      set_view_for_key(key, value)
-    end
-
-    def respond_to_missing?(method, include_private)
-      key = key_from_method_name(method)
-      if has_key?(key)
-        true
-      else
-        super
-      end
-    end
-
-    private
-
-    def method_missing(method, *args)
-      key = key_from_method_name(method)
-      if has_key?(key)
-        if method.to_s.include?('=')
-          set_view_for_key key, args.first
-        else
-          get_view_for_key key
-        end
-      else
-        super
-      end
-    end
-
-    def key_from_method_name(method)
-      method.to_s.tr('=', '').to_sym
-    end
-
-    def get_view_for_key(key)
-      @views[key.to_sym] || @@default_views[key.to_sym]
-    end
-
-    def set_view_for_key(key, view)
-      @views[key.to_sym] = view
+      send "#{key}=", value
     end
   end
 end

data/lib/active_admin/application.rb

@@ -1,138 +1,45 @@
 require 'active_admin/router'
-require 'active_admin/reloader'
-require 'active_admin/helpers/settings'
+require 'active_admin/application_settings'
+require 'active_admin/namespace_settings'
 
 module ActiveAdmin
   class Application
-    include Settings
-    include Settings::Inheritance
 
-    settings_inherited_by Namespace
-
-    # The default namespace to put controllers and routes inside. Set this
-    # in config/initializers/active_admin.rb using:
-    #
-    #   config.default_namespace = :super_admin
-    #
-    setting :default_namespace, :admin
+    class << self
+      def setting(name, default)
+        ApplicationSettings.register name, default
+      end
 
-    attr_reader :namespaces
-    def initialize
-      @namespaces = Namespace::Store.new
+      def inheritable_setting(name, default)
+        NamespaceSettings.register name, default
+      end
     end
 
-    # Load paths for admin configurations. Add folders to this load path
-    # to load up other resources for administration. External gems can
-    # include their paths in this load path to provide active_admin UIs
-    setting :load_paths, [File.expand_path('app/admin', Rails.root)]
-
-    # The default number of resources to display on index pages
-    inheritable_setting :default_per_page, 30
-
-    # The max number of resources to display on index pages and batch exports
-    inheritable_setting :max_per_page, 10_000
-
-    # The title which gets displayed in the main layout
-    inheritable_setting :site_title, ""
-
-    # Set the site title link href (defaults to AA dashboard)
-    inheritable_setting :site_title_link, ""
-
-    # Set the site title image displayed in the main layout (has precendence over :site_title)
-    inheritable_setting :site_title_image, ""
-
-    # Set a favicon
-    inheritable_setting :favicon, false
-
-    # Additional meta tags to place in head of logged in pages.
-    inheritable_setting :meta_tags, {}
-
-    # Additional meta tags to place in head of logged out pages.
-    inheritable_setting :meta_tags_for_logged_out_pages, { robots: "noindex, nofollow" }
-
-    # The view factory to use to generate all the view classes. Take
-    # a look at ActiveAdmin::ViewFactory
-    inheritable_setting :view_factory, ActiveAdmin::ViewFactory.new
-
-    # The method to call in controllers to get the current user
-    inheritable_setting :current_user_method, false
-
-    # The method to call in the controllers to ensure that there
-    # is a currently authenticated admin user
-    inheritable_setting :authentication_method, false
-
-    # The path to log user's out with. If set to a symbol, we assume
-    # that it's a method to call which returns the path
-    inheritable_setting :logout_link_path, :destroy_admin_user_session_path
-
-    # The method to use when generating the link for user logout
-    inheritable_setting :logout_link_method, :get
-
-    # Whether the batch actions are enabled or not
-    inheritable_setting :batch_actions, false
-
-    # Whether filters are enabled
-    inheritable_setting :filters, true
-
-    # The namespace root.
-    inheritable_setting :root_to, 'dashboard#index'
-
-    # Options that a passed to root_to.
-    inheritable_setting :root_to_options, {}
-
-    # Display breadcrumbs
-    inheritable_setting :breadcrumb, true
-
-    # Default CSV options
-    inheritable_setting :csv_options, { col_sep: ',', byte_order_mark: "\xEF\xBB\xBF" }
-
-    # Default Download Links options
-    inheritable_setting :download_links, true
-
-    # The authorization adapter to use
-    inheritable_setting :authorization_adapter, ActiveAdmin::AuthorizationAdapter
-
-    # A proc to be used when a user is not authorized to view the current resource
-    inheritable_setting :on_unauthorized_access, :rescue_active_admin_access_denied
-
-    # A regex to detect unsupported browser, set to false to disable
-    inheritable_setting :unsupported_browser_matcher, /MSIE [1-8]\.0/
-
-    # Whether to display 'Current Filters' on search screen
-    inheritable_setting :current_filters, true
-
-    # Request parameters that are permitted by default
-    inheritable_setting :permitted_params, [
-      :utf8, :_method, :authenticity_token, :commit, :id
-    ]
-
-    # Set flash message keys that shouldn't show in ActiveAdmin
-    inheritable_setting :flash_keys_to_except, ['timedout']
-
-    # Set default localize format for Date/Time values
-    setting :localize_format, :long
-
-    # Include association filters by default
-    inheritable_setting :include_default_association_filters, true
+    def settings
+      @settings ||= SettingsNode.build(ApplicationSettings)
+    end
 
-    # Active Admin makes educated guesses when displaying objects, this is
-    # the list of methods it tries calling in order
-    setting :display_name_methods, [ :display_name,
-                                      :full_name,
-                                      :name,
-                                      :username,
-                                      :login,
-                                      :title,
-                                      :email,
-                                      :to_s ]
+    def namespace_settings
+      @namespace_settings ||= SettingsNode.build(NamespaceSettings)
+    end
 
-    # To make debugging easier, by default don't stream in development
-    setting :disable_streaming_in, ['development']
+    def respond_to_missing?(method, include_private = false)
+      [settings, namespace_settings].any? { |sets| sets.respond_to?(method) } || super
+    end
 
-    # == Deprecated Settings
+    def method_missing(method, *args)
+      if settings.respond_to?(method)
+        settings.send(method, *args)
+      elsif namespace_settings.respond_to?(method)
+        namespace_settings.send(method, *args)
+      else
+        super
+      end
+    end
 
-    def allow_comments=(*)
-      raise "`config.allow_comments` is no longer provided in ActiveAdmin 1.x. Use `config.comments` instead."
+    attr_reader :namespaces
+    def initialize
+      @namespaces = Namespace::Store.new
     end
 
     include AssetRegistration
@@ -154,7 +61,7 @@ module ActiveAdmin
 
     # Registers a brand new configuration for the given resource.
     def register(resource, options = {}, &block)
-      ns = options.fetch(:namespace){ default_namespace }
+      ns = options.fetch(:namespace) { default_namespace }
       namespace(ns).register resource, options, &block
     end
 
@@ -184,7 +91,7 @@ module ActiveAdmin
     # @&block The registration block.
     #
     def register_page(name, options = {}, &block)
-      ns = options.fetch(:namespace){ default_namespace }
+      ns = options.fetch(:namespace) { default_namespace }
       namespace(ns).register_page name, options, &block
     end
 
@@ -205,7 +112,7 @@ module ActiveAdmin
     def load!
       unless loaded?
         ActiveSupport::Notifications.publish BeforeLoadEvent, self # before_load hook
-        files.each{ |file| load file }                             # load files
+        files.each { |file| load file }                            # load files
         namespace(default_namespace)                               # init AA resources
         ActiveSupport::Notifications.publish AfterLoadEvent, self  # after_load hook
         @@loaded = true
@@ -213,22 +120,26 @@ module ActiveAdmin
     end
 
     def load(file)
-      DatabaseHitDuringLoad.capture{ super }
+      DatabaseHitDuringLoad.capture { super }
     end
 
     # Returns ALL the files to be loaded
     def files
-      load_paths.flatten.compact.uniq.flat_map{ |path| Dir["#{path}/**/*.rb"] }
+      load_paths.flatten.compact.uniq.flat_map { |path| Dir["#{path}/**/*.rb"] }
     end
 
-    def router
-      @router ||= Router.new(self)
-    end
-
-    # One-liner called by user's config/routes.rb file
+    # Creates all the necessary routes for the ActiveAdmin configurations
+    #
+    # Use this within the routes.rb file:
+    #
+    #   Application.routes.draw do |map|
+    #     ActiveAdmin.routes(self)
+    #   end
+    #
+    # @param rails_router [ActionDispatch::Routing::Mapper]
     def routes(rails_router)
       load!
-      router.apply(rails_router)
+      Router.new(router: rails_router, namespaces: namespaces).apply
     end
 
     # Adds before, around and after filters to all controllers.
@@ -250,12 +161,11 @@ module ActiveAdmin
       controllers
     end
 
-  private
+    private
 
     def register_default_assets
-      register_stylesheet 'active_admin.css',       media: 'screen'
+      register_stylesheet 'active_admin.css', media: 'screen'
       register_stylesheet 'active_admin/print.css', media: 'print'
-
       register_javascript 'active_admin.js'
     end
 
@@ -283,11 +193,11 @@ module ActiveAdmin
           # Rails is about to unload all the app files (e.g. models), so we
           # should first unload the classes generated by Active Admin, otherwise
           # they will contain references to the stale (unloaded) classes.
-          Reloader.to_prepare(prepend: true, &unload_active_admin)
+          ActiveSupport::Reloader.to_prepare(prepend: true, &unload_active_admin)
         else
           # If the user has configured the app to always reload app files after
           # each request, so we should unload the generated classes too.
-          Reloader.to_complete(&unload_active_admin)
+          ActiveSupport::Reloader.to_complete(&unload_active_admin)
         end
 
         admin_dirs = {}
@@ -302,7 +212,7 @@ module ActiveAdmin
 
         app.reloaders << routes_reloader
 
-        Reloader.to_prepare do
+        ActiveSupport::Reloader.to_prepare do
           # Rails might have reloaded the routes for other reasons (e.g.
           # routes.rb has changed), in which case Active Admin would have been
           # loaded via the `ActiveAdmin.routes` call in `routes.rb`.

data/lib/active_admin/application_settings.rb

@@ -0,0 +1,42 @@
+require 'active_admin/settings_node'
+
+module ActiveAdmin
+  class ApplicationSettings < SettingsNode
+
+    # The default namespace to put controllers and routes inside. Set this
+    # in config/initializers/active_admin.rb using:
+    #
+    #   config.default_namespace = :super_admin
+    #
+    register :default_namespace, :admin
+
+    register :app_path, Rails.root
+
+    # Load paths for admin configurations. Add folders to this load path
+    # to load up other resources for administration. External gems can
+    # include their paths in this load path to provide active_admin UIs
+    register :load_paths, [File.expand_path('app/admin', Rails.root)]
+
+    # Set default localize format for Date/Time values
+    register :localize_format, :long
+
+    # Active Admin makes educated guesses when displaying objects, this is
+    # the list of methods it tries calling in order
+    # Note that Formtastic also has 'collection_label_methods' similar to this
+    # used by auto generated dropdowns in filter or belongs_to field of Active Admin
+    register :display_name_methods, [ :display_name,
+                                      :full_name,
+                                      :name,
+                                      :username,
+                                      :login,
+                                      :title,
+                                      :email,
+                                      :to_s ]
+
+    # To make debugging easier, by default don't stream in development
+    register :disable_streaming_in, ['development']
+
+    # Remove sensitive attributes from being displayed, made editable, or exported by default
+    register :filter_attributes, [:encrypted_password, :password, :password_confirmation]
+  end
+end

data/lib/active_admin/authorization_adapter.rb

@@ -10,7 +10,6 @@ module ActiveAdmin
 
   Auth = Authorization
 
-
   # Active Admin's default authorization adapter. This adapter returns true
   # for all requests to `#authorized?`. It should be the starting point for
   # implementing your own authorization adapter.
@@ -19,7 +18,6 @@ module ActiveAdmin
   class AuthorizationAdapter
     attr_reader :resource, :user
 
-
     # Initialize a new authorization adapter. This happens on each and
     # every request to a controller.
     #
@@ -54,7 +52,6 @@ module ActiveAdmin
       true
     end
 
-
     # A hook method for authorization libraries to scope the collection. By
     # default, we just return the same collection. The returned scope is used
     # as the starting point for all queries to the db in the controller.

data/lib/active_admin/base_controller/authorization.rb

@@ -1,7 +1,6 @@
 module ActiveAdmin
   class BaseController < ::InheritedResources::Base
     module Authorization
-      include MethodOrProcHelper
       extend ActiveSupport::Concern
 
       ACTIONS_DICTIONARY = {
@@ -19,6 +18,7 @@ module ActiveAdmin
 
         helper_method :authorized?
         helper_method :authorize!
+        helper_method :active_admin_authorization
       end
 
       protected
@@ -38,7 +38,6 @@ module ActiveAdmin
         active_admin_authorization.authorized?(action, subject)
       end
 
-
       # Authorize the action and subject. Available in the controller
       # as well as all the views. If the action is not allowd, it raises
       # an ActiveAdmin::AccessDenied exception.
@@ -101,7 +100,7 @@ module ActiveAdmin
       end
 
       def dispatch_active_admin_access_denied(exception)
-        call_method_or_exec_proc active_admin_namespace.on_unauthorized_access, exception
+        instance_exec(self, exception, &active_admin_namespace.on_unauthorized_access.to_proc)
       end
 
       def rescue_active_admin_access_denied(exception)
@@ -113,16 +112,14 @@ module ActiveAdmin
             redirect_backwards_or_to_root
           end
 
-          body = ActiveAdmin::Dependency.rails.render_key
-
-          format.csv  { render body =>        error,           status: :unauthorized }
+          format.csv  { render body:          error,           status: :unauthorized }
           format.json { render json: { error: error },         status: :unauthorized }
           format.xml  { render xml: "<error>#{error}</error>", status: :unauthorized }
         end
       end
 
       def redirect_backwards_or_to_root
-        ActiveAdmin::Dependency.rails.redirect_back self, active_admin_root
+        redirect_back fallback_location: active_admin_root
       end
 
     end

data/lib/active_admin/base_controller/menu.rb

@@ -4,11 +4,7 @@ module ActiveAdmin
       extend ActiveSupport::Concern
 
       included do
-        if ActiveAdmin::Dependency.rails >= 4
-          before_action :set_current_tab
-        else
-          before_filter :set_current_tab
-        end
+        before_action :set_current_tab
         helper_method :current_menu
       end
 
@@ -22,15 +18,15 @@ module ActiveAdmin
       # Get's called through a before filter
       def set_current_tab
         @current_tab = if current_menu && active_admin_config.belongs_to? && parent?
-          parent_item = active_admin_config.belongs_to_config.target.menu_item
-          if current_menu.include? parent_item
-            parent_item
-          else
-            active_admin_config.menu_item
-          end
-        else
-          active_admin_config.menu_item
-        end
+                         parent_item = active_admin_config.belongs_to_config.target.menu_item
+                         if current_menu.include? parent_item
+                           parent_item
+                         else
+                           active_admin_config.menu_item
+                         end
+                       else
+                         active_admin_config.menu_item
+                       end
       end
 
     end

data/lib/active_admin/base_controller.rb

@@ -10,13 +10,8 @@ module ActiveAdmin
 
     layout :determine_active_admin_layout
 
-    if ActiveAdmin::Dependency.rails >= 4
-      before_action :only_render_implemented_actions
-      before_action :authenticate_active_admin_user
-    else
-      before_filter :only_render_implemented_actions
-      before_filter :authenticate_active_admin_user
-    end
+    before_action :only_render_implemented_actions
+    before_action :authenticate_active_admin_user
 
     class << self
       # Ensure that this method is available for the DSL
@@ -27,6 +22,11 @@ module ActiveAdmin
       attr_accessor :active_admin_config
     end
 
+    include Authorization
+    include Menu
+
+    private
+
     # By default Rails will render un-implemented actions when the view exists. Because Active
     # Admin allows you to not render any of the actions by using the #actions method, we need
     # to check if they are implemented.
@@ -34,11 +34,6 @@ module ActiveAdmin
       raise AbstractController::ActionNotFound unless action_methods.include?(params[:action])
     end
 
-    include Menu
-    include Authorization
-
-    private
-
     # Calls the authentication method as defined in ActiveAdmin.authentication_method
     def authenticate_active_admin_user
       send(active_admin_namespace.authentication_method) if active_admin_namespace.authentication_method
@@ -64,7 +59,6 @@ module ActiveAdmin
     end
     helper_method :active_admin_namespace
 
-
     ACTIVE_ADMIN_ACTIONS = [:index, :show, :new, :create, :edit, :update, :destroy]
 
     # Determine which layout to use.
@@ -80,7 +74,7 @@ module ActiveAdmin
 
     def active_admin_root
       controller, action = active_admin_namespace.root_to.split '#'
-      {controller: controller, action: action}
+      { controller: controller, action: action }
     end
 
   end

data/lib/active_admin/batch_actions/controller.rb

@@ -5,9 +5,9 @@ module ActiveAdmin
       # Controller action that is called when submitting the batch action form
       def batch_action
         if action_present?
-          selection  =            params[:collection_selection] ||  []
+          selection  =            params[:collection_selection] || []
           inputs     = JSON.parse params[:batch_action_inputs]  || '{}'
-          valid_keys = render_in_context(self, current_batch_action.inputs).try(:keys)
+          valid_keys = MethodOrProcHelper.render_in_context(self, current_batch_action.inputs).try(:keys)
           inputs     = inputs.with_indifferent_access.slice *valid_keys
           instance_exec selection, inputs, &current_batch_action.block
         else
@@ -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

@@ -51,22 +51,14 @@ module ActiveAdmin
         @batch_actions = {}
       end
 
-      # Path to the batch action itself
-      def batch_action_path(params = {})
-        path = [route_collection_path(params), "batch_action"].join("/")
-        query = params.slice(:q, :scope)
-        query = query.permit!.to_h if query.respond_to? :permit!
-        [path, query.to_param].reject(&:blank?).join("?")
-      end
-
       private
 
       # @return [ActiveAdmin::BatchAction] The default "delete" action
       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|
@@ -92,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
     #
@@ -120,7 +112,11 @@ module ActiveAdmin
     # => You can pass a hash of options to `:form` that will be rendered as form input fields for the user to fill out.
     #
     def initialize(sym, title, options = {}, &block)
-      @sym, @title, @options, @block, @confirm = sym, title, options, block, options[:confirm]
+      @sym = sym
+      @title = title
+      @options = options
+      @block = block
+      @confirm = options[:confirm]
       @block ||= proc {}
     end
 
@@ -141,7 +137,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/batch_actions/views/batch_action_form.rb

@@ -15,7 +15,7 @@ module ActiveAdmin
         # Open a form with two hidden input fields:
         # batch_action        => name of the specific action called
         # batch_action_inputs => a JSON string of any requested confirmation values
-        text_node form_tag active_admin_config.batch_action_path(params), id: options[:id]
+        text_node form_tag active_admin_config.route_batch_action_path(params, url_options), id: options[:id]
         input name: :batch_action,        id: :batch_action,        type: :hidden
         input name: :batch_action_inputs, id: :batch_action_inputs, type: :hidden
 

data/lib/active_admin/batch_actions/views/batch_action_selector.rb

@@ -15,7 +15,7 @@ module ActiveAdmin
       end
 
       # We don't want to wrap the action list (or any other children) in
-      # an unecessary div, so instead we just return the children
+      # an unnecessary div, so instead we just return the children
       def to_s
         children.to_s
       end