activeadmin 1.4.3 → 2.9.0

data/docs/_config.yml

@@ -1,2 +1,4 @@
 plugins:
+  - jekyll-default-layout
   - jekyll-redirect-from
+  - jekyll-relative-links

data/docs/_includes/top-menu.html

@@ -8,9 +8,9 @@
     </div>
 
     <div id="tidelift">
-        <a href="https://tidelift.com/subscription/pkg/rubygems-activeadmin?utm_source=rubygems-activeadmin&utm_medium=readme" target="_blank">
+        <a href="https://tidelift.com/subscription/pkg/rubygems-activeadmin?utm_source=rubygems-activeadmin&utm_medium=referral&utm_campaign=enterprise" target="_blank">
             <span class="cta">
-                Get license assurances and timely security notifications
+                Active Admin for enterprise available via Tidelift
             </span>
         </a>
     </div>

data/docs/documentation.md

@@ -29,7 +29,7 @@ configurations.
 Migrate your db and start the server:
 
 ```bash
-$> rake db:migrate
+$> rails db:migrate
 $> rails server
 ```
 

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>
@@ -102,14 +122,95 @@
     <span class="n">column</span> <span class="s2">"Price"</span><span class="p">,</span> <span class="ss">sortable:</span> <span class="ss">:price</span> <span class="k">do</span> <span class="o">|</span><span class="n">product</span><span class="o">|</span>
       <span class="n">number_to_currency</span> <span class="n">product</span><span class="o">.</span><span class="n">price</span>
     <span class="k">end</span>
-    <span class="n">default_actions</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.rb

@@ -1,59 +1,57 @@
-require 'active_support/core_ext'
-require 'set'
+require "active_support/core_ext"
+require "set"
 
-require 'ransack'
-require 'ransack_ext'
-require 'kaminari'
-require 'formtastic'
-require 'formtastic_i18n'
-require 'inherited_resources'
-require 'jquery-rails'
-require 'coffee-rails'
-require 'arbre'
+require "ransack"
+require "ransack_ext"
+require "kaminari"
+require "formtastic"
+require "formtastic_i18n"
+require "inherited_resources"
+require "jquery-rails"
+require "arbre"
 
-require 'active_admin/helpers/i18n'
+require "active_admin/helpers/i18n"
 
 module ActiveAdmin
 
-  autoload :VERSION,                  'active_admin/version'
-  autoload :Application,              'active_admin/application'
-  autoload :AssetRegistration,        'active_admin/asset_registration'
-  autoload :Authorization,            'active_admin/authorization_adapter'
-  autoload :AuthorizationAdapter,     'active_admin/authorization_adapter'
-  autoload :Callbacks,                'active_admin/callbacks'
-  autoload :Component,                'active_admin/component'
-  autoload :BaseController,           'active_admin/base_controller'
-  autoload :CanCanAdapter,            'active_admin/cancan_adapter'
-  autoload :ControllerAction,         'active_admin/controller_action'
-  autoload :CSVBuilder,               'active_admin/csv_builder'
-  autoload :Dependency,               'active_admin/dependency'
-  autoload :Deprecation,              'active_admin/deprecation'
-  autoload :Devise,                   'active_admin/devise'
-  autoload :DSL,                      'active_admin/dsl'
-  autoload :Event,                    'active_admin/event'
-  autoload :FormBuilder,              'active_admin/form_builder'
-  autoload :Inputs,                   'active_admin/inputs'
-  autoload :Localizers,               'active_admin/localizers'
-  autoload :Menu,                     'active_admin/menu'
-  autoload :MenuCollection,           'active_admin/menu_collection'
-  autoload :MenuItem,                 'active_admin/menu_item'
-  autoload :Namespace,                'active_admin/namespace'
-  autoload :OrderClause,              'active_admin/order_clause'
-  autoload :Page,                     'active_admin/page'
-  autoload :PagePresenter,            'active_admin/page_presenter'
-  autoload :PageController,           'active_admin/page_controller'
-  autoload :PageDSL,                  'active_admin/page_dsl'
-  autoload :PunditAdapter,            'active_admin/pundit_adapter'
-  autoload :Resource,                 'active_admin/resource'
-  autoload :ResourceController,       'active_admin/resource_controller'
-  autoload :ResourceDSL,              'active_admin/resource_dsl'
-  autoload :Scope,                    'active_admin/scope'
-  autoload :ScopeChain,               'active_admin/helpers/scope_chain'
-  autoload :SidebarSection,           'active_admin/sidebar_section'
-  autoload :TableBuilder,             'active_admin/table_builder'
-  autoload :ViewFactory,              'active_admin/view_factory'
-  autoload :ViewHelpers,              'active_admin/view_helpers'
-  autoload :Views,                    'active_admin/views'
+  autoload :VERSION, "active_admin/version"
+  autoload :Application, "active_admin/application"
+  autoload :AssetRegistration, "active_admin/asset_registration"
+  autoload :Authorization, "active_admin/authorization_adapter"
+  autoload :AuthorizationAdapter, "active_admin/authorization_adapter"
+  autoload :Callbacks, "active_admin/callbacks"
+  autoload :Component, "active_admin/component"
+  autoload :BaseController, "active_admin/base_controller"
+  autoload :CanCanAdapter, "active_admin/cancan_adapter"
+  autoload :ControllerAction, "active_admin/controller_action"
+  autoload :CSVBuilder, "active_admin/csv_builder"
+  autoload :Dependency, "active_admin/dependency"
+  autoload :Deprecation, "active_admin/deprecation"
+  autoload :Devise, "active_admin/devise"
+  autoload :DSL, "active_admin/dsl"
+  autoload :FormBuilder, "active_admin/form_builder"
+  autoload :Inputs, "active_admin/inputs"
+  autoload :Localizers, "active_admin/localizers"
+  autoload :Menu, "active_admin/menu"
+  autoload :MenuCollection, "active_admin/menu_collection"
+  autoload :MenuItem, "active_admin/menu_item"
+  autoload :Namespace, "active_admin/namespace"
+  autoload :OrderClause, "active_admin/order_clause"
+  autoload :Page, "active_admin/page"
+  autoload :PagePresenter, "active_admin/page_presenter"
+  autoload :PageController, "active_admin/page_controller"
+  autoload :PageDSL, "active_admin/page_dsl"
+  autoload :PunditAdapter, "active_admin/pundit_adapter"
+  autoload :Resource, "active_admin/resource"
+  autoload :ResourceController, "active_admin/resource_controller"
+  autoload :ResourceDSL, "active_admin/resource_dsl"
+  autoload :Scope, "active_admin/scope"
+  autoload :ScopeChain, "active_admin/helpers/scope_chain"
+  autoload :SidebarSection, "active_admin/sidebar_section"
+  autoload :TableBuilder, "active_admin/table_builder"
+  autoload :ViewFactory, "active_admin/view_factory"
+  autoload :ViewHelpers, "active_admin/view_helpers"
+  autoload :Views, "active_admin/views"
 
   class << self
 
@@ -70,11 +68,11 @@ module ActiveAdmin
       application.prepare!
     end
 
-    delegate :register,      to: :application
+    delegate :register, to: :application
     delegate :register_page, to: :application
-    delegate :unload!,       to: :application
-    delegate :load!,         to: :application
-    delegate :routes,        to: :application
+    delegate :unload!, to: :application
+    delegate :load!, to: :application
+    delegate :routes, to: :application
 
     # A callback is triggered each time (before) Active Admin loads the configuration files.
     # In development mode, this will happen whenever the user changes files. In production
@@ -90,7 +88,7 @@ module ActiveAdmin
     #
     # @param [Block] block A block to call each time (before) AA loads resources
     def before_load(&block)
-      ActiveSupport::Notifications.subscribe ActiveAdmin::Application::BeforeLoadEvent, &ActiveAdmin::Event.wrap_block_for_active_support_notifications(block)
+      ActiveSupport::Notifications.subscribe ActiveAdmin::Application::BeforeLoadEvent, &wrap_block_for_active_support_notifications(block)
     end
 
     # A callback is triggered each time (after) Active Admin loads the configuration files. This
@@ -108,7 +106,13 @@ module ActiveAdmin
     #
     # @param [Block] block A block to call each time (after) AA loads resources
     def after_load(&block)
-      ActiveSupport::Notifications.subscribe ActiveAdmin::Application::AfterLoadEvent, &ActiveAdmin::Event.wrap_block_for_active_support_notifications(block)
+      ActiveSupport::Notifications.subscribe ActiveAdmin::Application::AfterLoadEvent, &wrap_block_for_active_support_notifications(block)
+    end
+
+    private
+
+    def wrap_block_for_active_support_notifications block
+      proc { |event, *args| block.call *args }
     end
 
   end
@@ -116,13 +120,13 @@ module ActiveAdmin
 end
 
 # Require things that don't support autoload
-require 'active_admin/engine'
-require 'active_admin/error'
+require "active_admin/engine"
+require "active_admin/error"
 
 # Require internal plugins
-require 'active_admin/batch_actions'
-require 'active_admin/filters'
+require "active_admin/batch_actions"
+require "active_admin/filters"
 
 # Require ORM-specific plugins
-require 'active_admin/orm/active_record' if defined? ActiveRecord
-require 'active_admin/orm/mongoid'       if defined? Mongoid
+require "active_admin/orm/active_record" if defined? ActiveRecord
+require "active_admin/orm/mongoid" if defined? Mongoid

data/lib/active_admin/application.rb

@@ -1,7 +1,6 @@
-require 'active_admin/router'
-require 'active_admin/reloader'
-require 'active_admin/application_settings'
-require 'active_admin/namespace_settings'
+require "active_admin/router"
+require "active_admin/application_settings"
+require "active_admin/namespace_settings"
 
 module ActiveAdmin
   class Application
@@ -43,17 +42,11 @@ module ActiveAdmin
       @namespaces = Namespace::Store.new
     end
 
-    # == Deprecated Settings
-
-    def allow_comments=(*)
-      raise "`config.allow_comments` is no longer provided in ActiveAdmin 1.x. Use `config.comments` instead."
-    end
-
     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!
@@ -68,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
 
@@ -80,7 +73,7 @@ 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
         namespace
@@ -98,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
 
@@ -119,20 +112,20 @@ module ActiveAdmin
     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
+        files.each { |file| load file } # load files
+        namespace(default_namespace) # init AA resources
+        ActiveSupport::Notifications.publish AfterLoadEvent, self # after_load hook
         @@loaded = true
       end
     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"] }.sort
     end
 
     # Creates all the necessary routes for the ActiveAdmin configurations
@@ -171,9 +164,9 @@ module ActiveAdmin
     private
 
     def register_default_assets
-      stylesheets['active_admin.css'] = { media: 'screen' }
-      stylesheets['active_admin/print.css'] = { media: 'print' }
-      javascripts.add 'active_admin.js'
+      register_stylesheet "active_admin.css", media: "screen"
+      register_stylesheet "active_admin/print.css", media: "print"
+      register_javascript "active_admin.js"
     end
 
     # Since app/admin is alphabetically before app/models, we have to remove it
@@ -183,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
@@ -200,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 = {}
@@ -219,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`.