activeadmin 2.2.0 → 2.12.0

data/docs/index.html

@@ -10,81 +10,101 @@
         <p class="intro">
           The <strong>administration framework</strong> for business critical <strong>Ruby on Rails</strong> applications.
         </p>
+
         <p>
           Active Admin is a Ruby on Rails plugin for generating administration style interfaces. It abstracts common business application patterns to make it simple for developers to implement beautiful and elegant interfaces with very little effort.
         </p>
+
         <h2>
           A beautiful interface designed for real people.
         </h2>
+
         <div id="features">
           <div id="features-left">
             <h3 class="first">
               Global Navigation
             </h3>
+
             <p>
               Customizable global navigation allows you to create usable admin interfaces for your business.
             </p>
+
             <h3>
               Scopes
             </h3>
+
             <p>
               Use scopes to create sections of mutually exclusive resources for quick navigation and reporting.
             </p>
+
             <h3>
               Index Styles
             </h3>
+
             <p>
               Index screens are available in many styles. The default, shown here, is a table view, but Active Admin also supports Grids, Blocks and a Blog view.
             </p>
+
             <h3>
               <span class="caps">API</span> &amp; Downloads
             </h3>
+
             <p>
-              Each resource that is registered wtih Active Admin becomes available as <span class="caps">JSON</span>, <span class="caps">XML</span> and <span class="caps">CSV</span> download. Customize the output to meet your requirements.
+              Each resource that is registered with Active Admin becomes available as <span class="caps">JSON</span>, <span class="caps">XML</span> and <span class="caps">CSV</span> download. Customize the output to meet your requirements.
             </p>
           </div>
+
           <div id="features-right">
             <h3 class="first">
               User Authentication
             </h3>
+
             <p>
               Use the bundled Devise configuration or implement your own authorization using the provided hooks.
             </p>
+
             <h3>
               Action Items
             </h3>
+
             <p>
               Add buttons, links or other content in the “Action Items” section on each screen.
             </p>
+
             <h3>
               Filters
             </h3>
+
             <p>
               Allow users to filter resources by searching strings, text fields, dates, and numeric values.
             </p>
+
             <h3>
               Sidebar Sections
             </h3>
+
             <p>
               Customize the sidebar sections with a simple <span class="caps">DSL</span> built in to Active Admin.
             </p>
           </div>
         </div>
+
         <p>
           Active Admin’s interface was designed from the ground up for non-technical users. It makes it easy for developers to build highly usable interfaces that customers will actually enjoy using.
         </p>
+
         <h2>
           An elegant <span class="caps">DSL</span> built for developer productivity.
         </h2>
+
         <p>
           Get started with one line of code or customize the entire interface with the provided <span class="caps">DSL</span>.
         </p>
+
         <div id="dsl">
           <div class="highlight">
-            <pre>
-<code class="ruby"><span class="c1"># app/admin/products.rb</span>
+            <pre><code class="ruby"><span class="c1"># app/admin/products.rb</span>
 <span class="no">ActiveAdmin</span><span class="o">.</span><span class="n">register</span> <span class="no">Product</span> <span class="k">do</span>
-
   <span class="c1"># Create sections on the index screen</span>
   <span class="n">scope</span> <span class="ss">:all</span><span class="p">,</span> <span class="ss">default:</span> <span class="kp">true</span>
   <span class="n">scope</span> <span class="ss">:available</span>
@@ -104,12 +124,93 @@
     <span class="k">end</span>
     <span class="n">actions</span>
   <span class="k">end</span>
-
-<span class="k">end</span>
-</code>
-            </pre>
+<span class="k">end</span></code></pre>
           </div>
         </div>
+
+        <h2>
+          Active Admin for enterprise
+        </h2>
+
+        <p>
+          <a href="https://tidelift.com/subscription/pkg/rubygems-activeadmin?utm_source=rubygems-activeadmin&utm_medium=referral&utm_campaign=enterprise">
+            Available as part of the Tidelift Subscription
+          </a>
+        </p>
+
+        <p>
+          Active Admin and the maintainers of thousands of other packages are
+          working with Tidelift to deliver one enterprise subscription that
+          covers all of the open source you use.
+        </p>
+
+        <p>
+          If you want the flexibility of open source and the confidence of
+          commercial-grade software, this is for you.
+        </p>
+
+        <div class="tidelift-buttons">
+          <a href="https://tidelift.com/subscription/pkg/rubygems-activeadmin?utm_source=rubygems-activeadmin&utm_medium=referral&utm_campaign=enterprise" target="_blank">
+            <span>LEARN MORE</span>
+          </a>
+
+          <a href="https://tidelift.com/subscription/request-a-demo?utm_source=rubygems-activeadmin&utm_medium=referral&utm_campaign=enterprise" target="_blank">
+            <span>REQUEST A DEMO</span>
+          </a>
+        </div>
+
+        <h3>
+          The Tidelift Subscription manages your dependencies for you.
+        </h3>
+
+        <ul>
+          <li>
+            Get the tools you need to continuously catalog and understand the open source software that your application depends on.
+          </li>
+
+          <li>
+            Your subscription helps pay the open source maintainers of the exact
+            packages you use to ensure they meet the standards you require.
+          </li>
+
+          <li>
+            Address issues proactively, with tools that scan for new security,
+            licensing, and maintenance issues, and alert our participating open
+            source maintainers so they can resolve them on your behalf.
+          </li>
+
+          <li>
+            Measure and improve your open source dependencies' health—which
+            improves your app’s health—and get a short list of high-impact steps
+            your team can take to improve them even more.
+          </li>
+
+          <li>
+            Get commercial assurances that don't come for free with open source
+            packages, like intellectual property indemnification and support
+            under a service level agreement. You expect these guarantees from
+            proprietary software, and you can have them when using open source
+            as well.
+          </li>
+        </ul>
+
+        <p>
+          The end result? All of the capabilities you expect from
+          commercial-grade software, for the full breadth of open source you
+          use. That means less time grappling with esoteric open source trivia,
+          and more time building your own applications—and your business.
+        </p>
+
+        <div class="tidelift-buttons">
+          <a href="https://tidelift.com/subscription/pkg/rubygems-activeadmin?utm_source=rubygems-activeadmin&utm_medium=referral&utm_campaign=enterprise" target="_blank">
+            <span>LEARN MORE</span>
+          </a>
+
+          <a href="https://tidelift.com/subscription/request-a-demo?utm_source=rubygems-activeadmin&utm_medium=referral&utm_campaign=enterprise" target="_blank">
+            <span>REQUEST A DEMO</span>
+          </a>
+        </div>
+
         <h2 class="getting-started-heading">
           3 Ways to Get Started:
         </h2>

data/docs/stylesheets/main.css

@@ -615,6 +615,35 @@ body #tidelift a .cta {
   padding-left: 30px;
 }
 
+body .tidelift-buttons a {
+  display: table;
+  width: 200px;
+  border: 2px solid #407985;
+  border-radius: 4px;
+  text-decoration: none;
+  font-family: 'Yanone Kaffeesatz', 'Helvetica Neue', Arial, Helvetica, sans-serif;
+  font-size: 18px;
+  letter-spacing: 1px;
+  margin: 0 10px;
+}
+
+body .tidelift-buttons a:first-child {
+  float: left;
+  color: #407985;
+  background: #FFF;
+}
+
+body .tidelift-buttons a:last-child {
+  color: #FFF;
+  background: #407985;
+}
+
+body .tidelift-buttons a span {
+  display: table-cell;
+  vertical-align: middle;
+  text-align: center;
+}
+
 body .clear {
   clear: both;
 }

data/lib/active_admin/abstract_view_factory.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   class AbstractViewFactory < SettingsNode
 

data/lib/active_admin/application.rb

@@ -1,6 +1,7 @@
-require 'active_admin/router'
-require 'active_admin/application_settings'
-require 'active_admin/namespace_settings'
+# frozen_string_literal: true
+require "active_admin/router"
+require "active_admin/application_settings"
+require "active_admin/namespace_settings"
 
 module ActiveAdmin
   class Application
@@ -45,8 +46,8 @@ module ActiveAdmin
     include AssetRegistration
 
     # Event that gets triggered on load of Active Admin
-    BeforeLoadEvent = 'active_admin.application.before_load'.freeze
-    AfterLoadEvent  = 'active_admin.application.after_load'.freeze
+    BeforeLoadEvent = "active_admin.application.before_load".freeze
+    AfterLoadEvent = "active_admin.application.after_load".freeze
 
     # Runs before the app's AA initializer
     def setup!
@@ -73,9 +74,9 @@ module ActiveAdmin
     def namespace(name)
       name ||= :root
 
-      namespace = namespaces[name] ||= begin
+      namespace = namespaces[name.to_sym] ||= begin
         namespace = Namespace.new(self, name)
-        ActiveSupport::Notifications.publish ActiveAdmin::Namespace::RegisterEvent, namespace
+        ActiveSupport::Notifications.instrument ActiveAdmin::Namespace::RegisterEvent, namespace
         namespace
       end
 
@@ -111,10 +112,10 @@ module ActiveAdmin
     # To reload everything simply call `ActiveAdmin.unload!`
     def load!
       unless loaded?
-        ActiveSupport::Notifications.publish BeforeLoadEvent, self # before_load hook
-        files.each { |file| load file }                            # load files
-        namespace(default_namespace)                               # init AA resources
-        ActiveSupport::Notifications.publish AfterLoadEvent, self  # after_load hook
+        ActiveSupport::Notifications.instrument BeforeLoadEvent, self # before_load hook
+        files.each { |file| load file } # load files
+        namespace(default_namespace) # init AA resources
+        ActiveSupport::Notifications.instrument AfterLoadEvent, self # after_load hook
         @@loaded = true
       end
     end
@@ -125,7 +126,7 @@ module ActiveAdmin
 
     # 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"] }.sort
     end
 
     # Creates all the necessary routes for the ActiveAdmin configurations
@@ -144,13 +145,13 @@ module ActiveAdmin
 
     # Adds before, around and after filters to all controllers.
     # Example usage:
-    #   ActiveAdmin.before_filter :authenticate_admin!
+    #   ActiveAdmin.before_action :authenticate_admin!
     #
     AbstractController::Callbacks::ClassMethods.public_instance_methods.
-      select { |m| m.match(/(filter|action)/) }.each do |name|
+      select { |m| m.match(/_action\z/) }.each do |name|
       define_method name do |*args, &block|
-        controllers_for_filters.each do |controller|
-          controller.public_send name, *args, &block
+        ActiveSupport.on_load(:active_admin_controller) do
+          public_send name, *args, &block
         end
       end
     end
@@ -164,9 +165,8 @@ module ActiveAdmin
     private
 
     def register_default_assets
-      register_stylesheet 'active_admin.css', media: 'screen'
-      register_stylesheet 'active_admin/print.css', media: 'print'
-      register_javascript 'active_admin.js'
+      register_stylesheet "active_admin.css", media: "all"
+      register_javascript "active_admin.js"
     end
 
     # Since app/admin is alphabetically before app/models, we have to remove it
@@ -176,7 +176,7 @@ module ActiveAdmin
     # files from being loaded twice in production.
     def remove_active_admin_load_paths_from_rails_autoload_and_eager_load
       ActiveSupport::Dependencies.autoload_paths -= load_paths
-      Rails.application.config.eager_load_paths  -= load_paths
+      Rails.application.config.eager_load_paths -= load_paths
     end
 
     # Hook into the Rails code reloading mechanism so that things are reloaded

data/lib/active_admin/application_settings.rb

@@ -1,4 +1,5 @@
-require 'active_admin/settings_node'
+# frozen_string_literal: true
+require "active_admin/settings_node"
 
 module ActiveAdmin
   class ApplicationSettings < SettingsNode
@@ -15,7 +16,7 @@ module ActiveAdmin
     # 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)]
+    register :load_paths, [File.expand_path("app/admin", Rails.root)]
 
     # Set default localize format for Date/Time values
     register :localize_format, :long
@@ -34,7 +35,7 @@ module ActiveAdmin
                                       :to_s ]
 
     # To make debugging easier, by default don't stream in development
-    register :disable_streaming_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]

data/lib/active_admin/asset_registration.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module AssetRegistration
 

data/lib/active_admin/authorization_adapter.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 module ActiveAdmin
 
   # Default Authorization permissions for Active Admin
   module Authorization
-    READ    = :read
-    CREATE  = :create
-    UPDATE  = :update
+    READ = :read
+    CREATE = :create
+    UPDATE = :update
     DESTROY = :destroy
   end
 

data/lib/active_admin/base_controller/authorization.rb

@@ -1,15 +1,16 @@
+# frozen_string_literal: true
 module ActiveAdmin
   class BaseController < ::InheritedResources::Base
     module Authorization
       extend ActiveSupport::Concern
 
       ACTIONS_DICTIONARY = {
-        index:   ActiveAdmin::Authorization::READ,
-        show:    ActiveAdmin::Authorization::READ,
-        new:     ActiveAdmin::Authorization::CREATE,
-        create:  ActiveAdmin::Authorization::CREATE,
-        edit:    ActiveAdmin::Authorization::UPDATE,
-        update:  ActiveAdmin::Authorization::UPDATE,
+        index: ActiveAdmin::Authorization::READ,
+        show: ActiveAdmin::Authorization::READ,
+        new: ActiveAdmin::Authorization::CREATE,
+        create: ActiveAdmin::Authorization::CREATE,
+        edit: ActiveAdmin::Authorization::UPDATE,
+        update: ActiveAdmin::Authorization::UPDATE,
         destroy: ActiveAdmin::Authorization::DESTROY
       }
 
@@ -52,9 +53,10 @@ module ActiveAdmin
       #                 an ActiveAdmin::AccessDenied.
       def authorize!(action, subject = nil)
         unless authorized? action, subject
-          raise ActiveAdmin::AccessDenied.new(current_active_admin_user,
-                                              action,
-                                              subject)
+          raise ActiveAdmin::AccessDenied.new(
+            current_active_admin_user,
+            action,
+            subject)
         end
       end
 
@@ -80,7 +82,7 @@ module ActiveAdmin
       def active_admin_authorization_adapter
         adapter = active_admin_namespace.authorization_adapter
         if adapter.is_a? String
-          ActiveSupport::Dependencies.constantize adapter
+          adapter.constantize
         else
           adapter
         end
@@ -112,9 +114,9 @@ module ActiveAdmin
             redirect_backwards_or_to_root
           end
 
-          format.csv  { render body:          error,           status: :unauthorized }
-          format.json { render json: { error: error },         status: :unauthorized }
-          format.xml  { render xml: "<error>#{error}</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
 

data/lib/active_admin/base_controller/menu.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   class BaseController < ::InheritedResources::Base
     module Menu

data/lib/active_admin/base_controller.rb

@@ -1,12 +1,12 @@
-require 'active_admin/base_controller/authorization'
-require 'active_admin/base_controller/menu'
+# frozen_string_literal: true
+require "active_admin/base_controller/authorization"
+require "active_admin/base_controller/menu"
 
 module ActiveAdmin
   # BaseController for ActiveAdmin.
   # It implements ActiveAdmin controllers core features.
   class BaseController < ::InheritedResources::Base
     helper ::ActiveAdmin::ViewHelpers
-    helper_method :env
 
     layout :determine_active_admin_layout
 
@@ -69,13 +69,14 @@ module ActiveAdmin
     #   2.  If we're rendering a custom action, we'll use the active_admin layout so
     #       that users can render any template inside Active Admin.
     def determine_active_admin_layout
-      ACTIVE_ADMIN_ACTIONS.include?(params[:action].to_sym) ? false : 'active_admin'
+      ACTIVE_ADMIN_ACTIONS.include?(params[:action].to_sym) ? false : "active_admin"
     end
 
     def active_admin_root
-      controller, action = active_admin_namespace.root_to.split '#'
+      controller, action = active_admin_namespace.root_to.split "#"
       { controller: controller, action: action }
     end
 
+    ActiveSupport.run_load_hooks(:active_admin_controller, self)
   end
 end

data/lib/active_admin/batch_actions/controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module BatchActions
     module Controller
@@ -5,10 +6,10 @@ module ActiveAdmin
       # Controller action that is called when submitting the batch action form
       def batch_action
         if action_present?
-          selection  =            params[:collection_selection] || []
-          inputs     = JSON.parse params[:batch_action_inputs]  || '{}'
+          selection = params[:collection_selection] || []
+          inputs = JSON.parse params[:batch_action_inputs] || "{}"
           valid_keys = MethodOrProcHelper.render_in_context(self, current_batch_action.inputs).try(:keys)
-          inputs     = inputs.with_indifferent_access.slice *valid_keys
+          inputs = inputs.with_indifferent_access.slice *valid_keys
           instance_exec selection, inputs, &current_batch_action.block
         else
           raise "Couldn't find batch action \"#{params[:batch_action]}\""

data/lib/active_admin/batch_actions/resource_extension.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
 
   module BatchActions
@@ -57,21 +58,22 @@ 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|
+        add_batch_action :destroy, proc { I18n.t("active_admin.delete") }, destroy_options do |selected_ids|
           batch_action_collection.find(selected_ids).each do |record|
             authorize! ActiveAdmin::Auth::DESTROY, record
             destroy_resource(record)
           end
 
           redirect_to active_admin_config.route_collection_path(params),
-                      notice: I18n.t("active_admin.batch_actions.succesfully_destroyed",
-                                        count: selected_ids.count,
-                                        model: active_admin_config.resource_label.downcase,
-                                        plural_model: active_admin_config.plural_resource_label(count: selected_ids.count).downcase)
+                      notice: I18n.t(
+                        "active_admin.batch_actions.succesfully_destroyed",
+                        count: selected_ids.count,
+                        model: active_admin_config.resource_label.downcase,
+                        plural_model: active_admin_config.plural_resource_label(count: selected_ids.count).downcase)
         end
       end
 
@@ -84,7 +86,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
     #

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

@@ -1,4 +1,5 @@
-require 'active_admin/component'
+# frozen_string_literal: true
+require "active_admin/component"
 
 module ActiveAdmin
   module BatchActions
@@ -16,7 +17,7 @@ module ActiveAdmin
         # 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.route_batch_action_path(params, url_options), id: options[:id]
-        input name: :batch_action,        id: :batch_action,        type: :hidden
+        input name: :batch_action, id: :batch_action, type: :hidden
         input name: :batch_action_inputs, id: :batch_action_inputs, type: :hidden
 
         super(options)
@@ -30,7 +31,7 @@ module ActiveAdmin
       private
 
       def closing_form_tag
-        '</form>'.html_safe
+        "</form>".html_safe
       end
 
     end

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

@@ -1,4 +1,5 @@
-require 'active_admin/component'
+# frozen_string_literal: true
+require "active_admin/component"
 
 module ActiveAdmin
   module BatchActions
@@ -31,17 +32,17 @@ module ActiveAdmin
             confirmation_text = render_or_call_method_or_proc_on(self, batch_action.confirm)
 
             options = {
-              :class         => "batch_action",
-              "data-action"  => batch_action.sym,
-              "data-confirm" => confirmation_text,
-              "data-inputs"  => render_in_context(self, batch_action.inputs).to_json
+              class: "batch_action",
+              "data-action": batch_action.sym,
+              "data-confirm": confirmation_text,
+              "data-inputs": render_in_context(self, batch_action.inputs).to_json
             }
 
             default_title = render_or_call_method_or_proc_on(self, batch_action.title)
             title = I18n.t("active_admin.batch_actions.labels.#{batch_action.sym}", default: default_title)
             label = I18n.t("active_admin.batch_actions.action_label", title: title)
 
-            item label, "#", options
+            item label, "#", **options
           end
         end
       end

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

@@ -1,4 +1,5 @@
-require 'active_admin/component'
+# frozen_string_literal: true
+require "active_admin/component"
 
 module ActiveAdmin
   module BatchActions
@@ -7,7 +8,7 @@ module ActiveAdmin
     class ResourceSelectionToggleCell < ActiveAdmin::Component
       builder_method :resource_selection_toggle_cell
 
-      def build(label_text = '')
+      def build(label_text = "")
         label do
           input type: "checkbox", id: "collection_selection_toggle_all", name: "collection_selection_toggle_all", class: "toggle_all"
           text_node label_text if label_text.present?
@@ -30,7 +31,7 @@ module ActiveAdmin
 
       def build
         super(id: "collection_selection_toggle_panel")
-        resource_selection_toggle_cell(I18n.t('active_admin.batch_actions.selection_toggle_explanation', default: "(Toggle Selection)"))
+        resource_selection_toggle_cell(I18n.t("active_admin.batch_actions.selection_toggle_explanation", default: "(Toggle Selection)"))
       end
     end
 

data/lib/active_admin/batch_actions.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ActiveAdmin.before_load do |app|
   require "active_admin/batch_actions/resource_extension"
   require "active_admin/batch_actions/controller"

data/lib/active_admin/callbacks.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Callbacks
     extend ActiveSupport::Concern

data/lib/active_admin/cancan_adapter.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
 unless ActiveAdmin::Dependency.cancan? || ActiveAdmin::Dependency.cancancan?
   ActiveAdmin::Dependency.cancan!
 end
 
-require 'cancan'
+require "cancan"
 
 # Add a setting to the application to configure the ability
 ActiveAdmin::Application.inheritable_setting :cancan_ability_class, "Ability"