yousty-activeadmin 1.0.4.pre → 1.0.5.pre

data/features/users/resetting_password.feature

@@ -15,20 +15,20 @@ Feature: User Resetting Password
     And I follow "Forgot your password?"
     When I fill in "Email" with "admin@example.com"
     And I press "Reset My Password"
-    Then I should see "You will receive an email with instructions about how to reset your password in a few minutes."
+    Then I should see "You will receive an email with instructions on how to reset your password in a few minutes."
 
   Scenario: Changing password after resetting
-    Given an admin user "admin@example.com" exists with reset password token "123reset"
-    When I go to the admin password reset form with reset password token "123reset"
-    And I fill in "Password" with "password"
+    When "admin@example.com" requests a password reset with token "foobarbaz"
+    When I go to the admin password reset form with token "foobarbaz"
+    And I fill in the password field with "password"
     And I fill in "Password confirmation" with "password"
     And I press "Change my password"
     Then I should see "success"
 
   Scenario: Changing password after resetting with errors
-    Given an admin user "admin@example.com" exists with expired reset password token "123reset"
-    When I go to the admin password reset form with reset password token "123reset"
-    And I fill in "Password" with "password"
+    When "admin@example.com" requests a password reset with token "foobarbaz" but it expires
+    When I go to the admin password reset form with token "foobarbaz"
+    And I fill in the password field with "password"
     And I fill in "Password confirmation" with "wrong"
     And I press "Change my password"
     Then I should see "expired"

data/lib/active_admin.rb

@@ -1,8 +1,9 @@
-require 'active_support/core_ext/class/attribute' # needed for Ransack
+require 'active_support/core_ext'
+require 'set'
+
 require 'ransack'
 require 'ransack_ext'
 require 'bourbon'
-require 'devise'
 require 'kaminari'
 require 'formtastic'
 require 'sass-rails'
@@ -11,7 +12,8 @@ require 'jquery-rails'
 require 'jquery-ui-rails'
 require 'coffee-rails'
 require 'arbre'
-require 'active_admin/engine'
+
+require 'active_admin/helpers/i18n'
 
 module ActiveAdmin
 
@@ -20,12 +22,13 @@ module ActiveAdmin
   autoload :AssetRegistration,        'active_admin/asset_registration'
   autoload :Authorization,            'active_admin/authorization_adapter'
   autoload :AuthorizationAdapter,     'active_admin/authorization_adapter'
-  autoload :Breadcrumbs,              'active_admin/breadcrumbs'
   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'
@@ -37,11 +40,12 @@ module ActiveAdmin
   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 :Reloader,                 'active_admin/reloader'
+  autoload :PunditAdapter,            'active_admin/pundit_adapter'
   autoload :Resource,                 'active_admin/resource'
   autoload :ResourceController,       'active_admin/resource_controller'
   autoload :ResourceDSL,              'active_admin/resource_dsl'
@@ -68,11 +72,11 @@ module ActiveAdmin
       application.prepare!
     end
 
-    delegate :register,      :to => :application
-    delegate :register_page, :to => :application
-    delegate :unload!,       :to => :application
-    delegate :load!,         :to => :application
-    delegate :routes,        :to => :application
+    delegate :register,      to: :application
+    delegate :register_page, 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
@@ -113,6 +117,10 @@ module ActiveAdmin
 
 end
 
+# Require things that don't support autoload
+require 'active_admin/engine'
+require 'active_admin/error'
+
 # Require internal plugins
 require 'active_admin/batch_actions'
 require 'active_admin/filters'
@@ -120,6 +128,3 @@ 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
-
-# Load gem-specific code only if that gem is being used
-require 'active_admin/cancan_adapter' if Gem.loaded_specs['cancan']

data/lib/active_admin/abstract_view_factory.rb

@@ -17,12 +17,12 @@ module ActiveAdmin
     # eg:
     #
     #   factory = AbstractViewFactory.new
-    #   factory.register :my_view => SomeViewClass
+    #   factory.register my_view: SomeViewClass
     #
     # You can setup many at the same time:
     #
-    #   factory.register  :my_view => SomeClass,
-    #                     :another_view => OtherViewClass
+    #   factory.register  my_view: SomeClass,
+    #                     another_view: OtherViewClass
     #
     def register(view_hash)
       view_hash.each do |view_key, view_class|
@@ -46,8 +46,7 @@ module ActiveAdmin
       set_view_for_key(key, value)
     end
 
-    # Override respond to to include keys
-    def respond_to?(method)
+    def respond_to_missing?(method, include_private)
       key = key_from_method_name(method)
       if has_key?(key)
         true
@@ -62,26 +61,17 @@ module ActiveAdmin
       key = key_from_method_name(method)
       if has_key?(key)
         if method.to_s.include?('=')
-          self.class_eval <<-EOS
-            def #{key}=(value)
-              set_view_for_key(:#{key}, value)
-            end
-          EOS
+          set_view_for_key key, args.first
         else
-          self.class_eval <<-EOS
-            def #{key}
-              get_view_for_key(:#{key})
-            end
-          EOS
+          get_view_for_key key
         end
-        self.send(method, *args)
       else
         super
       end
     end
 
     def key_from_method_name(method)
-      method.to_s.gsub('=', '').to_sym
+      method.to_s.tr('=', '').to_sym
     end
 
     def get_view_for_key(key)

data/lib/active_admin/application.rb

@@ -17,7 +17,7 @@ module ActiveAdmin
 
     attr_reader :namespaces
     def initialize
-      @namespaces = {}
+      @namespaces = Namespace::Store.new
     end
 
     # Load paths for admin configurations. Add folders to this load path
@@ -36,7 +36,7 @@ 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
 
@@ -67,8 +67,14 @@ module ActiveAdmin
     # The namespace root.
     inheritable_setting :root_to, 'dashboard#index'
 
+    # Options that a passed to root_to.
+    inheritable_setting :root_to_options, {}
+
+    # Display breadcrumbs
+    inheritable_setting :breadcrumb, true
+
     # Default CSV options
-    inheritable_setting :csv_options, {:col_sep => ','}
+    inheritable_setting :csv_options, { col_sep: ',', byte_order_mark: "\xEF\xBB\xBF" }
 
     # Default Download Links options
     inheritable_setting :download_links, true
@@ -79,6 +85,17 @@ module ActiveAdmin
     # 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
 
+    # A regex to detect unsupported browser, set to false to disable
+    inheritable_setting :unsupported_browser_matcher, /MSIE [1-8]\.0/
+
+    # Request parameters that are permitted by default
+    inheritable_setting :permitted_params, [
+      :utf8, :_method, :authenticity_token, :commit, :id
+    ]
+
+    # Set flash message keys that shouldn't show in ActiveAdmin
+    inheritable_setting :flash_keys_to_except, ['timedout']
+
     # 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,
@@ -92,7 +109,9 @@ module ActiveAdmin
 
     # == Deprecated Settings
 
-    # (none currently)
+    def allow_comments=(*)
+      raise "`config.allow_comments` is no longer provided in ActiveAdmin 1.x. Use `config.comments` instead."
+    end
 
     include AssetRegistration
 
@@ -121,15 +140,14 @@ module ActiveAdmin
     #
     # Yields the namespace if a block is given
     #
-    # @returns [Namespace] the new or existing namespace
+    # @return [Namespace] the new or existing namespace
     def namespace(name)
       name ||= :root
 
-      if namespaces[name]
-        namespace = namespaces[name]
-      else
-        namespace = namespaces[name] = Namespace.new(self, name)
+      namespace = namespaces[name] ||= begin
+        namespace = Namespace.new(self, name)
         ActiveAdmin::Event.dispatch ActiveAdmin::Namespace::RegisterEvent, namespace
+        namespace
       end
 
       yield(namespace) if block_given?
@@ -140,7 +158,7 @@ module ActiveAdmin
     # Register a page
     #
     # @param name [String] The page name
-    # @options [Hash] Accepts option :namespace.
+    # @option [Hash] Accepts option :namespace.
     # @&block The registration block.
     #
     def register_page(name, options = {}, &block)
@@ -156,7 +174,7 @@ module ActiveAdmin
     # Removes all defined controllers from memory. Useful in
     # development, where they are reloaded on each request.
     def unload!
-      namespaces.values.each &:unload!
+      namespaces.each &:unload!
       @@loaded = false
     end
 
@@ -172,6 +190,10 @@ module ActiveAdmin
       end
     end
 
+    def load(file)
+      DatabaseHitDuringLoad.capture{ super }
+    end
+
     # Returns ALL the files to be loaded
     def files
       load_paths.flatten.compact.uniq.map{ |path| Dir["#{path}/**/*.rb"] }.flatten
@@ -191,15 +213,20 @@ module ActiveAdmin
     # Example usage:
     #   ActiveAdmin.before_filter :authenticate_admin!
     #
-    %w(before_filter skip_before_filter after_filter around_filter skip_filter).each do |name|
+    %w(before_filter skip_before_filter after_filter skip_after_filter around_filter skip_filter).each do |name|
       define_method name do |*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
+        controllers_for_filters.each do |controller|
+          controller.public_send name, *args, &block
+        end
       end
     end
 
+    def controllers_for_filters
+      controllers = [BaseController]
+      controllers.push *Devise.controllers_for_filters if Dependency.devise?
+      controllers
+    end
+
   private
 
     def register_default_assets
@@ -215,11 +242,8 @@ module ActiveAdmin
     # As well, we have to remove it from +eager_load_paths+ to prevent the
     # files from being loaded twice in production.
     def remove_active_admin_load_paths_from_rails_autoload_and_eager_load
-      ActiveSupport::Dependencies.autoload_paths.reject!{ |path| load_paths.include? path }
-      Rails.application.config.eager_load_paths = # the array is frozen :/
-      Rails.application.config.eager_load_paths.reject do |path|
-        load_paths.include?(path) 
-      end
+      ActiveSupport::Dependencies.autoload_paths -= load_paths
+      Rails.application.config.eager_load_paths  -= load_paths
     end
 
     # Hooks the app/admin directory into our Rails Engine's +watchable_dirs+, so the
@@ -232,10 +256,11 @@ module ActiveAdmin
         ActiveAdmin::Engine.config.watchable_dirs[path] = [:rb]
       end
 
-      app = self
-      ActionDispatch::Reloader.to_prepare do
-        app.unload!
-        Rails.application.reload_routes!
+      Rails.application.config.after_initialize do
+        ActionDispatch::Reloader.to_prepare do
+          ActiveAdmin.application.unload!
+          Rails.application.reload_routes!
+        end
       end
     end
   end

data/lib/active_admin/asset_registration.rb

@@ -10,7 +10,7 @@ module ActiveAdmin
     end
 
     def clear_stylesheets!
-      @stylesheets = {}
+      stylesheets.clear
     end
 
     def register_javascript(name)
@@ -22,7 +22,7 @@ module ActiveAdmin
     end
 
     def clear_javascripts!
-      @javascripts = Set.new
+      javascripts.clear
     end
 
   end

data/lib/active_admin/authorization_adapter.rb

@@ -49,7 +49,7 @@ module ActiveAdmin
     #        global navigation. To deal with this nicely in a case statement, take
     #        a look at `#normalized(klasss)`
     #
-    # @returns [Boolean]
+    # @return [Boolean]
     def authorized?(action, subject = nil)
       true
     end
@@ -66,7 +66,7 @@ module ActiveAdmin
     #        one of the `ActiveAdmin::Auth::*` symbols. Defaults to `Auth::READ` if
     #        no action passed in.
     #
-    # @returns [ActiveRecord::Relation] A new collection, scoped to the
+    # @return [ActiveRecord::Relation] A new collection, scoped to the
     #          objects that the current user has access to.
     def scope_collection(collection, action = Auth::READ)
       collection

data/lib/active_admin/base_controller.rb

@@ -1,5 +1,3 @@
-require 'inherited_resources'
-
 require 'active_admin/base_controller/authorization'
 require 'active_admin/base_controller/menu'
 
@@ -8,6 +6,7 @@ module ActiveAdmin
   # It implements ActiveAdmin controllers core features.
   class BaseController < ::InheritedResources::Base
     helper ::ActiveAdmin::ViewHelpers
+    helper_method :env
 
     layout :determine_active_admin_layout
 
@@ -23,7 +22,7 @@ module ActiveAdmin
       attr_accessor :active_admin_config
     end
 
-    # By default Rails will render un-implemented actions when the view exists. Becuase Active
+    # By default Rails will render un-implemented actions when the view exists. Because Active
     # Admin allows you to not render any of the actions by using the #actions method, we need
     # to check if they are implemented.
     def only_render_implemented_actions

data/lib/active_admin/base_controller/authorization.rb

@@ -1,39 +1,21 @@
 module ActiveAdmin
-
-  # Exception class to raise when there is an authorized access
-  # 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
-
-    def initialize(user, action, subject)
-      @user, @action, @subject = user, action, subject
-
-      super()
-    end
-
-    def message
-      I18n.t("active_admin.access_denied.message")
-    end
-  end
-
   class BaseController < ::InheritedResources::Base
     module Authorization
       include MethodOrProcHelper
       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,
-        :destroy => ActiveAdmin::Authorization::DESTROY
+        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
       }
 
       included do
-        rescue_from ActiveAdmin::AccessDenied, :with => :dispatch_active_admin_access_denied
+        rescue_from ActiveAdmin::AccessDenied, with: :dispatch_active_admin_access_denied
 
         helper_method :authorized?
         helper_method :authorize!
@@ -50,7 +32,7 @@ module ActiveAdmin
       # @param [any] subject The subject that the user is trying to perform
       #                 the action on.
       #
-      # @returns [Boolean]
+      # @return [Boolean]
       #
       def authorized?(action, subject = nil)
         active_admin_authorization.authorized?(action, subject)
@@ -67,7 +49,7 @@ module ActiveAdmin
       # @param [any] subject The subject that the user is trying to perform
       #                 the action on.
       #
-      # @returns [Boolean] True if authorized, otherwise raises
+      # @return [Boolean] True if authorized, otherwise raises
       #                 an ActiveAdmin::AccessDenied.
       def authorize!(action, subject = nil)
         unless authorized? action, subject
@@ -87,7 +69,7 @@ module ActiveAdmin
 
       # Retrieve or instantiate the authorization instance for this resource
       #
-      # @returns [ActiveAdmin::AuthorizationAdapter]
+      # @return [ActiveAdmin::AuthorizationAdapter]
       def active_admin_authorization
         @active_admin_authorization ||=
          active_admin_authorization_adapter.new active_admin_config, current_active_admin_user
@@ -95,7 +77,7 @@ module ActiveAdmin
 
       # Returns the class to be used as the authorization adapter
       #
-      # @returns [Class]
+      # @return [Class]
       def active_admin_authorization_adapter
         adapter = active_admin_namespace.authorization_adapter
         if adapter.is_a? String
@@ -111,7 +93,7 @@ module ActiveAdmin
       #
       # @param [String, Symbol] action The controller action name.
       #
-      # @returns [Symbol] The permission name to use.
+      # @return [Symbol] The permission name to use.
       def action_to_permission(action)
         if action && action = action.to_sym
           Authorization::ACTIONS_DICTIONARY[action] || action