activeadmin 1.0.0.pre1 → 1.0.0.pre2

data/docs/14-gotchas.md

@@ -54,8 +54,8 @@ end
 ## CSS
 
 In order to avoid the override of your application style with the Active Admin one, you can do one of this things:
-* You can properly move the generated file `active_admin.css.scss` from `app/assets/stylesheets` to `vendor/assets/stylesheets`.
-* You can remove all `require_tree` comands from your root level css files, where the `active_admin.css.scss` is in the tree.
+* You can properly move the generated file `active_admin.scss` from `app/assets/stylesheets` to `vendor/assets/stylesheets`.
+* You can remove all `require_tree` comands from your root level css files, where the `active_admin.scss` is in the tree.
 
 ## Conflicts
 

data/docs/2-resource-customization.md

@@ -30,9 +30,11 @@ end
 Any form field that sends multiple values (such as a HABTM association, or an array attribute)
 needs to pass an empty array to `permit_params`:
 
+If your HABTM is `roles`, you should permit `role_ids: []`
+
 ```ruby
 ActiveAdmin.register Post do
-  permit_params :title, :content, :publisher_id, roles: []
+  permit_params :title, :content, :publisher_id, role_ids: []
 end
 ```
 
@@ -336,7 +338,7 @@ ActiveAdmin.register Ticket do
 end
 ```
 
-Projects will be available as usual and tickets will be availble by visiting
+Projects will be available as usual and tickets will be available by visiting
 `/admin/projects/1/tickets` assuming that a Project with the id of 1 exists.
 Active Admin does not add "Tickets" to the global navigation because the routes
 can only be generated when there is a project id.
@@ -367,7 +369,7 @@ end
 In some cases (like Projects), there are many sub resources and you would
 actually like the global navigation to switch when the user navigates "into" a
 project. To accomplish this, Active Admin stores the `belongs_to` resources in a
-seperate menu which you can use if you so wish. To use:
+separate menu which you can use if you so wish. To use:
 
 ```ruby
 ActiveAdmin.register Ticket do

data/docs/3-index-pages.md

@@ -152,6 +152,13 @@ preserve_default_filters!
 filter :author
 ```
 
+Or you can also remove a filter and still preserve the default filters:
+
+```ruby
+preserve_default_filters!
+remove_filter :id
+```
+
 ## Index Scopes
 
 You can define custom scopes for your index page. This will add a tab bar above

data/docs/3-index-pages/index-as-table.md

@@ -55,6 +55,8 @@ index do
 end
 ```
 
+## Defining Actions
+
 To setup links to View, Edit and Delete a resource, use the `actions` method:
 
 ```ruby
@@ -84,6 +86,8 @@ index do
   column :title
   actions defaults: false do |post|
     item "View", admin_post_path(post)
+    item "Edit", edit_admin_post_path(post)
+    item "Delete", admin_post_path(post), method: :delete
   end
 end
 ```

data/docs/6-show-pages.md

@@ -21,7 +21,7 @@ You can render a partial at any point:
 ActiveAdmin.register Post do
   show do
     # renders app/views/admin/posts/_some_partial.html.erb
-    render 'some_partial'
+    render 'some_partial', { post: post }
   end
 end
 ```

data/docs/7-sidebars.md

@@ -39,6 +39,14 @@ sidebar :help, if: proc{ current_admin_user.super_admin? } do
 end
 ```
 
+You can access your model as resource in the sidebar too:
+
+```ruby
+sidebar :custom, only: :show do
+  resource.a_method
+end
+```
+
 You can also render a partial:
 
 ```ruby

data/features/index/batch_actions.feature

@@ -1,5 +1,6 @@
 Feature: Batch Actions
 
+  @javascript
   Scenario: Use default (destroy) batch action
     Given 10 posts exist
     And an index configuration of:
@@ -16,10 +17,28 @@ Feature: Batch Actions
     And I follow "Batch Actions"
     Then I should see the batch action :destroy "Delete Selected"
 
-    Given I submit the batch action form with "destroy"
+    Given I click "Delete Selected" and accept confirmation
     Then I should see a flash with "Successfully destroyed 2 posts"
     And I should see 8 posts in the table
 
+  Scenario: Use default (destroy) batch action on a decorated resource
+    Given 5 posts exist
+    And an index configuration of:
+    """
+      ActiveAdmin.register Post do
+        decorate_with PostDecorator
+      end
+    """
+    When I check the 2nd record
+    And I check the 4th record
+    And I follow "Batch Actions"
+    Then I should see the batch action :destroy "Delete Selected"
+
+    Given I submit the batch action form with "destroy"
+    Then I should see a flash with "Successfully destroyed 2 posts"
+    And I should see 3 posts in the table
+
+  @javascript
   Scenario: Use default (destroy) batch action on a nested resource
     Given I am logged in
     And 5 posts written by "John Doe" exist
@@ -41,7 +60,7 @@ Feature: Batch Actions
     And I follow "Batch Actions"
     Then I should see the batch action :destroy "Delete Selected"
 
-    Given I submit the batch action form with "destroy"
+    Given I click "Delete Selected" and accept confirmation
     Then I should see a flash with "Successfully destroyed 2 posts"
     And I should see 3 posts in the table
 

data/features/index/pagination.feature

@@ -43,17 +43,21 @@ Feature: Index Pagination
     When I am on the index page for posts
     Then I should not see pagination
 
-    Scenario: Viewing index with pagination_total set to false
-      Given an index configuration of:
-      """
-        ActiveAdmin.register Post do
-          index :pagination_total => false do
-          end
+  Scenario: Viewing index with pagination_total set to false
+    Given an index configuration of:
+    """
+      ActiveAdmin.register Post do
+        config.per_page = 10
+        index :pagination_total => false do
         end
-      """
-      Given 100 posts exist
-      When I am on the index page for posts
-      Then I should see pagination with 4 pages
-      Then I should see "Displaying Posts 1 - 30"
-      And I should not see "Displaying Posts 1 - 30 of 100 in total"
+      end
+    """
+    Given 11 posts exist
+    When I am on the index page for posts
+    Then I should see "Displaying Posts 1 - 10"
+    And I should not see "11 in total"
+    And I should see the pagination "Next" link
 
+    When I follow "Next"
+    Then I should see "Displaying Posts 11 - 11"
+    And I should not see the pagination "Next" link

data/features/meta_tags.feature

@@ -0,0 +1,21 @@
+Feature: Meta Tag
+
+  Add custom meta tags to head of pages.
+
+  Background:
+    Given a configuration of:
+    """
+      ActiveAdmin.register Post
+      ActiveAdmin.application.meta_tags = { author: 'My Company' }
+      ActiveAdmin.application.meta_tags_for_logged_out_pages = { robots: 'noindex' }
+    """
+
+  Scenario: Logged out views include custom meta tags
+    Given I am logged out
+    When I am on the login page
+    Then the site should contain a meta tag with name "robots" and content "noindex"
+
+  Scenario: Logged in views include custom meta tags
+    Given I am logged in
+    When I am on the dashboard
+    Then the site should contain a meta tag with name "author" and content "My Company"

data/features/registering_assets.feature

@@ -12,8 +12,7 @@ Feature: Registering Assets
 
   Scenario: Viewing default asset files
     When I am on the index page for posts
-    Then I should see the css file "admin/active_admin.css"
-    Then I should see the js file "active_admin_vendor.js"
+    Then I should see the css file "active_admin.css"
     Then I should see the js file "active_admin.js"
 
   Scenario: Registering a CSS file

data/features/show/columns.feature

@@ -0,0 +1,40 @@
+Feature: Show - Columns
+
+  Columns in show page
+
+  Background:
+    Given a post with the title "Hello World" written by "Jane Doe" exists
+
+  Scenario:
+    Given a show configuration of:
+    """
+      ActiveAdmin.register Post do
+
+        show do
+          columns do
+          end
+        end
+
+      end
+    """
+    Then I should see a columns container
+    And I should see 0 column
+
+  Scenario:
+    Given a show configuration of:
+    """
+      ActiveAdmin.register Post do
+
+        show do
+          columns do
+            column do
+            end
+            column do
+            end
+          end
+        end
+
+      end
+    """
+    Then I should see a columns container
+    And I should see 2 columns

data/features/show/default_content.feature

@@ -3,7 +3,7 @@ Feature: Show - Default Content
   Viewing the show page for a resource
 
   Background:
-    Given a post with the title "Hello World" written by "Jane Doe" exists
+    Given a unstarred post with the title "Hello World" written by "Jane Doe" exists
 
   Scenario: Viewing the default show page
     Given a show configuration of:
@@ -14,6 +14,7 @@ Feature: Show - Default Content
     And I should see the attribute "Body" with "Empty"
     And I should see the attribute "Created At" with a nicely formatted datetime
     And I should see the attribute "Author" with "Jane Doe"
+    And I should see the attribute "Starred" with "false"
     And I should see an action item button "Delete Post"
     And I should see an action item button "Edit Post"
 

data/features/step_definitions/asset_steps.rb

@@ -3,13 +3,13 @@ Then /^I should see the css file "([^"]*)"$/ do |path|
 end
 
 Then /^I should see the css file "([^"]*)" of media "([^"]*)"$/ do |path, media|
-  expect(page).to have_xpath("//link[contains(@href, /stylesheets/#{path}) and contains(@media, #{media})]", visible: false)
+  expect(page).to have_xpath("//link[contains(@href, '#{path}') and contains(@media, '#{media}')]", visible: false)
 end
 
 Then /^I should see the js file "([^"]*)"$/ do |path|
-  expect(page).to have_xpath("//script[contains(@src, /javascripts/#{path})]", visible: false)
+  expect(page).to have_xpath("//script[contains(@src, '#{path}')]", visible: false)
 end
 
 Then /^I should see the favicon "([^"]*)"$/ do |path|
-  expect(page).to have_xpath("//link[contains(@href, path)]", visible: false)
+  expect(page).to have_xpath("//link[contains(@href, '#{path}')]", visible: false)
 end

data/features/step_definitions/batch_action_steps.rb

@@ -7,11 +7,11 @@ Then /^I (should|should not) be asked to confirm "([^"]*)" for "([^"]*)"$/ do |m
 end
 
 Then /^I (should|should not) see the batch action :([^\s]*) "([^"]*)"$/ do |maybe, sym, title|
-  selector = ".batch_actions_selector a.batch_action:contains('#{title}')"
+  selector = ".batch_actions_selector a.batch_action"
   selector << "[href='#'][data-action='#{sym}']" if maybe == 'should'
 
   verb = maybe == 'should' ? :to : :to_not
-  expect(page).send verb, have_css(selector)
+  expect(page).send verb, have_css(selector, text: title)
 end
 
 Then /^the (\d+)(?:st|nd|rd|th) batch action should be "([^"]*)"$/ do |index, title|
@@ -57,6 +57,15 @@ Given /^I submit the batch action form with "([^"]*)"$/ do |action|
   page.driver.submit form['method'], form['action'], params
 end
 
+When /^I click "(.*?)" and accept confirmation$/ do |link|
+  # Use this implementation instead if poltergeist ever implements it
+  # page.driver.accept_modal(:confirm) { click_link(link) }
+
+  click_link(link)
+  expect(page).to have_content("Are you sure you want to delete these posts?")
+  click_button("OK")
+end
+
 Then /^I should not see checkboxes in the table$/ do
   expect(page).to_not have_css '.paginated_collection table input[type=checkbox]'
 end

data/features/step_definitions/column_steps.rb

@@ -0,0 +1,8 @@
+Then /^I should see a columns container$/ do
+  expect(page).to have_css '.columns'
+end
+
+Then /^I should see (a|\d+) columns?$/ do |count|
+  count = count == 'a' ? 1 : count.to_i
+  expect(page).to have_css '.column', count: count
+end

data/features/step_definitions/configuration_steps.rb

@@ -1,8 +1,8 @@
 module ActiveAdminReloading
   def load_aa_config(config_content)
-    ActiveAdmin::Event.dispatch ActiveAdmin::Application::BeforeLoadEvent, ActiveAdmin.application
+    ActiveSupport::Notifications.publish ActiveAdmin::Application::BeforeLoadEvent, ActiveAdmin.application
     eval(config_content)
-    ActiveAdmin::Event.dispatch ActiveAdmin::Application::AfterLoadEvent,  ActiveAdmin.application
+    ActiveSupport::Notifications.publish ActiveAdmin::Application::AfterLoadEvent,  ActiveAdmin.application
     Rails.application.reload_routes!
     ActiveAdmin.application.namespaces.each &:reset_menu!
   end

data/features/step_definitions/factory_steps.rb

@@ -3,14 +3,15 @@ def create_user(name, type = 'User')
   user = type.camelize.constantize.where(first_name: first_name, last_name: last_name).first_or_create(username: name.tr(' ', '').underscore)
 end
 
-Given /^(a|\d+)( published)? posts?(?: with the title "([^"]*)")?(?: and body "([^"]*)")?(?: written by "([^"]*)")?(?: in category "([^"]*)")? exists?$/ do |count, published, title, body, user, category_name|
+Given /^(a|\d+)( published)?( unstarred|starred)? posts?(?: with the title "([^"]*)")?(?: and body "([^"]*)")?(?: written by "([^"]*)")?(?: in category "([^"]*)")? exists?$/ do |count, published, starred, title, body, user, category_name|
   count     = count == 'a' ? 1 : count.to_i
   published = Time.now          if published
+  starred   = starred == " starred" if starred
   author    = create_user(user) if user
   category  = Category.where(name: category_name).first_or_create if category_name
   title   ||= "Hello World %i"
   count.times do |i|
-    Post.create! title: title % i, body: body, author: author, published_at: published, custom_category_id: category.try(:id)
+    Post.create! title: title % i, body: body, author: author, published_at: published, custom_category_id: category.try(:id), starred: starred
   end
 end
 

data/features/step_definitions/meta_tag_steps.rb

@@ -0,0 +1,3 @@
+Then /^the site should contain a meta tag with name "([^"]*)" and content "([^"]*)"$/ do |name, content|
+  expect(page).to have_xpath("//meta[@name='#{name}' and @content='#{content}']", visible: false)
+end

data/features/step_definitions/pagination_steps.rb

@@ -5,3 +5,11 @@ end
 Then /^I should see pagination with (\d+) pages$/ do |count|
   expect(page).to have_css '.pagination span.page', count: count
 end
+
+Then /^I should see the pagination "Next" link/ do
+  expect(page).to have_css "a", text: "Next"
+end
+
+Then /^I should not see the pagination "Next" link/ do
+  expect(page).to_not have_css "a", text: "Next"
+end

data/features/step_definitions/table_steps.rb

@@ -1,5 +1,6 @@
 Then /^I should see (\d+) ([\w]*) in the table$/ do |count, resource_type|
-  expect(all("table.index_table tr > td:first").count).to eq count.to_i
+  expect(page).to \
+    have_css("table.index_table tr > td:first-child", count: count.to_i)
 end
 
 # TODO: simplify this, if possible?

data/lib/active_admin.rb

@@ -6,6 +6,7 @@ require 'ransack_ext'
 require 'bourbon'
 require 'kaminari'
 require 'formtastic'
+require 'formtastic_i18n'
 require 'sass-rails'
 require 'inherited_resources'
 require 'jquery-rails'
@@ -35,7 +36,6 @@ module ActiveAdmin
   autoload :Event,                    'active_admin/event'
   autoload :FormBuilder,              'active_admin/form_builder'
   autoload :Inputs,                   'active_admin/inputs'
-  autoload :Iconic,                   'active_admin/iconic'
   autoload :Menu,                     'active_admin/menu'
   autoload :MenuCollection,           'active_admin/menu_collection'
   autoload :MenuItem,                 'active_admin/menu_item'
@@ -92,7 +92,7 @@ module ActiveAdmin
     #
     # @param [Block] block A block to call each time (before) AA loads resources
     def before_load(&block)
-      ActiveAdmin::Event.subscribe ActiveAdmin::Application::BeforeLoadEvent, &block
+      ActiveSupport::Notifications.subscribe ActiveAdmin::Application::BeforeLoadEvent, &ActiveAdmin::Event.wrap_block_for_active_support_notifications(block)
     end
 
     # A callback is triggered each time (after) Active Admin loads the configuration files. This
@@ -110,7 +110,7 @@ module ActiveAdmin
     #
     # @param [Block] block A block to call each time (after) AA loads resources
     def after_load(&block)
-      ActiveAdmin::Event.subscribe ActiveAdmin::Application::AfterLoadEvent, &block
+      ActiveSupport::Notifications.subscribe ActiveAdmin::Application::AfterLoadEvent, &ActiveAdmin::Event.wrap_block_for_active_support_notifications(block)
     end
 
   end

data/lib/active_admin/application.rb

@@ -28,6 +28,9 @@ module ActiveAdmin
     # 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, ""
 
@@ -40,6 +43,12 @@ module ActiveAdmin
     # 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
@@ -88,6 +97,9 @@ module ActiveAdmin
     # 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
@@ -96,6 +108,9 @@ module ActiveAdmin
     # 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
+    inheritable_setting :localize_format, :long
+
     # 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,
@@ -146,7 +161,7 @@ module ActiveAdmin
 
       namespace = namespaces[name] ||= begin
         namespace = Namespace.new(self, name)
-        ActiveAdmin::Event.dispatch ActiveAdmin::Namespace::RegisterEvent, namespace
+        ActiveSupport::Notifications.publish ActiveAdmin::Namespace::RegisterEvent, namespace
         namespace
       end
 
@@ -182,10 +197,10 @@ module ActiveAdmin
     # To reload everything simply call `ActiveAdmin.unload!`
     def load!
       unless loaded?
-        ActiveAdmin::Event.dispatch BeforeLoadEvent, self # before_load hook
-        files.each{ |file| load file }                    # load files
-        namespace(default_namespace)                      # init AA resources
-        ActiveAdmin::Event.dispatch AfterLoadEvent, self  # after_load hook
+        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
         @@loaded = true
       end
     end
@@ -213,7 +228,8 @@ module ActiveAdmin
     # Example usage:
     #   ActiveAdmin.before_filter :authenticate_admin!
     #
-    %w(before_filter skip_before_filter after_filter skip_after_filter around_filter skip_filter).each do |name|
+    AbstractController::Callbacks::ClassMethods.public_instance_methods.
+      select { |m| m.match(/(filter|action)/) }.each do |name|
       define_method name do |*args, &block|
         controllers_for_filters.each do |controller|
           controller.public_send name, *args, &block
@@ -246,20 +262,54 @@ module ActiveAdmin
       Rails.application.config.eager_load_paths  -= load_paths
     end
 
-    # Hooks the app/admin directory into our Rails Engine's +watchable_dirs+, so the
-    # files are automatically reloaded in your development environment.
+    # Hook into the Rails code reloading mechanism so that things are reloaded
+    # properly in development mode.
     #
-    # If files have changed on disk, we forcibly unload all AA configurations, and
-    # tell the host application to redraw routes (triggering AA itself to reload).
+    # If any of the app files (e.g. models) has changed, we need to reload all
+    # the admin files. If the admin files themselves has changed, we need to
+    # regenerate the routes as well.
     def attach_reloader
-      load_paths.each do |path|
-        ActiveAdmin::Engine.config.watchable_dirs[path] = [:rb]
-      end
+      Rails.application.config.after_initialize do |app|
+        unload_active_admin = -> { ActiveAdmin.application.unload! }
+
+        if app.config.reload_classes_only_on_change
+          # 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.
+          ActionDispatch::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.
+          ActionDispatch::Reloader.to_cleanup(&unload_active_admin)
+        end
+
+        admin_dirs = {}
+
+        load_paths.each do |path|
+          admin_dirs[path] = [:rb]
+        end
+
+        routes_reloader = app.config.file_watcher.new([], admin_dirs) do
+          app.reload_routes!
+        end
+
+        app.reloaders << routes_reloader
 
-      Rails.application.config.after_initialize do
         ActionDispatch::Reloader.to_prepare do
-          ActiveAdmin.application.unload!
-          Rails.application.reload_routes!
+          # 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`.
+          #
+          # Otherwise, we should check if any of the admin files are changed
+          # and force the routes to reload if necessary. This would again causes
+          # Active Admin to load via `ActiveAdmin.routes`.
+          #
+          # Finally, if Active Admin is still not loaded at this point, then we
+          # would need to load it manually.
+          unless ActiveAdmin.application.loaded?
+            routes_reloader.execute_if_updated
+            ActiveAdmin.application.load!
+          end
         end
       end
     end