activeadmin 0.6.0 → 0.6.1

data/features/support/env.rb

@@ -1,6 +1,6 @@
 # IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
-# It is recommended to regenerate this file in the future when you upgrade to a 
-# newer version of cucumber-rails. Consider adding your own code to a new file 
+# It is recommended to regenerate this file in the future when you upgrade to a
+# newer version of cucumber-rails. Consider adding your own code to a new file
 # instead of editing this one. Cucumber will automatically load all features/**/*.rb
 # files.
 
@@ -43,7 +43,7 @@ require 'capybara/session'
 # steps to use the XPath syntax.
 Capybara.default_selector = :css
 
-# If you set this to false, any error raised from within your app will bubble 
+# If you set this to false, any error raised from within your app will bubble
 # up to your step definition and out to cucumber unless you catch it somewhere
 # on the way. You can make Rails rescue errors and render error pages on a
 # per-scenario basis by tagging a scenario or feature with the @allow-rescue tag.
@@ -55,15 +55,15 @@ Capybara.default_selector = :css
 ActionController::Base.allow_rescue = false
 
 # If you set this to true, each scenario will run in a database transaction.
-# You can still turn off transactions on a per-scenario basis, simply tagging 
+# You can still turn off transactions on a per-scenario basis, simply tagging
 # a feature or scenario with the @no-txn tag. If you are using Capybara,
 # tagging with @culerity or @javascript will also turn transactions off.
 #
 # If you set this to false, transactions will be off for all scenarios,
 # regardless of whether you use @no-txn or not.
 #
-# Beware that turning transactions off will leave data in your database 
-# after each scenario, which can lead to hard-to-debug failures in 
+# Beware that turning transactions off will leave data in your database
+# after each scenario, which can lead to hard-to-debug failures in
 # subsequent scenarios. If you do this, we recommend you create a Before
 # block that will explicitly put your database in a known state.
 Cucumber::Rails::World.use_transactional_fixtures = false
@@ -78,34 +78,11 @@ if defined?(ActiveRecord::Base)
   end
 end
 
-def add_default_dashboard
-  begin
-    dashboard_file = ENV['RAILS_ROOT'] + "/app/admin/dashboard.rb"
-    dashboard_template = File.expand_path('../../../lib/generators/active_admin/install/templates/dashboard.rb', __FILE__)
-    cmd = "cp #{dashboard_template} #{dashboard_file}"
-    system cmd
-  rescue
-    p $!
-    raise $!
-  end
-end
-
-def delete_default_dashboard
-  begin
-    dashboard_file = ENV['RAILS_ROOT'] + "/app/admin/dashboard.rb"
-    File.delete(dashboard_file) if File.exists?(dashboard_file)
-  rescue
-    p $!
-    raise $!
-  end
-end
-
 # Warden helpers to speed up login
 # See https://github.com/plataformatec/devise/wiki/How-To:-Test-with-Capybara
 include Warden::Test::Helpers
 
 After do
-  add_default_dashboard
   Warden.test_reset!
 
   # Reset back to the default auth adapter
@@ -113,12 +90,7 @@ After do
     authorization_adapter = ActiveAdmin::AuthorizationAdapter
 end
 
-Before '@dashboard' do
-  delete_default_dashboard
-end
-
 Before do
-  add_default_dashboard
 
   begin
     # We are caching classes, but need to manually clear references to
@@ -137,3 +109,10 @@ end
 # improve the performance of the specs suite by not logging anything
 # see http://blog.plataformatec.com.br/2011/12/three-tips-to-improve-the-performance-of-your-test-suite/
 Rails.logger.level = 4
+
+# Improves performance by forcing the garbage collector to run less often.
+unless ENV['DEFER_GC'] == '0' || ENV['DEFER_GC'] == 'false'
+  require File.expand_path('../../../spec/support/deferred_garbage_collection', __FILE__)
+  Before { DeferredGarbageCollection.start }
+  After  { DeferredGarbageCollection.reconsider }
+end

data/features/support/paths.rb

@@ -14,6 +14,8 @@ module NavigationHelpers
       "/admin"
     when /the new post page/
       "/admin/posts/new"
+    when /the login page/
+      "/admin/login"
     when /the admin password reset form with reset password token "([^"]*)"/
       "/admin/password/edit?reset_password_token=#{$1}"
 

data/features/users/logging_in.feature

@@ -16,8 +16,8 @@ Feature: User Logging In
     And I fill in "Password" with "password"
     And I press "Login"
     Then I should be on the the dashboard
-    And I should see "Logout"
-    And I should see "admin@example.com"
+    And I should see the element "a[href='/admin/logout'       ]:contains('Logout')"
+    And I should see the element "a[href='/admin/admin_users/1']:contains('admin@example.com')"
 
   Scenario: Attempting to log in with an incorrect email address
     When I fill in "Email" with "not-an-admin@example.com"

data/features/users/logging_out.feature

@@ -11,15 +11,3 @@ Feature: User Logging out
     When I go to the dashboard
     And I follow "Logout"
     Then I should see "Login"
-
-  Scenario: With logout_link_path set to :logout_path (the symbol)
-    Given a configuration of:
-      """
-      ActiveAdmin.setup do |config|
-        config.logout_link_path = :logout_path
-      end
-      """
-    And I am logged in
-    When I go to the dashboard
-    And I follow "Logout"
-    Then I should see "Login"

data/features/users/resetting_password.feature

@@ -31,4 +31,4 @@ Feature: User Resetting Password
     And I fill in "Password" with "password"
     And I fill in "Password confirmation" with "wrong"
     And I press "Change my password"
-    Then I should see "expired"
+    Then I should see "expired"

data/lib/active_admin.rb

@@ -7,7 +7,7 @@ require 'sass'
 require 'inherited_resources'
 require 'jquery-rails'
 require 'arbre'
-require 'active_admin/dependency_checker' 
+require 'active_admin/dependency_checker'
 require 'active_admin/sass/helpers'
 require 'active_admin/engine'
 
@@ -19,13 +19,11 @@ module ActiveAdmin
   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'
   autoload :ControllerAction,         'active_admin/controller_action'
   autoload :CSVBuilder,               'active_admin/csv_builder'
-  autoload :Dashboards,               'active_admin/dashboards'
   autoload :Deprecation,              'active_admin/deprecation'
   autoload :Devise,                   'active_admin/devise'
   autoload :DSL,                      'active_admin/dsl'
@@ -53,14 +51,6 @@ module ActiveAdmin
   autoload :ViewHelpers,              'active_admin/view_helpers'
   autoload :Views,                    'active_admin/views'
 
-  class Railtie < ::Rails::Railtie
-    config.after_initialize do
-      # Add load paths straight to I18n, so engines and application can overwrite it.
-      require 'active_support/i18n'
-      I18n.load_path.unshift *Dir[File.expand_path('../active_admin/locales/*.yml', __FILE__)]
-    end
-  end
-
   class << self
 
     attr_accessor :application
@@ -88,12 +78,6 @@ module ActiveAdmin
       DependencyChecker.rails_3_1? && Rails.application.config.try(:assets).try(:enabled)
     end
 
-    # Migration MoveAdminNotesToComments generated with version 0.2.2 might reference
-    # to ActiveAdmin.default_namespace.
-    delegate :default_namespace, :to => :application
-    ActiveAdmin::Deprecation.deprecate self, :default_namespace, 
-      "ActiveAdmin.default_namespace is deprecated. Please use ActiveAdmin.application.default_namespace"
-
     # 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
     # it only happens on boot.
@@ -139,3 +123,6 @@ ActiveAdmin::DependencyChecker.check!
 require 'active_admin/comments'
 require 'active_admin/batch_actions'
 require 'active_admin/filters'
+
+# Load gem-specific code only if that gem is being used
+require 'active_admin/cancan_adapter' if ActiveAdmin::DependencyChecker.cancan?

data/lib/active_admin/abstract_view_factory.rb

@@ -15,7 +15,7 @@ module ActiveAdmin
     # Register a new view key with the view factory
     #
     # eg:
-    #   
+    #
     #   factory = AbstractViewFactory.new
     #   factory.register :my_view => SomeViewClass
     #

data/lib/active_admin/application.rb

@@ -4,18 +4,9 @@ require 'active_admin/helpers/settings'
 module ActiveAdmin
   class Application
     include Settings
+    include Settings::Inheritance
 
-    # Adds settings to both the Application and the Namespace instance
-    # so that they can be configured independantly.
-    def self.inheritable_setting(name, default)
-      Namespace.setting name, nil
-      setting name, default
-    end
-
-    def self.deprecated_inheritable_setting(name, default)
-      Namespace.deprecated_setting name, nil
-      deprecated_setting name, default
-    end
+    settings_inherited_by Namespace
 
     # The default namespace to put controllers and routes inside. Set this
     # in config/initializers/active_admin.rb using:
@@ -24,8 +15,10 @@ module ActiveAdmin
     #
     setting :default_namespace, :admin
 
-    # A hash of all the registered namespaces
-    setting :namespaces, {}
+    attr_reader :namespaces
+    def initialize
+      @namespaces = {}
+    end
 
     # Load paths for admin configurations. Add folders to this load path
     # to load up other resources for administration. External gems can
@@ -43,6 +36,9 @@ module ActiveAdmin
 
     # Set the site title image displayed in the main layout (has precendence over :site_title)
     inheritable_setting :site_title_image, ""
+    
+    # Set a favicon
+    inheritable_setting :favicon, false
 
     # The view factory to use to generate all the view classes. Take
     # a look at ActiveAdmin::ViewFactory
@@ -72,7 +68,7 @@ module ActiveAdmin
     inheritable_setting :root_to, 'dashboard#index'
 
     # Default CSV options
-    inheritable_setting :csv_options, {}
+    inheritable_setting :csv_options, {:col_sep => ','}
 
     # Default Download Links options
     inheritable_setting :download_links, true
@@ -96,15 +92,7 @@ module ActiveAdmin
 
     # == Deprecated Settings
 
-    # @deprecated Default CSV separator will be removed in 0.6.0. Use `csv_options = { :col_sep => ',' }` instead.
-    deprecated_inheritable_setting :csv_column_separator, ','
-
-    # @deprecated The default sort order for index pages
-    deprecated_setting :default_sort_order, 'id_desc'
-
-    # DEPRECATED: This option is deprecated and will be removed. Use
-    # the #allow_comments_in option instead
-    attr_accessor :admin_notes
+    # (none currently)
 
     include AssetRegistration
 
@@ -177,7 +165,7 @@ module ActiveAdmin
       unless loaded?
         ActiveAdmin::Event.dispatch BeforeLoadEvent, self # before_load hook
         files.each{ |file| load file }                    # load files
-        namespace(nil)                                    # init AA resources
+        namespace(default_namespace)                      # init AA resources
         ActiveAdmin::Event.dispatch AfterLoadEvent, self  # after_load hook
         @@loaded = true
       end
@@ -198,13 +186,16 @@ module ActiveAdmin
       router.apply(rails_router)
     end
 
-    # Add before, around and after filters to each registered resource and pages.
-    # For example:
+    # Adds before, around and after filters to all controllers.
+    # Example usage:
     #   ActiveAdmin.before_filter :authenticate_admin!
     #
-    %w(before_filter skip_before_filter after_filter around_filter).each do |name|
+    %w(before_filter skip_before_filter after_filter around_filter skip_filter).each do |name|
       define_method name do |*args, &block|
-        BaseController.send name, *args, &block
+        ActiveAdmin::BaseController.send              name, *args, &block
+        ActiveAdmin::Devise::PasswordsController.send name, *args, &block
+        ActiveAdmin::Devise::SessionsController.send  name, *args, &block
+        ActiveAdmin::Devise::UnlocksController.send   name, *args, &block
       end
     end
 

data/lib/active_admin/asset_registration.rb

@@ -1,47 +1,29 @@
 module ActiveAdmin
   module AssetRegistration
 
-    # Stylesheets
-
-    def register_stylesheet(*args)
-      stylesheets << ActiveAdmin::Stylesheet.new(*args)
+    def register_stylesheet(path, options = {})
+      stylesheets[path] = options
     end
 
     def stylesheets
-      @stylesheets ||= []
+      @stylesheets ||= {}
     end
 
     def clear_stylesheets!
-      @stylesheets = []
+      @stylesheets = {}
     end
 
-
-    # Javascripts
-
     def register_javascript(name)
-      javascripts << name
+      javascripts.add name
     end
 
     def javascripts
-      @javascripts ||= []
+      @javascripts ||= Set.new
     end
 
     def clear_javascripts!
-      @javascripts = []
+      @javascripts = Set.new
     end
 
   end
-  
-  # Wrapper class for stylesheet registration
-  class Stylesheet
-    
-    attr_reader :options, :path
-    
-    def initialize(*args)
-      @options = args.extract_options!
-      @path = args.first if args.first
-    end
-    
-  end
-  
 end

data/lib/active_admin/authorization_adapter.rb

@@ -43,9 +43,9 @@ module ActiveAdmin
     #        one of the `ActiveAdmin::Auth::*` symbols.
     #
     # @param [any] subject The subject the action is being performed on usually this
-    #        is a model object. Note, that this is NOT always in instance, it can be 
+    #        is a model object. Note, that this is NOT always in instance, it can be
     #        the class of the subject also. For example, Active Admin uses the class
-    #        of the resource to decide if the resource should be displayed in the 
+    #        of the resource to decide if the resource should be displayed in the
     #        global navigation. To deal with this nicely in a case statement, take
     #        a look at `#normalized(klasss)`
     #
@@ -62,9 +62,13 @@ module ActiveAdmin
     # @param [ActiveRecord::Relation] collection The collection the user is
     #        attempting to view.
     #
-    # @returns [ActiveRecord::Relation] A new collection, scoped to the 
+    # @param [Symbol] action The name of the action to perform. Usually this will be
+    #        one of the `ActiveAdmin::Auth::*` symbols. Defaults to `Auth::READ` if
+    #        no action passed in.
+    #
+    # @returns [ActiveRecord::Relation] A new collection, scoped to the
     #          objects that the current user has access to.
-    def scope_collection(collection)
+    def scope_collection(collection, action = Auth::READ)
       collection
     end
 
@@ -72,7 +76,7 @@ module ActiveAdmin
 
     # The `#authorized?` method's subject can be set to both instances as well
     # as classes of objects. This can make it much difficult to create simple
-    # case statements for authorization since you have to handle both the 
+    # case statements for authorization since you have to handle both the
     # class level match and the instance level match.
     #
     # For example:

data/lib/active_admin/base_controller.rb

@@ -4,7 +4,7 @@ require 'active_admin/base_controller/authorization'
 require 'active_admin/base_controller/menu'
 
 module ActiveAdmin
-  # BaseController for ActiveAdmin. 
+  # BaseController for ActiveAdmin.
   # It implements ActiveAdmin controllers core features.
   class BaseController < ::InheritedResources::Base
     helper ::ActiveAdmin::ViewHelpers
@@ -46,7 +46,7 @@ module ActiveAdmin
     helper_method :current_active_admin_user
 
     def current_active_admin_user?
-      !current_active_admin_user.nil?
+      !!current_active_admin_user
     end
     helper_method :current_active_admin_user?
 

data/lib/active_admin/base_controller/authorization.rb

@@ -1,7 +1,7 @@
 module ActiveAdmin
 
   # Exception class to raise when there is an authorized access
-  # exception thrown. The exception has a few goodies that may 
+  # exception thrown. The exception has a few goodies that may
   # be useful for capturing / recognizing security issues.
   class AccessDenied < StandardError
     attr_reader :user, :action, :subject
@@ -17,7 +17,6 @@ module ActiveAdmin
     end
   end
 
-
   class BaseController < ::InheritedResources::Base
     module Authorization
       include MethodOrProcHelper
@@ -43,7 +42,7 @@ module ActiveAdmin
       protected
 
       # Authorize the action and subject. Available in the controller
-      # as well as all the views. 
+      # as well as all the views.
       #
       # @param [Symbol] action The action to check if the user has permission
       #                 to perform on the subject.
@@ -90,17 +89,19 @@ module ActiveAdmin
       #
       # @returns [ActiveAdmin::AuthorizationAdapter]
       def active_admin_authorization
-        @active_admin_authorization ||= active_admin_authorization_adapter.new(active_admin_config, current_active_admin_user)
+        @active_admin_authorization ||=
+         active_admin_authorization_adapter.new active_admin_config, current_active_admin_user
       end
 
       # Returns the class to be used as the authorization adapter
       #
       # @returns [Class]
       def active_admin_authorization_adapter
-        if active_admin_namespace.authorization_adapter.is_a?(String)
-          ActiveSupport::Dependencies.constantize(active_admin_namespace.authorization_adapter)
+        adapter = active_admin_namespace.authorization_adapter
+        if adapter.is_a? String
+          ActiveSupport::Dependencies.constantize adapter
         else
-          active_admin_namespace.authorization_adapter
+          adapter
         end
       end
 
@@ -112,14 +113,8 @@ module ActiveAdmin
       #
       # @returns [Symbol] The permission name to use.
       def action_to_permission(action)
-        return nil unless action
-
-        action = action.to_sym
-
-        if Authorization::ACTIONS_DICTIONARY.has_key?(action)
-          Authorization::ACTIONS_DICTIONARY[action]
-        else
-          action
+        if action && action = action.to_sym
+          Authorization::ACTIONS_DICTIONARY[action] || action
         end
       end
 
@@ -128,23 +123,26 @@ module ActiveAdmin
       end
 
       def rescue_active_admin_access_denied(exception)
-        error_message = exception.message
+        error = exception.message
 
         respond_to do |format|
           format.html do
-            flash[:error] = error_message
-
-            if request.headers.keys.include?("HTTP_REFERER")
-              redirect_to :back
-            else
-              controller, action = active_admin_namespace.root_to.split("#")
-              redirect_to :controller => controller, :action => action
-            end
+            flash[:error] = error
+            redirect_backwards_or_to_root
           end
 
-          format.csv { render :text => error_message, :status => :unauthorized}
-          format.json { render :json => { :error => error_message }, :status => :unauthorized}
-          format.xml { render :xml => "<error>#{error_message}</error>", :status => :unauthorized}
+          format.csv  { render text:          error,           status: :unauthorized }
+          format.json { render json: { error: error },         status: :unauthorized }
+          format.xml  { render xml: "<error>#{error}</error>", status: :unauthorized }
+        end
+      end
+
+      def redirect_backwards_or_to_root
+        if request.headers.key? "HTTP_REFERER"
+          redirect_to :back
+        else
+          controller, action = active_admin_namespace.root_to.split '#'
+          redirect_to controller: controller, action: action
         end
       end