activeadmin 0.5.1 → 0.6.0

data/features/index/index_parameters.feature

@@ -10,3 +10,72 @@ Feature: Index Parameters
     Given 31 posts exist
     When I am on the index page for posts
     Then I should not see a link to download "CSV"
+
+  Scenario: Viewing index when download_links disabled globally
+    Given a configuration of:
+      """
+      ActiveAdmin.application.download_links = false
+      """
+    Given an index configuration of:
+      """
+      ActiveAdmin.register Post do
+        index :as => :table
+      end
+      """
+    Given 1 posts exist
+    When I am on the index page for posts
+    Then I should be on the index page for posts
+    Then I should not see a link to download "CSV"
+    Given a configuration of:
+      """
+      ActiveAdmin.application.download_links = true
+      """
+
+  Scenario: Viewing index when download_links disabled only in one namespace
+    Given a configuration of:
+      """
+      ActiveAdmin.setup do |config|
+        config.namespace :superadmin do |namespace|
+          namespace.download_links = false
+        end
+      end
+      """
+    Given an index configuration of:
+      """
+      ActiveAdmin.register Post do
+        index :as => :table
+      end
+      ActiveAdmin.register Post, :namespace => :superadmin do
+        index :as => :table
+      end
+      """
+    Given 1 posts exist
+    When I am on the index page for posts in the superadmin namespace
+    Then I should be on the index page for posts in the superadmin namespace
+    Then I should not see a link to download "CSV"
+    When I am on the index page for posts
+    Then I should be on the index page for posts
+    Then I should see a link to download "CSV"
+
+  Scenario: Viewing index when download_links enabled only for a resource
+    Given a configuration of:
+      """
+      ActiveAdmin.setup do |config|
+        config.namespace :superadmin do |namespace|
+          namespace.download_links = false
+        end
+      end
+      """
+    Given an index configuration of:
+      """
+      ActiveAdmin.register Post do
+        index :as => :table
+      end
+      ActiveAdmin.register Post, :namespace => :superadmin do
+        index :as => :table, :download_links => true
+      end
+      """
+    Given 1 posts exist
+    When I am on the index page for posts in the superadmin namespace
+    Then I should be on the index page for posts in the superadmin namespace
+    Then I should see a link to download "CSV"

data/features/index/index_scopes.feature

@@ -26,21 +26,17 @@ Feature: Index Scoping
     And I should see the scope "All" with the count 3
     And I should see 3 posts in the table
 
-  Scenario: Viewing resources with one scope and no results
+  Scenario: Viewing resources with a scope and no results
     Given 3 posts exist
     And an index configuration of:
-     """
-     ActiveAdmin.register Post do
-       scope :all, :default => true
-       filter :title
-     end
-     """
-
+      """
+      ActiveAdmin.register Post do
+        scope :all, :default => true
+        filter :title
+      end
+      """
     When I fill in "Search Title" with "Non Existing Post"
     And I press "Filter"
-    And I should not see the scope "All"
-
-    When I am on the index page for posts
     Then I should see the scope "All" selected
 
   Scenario: Viewing resources with a scope but scope_count turned off

data/features/index/page_title.feature

@@ -10,3 +10,21 @@ Feature: Index - Page Title
       end
     """
     Then I should see the page title "Awesome Title"
+
+  Scenario: Set the title using a proc
+    Given an index configuration of:
+    """
+      ActiveAdmin.register Post do
+        index :title => proc{ 'Custom title from proc' }
+      end
+    """
+    Then I should see the page title "Custom title from proc"
+
+  Scenario: Set the title using a proc that uses the available resource class
+    Given an index configuration of:
+    """
+      ActiveAdmin.register Post do
+        index :title => proc{ "List of #{resource_class.model_name.plural}" }
+      end
+    """
+    Then I should see the page title "List of posts"

data/features/index/switch_index_view.feature

@@ -0,0 +1,73 @@
+Feature: Switch Index View
+
+	In order to switch index views
+	As a user
+	I want to view links to views
+
+  Scenario: Show default Page Presenter
+  Given a post with the title "Hello World from Table" exists
+  And an index configuration of:
+    """
+    ActiveAdmin.register Post do
+      index :as => :table do
+        column :title
+      end
+      index :as => :block do |post|
+        span(link_to(post.title, admin_post_path(post)))
+      end
+    end
+    """
+  Then I should see "Hello World from Table" within ".index_as_table"
+
+	Scenario: Show default Page Presenter when default is specified
+		Given a post with the title "Hello World from Table" exists
+		And an index configuration of:
+			"""
+      ActiveAdmin.register Post do
+        index :as => :block do |post|
+          span(link_to(post.title, admin_post_path(post)))
+        end
+        index :as => :table, :default => true do
+          column :title
+        end
+      end
+      """
+    Then I should see "Hello World from Table" within ".index_as_table"
+
+  Scenario: Show links to different page views
+		Given a post with the title "Hello World from Table" exists
+		And an index configuration of:
+			"""
+      ActiveAdmin.register Post do
+        index :as => :block do |post|
+          span(link_to(post.title, admin_post_path(post)))
+        end
+        index :as => :table, :default => true do
+          column :title
+        end
+      end
+      """
+    Then I should see "Hello World from Table" within ".index_as_table"
+    And I should see a link to "Table"
+    And I should see a link to "List"
+
+ 	Scenario: Show change between page views
+		Given a post with the title "Hey from Table" and body "My body is awesome" exists
+		And an index configuration of:
+			"""
+      ActiveAdmin.register Post do
+        index :as => :block do |post|
+          span(link_to(post.title, admin_post_path(post)))
+        end
+        index :as => :table, :default => true do
+          column :title
+          column :body
+        end
+      end
+      """
+    Then I should see "My body is awesome" within ".index_as_table"
+    When I click "List"
+    Then I should not see "My body is awesome" within ".index_as_block"
+
+
+

data/features/menu.feature

@@ -24,3 +24,30 @@ Feature: Menu
     Then I should see a menu item for "Articles"
     And I should not see a menu item for "Posts"
 
+  Scenario: Add a non-resource menu item
+    Given a configuration of:
+    """
+      ActiveAdmin.application.namespace :admin do |admin|
+        admin.build_menu do |menu|
+          menu.add :label => "Custom Menu", :url => :admin_dashboard_path
+        end
+      end
+    """
+    When I am on the dashboard
+    Then I should see a menu item for "Custom Menu"
+    When I follow "Custom Menu"
+    Then I should be on the admin dashboard page
+
+  Scenario: Adding a resource as a sub menu item
+    Given a configuration of:
+    """
+      ActiveAdmin.register User
+      ActiveAdmin.register Post do
+        menu :parent => 'User'
+      end
+    """
+    When I am on the dashboard
+    Then I should see a menu item for "Users"
+    When I follow "Users"
+    Then the "Users" tab should be selected
+    And I should see a nested menu item for "Posts"

data/features/registering_pages.feature

@@ -123,5 +123,26 @@ Feature: Registering Pages
     And I follow "Status"
     And I follow "Check"
     Then I should see the content "Chocolate I lØve You!"
+    And I should see the Active Admin layout
 
+  Scenario: Adding a page action to a page with erb view
+    Given a configuration of:
+    """
+    ActiveAdmin.register_page "Status" do
+      page_action :check do
+      end
 
+      content do
+        ("Chocolate I lØve You!" + link_to("Check", admin_status_check_path)).html_safe
+      end
+    end
+    """
+    Given "app/views/admin/status/check.html.erb" contains:
+      """
+        <div>Chocolate lØves You Too!</div>
+      """
+    When I go to the dashboard
+    And I follow "Status"
+    And I follow "Check"
+    Then I should see the content "Chocolate lØves You Too!"
+    And I should see the Active Admin layout

data/features/step_definitions/additional_web_steps.rb

@@ -89,3 +89,7 @@ end
 Then /^I should see a validation error "([^"]*)"$/ do |error_message|
   page.should have_css(".inline-errors", :text => error_message)
 end
+
+Then /^I should see a table with id "([^"]*)"$/ do |dom_id|
+  page.should have_css('table', :id => dom_id)
+end

data/features/step_definitions/batch_action_steps.rb

@@ -29,7 +29,7 @@ Then /^the (\d+)(?:st|nd|rd|th) batch action should be "([^"]*)"$/ do |index, ti
   within "#batch_actions_selector" do
     page.all( "a.batch_action" )[index.to_i - 1].text.should match( title )
   end
-end 
+end
 
 When /^I check the (\d+)(?:st|nd|rd|th) record$/ do |index|
   page.all( "table.index_table input[type=checkbox]" )[index.to_i].set( true )
@@ -39,7 +39,7 @@ When /^I uncheck the (\d+)(?:st|nd|rd|th) record$/ do |index|
   page.all( "table.index_table input[type='checkbox']" )[index.to_i].set( false )
 end
 
-When /^I toggle the collection selection$/ do 
+When /^I toggle the collection selection$/ do
   toggle_box = page.find( "#collection_selection_toggle_all" )
   toggle_box.click
 end
@@ -48,7 +48,7 @@ Then /^I should see (\d+) record(?:s)? selected$/ do |count|
   within "table.index_table" do
     unless count.to_i == 0
       page.should have_xpath(".//input[@type='checkbox' and @checked='checked']", :count => count)
-    else 
+    else
       page.should have_no_xpath(".//input[@type='checkbox' and @checked='checked']")
     end
   end
@@ -60,7 +60,7 @@ end
 
 Then /^I (should|should not) see the batch action button$/ do |maybe|
   if maybe == "should not"
-    page.should_not have_css("div.table_tools #batch_actions_selector .dropdown_menu_button")    
+    page.should_not have_css("div.table_tools #batch_actions_selector .dropdown_menu_button")
   else
     page.should have_css("div.table_tools #batch_actions_selector .dropdown_menu_button")
   end
@@ -75,11 +75,21 @@ Then /^I should see the batch action popover exists$/ do
 end
 
 Given /^I submit the batch action form with "([^"]*)"$/ do |action|
-  page.find(:css, "#batch_action").set(action) 
+  page.find(:css, "#batch_action").set(action)
 
   within("#main_content") do
     @params = page.all("input").reduce({}) do |acc, input|
-      acc.store(input['name'], input['value'])
+      param_key = input['name']
+      param_value = input['value']
+
+      if param_key == 'collection_selection[]'
+        # the collection_selection should be sent as an array containing only IDs of checked rows
+        acc[param_key] ||= Array.new
+        acc[param_key] << param_value if input.checked?
+      else
+        # other inputs, just send the value normally
+        acc.store(param_key, param_value)
+      end
       acc
     end
   end

data/features/step_definitions/index_scope_steps.rb

@@ -26,11 +26,11 @@ end
 
 Then /^I should see (\d+) ([\w]*) in the table$/ do |count, resource_type|
   begin
-    page.should have_css("table##{resource_type} tr > td:first", :count => count.to_i)
+    page.should have_css("table#index_table_#{resource_type} tr > td:first", :count => count.to_i)
   rescue
     current_count = 0
-    
-    all("table##{resource_type} tr > td:first").each { current_count += 1 }
+
+    all("table#index_table_#{resource_type} tr > td:first").each { current_count += 1 }
 
     raise "There were #{current_count} rows in the table not #{count}"
   end

data/features/step_definitions/index_views_steps.rb

@@ -0,0 +1,3 @@
+When /^I click "(.*?)"$/ do |link|
+  click_link(link)
+end

data/features/step_definitions/menu_steps.rb

@@ -5,3 +5,7 @@ end
 Then /^I should not see a menu item for "([^"]*)"$/ do |name|
   page.should_not have_css('#tabs li a', :text => name)
 end
+
+Then /^I should see a nested menu item for "([^"]*)"$/ do |name|
+  page.should have_css('#tabs > li > ul > li > a', :text => name)
+end

data/features/support/env.rb

@@ -107,6 +107,10 @@ include Warden::Test::Helpers
 After do
   add_default_dashboard
   Warden.test_reset!
+
+  # Reset back to the default auth adapter
+  ActiveAdmin.application.namespace(:admin).
+    authorization_adapter = ActiveAdmin::AuthorizationAdapter
 end
 
 Before '@dashboard' do

data/features/support/paths.rb

@@ -36,6 +36,9 @@ module NavigationHelpers
     when /^the last author's last post page$/
       admin_user_post_path(User.last, Post.where(:author_id => User.last.id).last)
 
+    when /^the last post's edit page$/
+      edit_admin_post_path(Post.last)
+
     # Add more mappings here.
     # Here is an example that pulls values out of the Regexp:
     #

data/lib/active_admin.rb

@@ -16,7 +16,10 @@ 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 :Breadcrumbs,              'active_admin/breadcrumbs'
+  autoload :CanCanAdapter,            'active_admin/cancan_adapter'
   autoload :Callbacks,                'active_admin/callbacks'
   autoload :Component,                'active_admin/component'
   autoload :BaseController,           'active_admin/base_controller'
@@ -31,6 +34,7 @@ module ActiveAdmin
   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'
   autoload :Namespace,                'active_admin/namespace'
   autoload :Page,                     'active_admin/page'

data/lib/active_admin/application.rb

@@ -74,6 +74,15 @@ module ActiveAdmin
     # Default CSV options
     inheritable_setting :csv_options, {}
 
+    # 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
+
     # 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,
@@ -115,9 +124,8 @@ module ActiveAdmin
 
     # Registers a brand new configuration for the given resource.
     def register(resource, options = {}, &block)
-      namespace_name = extract_namespace_name(options)
-      namespace = find_or_create_namespace(namespace_name)
-      namespace.register(resource, options, &block)
+      ns_name = namespace_name(options)
+      namespace(ns_name).register resource, options, &block
     end
 
     # Creates a namespace for the given name
@@ -125,14 +133,13 @@ module ActiveAdmin
     # Yields the namespace if a block is given
     #
     # @returns [Namespace] the new or existing namespace
-    def find_or_create_namespace(name)
+    def namespace(name)
       name ||= :root
 
       if namespaces[name]
         namespace = namespaces[name]
       else
-        namespace = Namespace.new(self, name)
-        namespaces[name] = namespace
+        namespace = namespaces[name] = Namespace.new(self, name)
         ActiveAdmin::Event.dispatch ActiveAdmin::Namespace::RegisterEvent, namespace
       end
 
@@ -141,8 +148,6 @@ module ActiveAdmin
       namespace
     end
 
-    alias_method :namespace, :find_or_create_namespace
-
     # Register a page
     #
     # @param name [String] The page name
@@ -150,96 +155,57 @@ module ActiveAdmin
     # @&block The registration block.
     #
     def register_page(name, options = {}, &block)
-      namespace_name = extract_namespace_name(options)
-      namespace = find_or_create_namespace(namespace_name)
-      namespace.register_page(name, options, &block)
+      ns_name = namespace_name(options)
+      namespace(ns_name).register_page name, options, &block
     end
 
-    # Stores if everything has been loaded or we need to reload
-    @@loaded = false
-
-    # Returns true if all the configuration files have been loaded.
+    # Whether all configuration files have been loaded
     def loaded?
-      @@loaded
+      @@loaded ||= false
     end
 
-    # Removes all the controllers that were defined by registering
-    # resources for administration.
-    #
-    # We remove them, then load them on each request in development
-    # to allow for changes without having to restart the server.
+    # Removes all defined controllers from memory. Useful in
+    # development, where they are reloaded on each request.
     def unload!
-      namespaces.values.each{|namespace| namespace.unload! }
+      namespaces.values.each{ |namespace| namespace.unload! }
       @@loaded = false
     end
 
-    # Loads all of the ruby files that are within the load path of
-    # ActiveAdmin.load_paths. This should load all of the administration
-    # UIs so that they are available for the router to proceed.
-    #
-    # The files are only loaded if we haven't already loaded all the files
-    # and they aren't marked for re-loading. To mark the files for re-loading
-    # you must first call ActiveAdmin.unload!
+    # Loads all ruby files that are within the load_paths setting.
+    # To reload everything simply call `ActiveAdmin.unload!`
     def load!
-      # No work to do if we've already loaded
-      return false if loaded?
-
-      ActiveAdmin::Event.dispatch BeforeLoadEvent, self
-
-      # Load files
-      files_in_load_path.each{|file| load file }
-
-      # If no configurations, let's make sure you can still login
-      load_default_namespace if namespaces.values.empty?
-
-      # Dispatch an ActiveAdmin::Application::LoadEvent with the Application
-      ActiveAdmin::Event.dispatch AfterLoadEvent, self
-
-      @@loaded = true
+      unless loaded?
+        ActiveAdmin::Event.dispatch BeforeLoadEvent, self # before_load hook
+        files.each{ |file| load file }                    # load files
+        namespace(nil)                                    # init AA resources
+        ActiveAdmin::Event.dispatch AfterLoadEvent, self  # after_load hook
+        @@loaded = true
+      end
     end
 
-    # Returns ALL the files to load from all the load paths
-    def files_in_load_path
-      load_paths.flatten.compact.uniq.collect{|path| Dir["#{path}/**/*.rb"] }.flatten
+    # Returns ALL the files to be loaded
+    def files
+      load_paths.flatten.compact.uniq.map{ |path| Dir["#{path}/**/*.rb"] }.flatten
     end
 
     def router
       @router ||= Router.new(self)
     end
 
+    # One-liner called by user's config/routes.rb file
     def routes(rails_router)
-      # Ensure that all the configurations (which define the routes)
-      # are all loaded
       load!
-
       router.apply(rails_router)
     end
 
-    def load_default_namespace
-      find_or_create_namespace(default_namespace)
-    end
-
-    #
     # Add before, around and after filters to each registered resource and pages.
-    #
-    # eg:
-    #
+    # For example:
     #   ActiveAdmin.before_filter :authenticate_admin!
     #
-    def before_filter(*args, &block)
-      BaseController.before_filter(*args, &block)
-    end
-
-    def skip_before_filter(*args, &block)
-      BaseController.skip_before_filter(*args, &block)
-    end
-
-    def after_filter(*args, &block)
-      BaseController.after_filter(*args, &block)
-    end
-
-    def around_filter(*args, &block)
-      BaseController.around_filter(*args, &block)
+    %w(before_filter skip_before_filter after_filter around_filter).each do |name|
+      define_method name do |*args, &block|
+        BaseController.send name, *args, &block
+      end
     end
 
     # Helper method to add a dashboard section
@@ -249,6 +215,11 @@ module ActiveAdmin
 
     private
 
+    # Return either the passed in namespace or the default
+    def namespace_name(options)
+      options.fetch(:namespace){ default_namespace }
+    end
+
     def register_default_assets
       register_stylesheet 'active_admin.css', :media => 'screen'
       register_stylesheet 'active_admin/print.css', :media => 'print'
@@ -262,10 +233,6 @@ module ActiveAdmin
       register_javascript 'active_admin.js'
     end
 
-    def extract_namespace_name(options)
-      options.has_key?(:namespace) ? options[:namespace] : default_namespace
-    end
-
     # Since we're dealing with all our own file loading, we need
     # to remove our paths from the ActiveSupport autoload paths.
     # If not, file naming becomes very important and can cause clashes.