activeadmin 0.6.0 → 0.6.1

data/lib/active_admin/views/pages/index.rb

@@ -63,7 +63,13 @@ module ActiveAdmin
             build_batch_actions_selector
             build_scopes
             build_index_list
-          end
+          end if any_table_tools?
+        end
+
+        def any_table_tools?
+          active_admin_config.batch_actions.any? ||
+          active_admin_config.scopes.any? ||
+          active_admin_config.page_presenters[:index].try(:size).try(:>, 1)
         end
 
         def build_batch_actions_selector
@@ -90,7 +96,7 @@ module ActiveAdmin
             active_admin_config.page_presenters[:index].each do |type, page_presenter|
               index_classes << find_index_renderer_class(page_presenter[:as])
             end
-            
+
             index_list_renderer index_classes
           end
         end
@@ -110,17 +116,11 @@ module ActiveAdmin
 
         # Returns the actual class for renderering the main content on the index
         # page. To set this, use the :as option in the page_presenter block.
-        def find_index_renderer_class(symbol_or_class)
-          case symbol_or_class
-          when Symbol
-            ::ActiveAdmin::Views.const_get("IndexAs" + symbol_or_class.to_s.camelcase)
-          when Class
-            symbol_or_class
-          else
-            raise ArgumentError, "'as' requires a class or a symbol"
-          end
+        def find_index_renderer_class(klass)
+          klass.is_a?(Class) ? klass :
+            ::ActiveAdmin::Views.const_get("IndexAs" + klass.to_s.camelcase)
         end
-        
+
         def render_blank_slate
           blank_slate_content = I18n.t("active_admin.blank_slate.content", :resource_name => active_admin_config.plural_resource_label)
           if controller.action_methods.include?('new')
@@ -128,21 +128,23 @@ module ActiveAdmin
           end
           insert_tag(view_factory.blank_slate, blank_slate_content)
         end
-        
+
         def render_empty_results
           empty_results_content = I18n.t("active_admin.pagination.empty", :model => active_admin_config.plural_resource_label)
           insert_tag(view_factory.blank_slate, empty_results_content)
         end
-        
+
         def render_index
           renderer_class = find_index_renderer_class(config[:as])
           paginator      = config[:paginator].nil?      ? true : config[:paginator]
           download_links = config[:download_links].nil? ? active_admin_config.namespace.download_links : config[:download_links]
-          
+          pagination_total = config[:pagination_total].nil? ? true : config[:pagination_total]
+
           paginated_collection(collection, :entry_name     => active_admin_config.resource_label,
-                                           :entries_name   => active_admin_config.plural_resource_label,
+                                           :entries_name   => active_admin_config.plural_resource_label(:count => collection_size),
                                            :download_links => download_links,
-                                           :paginator      => paginator) do
+                                           :paginator      => paginator,
+                                           :pagination_total => pagination_total) do
             div :class => 'index_content' do
               insert_tag(renderer_class, config, collection)
             end

data/lib/generators/active_admin/assets/templates/3.0/active_admin.js

@@ -1 +1 @@
-(function(){window.AA={}}).call(this),function(){window.AA.CheckboxToggler=AA.CheckboxToggler=function(){function a(a,b){var c;this.options=a,this.container=b,c={},this.options=$.extend({},c,a),this._init(),this._bind()}return a.name="CheckboxToggler",a.prototype._init=function(){if(!this.container)throw new Error("Container element not found");this.$container=$(this.container);if(!this.$container.find(".toggle_all").length)throw new Error("'toggle all' checkbox not found");return this.toggle_all_checkbox=this.$container.find(".toggle_all"),this.checkboxes=this.$container.find(":checkbox").not(this.toggle_all_checkbox)},a.prototype._bind=function(){var a=this;return this.checkboxes.bind("change",function(b){return a._didChangeCheckbox(b.target)}),this.toggle_all_checkbox.bind("change",function(b){return a._didChangeToggleAllCheckbox()})},a.prototype._didChangeCheckbox=function(a){if(this.checkboxes.filter(":checked").length===this.checkboxes.length-1)return this._uncheckToggleAllCheckbox();if(this.checkboxes.filter(":checked").length===this.checkboxes.length)return this._checkToggleAllCheckbox()},a.prototype._didChangeToggleAllCheckbox=function(){return this.toggle_all_checkbox.attr("checked")==="checked"?this._checkAllCheckboxes():this._uncheckAllCheckboxes()},a.prototype._uncheckToggleAllCheckbox=function(){return this.toggle_all_checkbox.removeAttr("checked")},a.prototype._checkToggleAllCheckbox=function(){return this.toggle_all_checkbox.attr("checked","checked")},a.prototype._uncheckAllCheckboxes=function(){var a=this;return this.checkboxes.each(function(b,c){return $(c).removeAttr("checked"),a._didChangeCheckbox(c)})},a.prototype._checkAllCheckboxes=function(){var a=this;return this.checkboxes.each(function(b,c){return $(c).attr("checked","checked"),a._didChangeCheckbox(c)})},a}(),function(a){return a.widget.bridge("checkboxToggler",AA.CheckboxToggler)}(jQuery)}.call(this),function(){window.AA.DropdownMenu=AA.DropdownMenu=function(){function a(a,b){var c;return this.options=a,this.element=b,this.$element=$(this.element),c={fadeInDuration:20,fadeOutDuration:100,onClickActionItemCallback:null},this.options=$.extend({},c,a),this.$menuButton=this.$element.find(".dropdown_menu_button"),this.$menuList=this.$element.find(".dropdown_menu_list_wrapper"),this.isOpen=!1,this._buildMenuList(),this._bind(),this}return a.name="DropdownMenu",a.prototype.open=function(){return this.isOpen=!0,this.$menuList.fadeIn(this.options.fadeInDuration),this._positionMenuList(),this._positionNipple(),this},a.prototype.close=function(){return this.isOpen=!1,this.$menuList.fadeOut(this.options.fadeOutDuration),this},a.prototype.destroy=function(){return this.$element.unbind(),this.$element=null,this},a.prototype.isDisabled=function(){return this.$menuButton.hasClass("disabled")},a.prototype.disable=function(){return this.$menuButton.addClass("disabled")},a.prototype.enable=function(){return this.$menuButton.removeClass("disabled")},a.prototype.option=function(a,b){return $.isPlainObject(a)?this.options=$.extend(!0,this.options,a):a!=null?this.options[a]:this.options[a]=b},a.prototype._buildMenuList=function(){return this.$menuList.prepend('<div class="dropdown_menu_nipple"></div>'),this.$menuList.hide()},a.prototype._bind=function(){var a=this;return $("body").bind("click",function(){if(a.isOpen===!0)return a.close()}),this.$menuButton.bind("click",function(){return a.isDisabled()||(a.isOpen===!0?a.close():a.open()),!1})},a.prototype._positionMenuList=function(){var a,b,c;return a=this.$menuButton.offset().left+this.$menuButton.outerWidth()/2,b=this.$menuList.outerWidth()/2,c=a-b,this.$menuList.css("left",c)},a.prototype._positionNipple=function(){var a,b,c,d,e;return c=this.$menuList.outerWidth()/2,b=this.$menuButton.offset().top+this.$menuButton.outerHeight()+10,this.$menuList.css("top",b),a=this.$menuList.find(".dropdown_menu_nipple"),d=a.outerWidth()/2,e=c-d,a.css("left",e)},a}(),function(a){return a.widget.bridge("aaDropdownMenu",AA.DropdownMenu),a(function(){return a(".dropdown_menu").aaDropdownMenu()})}(jQuery)}.call(this),function(){window.AA.Popover=AA.Popover=function(){function a(a,b){var c;return this.options=a,this.element=b,this.$element=$(this.element),c={fadeInDuration:20,fadeOutDuration:100,autoOpen:!0,pageWrapperElement:"#wrapper",onClickActionItemCallback:null},this.options=$.extend({},c,a),this.$popover=null,this.isOpen=!1,$(this.$element.attr("href")).length>0?this.$popover=$(this.$element.attr("href")):this.$popover=this.$element.next(".popover"),this._buildPopover(),this._bind(),this}return a.name="Popover",a.prototype.open=function(){return this.isOpen=!0,this.$popover.fadeIn(this.options.fadeInDuration),this._positionPopover(),this._positionNipple(),this},a.prototype.close=function(){return this.isOpen=!1,this.$popover.fadeOut(this.options.fadeOutDuration),this},a.prototype.destroy=function(){return this.$element.removeData("popover"),this.$element.unbind(),this.$element=null,this},a.prototype.option=function(){},a.prototype._buildPopover=function(){return this.$popover.prepend('<div class="popover_nipple"></div>'),this.$popover.hide(),this.$popover.addClass("popover")},a.prototype._bind=function(){var a=this;$(this.options.pageWrapperElement).bind("click",function(b){if(a.isOpen===!0)return a.close()});if(this.options.autoOpen===!0)return this.$element.bind("click",function(){return a.isOpen===!0?a.close():a.open(),!1})},a.prototype._positionPopover=function(){var a,b,c;return a=this.$element.offset().left+this.$element.outerWidth()/2,b=this.$popover.outerWidth()/2,c=a-b,this.$popover.css("left",c)},a.prototype._positionNipple=function(){var a,b,c,d,e;return c=this.$popover.outerWidth()/2,b=this.$element.offset().top+this.$element.outerHeight()+10,this.$popover.css("top",b),a=this.$popover.find(".popover_nipple"),d=a.outerWidth()/2,e=c-d,a.css("left",e)},a}(),function(a){return a.widget.bridge("popover",AA.Popover)}(jQuery)}.call(this),function(){var a={}.hasOwnProperty,b=function(b,c){function e(){this.constructor=b}for(var d in c)a.call(c,d)&&(b[d]=c[d]);return e.prototype=c.prototype,b.prototype=new e,b.__super__=c.prototype,b};window.AA.TableCheckboxToggler=AA.TableCheckboxToggler=function(a){function c(){return c.__super__.constructor.apply(this,arguments)}return b(c,a),c.name="TableCheckboxToggler",c.prototype._init=function(){return c.__super__._init.apply(this,arguments)},c.prototype._bind=function(){var a=this;return c.__super__._bind.apply(this,arguments),this.$container.find("tbody").find("td").bind("click",function(b){if(b.target.type!=="checkbox")return a._didClickCell(b.target)})},c.prototype._didChangeCheckbox=function(a){var b;return c.__super__._didChangeCheckbox.apply(this,arguments),b=$(a).parents("tr"),a.checked?b.addClass("selected"):b.removeClass("selected")},c.prototype._didClickCell=function(a){return $(a).parent("tr").find(":checkbox").click()},c}(AA.CheckboxToggler),function(a){return a.widget.bridge("tableCheckboxToggler",AA.TableCheckboxToggler)}(jQuery)}.call(this),function(){$(function(){return $(".datepicker").datepicker({dateFormat:"yy-mm-dd"}),$(".clear_filters_btn").click(function(){return window.location.search="",!1}),$(".dropdown_button").popover()})}.call(this),function(){jQuery(function(a){a(document).delegate("#batch_actions_selector li a","click.rails",function(){return a("#batch_action").val(a(this).attr("data-action")),a("#collection_selection").submit()});if(a("#batch_actions_selector").length&&a(":checkbox.toggle_all").length)return a(".paginated_collection").find("table.index_table").length?a(".paginated_collection table").tableCheckboxToggler():a(".paginated_collection").checkboxToggler(),a(".paginated_collection").find(":checkbox").bind("change",function(){return a(".paginated_collection").find(":checkbox").filter(":checked").length>0?a("#batch_actions_selector").aaDropdownMenu("enable"):a("#batch_actions_selector").aaDropdownMenu("disable")})})}.call(this);
+(function(){window.ActiveAdmin={},window.AA||(window.AA=window.ActiveAdmin)}).call(this),function(){window.ActiveAdmin.CheckboxToggler=ActiveAdmin.CheckboxToggler=function(){function t(t,e){var n;this.options=t,this.container=e,n={},this.options=$.extend({},n,t),this._init(),this._bind()}return t.prototype._init=function(){if(!this.container)throw new Error("Container element not found");if(this.$container=$(this.container),!this.$container.find(".toggle_all").length)throw new Error('"toggle all" checkbox not found');return this.toggle_all_checkbox=this.$container.find(".toggle_all"),this.checkboxes=this.$container.find(":checkbox").not(this.toggle_all_checkbox)},t.prototype._bind=function(){var t=this;return this.checkboxes.change(function(e){return t._didChangeCheckbox(e.target)}),this.toggle_all_checkbox.change(function(){return t._didChangeToggleAllCheckbox()})},t.prototype._didChangeCheckbox=function(){switch(this.checkboxes.filter(":checked").length){case this.checkboxes.length-1:return this.toggle_all_checkbox.prop({checked:null});case this.checkboxes.length:return this.toggle_all_checkbox.prop({checked:!0})}},t.prototype._didChangeToggleAllCheckbox=function(){var t,e=this;return t=this.toggle_all_checkbox.prop("checked")?!0:null,this.checkboxes.each(function(n,i){return $(i).prop({checked:t}),e._didChangeCheckbox(i)})},t}(),jQuery(function(t){return t.widget.bridge("checkboxToggler",ActiveAdmin.CheckboxToggler)})}.call(this),function(){window.ActiveAdmin.DropdownMenu=ActiveAdmin.DropdownMenu=function(){function t(t,e){var n;this.options=t,this.element=e,this.$element=$(this.element),n={fadeInDuration:20,fadeOutDuration:100,onClickActionItemCallback:null},this.options=$.extend({},n,t),this.$menuButton=this.$element.find(".dropdown_menu_button"),this.$menuList=this.$element.find(".dropdown_menu_list_wrapper"),this.isOpen=!1,this._buildMenuList(),this._bind()}return t.prototype.open=function(){return this.isOpen=!0,this.$menuList.fadeIn(this.options.fadeInDuration),this._positionMenuList(),this._positionNipple(),this},t.prototype.close=function(){return this.isOpen=!1,this.$menuList.fadeOut(this.options.fadeOutDuration),this},t.prototype.destroy=function(){return this.$element.unbind(),this.$element=null,this},t.prototype.isDisabled=function(){return this.$menuButton.hasClass("disabled")},t.prototype.disable=function(){return this.$menuButton.addClass("disabled")},t.prototype.enable=function(){return this.$menuButton.removeClass("disabled")},t.prototype.option=function(t,e){return $.isPlainObject(t)?this.options=$.extend(!0,this.options,t):null!=t?this.options[t]:this.options[t]=e},t.prototype._buildMenuList=function(){return this.$menuList.prepend('<div class="dropdown_menu_nipple"></div>'),this.$menuList.hide()},t.prototype._bind=function(){var t=this;return $("body").bind("click",function(){return t.isOpen===!0?t.close():void 0}),this.$menuButton.bind("click",function(){return t.isDisabled()||(t.isOpen===!0?t.close():t.open()),!1})},t.prototype._positionMenuList=function(){var t,e,n;return t=this.$menuButton.position().left+this.$menuButton.outerWidth()/2,e=this.$menuList.outerWidth()/2,n=t-e,this.$menuList.css("left",n)},t.prototype._positionNipple=function(){var t,e,n,i,o;return n=this.$menuList.outerWidth()/2,e=this.$menuButton.position().top+this.$menuButton.outerHeight()+10,this.$menuList.css("top",e),t=this.$menuList.find(".dropdown_menu_nipple"),i=t.outerWidth()/2,o=n-i,t.css("left",o)},t}(),function(t){return t.widget.bridge("aaDropdownMenu",ActiveAdmin.DropdownMenu),t(function(){return t(".dropdown_menu").aaDropdownMenu()})}(jQuery)}.call(this),function(){window.ActiveAdmin.Popover=ActiveAdmin.Popover=function(){function t(t,e){var n;this.options=t,this.element=e,this.$element=$(this.element),n={fadeInDuration:20,fadeOutDuration:100,autoOpen:!0,pageWrapperElement:"#wrapper",onClickActionItemCallback:null},this.options=$.extend({},n,t),this.$popover=null,this.isOpen=!1,this.$popover=$(this.$element.attr("href")).length>0?$(this.$element.attr("href")):this.$element.next(".popover"),this._buildPopover(),this._bind()}return t.prototype.open=function(){return this.isOpen=!0,this.$popover.fadeIn(this.options.fadeInDuration),this._positionPopover(),this._positionNipple(),this},t.prototype.close=function(){return this.isOpen=!1,this.$popover.fadeOut(this.options.fadeOutDuration),this},t.prototype.destroy=function(){return this.$element.removeData("popover"),this.$element.unbind(),this.$element=null,this},t.prototype.option=function(){},t.prototype._buildPopover=function(){return this.$popover.prepend('<div class="popover_nipple"></div>'),this.$popover.hide(),this.$popover.addClass("popover")},t.prototype._bind=function(){var t=this;return $(this.options.pageWrapperElement).bind("click",function(){return t.isOpen===!0?t.close():void 0}),this.options.autoOpen===!0?this.$element.bind("click",function(){return t.isOpen===!0?t.close():t.open(),!1}):void 0},t.prototype._positionPopover=function(){var t,e,n;return t=this.$element.offset().left+this.$element.outerWidth()/2,e=this.$popover.outerWidth()/2,n=t-e,this.$popover.css("left",n)},t.prototype._positionNipple=function(){var t,e,n,i,o;return n=this.$popover.outerWidth()/2,e=this.$element.offset().top+this.$element.outerHeight()+10,this.$popover.css("top",e),t=this.$popover.find(".popover_nipple"),i=t.outerWidth()/2,o=n-i,t.css("left",o)},t}(),function(t){return t.widget.bridge("popover",ActiveAdmin.Popover)}(jQuery)}.call(this),function(){var t,e={}.hasOwnProperty,n=function(t,n){function i(){this.constructor=t}for(var o in n)e.call(n,o)&&(t[o]=n[o]);return i.prototype=n.prototype,t.prototype=new i,t.__super__=n.prototype,t};window.ActiveAdmin.TableCheckboxToggler=ActiveAdmin.TableCheckboxToggler=function(e){function i(){return t=i.__super__.constructor.apply(this,arguments)}return n(i,e),i.prototype._init=function(){return i.__super__._init.apply(this,arguments)},i.prototype._bind=function(){var t=this;return i.__super__._bind.apply(this,arguments),this.$container.find("tbody td").click(function(e){return"checkbox"!==e.target.type?t._didClickCell(e.target):void 0})},i.prototype._didChangeCheckbox=function(t){var e;return i.__super__._didChangeCheckbox.apply(this,arguments),e=$(t).parents("tr"),t.checked?e.addClass("selected"):e.removeClass("selected")},i.prototype._didClickCell=function(t){return $(t).parent("tr").find(":checkbox").click()},i}(ActiveAdmin.CheckboxToggler),jQuery(function(t){return t.widget.bridge("tableCheckboxToggler",ActiveAdmin.TableCheckboxToggler)})}.call(this),function(){$(function(){return $(document).on("focus",".datepicker:not(.hasDatepicker)",function(){return $(this).datepicker({dateFormat:"yy-mm-dd"})}),$(".clear_filters_btn").click(function(){return window.location.search=""}),$(".dropdown_button").popover(),$(".filter_form").submit(function(){return $(this).find(":input").filter(function(){return""===this.value}).prop("disabled",!0)}),$(".filter_form_field.select_and_search select").change(function(){return $(this).siblings("input").prop({name:"q["+this.value+"]"})})})}.call(this),function(){jQuery(function(t){return t(document).delegate("#batch_actions_selector li a","click.rails",function(){return t("#batch_action").val(t(this).attr("data-action")),t("#collection_selection").submit()}),t("#batch_actions_selector").length&&t(":checkbox.toggle_all").length?(t(".paginated_collection table.index_table").length?t(".paginated_collection table.index_table").tableCheckboxToggler():t(".paginated_collection").checkboxToggler(),t(".paginated_collection").find(":checkbox").bind("change",function(){return t(".paginated_collection").find(":checkbox").filter(":checked").length>0?t("#batch_actions_selector").aaDropdownMenu("enable"):t("#batch_actions_selector").aaDropdownMenu("disable")})):void 0})}.call(this);

data/lib/generators/active_admin/assets/templates/3.1/active_admin.css.scss

@@ -14,16 +14,4 @@
 // Overriding any non-variable SASS must be done after the fact.
 // For example, to change the default status-tag color:
 //
-//   body.active_admin {
-//      .status_tag { background: #6090DB; }
-//   }
-//
-// Notice that Active Admin CSS rules are nested within a
-// 'body.active_admin' selector to prevent conflicts with
-// other pages in the app. It is best to wrap your changes in a 
-// namespace so they are properly recognized. You have options
-// if you e.g. want different styles for different namespaces:
-//
-// .active_admin       applies to any Active Admin namespace
-// .admin_namespace    applies to the admin namespace (eg: /admin)
-// .other_namespace    applies to a custom namespace named other (eg: /other)
+//   .status_tag { background: #6090DB; }

data/lib/generators/active_admin/devise/devise_generator.rb

@@ -1,5 +1,8 @@
 module ActiveAdmin
   module Generators
+    class Error < Rails::Generators::Error
+    end
+
     class DeviseGenerator < Rails::Generators::NamedBase
       desc "Creates an admin user and uses Devise for authentication"
       argument :name, :type => :string, :default => "AdminUser"
@@ -7,6 +10,8 @@ module ActiveAdmin
       class_option  :registerable, :type => :boolean, :default => false,
                     :desc => "Should the generated resource be registerable?"
 
+      RESERVED_NAMES = [:active_admin_user]
+
       def install_devise
         require 'devise'
         if File.exists?(File.join(destination_root, "config", "initializers", "devise.rb"))
@@ -18,6 +23,9 @@ module ActiveAdmin
       end
 
       def create_admin_user
+        if RESERVED_NAMES.include?(name.underscore)
+          raise Error, "The name #{name} is reserved by Active Admin"
+        end
         invoke "devise", [name]
       end
 
@@ -28,6 +36,19 @@ module ActiveAdmin
         end
       end
 
+      # This fixes a bug in the 3.0.0 release of Devise. For more info:
+      # https://github.com/plataformatec/devise/issues/2515
+      def add_attr_accessible_if_missing
+        require 'devise/version'
+        if ::Devise::VERSION == '3.0.0'
+          if Rails::VERSION::MAJOR == 3 && !defined?(ActionController::StrongParameters)
+            model = File.join(destination_root, "app", "models", "#{file_path}.rb")
+            inject_into_file model, "\n  attr_accessible :email, :password, :password_confirmation, :remember_me\n",
+                             :before => /end\s*\z/
+          end
+        end
+      end
+
       def set_namespace_for_path
         routes_file = File.join(destination_root, "config", "routes.rb")
         gsub_file routes_file, /devise_for :#{plural_table_name}/, "devise_for :#{plural_table_name}, ActiveAdmin::Devise.config"
@@ -42,7 +63,7 @@ module ActiveAdmin
 
         if devise_migration_content["def change"]
           inject_into_file  devise_migration_file,
-                            "def migrate(direction)\n    super\n    # Create a default user\n    #{class_name}.create!(:email => 'admin@example.com', :password => 'password', :password_confirmation => 'password') if direction == :up\n  end\n\n  ", 
+                            "def migrate(direction)\n    super\n    # Create a default user\n    #{class_name}.create!(:email => 'admin@example.com', :password => 'password', :password_confirmation => 'password') if direction == :up\n  end\n\n  ",
                             :before => "def change"
         elsif devise_migration_content[/def (self.)?up/]
           inject_into_file  devise_migration_file,

data/lib/generators/active_admin/install/install_generator.rb

@@ -39,11 +39,7 @@ module ActiveAdmin
       end
 
       def create_migrations
-        Dir["#{self.class.source_root}/migrations/*.rb"].sort.each do |filepath|
-          name = File.basename(filepath)
-          migration_template "migrations/#{name}", "db/migrate/#{name.gsub(/^\d+_/,'')}"
-          sleep 1
-        end
+        migration_template 'migrations/create_active_admin_comments.rb', 'db/migrate/create_active_admin_comments.rb'
       end
     end
   end

data/lib/generators/active_admin/install/templates/active_admin.rb.erb

@@ -57,6 +57,23 @@ ActiveAdmin.setup do |config|
   # within the controller.
   config.authentication_method = :authenticate_<%= @underscored_user_name %>!
 
+  # == User Authorization
+  #
+  # Active Admin will automatically call an authorization
+  # method in a before filter of all controller actions to
+  # ensure that there is a user with proper rights. You can use
+  # CanCanAdapter or make your own. Please refer to documentation.
+  # config.authorization_adapter = ActiveAdmin::CanCanAdapter
+
+  # You can customize your CanCan Ability class name here.
+  # config.cancan_ability_class = "Ability"
+
+  # You can specify a method to be called on unauthorized access.
+  # This is necessary in order to prevent a redirect loop which happens
+  # because, by default, user gets redirected to Dashboard. If user
+  # doesn't have access to Dashboard, he'll end up in a redirect loop.
+  # Method provided here should be defined in application_controller.rb.
+  # config.on_unauthorized_access = :access_denied
 
   # == Current User
   #
@@ -86,6 +103,7 @@ ActiveAdmin.setup do |config|
   # Default:
   # config.logout_link_method = :get
 
+
   # == Root
   #
   # Set the action to call for the root path. You can set different
@@ -94,21 +112,19 @@ ActiveAdmin.setup do |config|
   # Default:
   # config.root_to = 'dashboard#index'
 
+
   # == Admin Comments
   #
-  # Admin comments allow you to add comments to any model for admin use.
-  # Admin comments are enabled by default.
+  # This allows your users to comment on any resource registered with Active Admin.
   #
-  # Default:
-  # config.allow_comments = true
+  # You can completely disable comments:
+  # config.allow_comments = false
   #
-  # You can turn them on and off for any given namespace by using a
-  # namespace config block.
+  # You can disable the menu item for the comments index page:
+  # config.show_comments_in_menu = false
   #
-  # Eg:
-  #   config.namespace :without_comments do |without_comments|
-  #     without_comments.allow_comments = false
-  #   end
+  # You can change the name under which comments are registered:
+  # config.comments_registration_name = 'AdminComment'
 
 
   # == Batch Actions
@@ -124,6 +140,11 @@ ActiveAdmin.setup do |config|
   # Active Admin resources and pages from here.
   #
   # config.before_filter :do_something_awesome
+  
+  
+  # == Setting a Favicon
+  #
+  # config.favicon = '/assets/favicon.ico'
 
 
   # == Register Stylesheets & Javascripts
@@ -134,7 +155,7 @@ ActiveAdmin.setup do |config|
   #
   # To load a stylesheet:
   #   config.register_stylesheet 'my_stylesheet.css'
-
+  #
   # You can provide an options hash for more control, which is passed along to stylesheet_link_tag():
   #   config.register_stylesheet 'my_print_stylesheet.css', :media => :print
   #
@@ -144,19 +165,19 @@ ActiveAdmin.setup do |config|
 
   # == CSV options
   #
-  # Set the CSV builder separator (default is ",")
-  # config.csv_column_separator = ','
+  # Set the CSV builder separator
+  # config.csv_options = { :col_sep => ';' }
   #
-  # Set the CSV builder options (default is {})
-  # config.csv_options = {}
+  # Force the use of quotes
+  # config.csv_options = { :force_quotes => true }
 
 
   # == Menu System
   #
   # You can add a navigation menu to be used in your application, or configure a provided menu
-  # 
+  #
   # To change the default utility navigation to show a link to your website & a logout btn
-  # 
+  #
   #   config.namespace :admin do |admin|
   #     admin.build_menu :utility_navigation do |menu|
   #       menu.add label: "My Great Website", url: "http://www.mygreatwebsite.com", html_options: { target: :blank }
@@ -172,6 +193,7 @@ ActiveAdmin.setup do |config|
   #     end
   #   end
 
+
   # == Download Links
   #
   # You can disable download links on resource listing pages,
@@ -200,11 +222,10 @@ ActiveAdmin.setup do |config|
 
   # == Filters
   #
-  # By default the index screen includes a “Filters” sidebar on the right 
+  # By default the index screen includes a “Filters” sidebar on the right
   # hand side with a filter for each attribute of the registered model.
   # You can enable or disable them for all resources here.
   #
   # config.filters = true
 
-
 end

data/lib/generators/active_admin/install/templates/admin_user.rb.erb

@@ -1,20 +1,20 @@
-ActiveAdmin.register <%= @user_class %> do     
-  index do                            
-    column :email                     
-    column :current_sign_in_at        
-    column :last_sign_in_at           
-    column :sign_in_count             
-    default_actions                   
-  end                                 
+ActiveAdmin.register <%= @user_class %> do
+  index do
+    column :email
+    column :current_sign_in_at
+    column :last_sign_in_at
+    column :sign_in_count
+    default_actions
+  end
 
-  filter :email                       
+  filter :email
 
-  form do |f|                         
-    f.inputs "Admin Details" do       
-      f.input :email                  
-      f.input :password               
-      f.input :password_confirmation  
-    end                               
-    f.actions                         
-  end                                 
-end                                   
+  form do |f|
+    f.inputs "Admin Details" do
+      f.input :email
+      f.input :password
+      f.input :password_confirmation
+    end
+    f.actions
+  end
+end

data/lib/generators/active_admin/install/templates/migrations/create_active_admin_comments.rb

@@ -0,0 +1,19 @@
+class CreateActiveAdminComments < ActiveRecord::Migration
+  def self.up
+    create_table :active_admin_comments do |t|
+      t.string :namespace
+      t.text   :body
+      t.string :resource_id,   :null => false
+      t.string :resource_type, :null => false 
+      t.references :author, :polymorphic => true
+      t.timestamps
+    end
+    add_index :active_admin_comments, [:namespace]
+    add_index :active_admin_comments, [:author_type, :author_id]
+    add_index :active_admin_comments, [:resource_type, :resource_id]
+  end
+
+  def self.down
+    drop_table :active_admin_comments
+  end
+end

data/lib/generators/active_admin/resource/resource_generator.rb

@@ -8,7 +8,7 @@ module ActiveAdmin
       end
 
       def generate_config_file
-        template "admin.rb", "app/admin/#{file_path.gsub('/', '_').pluralize}.rb"
+        template "admin.rb", "app/admin/#{file_path.gsub('/', '_')}.rb"
       end
 
     end

data/lib/generators/active_admin/resource/templates/admin.rb

@@ -1,3 +1,3 @@
 ActiveAdmin.register <%= class_name %> do
-  
+
 end

data/script/use_rails

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 #
 # Switches the development environment to use the given
-# version of rails. Caches the Gemfile.locks so that 
+# version of rails. Caches the Gemfile.locks so that
 # switching it very fast.
 #
 require File.expand_path("../../spec/support/detect_rails_version", __FILE__)

data/spec/integration/memory_spec.rb

@@ -11,13 +11,14 @@ describe "Memory Leak" do
 
   def self.it_should_not_leak(klass)
     it "should not leak #{klass}" do
+      previously_disabled = GC.enable # returns true if the garbage collector was disabled
       GC.start
-
       count = count_instances_of(klass)
 
       load_defaults!
-      GC.start
 
+      GC.start
+      GC.disable if previously_disabled
       count_instances_of(klass).should <= count
     end
   end

data/spec/javascripts/coffeescripts/jquery.aa.checkbox-toggler-spec.js.coffee

@@ -1,4 +1,4 @@
-describe "AA.CheckboxToggler", ->
+describe "ActiveAdmin.CheckboxToggler", ->
   
   beforeEach ->
     loadFixtures('checkboxes.html')
@@ -9,15 +9,15 @@ describe "AA.CheckboxToggler", ->
     @checkboxes = @collection.find(":checkbox").not(@toggle_all)
     
     
-    new AA.CheckboxToggler({}, @collection)
+    new ActiveAdmin.CheckboxToggler({}, @collection)
 
   describe "on init", ->
     it "should raise an error if container not found", ->
-      expect( => new AA.CheckboxToggler({}) ).toThrow("Container element not found")
+      expect( => new ActiveAdmin.CheckboxToggler({}) ).toThrow("Container element not found")
 
     it "should raise an error if 'toggle all' checkbox not found", ->
       @toggle_all.remove()
-      expect( => new AA.CheckboxToggler({}, @collection); ).toThrow("'toggle all' checkbox not found")
+      expect( => new ActiveAdmin.CheckboxToggler({}, @collection); ).toThrow("'toggle all' checkbox not found")
 
   describe "'toggle all' checkbox", ->
     it "should check all checkboxes when checked", ->

data/spec/javascripts/coffeescripts/jquery.aa.popover-spec.js.coffee

@@ -1,4 +1,4 @@
-describe "AA.Popover", ->
+describe "ActiveAdmin.Popover", ->
   $wrapper = undefined
   $button = undefined
   $popover = undefined

data/spec/javascripts/coffeescripts/jquery.aa.table-checkbox-toggler-spec.js.coffee

@@ -1,4 +1,4 @@
-describe "AA.TableCheckboxToggler", ->
+describe "ActiveAdmin.TableCheckboxToggler", ->
   
   beforeEach ->
     loadFixtures('table_checkboxes.html');
@@ -8,7 +8,7 @@ describe "AA.TableCheckboxToggler", ->
 
     @checkboxes = @collection.find(":checkbox").not(@toggle_all)
     
-    new AA.TableCheckboxToggler({}, @collection)
+    new ActiveAdmin.TableCheckboxToggler({}, @collection)
 
   describe "'selected' class for table row", ->
     it "should add the class 'selected' to rows when their checkbox is checked ", ->

data/spec/javascripts/compiled/jquery.aa.checkbox-toggler-spec.js

@@ -1,25 +1,25 @@
 (function() {
 
-  describe("AA.CheckboxToggler", function() {
+  describe("ActiveAdmin.CheckboxToggler", function() {
     beforeEach(function() {
       loadFixtures('checkboxes.html');
       this.collection = $("#collection");
       this.toggle_all = this.collection.find(".toggle_all");
       this.checkboxes = this.collection.find(":checkbox").not(this.toggle_all);
-      return new AA.CheckboxToggler({}, this.collection);
+      return new ActiveAdmin.CheckboxToggler({}, this.collection);
     });
     describe("on init", function() {
       it("should raise an error if container not found", function() {
         var _this = this;
         return expect(function() {
-          return new AA.CheckboxToggler({});
+          return new ActiveAdmin.CheckboxToggler({});
         }).toThrow("Container element not found");
       });
       return it("should raise an error if 'toggle all' checkbox not found", function() {
         var _this = this;
         this.toggle_all.remove();
         return expect(function() {
-          return new AA.CheckboxToggler({}, _this.collection);
+          return new ActiveAdmin.CheckboxToggler({}, _this.collection);
         }).toThrow("'toggle all' checkbox not found");
       });
     });