activeadmin 0.3.1 → 0.3.2

data/.gitignore

@@ -32,3 +32,4 @@ viewcumber
 test-rails*
 public
 .rvmrc
+.rspec

data/CHANGELOG.md

@@ -2,6 +2,51 @@
 
 Nothing yet
 
+## 0.3.2
+
+45 commits by 15 contributors
+
+### Enhancements
+
+* Site title can now be a link. Use config.site_title_link in
+  config/initializers/active_admin.rb
+* i18n support for Japanese
+* i18n support for Bulgarian
+* i18n support for Swedish
+
+### Bug Fixes
+
+* DeviseGenerator respects singular table names
+* Active Admin no longer assumes sass-rails is installed
+* Arbre::Context passes methods to the underlying html which fixes
+  issues on different types of servers (and on Heroku)
+* #45: Fix for multibyte characters (@tricknotes)
+* #505: Fix titlebar height when no breadcrumb (@mattvague)
+* Fixed vertical align in dashboard
+* Fixed i18n path's for multi-word model names
+
+### Dependencies
+
+* Formtastic 2.0.0 breaks Active Admin. Locking to < 2.0.0
+
+### Contributors
+
+* Amiel Martin
+* Christian Hjalmarsson
+* Edgars Beigarts
+* Greg Bell
+* Jan Dupal
+* Joe Van
+* Mark Roghelia
+* Mathieu Martin
+* Matt Vague
+* Philippe Creux
+* Ryunosuke SATO
+* Sam Vincent
+* Trace Wax
+* Tsvetan Roustchev
+* l4u
+
 ## 0.3.1
 
 * Only support InheritedResources up to 1.2.2

data/Gemfile

@@ -4,7 +4,7 @@ gemspec
 
 require File.expand_path('../spec/support/detect_rails_version', __FILE__)
 
-rails_version = ENV['RAILS'] || detect_rails_version || "3.1.0.rc10"
+rails_version = ENV['RAILS'] || detect_rails_version || "3.1.0"
 gem 'rails',          rails_version
 
 case rails_version

data/README.rdoc

@@ -4,6 +4,7 @@ Active Admin is a framework for creating administration style interfaces. It
 abstracts common business application patterns to make it simple for developers
 to implement beautiful and elegant interfaces with very little effort.
 
+{<img src="http://travis-ci.org/gregbell/active_admin.png" />}[http://travis-ci.org/gregbell/active_admin]
 
 == Help / Support / Demo
 
@@ -29,10 +30,10 @@ to implement beautiful and elegant interfaces with very little effort.
 Active Admin is released as a Ruby Gem. The gem is to be installed within a Ruby
 on Rails 3 application. To install, simply add the following to your Gemfile:
 
-  # Gemfile in Rails <= 3.1
+  # Gemfile in Rails < 3.1
   gem 'activeadmin'
 
-If you are using Rails >= 3.1, you must also include a beta version of MetaSearch and sass-rails:
+If you are using Rails >= 3.1, you must also have sass-rails in your Gemfile:
 
   # Gemfile in Rails >= 3.1
   gem 'activeadmin'

data/activeadmin.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.add_dependency("rails", ">= 3.0.0")
   s.add_dependency("meta_search", ">= 0.9.2")
   s.add_dependency("devise", ">= 1.1.2")
-  s.add_dependency("formtastic", ">= 1.1.0")
+  s.add_dependency("formtastic", "< 2.0.0")
   s.add_dependency("inherited_resources", "< 1.3.0")
   s.add_dependency("kaminari", ">= 0.12.4")
   s.add_dependency("sass", ">= 3.1.0")

data/app/assets/stylesheets/active_admin/_base.css.scss

@@ -11,6 +11,7 @@
 @import "active_admin/components/comments";
 @import "active_admin/components/flash_messages";
 @import "active_admin/components/date_picker";
+@import "active_admin/components/tables";
 
 body {
   font-family: Helvetica, Arial, sans-serif;
@@ -25,36 +26,52 @@ body {
 // ----------------------------------- Page Title Bar 
 #title_bar {
   @include section-header;
+  @include clearfix;
+  @include box-sizing(border-box);
+  display: table;
+  width: 100%;
   position: relative; 
   margin: 0; 
   padding: 10px $horizontal-page-margin; 
 
+  #titlebar_left, #titlebar_right {
+    height: 50px;
+    vertical-align: middle;
+    display: table-cell;
+  }
+  
+  #titlebar_right {
+    text-align: right;
+  }
+  
   h2 { 
-    margin: 12px 0 5px 0; 
+    margin: 0;
     padding: 0; 
     font-size: 2.6em;
     font-weight: bold;
   }
 
   .action_items { 
-    position: absolute; 
-    right: $horizontal-page-margin; 
-    top: 28px;
-
     a { 
       @include light-button; 
       @include icon(#777, 0.8em); 
       @include gradient(#f9f9f9, #dddbdb);
+      display: inline-block;
       padding: .8em 1.5em .7em 1.5em;
       border: 1px solid #f8f8f8;
       span.icon { vertical-align: bottom; margin-right: 4px;} 
       &:hover{ @include icon-color(#000); }
-      &:active { border: inherit; }
     }
   }
 }
 
-// ----------------------------------- Main Structure 
+// ----------------------------------- Main Structure
+
+#wrapper {
+  display: table;
+  width: 100%;
+}
+
 #active_admin_content { 
   margin: 0; 
   padding: 25px $horizontal-page-margin; 
@@ -111,9 +128,12 @@ a.button, input[type=submit] { @include dark-button; }
 
 // ----------------------------------- Breadcrumbs 
 .breadcrumb {
-  text-transform: uppercase;
+  display: block;
   font-size: 0.9em;
   font-weight: normal;
+  line-height: 1.0em;
+  margin-bottom: 12px;
+  text-transform: uppercase;
 
   a, a:link {
     color: #8a949e ;
@@ -166,65 +186,6 @@ a.button, input[type=submit] { @include dark-button; }
   margin-top: 80px;
 }
 
-// ----------------------------------- Tables 
-table.index_table {
-  width: 100%;
-  margin-bottom: 10px;
-  border: 0;
-  border-spacing: 0;
-
-
-  th { 
-    @include section-header;
-    text-align: left;
-    padding-left: $cell-horizontal-padding;
-    padding-right: $cell-horizontal-padding;
-
-    a, a:link, a:visited {
-      color: $section-header-text-color;
-      text-decoration: none;
-      display: block;
-    }
-
-    &.sortable a {
-      background: url(active_admin_image_path('orderable.png')) no-repeat 0 4px; padding-left: 13px;
-    }
-
-    &.sorted-asc a { background-position: 0 -27px; }
-    &.sorted-desc a {  background-position: 0 -56px;}
-
-    &.sorted-asc, &.sorted-desc {
-      @include gradient(darken($secondary-gradient-start, 5%), darken($secondary-gradient-stop, 5%));
-      border-bottom: 1px solid $secondary-gradient-stop;
-    }
-  }
-
-  tr.even td { background: $table-stripe-color; }
-
-  td {
-    padding: 10px $cell-horizontal-padding 8px $cell-horizontal-padding;
-    border-bottom: 1px solid #e8e8e8;
-    vertical-align: top;
-  }
-}
-
-// ----------------------------------- Tables inside Panels
-
-.panel_contents table {
-  margin-top: 5px;
-  th { 
-    padding-top: 10px;
-    background: none;
-    color: $primary-color;
-    @include no-shadow;
-    @include text-shadow;
-    text-transform: uppercase;
-    border-bottom: 1px solid #ccc;
-  }
-  tr.odd td { background: darken($table-stripe-color, 3%); }
-  tr.even td { background: $table-stripe-color; }
-}
-
 // ----------------------------------- Sidebar Sections 
 .sidebar_section { @include section; }
 

data/app/assets/stylesheets/active_admin/_header.css.scss

@@ -13,7 +13,16 @@
     margin-right: 20px; 
     margin-bottom: 0px;
     font-size: 1.3em; 
-    font-weight: normal; 
+    font-weight: normal;
+    
+    a {
+      text-decoration: none;
+      
+      &:hover {
+        color: #fff;
+      }
+      
+    } 
   }
 
   a, a:link { color: #cdcdcd; }

data/app/assets/stylesheets/active_admin/components/_flash_messages.css.scss

@@ -1,10 +1,9 @@
 body.logged_in {
   .flash {
-    @include primary-gradient;
+    @include gradient(#f7f1d3, #f5edc5);
     @include text-shadow(#fafafa);
-    background-color: #a24a42;
-    border: none;
-    color: #fff;
+    border-bottom: 1px solid #eee098;
+    color: #cb9810;
     font-weight: bold;
     font-size: 1.1em;
     line-height: 1.0em;

data/app/assets/stylesheets/active_admin/components/_tables.css.scss

@@ -0,0 +1,66 @@
+// ----------------------------------- Tables 
+
+table tr {
+  td {
+    vertical-align: top;
+  }
+}
+
+// --------- Index Tables 
+
+table.index_table {
+  width: 100%;
+  margin-bottom: 10px;
+  border: 0;
+  border-spacing: 0;
+
+  th { 
+    @include section-header;
+    text-align: left;
+    padding-left: $cell-horizontal-padding;
+    padding-right: $cell-horizontal-padding;
+
+    a, a:link, a:visited {
+      color: $section-header-text-color;
+      text-decoration: none;
+      display: block;
+    }
+
+    &.sortable a {
+      background: url(active_admin_image_path('orderable.png')) no-repeat 0 4px; padding-left: 13px;
+    }
+
+    &.sorted-asc a { background-position: 0 -27px; }
+    &.sorted-desc a {  background-position: 0 -56px;}
+
+    &.sorted-asc, &.sorted-desc {
+      @include gradient(darken($secondary-gradient-start, 5%), darken($secondary-gradient-stop, 5%));
+      border-bottom: 1px solid $secondary-gradient-stop;
+    }
+  }
+
+  tr.even td { background: $table-stripe-color; }
+
+  td {
+    padding: 10px $cell-horizontal-padding 8px $cell-horizontal-padding;
+    border-bottom: 1px solid #e8e8e8;
+    vertical-align: top;
+  }
+}
+
+// --------- Tables inside Panels
+
+.panel_contents table {
+  margin-top: 5px;
+  th { 
+    padding-top: 10px;
+    background: none;
+    color: $primary-color;
+    @include no-shadow;
+    @include text-shadow;
+    text-transform: uppercase;
+    border-bottom: 1px solid #ccc;
+  }
+  tr.odd td { background: darken($table-stripe-color, 3%); }
+  tr.even td { background: $table-stripe-color; }
+}

data/app/assets/stylesheets/active_admin/mixins/_all.css.scss

@@ -6,3 +6,5 @@
 @import "active_admin/mixins/rounded";
 @import "active_admin/mixins/buttons";
 @import "active_admin/mixins/sections";
+@import "active_admin/mixins/utilities";
+

data/app/assets/stylesheets/active_admin/mixins/_utilities.scss

@@ -0,0 +1,17 @@
+@mixin clearfix {
+  &:after {
+    visibility: hidden;
+    display: block;
+    content: "";
+    clear: both;
+    height: 0;
+  }
+}
+
+@mixin box-sizing($value: border-box) {
+  -moz-box-sizing: $value;
+  -webkit-box-sizing: $value;
+  -o-box-sizing: $value;
+  -ms-box-sizing: $value;
+  box-sizing: $value;
+}

data/docs/2-resource-customization.md

@@ -77,3 +77,38 @@ Menu items can be shown or hidden at runtime using the `:if` option.
 
 The `proc` will be called in the context of the view, so you have access to all
 your helpers and current user session information.
+
+## Scoping the queries
+
+If your administrators have different access levels, you may sometimes want to 
+scope what they have access to. Assuming your User model has the proper 
+has_many relationships, you can simply scope the listings and finders like so:
+
+    ActiveAdmin.register Post do
+      scope_to :current_user
+
+      # or if the association doesn't have the default name.
+      # scope_to :current_user, :association_method => :blog_posts
+    end
+
+That approach limits the posts an admin can access to ```current_user.posts```.
+
+If you want to do something fancier, for example override a default scope, you can 
+also use :association_method parameter with a normal method on your User model. 
+The only requirement is that your method returns an instance of ActiveRecord::Relation.
+
+    class Ad < ActiveRecord::Base
+      default_scope lambda { where :published => true }
+    end
+
+    class User < ActiveRecord::Base
+      def managed_ads
+        # Overrides Ad's default_scope
+        Ad.unscoped
+      end
+    end
+
+    ActiveAdmin.register Ad do
+      scope_to :current_user, :association_method => :managed_ads
+    end
+

data/docs/6-show-screens.md

@@ -20,3 +20,17 @@ can also render a partial at any point.
         render "some_partial"
       end
     end
+
+If you'd like to keep the default active_admin look, you can also use "attributes_table":
+
+    ActiveAdmin.register Ad do
+      show do |ad|
+        attributes_table do
+          row :title
+          row :image do
+            image_tag(ad.image.url)
+          end
+        end
+        active_admin_comments
+      end
+    end

data/features/menu.feature

@@ -13,7 +13,6 @@ Feature: Menu
     When I am on the dashboard
     Then I should not see a menu item for "Posts"
 
-  @wip
   Scenario: Set the menu item label
     Given a configuration of:
     """
@@ -24,3 +23,15 @@ Feature: Menu
     When I am on the dashboard
     Then I should see a menu item for "Articles"
     And I should not see a menu item for "Posts"
+
+  Scenario: Set the site title and site title link
+    Given a configuration of:
+    """
+      ActiveAdmin.application.site_title = "My Great Site"
+      ActiveAdmin.application.site_title_link = "http://www.google.com/"
+    """
+    When I am on the dashboard
+    And I should see "My Great Site"
+    When I follow "My Great Site"
+    Then I should see "Ruby on Rails: Welcome aboard"
+    # Why won't it take me to the Googles??? It takes me to / instead. Oh well

data/lib/active_admin/application.rb

@@ -20,6 +20,9 @@ module ActiveAdmin
 
     # The title which gets displayed in the main layout
     setting :site_title, ""
+    
+    # Set the site title link href (defaults to AA dashboard)
+    setting :site_title_link, ""
 
     # Load paths for admin configurations. Add folders to this load path
     # to load up other resources for administration. External gems can

data/lib/active_admin/arbre/context.rb

@@ -7,10 +7,39 @@ module Arbre
       super - 1
     end
 
-    def length
-      to_html.length
+    def bytesize
+      cached_html.bytesize
+    end
+    alias :length :bytesize
+
+    def respond_to?(method)
+      super || cached_html.respond_to?(method)
+    end
+
+    # Webservers treat Arbre::Context as a string. We override
+    # method_missing to delegate to the string representation
+    # of the html.
+    def method_missing(method, *args, &block)
+      if cached_html.respond_to? method
+        cached_html.send method, *args, &block
+      else
+        super
+      end
+    end
+
+    private
+
+    # Caches the rendered HTML so that we don't re-render just to
+    # get the content lenght or to delegate a method to the HTML
+    def cached_html
+      if defined?(@cached_html)
+        @cached_html
+      else
+        html = to_html
+        @cached_html = html if html.length > 0
+        html
+      end
     end
-    alias :bytesize :length
 
   end
 end

data/lib/active_admin/dependency_checker.rb

@@ -22,6 +22,8 @@ module ActiveAdmin
       def sass_rails_3_1?
         require 'sass/rails/version'
         Sass::Rails::VERSION >= "3.1"
+      rescue LoadError
+        false
       end
     end
   end

data/lib/active_admin/locales/bg.yml

@@ -0,0 +1,40 @@
+bg:
+  active_admin:
+    dashboard: Табло
+    dashboard_welcome:
+      welcome: "Добре дошли в Active Admin. Това е таблото по подразбиране."
+      call_to_action: "За да добавите секции, проверете 'app/admin/dashboards.rb'"
+    view: "Преглед"
+    edit: "Редакция"
+    delete: "Изтриване"
+    delete_confirmation: "Сигурни ли сте, че искате да изтриете това?"
+    new_model: "Създай %{model}"
+    edit_model: "Редактирай %{model}"
+    delete_model: "Изтрий %{model}"
+    details: "%{model} Детайли"
+    cancel: "Отказ"
+    empty: "Празни"
+    previous: "Назад"
+    next: "Напред"
+    download: "Свали:"
+    has_many_new: "Добави нов %{model}"
+    has_many_delete: "Изтрий"
+    filter: "Филтър"
+    clear_filters: "Изчисти филтрите"
+    search_field: "Търси %{field}"
+    equal_to: "Съответства на"
+    greater_than: "По-голямо от"
+    less_than: "По-малко от"
+    main_content: "Моля, приложи %{model}#main_content за визуализация на съдържанието."
+    logout: "Изход"
+    sidebars:
+      filters: "Филтри"
+    pagination:
+      empty: "%{model} не е открит"
+      one: "Показване на <b>1</b> %{model}"
+      one_page: "Показване на <b>всички %{n}</b> %{model}"
+      multiple: "Показване на %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b> от <b>%{total}</b> общо"
+    any: "Всеки"
+    blank_slate:
+      content: "Няма %{resource_name} все още."
+      link: "Създай връзка"

data/lib/active_admin/locales/ja.yml

@@ -0,0 +1,40 @@
+ja:
+  active_admin:
+    dashboard: "ダッシュボード"
+    dashboard_welcome:
+      welcome: "Active Admin へようこそ。ダッシュボードの初期ページを表示しています。"
+      call_to_action: "ダッシュボードに項目を追加するために 'app/admin/dashboards.rb' を編集してください。"
+    view: "閲覧"
+    edit: "編集"
+    delete: "削除"
+    delete_confirmation: "本当に削除しますか?"
+    new_model: "%{model} を作成する"
+    edit_model: "%{model} を編集する"
+    delete_model: "%{model} を削除する"
+    details: "%{model} の詳細"
+    cancel: "取り消す"
+    empty: "空"
+    previous: "前"
+    next: "次"
+    download: "ダウンロード:"
+    has_many_new: "新規に %{model} を追加する"
+    has_many_delete: "削除する"
+    filter: "絞り込む"
+    clear_filters: "条件を削除する"
+    search_field: "%{field} で絞り込む"
+    equal_to: "等しい"
+    greater_than: "より大きい"
+    less_than: "より小さい"
+    main_content: "内容を表示するために %{model}#main_content を実装してください。"
+    logout: "ログアウト"
+    sidebars:
+      filters: "検索条件"
+    pagination:
+      empty: "%{model} は見つかりませんでした"
+      one: "<b>1</b> 件の %{model} を表示しています"
+      one_page: "<b>全 %{n}</b> 件の %{model} を表示しています"
+      multiple: "全 <b>%{total}</b> 件中 <b>%{from}&nbsp;-&nbsp;%{to}</b> 件の %{model} を表示しています"
+    any: "任意"
+    blank_slate:
+      content: "%{resource_name} はまだありません。"
+      link: "作成する"

data/lib/active_admin/locales/sv-SE.yml

@@ -0,0 +1,40 @@
+"sv-SE":
+  active_admin:
+    dashboard: Skrivbord
+    dashboard_welcome:
+      welcome: "Välkommen till Active Admin. Detta är ditt standardskrivbord."
+      call_to_action: "För att lägga till sektioner, gör en checkout på 'app/admin/dashboards.rb'"
+    view: "Visa"
+    edit: "Editera"
+    delete: "Ta bort"
+    delete_confirmation: "Är du säker att du vill ta bort denna?"
+    new_model: "Ny %{model}"
+    edit_model: "Editera %{model}"
+    delete_model: "Ta bort %{model}"
+    details: "Detaljvy för %{model}"
+    cancel: "Avbryt"
+    empty: "Tom"
+    previous: "Föregående"
+    next: "Nästa"
+    download: "Ladda ner:"
+    has_many_new: "Skapa en ny %{model}"
+    has_many_delete: "Ta bort"
+    filter: "Filter"
+    clear_filters: "Töm dina filters"
+    search_field: "Sök %{field}"
+    equal_to: "Lika med"
+    greater_than: "Större än"
+    less_than: "Mindre än"
+    main_content: "Implementera %{model}#main_content för att kunna visa något."
+    logout: "Logga ut"
+    sidebars:
+      filters: "Filter"
+    pagination:
+      empty: "Ingen %{model} funnen"
+      one: "Visar <b>1</b> utav %{model}"
+      one_page: "Visar <b>alla %{n}</b> utav %{model}"
+      multiple: "Visar %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b> av <b>%{total}</b> totalt"
+    any: "Någon"
+    blank_slate:
+      content: "Finns ingen %{resource_name} än."
+      link: "Skapa en"

data/lib/active_admin/resource/naming.rb

@@ -33,14 +33,18 @@ module ActiveAdmin
         else
           # Check if we have a translation available otherwise pluralize
           begin
-            I18n.translate!("activerecord.models.#{resource.model_name.downcase}")
+            I18n.translate!("activerecord.models.#{resource.model_name.underscore}")
             resource.model_name.human(:count => 3)
           rescue I18n::MissingTranslationData
             resource_name.pluralize
           end
         end
       end
-
+      
+      # Returns the plural and underscored version of this resource. Useful for element id's.
+      def plural_underscored_resource_name
+        plural_resource_name.underscore.gsub(/\s/, '_')
+      end
     end
   end
 end

data/lib/active_admin/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdmin
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

data/lib/active_admin/views/components/table_for.rb

@@ -81,7 +81,7 @@ module ActiveAdmin
       def build_table_body
         @tbody = tbody do
           # Build enough rows for our collection
-          @collection.each{|_| tr(:class => cycle('odd', 'even')) }
+          @collection.each{|_| tr(:class => cycle('odd', 'even'), :id => dom_id(_)) }
         end
       end
 

data/lib/active_admin/views/header_renderer.rb

@@ -12,7 +12,11 @@ module ActiveAdmin
       protected
 
       def title
-        content_tag 'h1', active_admin_application.site_title, :id => 'site_title'
+        if !active_admin_application.site_title_link || active_admin_application.site_title_link == ""
+          content_tag 'h1', active_admin_application.site_title, :id => 'site_title'
+        else
+          content_tag 'h1', link_to(active_admin_application.site_title, active_admin_application.site_title_link), :id => 'site_title'
+        end
       end
 
       # Renders the global navigation returned by

data/lib/active_admin/views/index_as_table.rb

@@ -94,7 +94,7 @@ module ActiveAdmin
 
       def build(page_config, collection)
         table_options = {
-          :id => active_admin_config.plural_resource_name.underscore,
+          :id => active_admin_config.plural_underscored_resource_name,
           :sortable => true,
           :class => "index_table",
           :i18n => active_admin_config.resource

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

@@ -52,8 +52,20 @@ module ActiveAdmin
 
         def build_title_bar
           div :id => "title_bar" do
+            build_titlebar_left
+            build_titlebar_right
+          end
+        end
+        
+        def build_titlebar_left
+          div :id => "titlebar_left" do
             build_breadcrumb
             build_title_tag
+          end
+        end
+        
+        def build_titlebar_right
+          div :id => "titlebar_right" do
             build_action_items
           end
         end

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

@@ -31,7 +31,7 @@ module ActiveAdmin
 
       def set_namespace_for_path
         routes_file = File.join(destination_root, "config", "routes.rb")
-        gsub_file routes_file, /devise_for :#{table_name}/, "devise_for :#{table_name}, ActiveAdmin::Devise.config"
+        gsub_file routes_file, /devise_for :#{plural_table_name}/, "devise_for :#{plural_table_name}, ActiveAdmin::Devise.config"
       end
 
       def add_default_user_to_migration

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

@@ -7,6 +7,10 @@ ActiveAdmin.setup do |config|
   #
   config.site_title = "<%= Rails.application.class.name.split("::").first.titlecase %>"
 
+  # Set the link url for the title. For example, to take 
+  # users to your main site. Defaults to no link.
+  #
+  # config.site_title_link = "/"
 
   # == Default Namespace
   #
@@ -25,7 +29,6 @@ ActiveAdmin.setup do |config|
   # Default:
   # config.default_namespace = :admin
 
-
   # == User Authentication
   #
   # Active Admin will automatically call an authentication 

data/spec/integration/memory_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+# These tests show the memory leak that is currently in Active Admin. They
+# are all marked as pending until they pass. To work on them, comment out the
+# pending method call in #it_should_not_leak
+describe "Memory Leak" do
+
+  def count_instances_of(klass)
+    count = 0
+
+    ObjectSpace.each_object do |o|
+      if o.class == klass
+        count += 1
+      end
+    end
+
+    count
+  end
+
+  def self.it_should_not_leak(klass)
+    it "should not leak #{klass}" do
+      pending
+
+      GC.start
+
+      count = count_instances_of(klass)
+
+      load_defaults!
+      GC.start
+
+      count_instances_of(klass).should == count
+    end
+  end
+
+  it_should_not_leak ActiveAdmin::Namespace
+  it_should_not_leak ActiveAdmin::Resource
+
+end

data/spec/unit/application_spec.rb

@@ -30,6 +30,15 @@ describe ActiveAdmin::Application do
     application.site_title = "New Title"
     application.site_title.should == "New Title"
   end
+  
+  it "should store the site's title link" do
+    application.site_title_link.should == ""
+  end
+
+  it "should set the site's title link" do
+    application.site_title_link = "http://www.mygreatsite.com"
+    application.site_title_link.should == "http://www.mygreatsite.com"
+  end
 
   it "should have a view factory" do
     application.view_factory.should be_an_instance_of(ActiveAdmin::ViewFactory)

data/spec/unit/arbre/context_spec.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 require 'spec_helper'
 
 describe Arbre::Context do
@@ -5,18 +6,30 @@ describe Arbre::Context do
   setup_arbre_context!
 
   before do
-    h1 # Add some HTML to the context
+    h1 "札幌市北区" # Add some HTML to the context
+  end
+
+  it "should not increment the indent_level" do
+    current_dom_context.indent_level.should == -1
   end
 
   it "should return a bytesize" do
-    current_dom_context.bytesize.should == 10
+    current_dom_context.bytesize.should == 25
   end
 
   it "should return a length" do
-    current_dom_context.length.should == 10
+    current_dom_context.length.should == 25
   end
 
-  it "should not increment the indent_level" do
-    current_dom_context.indent_level.should == -1
+  it "should delegate missing methods to the html string" do
+    current_dom_context.should respond_to(:index)
+    current_dom_context.index('<').should == 0
+  end
+
+  it "should use a cached version of the HTML for method delegation" do
+    current_dom_context.should_receive(:to_html).once.and_return("<h1>札幌市北区</h1>")
+    current_dom_context.index('<').should == 0
+    current_dom_context.index('<').should == 0
   end
+
 end

data/spec/unit/resource/naming_spec.rb

@@ -37,6 +37,17 @@ module ActiveAdmin
         config(:as => "Blog Categories").camelized_resource_name.should == "BlogCategory"
       end
     end
+    
+    describe "plural underscored resource name" do
+      before(:all) do
+        class ::CandyCane; end
+        @config = Resource.new(namespace, CandyCane, {})
+      end
+      
+      it "should return an underscored and pluralized resource name" do
+        config.plural_underscored_resource_name.should == "candy_canes"
+      end
+    end
 
     describe "resource name" do
       it "should return a pretty name" do

data/tasks/test.rake

@@ -14,7 +14,8 @@ namespace :test do
       puts
       puts "== Using Rails #{version}"
       cmd "./script/use_rails #{version}"
-      cmd "bundle exec rspec spec"
+      cmd "bundle exec rspec spec/unit"
+      cmd "bundle exec rspec spec/integration"
       cmd "bundle exec cucumber features"
     end
     cmd "./script/use_rails #{current_version}" if current_version
@@ -24,7 +25,8 @@ end
 
 # Run specs and cukes
 task :test do
-  cmd "bundle exec rspec spec"
+  cmd "bundle exec rspec spec/unit"
+  cmd "bundle exec rspec spec/integration"
   cmd "bundle exec cucumber features"
 end
 

metadata

@@ -1,111 +1,158 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: activeadmin
-version: !ruby/object:Gem::Version
-  version: 0.3.1
+version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: 
+  segments: 
+  - 0
+  - 3
+  - 2
+  version: 0.3.2
 platform: ruby
-authors:
+authors: 
 - Greg Bell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-02 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: &70245214115280 !ruby/object:Gem::Requirement
+
+date: 2011-09-23 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
         version: 3.0.0
-  type: :runtime
+  name: rails
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70245214115280
-- !ruby/object:Gem::Dependency
-  name: meta_search
-  requirement: &70245214709900 !ruby/object:Gem::Requirement
+  type: :runtime
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
         version: 0.9.2
-  type: :runtime
+  name: meta_search
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70245214709900
-- !ruby/object:Gem::Dependency
-  name: devise
-  requirement: &70245215132620 !ruby/object:Gem::Requirement
+  type: :runtime
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 1
+        - 2
         version: 1.1.2
-  type: :runtime
+  name: devise
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70245215132620
-- !ruby/object:Gem::Dependency
-  name: formtastic
-  requirement: &70245215318320 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.1.0
   type: :runtime
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
+  name: formtastic
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70245215318320
-- !ruby/object:Gem::Dependency
-  name: inherited_resources
-  requirement: &70245215317700 !ruby/object:Gem::Requirement
+  type: :runtime
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - <
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
         version: 1.3.0
-  type: :runtime
+  name: inherited_resources
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70245215317700
-- !ruby/object:Gem::Dependency
-  name: kaminari
-  requirement: &70245215297560 !ruby/object:Gem::Requirement
+  type: :runtime
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 39
+        segments: 
+        - 0
+        - 12
+        - 4
         version: 0.12.4
-  type: :runtime
+  name: kaminari
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70245215297560
-- !ruby/object:Gem::Dependency
-  name: sass
-  requirement: &70245215296960 !ruby/object:Gem::Requirement
+  type: :runtime
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 3
+        - 1
+        - 0
         version: 3.1.0
-  type: :runtime
+  name: sass
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70245215296960
-- !ruby/object:Gem::Dependency
-  name: fastercsv
-  requirement: &70245215296300 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
-  prerelease: false
-  version_requirements: *70245215296300
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: fastercsv
+  version_requirements: *id008
 description: The administration framework for Ruby on Rails.
-email:
+email: 
 - gregdbell@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .document
 - .gitignore
 - .travis.yml
@@ -137,6 +184,7 @@ files:
 - app/assets/stylesheets/active_admin/components/_comments.css.scss
 - app/assets/stylesheets/active_admin/components/_date_picker.css.scss
 - app/assets/stylesheets/active_admin/components/_flash_messages.css.scss
+- app/assets/stylesheets/active_admin/components/_tables.css.scss
 - app/assets/stylesheets/active_admin/mixins/_all.css.scss
 - app/assets/stylesheets/active_admin/mixins/_buttons.css.scss
 - app/assets/stylesheets/active_admin/mixins/_gradients.css.scss
@@ -145,6 +193,7 @@ files:
 - app/assets/stylesheets/active_admin/mixins/_rounded.css.scss
 - app/assets/stylesheets/active_admin/mixins/_sections.css.scss
 - app/assets/stylesheets/active_admin/mixins/_shadows.css.scss
+- app/assets/stylesheets/active_admin/mixins/_utilities.scss
 - app/assets/stylesheets/active_admin/mixins/_variables.css.scss
 - app/views/active_admin/dashboard/index.html.arb
 - app/views/active_admin/devise/mailer/reset_password_instructions.html.erb
@@ -267,15 +316,18 @@ files:
 - lib/active_admin/helpers/settings.rb
 - lib/active_admin/iconic.rb
 - lib/active_admin/iconic/icons.rb
+- lib/active_admin/locales/bg.yml
 - lib/active_admin/locales/cs.yml
 - lib/active_admin/locales/da.yml
 - lib/active_admin/locales/en.yml
 - lib/active_admin/locales/es.yml
 - lib/active_admin/locales/fr.yml
 - lib/active_admin/locales/it.yml
+- lib/active_admin/locales/ja.yml
 - lib/active_admin/locales/pl.yml
 - lib/active_admin/locales/pt-BR.yml
 - lib/active_admin/locales/ru.yml
+- lib/active_admin/locales/sv-SE.yml
 - lib/active_admin/locales/zh_cn.yml
 - lib/active_admin/menu.rb
 - lib/active_admin/menu_item.rb
@@ -368,6 +420,7 @@ files:
 - spec/integration/belongs_to_spec.rb
 - spec/integration/default_namespace.rb
 - spec/integration/javascript_spec.rb
+- spec/integration/memory_spec.rb
 - spec/integration/stylesheets_spec.rb
 - spec/spec_helper.rb
 - spec/support/detect_rails_version.rb
@@ -439,35 +492,38 @@ files:
 - tasks/yard.rake
 homepage: http://activeadmin.info
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -256188017324891804
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -256188017324891804
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: The administration framework for Ruby on Rails.
-test_files:
+test_files: 
 - features/comments/commenting.feature
 - features/comments/viewing_index.feature
 - features/dashboard.feature
@@ -519,6 +575,7 @@ test_files:
 - spec/integration/belongs_to_spec.rb
 - spec/integration/default_namespace.rb
 - spec/integration/javascript_spec.rb
+- spec/integration/memory_spec.rb
 - spec/integration/stylesheets_spec.rb
 - spec/spec_helper.rb
 - spec/support/detect_rails_version.rb