activeadmin 0.4.1 → 0.4.2

data/CHANGELOG.md

@@ -1,29 +1,51 @@
 ## Master (unreleased)
 
+## 0.4.2
+
+### Enhancements
+
+* [#822][]: Automatically include js and css to precompile list ([@jschwindt][])
+* [#1033][]: Site title accepts a proc that is rendered in the context
+         of the view ([@pcreux][])
+* [#70][]: Form blocks are now rendered within the context of the view ([@gregbell][])
+* [#70][]: Filter's collections are now eval'd in the context of the view ([@gregbell][])
+* [#1032][]: The html body now includes a class for the namespace name ([@mattvague][])
+* [#1013][]: Hide the count from one specific scope using `:show_count => false`
+         ([@latortuga][])
+
+### Bug Fixes
+
+* [#34][]: Comments now work with models using string ids ([@jancel][])
+* [#1041][]: When `table_for` collection is empty it no longer outputs
+         a blank array in Ruby 1.9 ([@jancel][], [#1016][])
+* [#983][]: Fixed compatibility with pry-rails ([@pcreux][])
+* [#409][]: Install generator handles custom class names for user ([@gregbell][])
+
+
 ## 0.4.1
 
 ### Enhancements
 
-* #865: Pages support the `#page_action` to add custom controller actions
-        to a page (@BoboFraggins)
+* [#865][]: Pages support the `#page_action` to add custom controller actions
+        to a page ([@BoboFraggins][])
 * Columns component now supports column spans, max and min widths ([@gregbell][])
-* #497: Custom pagination settings per resource (@pcreux)
-* #993: Login form now focuses on email (@mattvague)
-* #865: Add `:if` support to sidebar sections (@BoboFraggins)
-* #865: Added `:scope_count => false` to the index to hide scope counts
-        in generated scopes (@BoboFraggins)
+* [#497][]: Custom pagination settings per resource ([@pcreux][])
+* [#993][]: Login form now focuses on email ([@mattvague][])
+* [#865][]: Add `:if` support to sidebar sections ([@BoboFraggins][])
+* [#865][]: Added `:scope_count => false` to the index to hide scope counts
+        in generated scopes ([@BoboFraggins][])
 
 ### Bug Fixes
 
-* #101: Global nav now works with RackBaseURI ([@gregbell][])
-* #960: Global nav works when scoped in rails routes ([@gregbell][])
-* #994: Fix index page check collection.limit(1).exists? causes exception when
-        ordering by virtual colum (@latortuga, @gregbell)
-* #971: Fix SQL when sorting tables with a column named "group" (@ggilder)
+* [#101][]: Global nav now works with RackBaseURI ([@gregbell][])
+* [#960][]: Global nav works when scoped in rails routes ([@gregbell][])
+* [#994][]: Fix index page check collection.limit(1).exists? causes exception when
+        ordering by virtual colum ([@latortuga][], [@gregbell][])
+* [#971][]: Fix SQL when sorting tables with a column named "group" ([@ggilder][])
 
 ### Dependencies
 
-* #978: Support for Inherited Resources 1.3.0 (@fabiormoura)
+* [#978][]: Support for Inherited Resources 1.3.0 ([@fabiormoura][])
 
 ### Contributors
 
@@ -112,7 +134,7 @@ since we've changed both the CSS and JS files.
 * [#869][]: Upgraded Kaminari to >= 0.13.0 and added support for
   `Kaminari.config.page_method_name`. Active Admin should now be happy if
   `will_paginate` is installed with it. ([@j][]-manu)
-* #931: Support for Rails 3.2 added (@mperham)
+* [#931][]: Support for Rails 3.2 added ([@mperham][])
 
 ### Contributors
 
@@ -421,6 +443,7 @@ of the highlights. 250 commits. Enough said.
 [#28]: https://github.com/gregbell/active_admin/issues/28
 [#31]: https://github.com/gregbell/active_admin/issues/31
 [#32]: https://github.com/gregbell/active_admin/issues/32
+[#34]: https://github.com/gregbell/active_admin/issues/34
 [#38]: https://github.com/gregbell/active_admin/issues/38
 [#42]: https://github.com/gregbell/active_admin/issues/42
 [#45]: https://github.com/gregbell/active_admin/issues/45
@@ -428,12 +451,14 @@ of the highlights. 250 commits. Enough said.
 [#52]: https://github.com/gregbell/active_admin/issues/52
 [#55]: https://github.com/gregbell/active_admin/issues/55
 [#69]: https://github.com/gregbell/active_admin/issues/69
+[#70]: https://github.com/gregbell/active_admin/issues/70
 [#77]: https://github.com/gregbell/active_admin/issues/77
 [#92]: https://github.com/gregbell/active_admin/issues/92
 [#95]: https://github.com/gregbell/active_admin/issues/95
 [#96]: https://github.com/gregbell/active_admin/issues/96
 [#99]: https://github.com/gregbell/active_admin/issues/99
 [#100]: https://github.com/gregbell/active_admin/issues/100
+[#101]: https://github.com/gregbell/active_admin/issues/101
 [#110]: https://github.com/gregbell/active_admin/issues/110
 [#122]: https://github.com/gregbell/active_admin/issues/122
 [#131]: https://github.com/gregbell/active_admin/issues/131
@@ -449,10 +474,12 @@ of the highlights. 250 commits. Enough said.
 [#332]: https://github.com/gregbell/active_admin/issues/332
 [#369]: https://github.com/gregbell/active_admin/issues/369
 [#381]: https://github.com/gregbell/active_admin/issues/381
+[#409]: https://github.com/gregbell/active_admin/issues/409
 [#428]: https://github.com/gregbell/active_admin/issues/428
 [#468]: https://github.com/gregbell/active_admin/issues/468
 [#470]: https://github.com/gregbell/active_admin/issues/470
 [#496]: https://github.com/gregbell/active_admin/issues/496
+[#497]: https://github.com/gregbell/active_admin/issues/497
 [#505]: https://github.com/gregbell/active_admin/issues/505
 [#527]: https://github.com/gregbell/active_admin/issues/527
 [#551]: https://github.com/gregbell/active_admin/issues/551
@@ -472,8 +499,23 @@ of the highlights. 250 commits. Enough said.
 [#751]: https://github.com/gregbell/active_admin/issues/751
 [#758]: https://github.com/gregbell/active_admin/issues/758
 [#780]: https://github.com/gregbell/active_admin/issues/780
+[#822]: https://github.com/gregbell/active_admin/issues/822
+[#865]: https://github.com/gregbell/active_admin/issues/865
 [#869]: https://github.com/gregbell/active_admin/issues/869
 [#897]: https://github.com/gregbell/active_admin/issues/897
+[#931]: https://github.com/gregbell/active_admin/issues/931
+[#960]: https://github.com/gregbell/active_admin/issues/960
+[#971]: https://github.com/gregbell/active_admin/issues/971
+[#978]: https://github.com/gregbell/active_admin/issues/978
+[#983]: https://github.com/gregbell/active_admin/issues/983
+[#993]: https://github.com/gregbell/active_admin/issues/993
+[#994]: https://github.com/gregbell/active_admin/issues/994
+[#1013]: https://github.com/gregbell/active_admin/issues/1013
+[#1016]: https://github.com/gregbell/active_admin/issues/1016
+[#1032]: https://github.com/gregbell/active_admin/issues/1032
+[#1033]: https://github.com/gregbell/active_admin/issues/1033
+[#1041]: https://github.com/gregbell/active_admin/issues/1041
+[@BoboFraggins]: https://github.com/BoboFraggins
 [@DMajrekar]: https://github.com/DMajrekar
 [@ZequeZ]: https://github.com/ZequeZ
 [@bobbytables]: https://github.com/bobbytables
@@ -483,15 +525,21 @@ of the highlights. 250 commits. Enough said.
 [@ebeigarts]: https://github.com/ebeigarts
 [@emzeq]: https://github.com/emzeq
 [@fabiokr]: https://github.com/fabiokr
+[@fabiormoura]: https://github.com/fabiormoura
 [@fbuenemann]: https://github.com/fbuenemann
 [@george]: https://github.com/george
+[@ggilder]: https://github.com/ggilder
 [@gregbell]: https://github.com/gregbell
 [@j]: https://github.com/j
+[@jancel]: https://github.com/jancel
 [@jbarket]: https://github.com/jbarket
+[@jschwindt]: https://github.com/jschwindt
 [@knoopx]: https://github.com/knoopx
 [@krug]: https://github.com/krug
+[@latortuga]: https://github.com/latortuga
 [@macfanatic]: https://github.com/macfanatic
 [@mattvague]: https://github.com/mattvague
+[@mperham]: https://github.com/mperham
 [@mwindwer]: https://github.com/mwindwer
 [@page_title]: https://github.com/page_title
 [@pcreux]: https://github.com/pcreux
@@ -503,4 +551,4 @@ of the highlights. 250 commits. Enough said.
 [@tricknotes]: https://github.com/tricknotes
 [@utkarshkukreti]: https://github.com/utkarshkukreti
 [@vairix]: https://github.com/vairix
-[@watson]: https://github.com/watson
+[@watson]: https://github.com/watson

data/Gemfile

@@ -29,6 +29,7 @@ end
 
 group :test do
   gem 'rspec-rails',    '~> 2.8.1'
+  gem 'cucumber', '1.1.4'
   gem 'cucumber-rails', '1.2.1'
   gem 'capybara',       '1.1.2'
   gem 'database_cleaner'

data/README.rdoc

@@ -9,6 +9,7 @@ to implement beautiful and elegant interfaces with very little effort.
 == Documentation & Support
 
 * Documentation & Guides: http://activeadmin.info/documentation.html
+* Wiki: https://github.com/gregbell/active_admin/wiki
 * RDoc: http://rubydoc.info/github/gregbell/active_admin/master/frames
 * Live demo: http://demo.activeadmin.info/admin
 * Website: http://www.activeadmin.info
@@ -33,22 +34,8 @@ 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
   gem 'activeadmin'
 
-If you are using Rails >= 3.1, you must also have sass-rails and meta_search in your Gemfile (if sass-rails is already present in assets group, move it out):
-
-  # Gemfile in Rails >= 3.1
-  gem 'activeadmin'
-  gem 'sass-rails'
-  gem 'meta_search',    '>= 1.1.0.pre'
-
-and add activeadmin assets into precompiling by adding the following line into your config/environments/production.rb:
-
-  config.assets.precompile += %w[active_admin.css active_admin.js]
-
-There is also some issue with precompiling activeadmin images in Rails 3.1.0, it is fixed in Rails 3.1.1.
-
 After updating your bundle, run the installer
 
   $> rails generate active_admin:install

data/docs/3-index-pages/index-as-table.md

@@ -15,6 +15,13 @@ column method:
       column :title
     end
 
+For association columns we make an educated guess on what to display by
+calling the following methods in the following order:
+
+    :display_name, :full_name, :name, :username, :login, :title, :email, :to_s
+
+This can be customized in config/initializers/active_admin.rb.
+
 If the default title does not work for you, pass it as the first argument:
 
     index do
@@ -53,7 +60,6 @@ Alternatively, you can create a column with custom links:
       end
     end
 
-
 ## Sorting
 
 When a column is generated from an Active Record attribute, the table is
@@ -87,4 +93,4 @@ For example, if you were using CanCan:
       if can? :manage, Post
         column :some_secret_data
       end
-    end
+    end

data/features/comments/commenting.feature

@@ -89,7 +89,7 @@ Feature: Commenting
     Then I should see a flash with "Comment wasn't saved, text was empty."
     And I should see "Comments (0)"
 
-  Scenario: Viewing all commments for a namespace
+  Scenario: Viewing all comments for a namespace
     Given a show configuration of:
       """
         ActiveAdmin.register Post
@@ -111,3 +111,16 @@ Feature: Commenting
     When I add a comment "Hello World"
     Then I should see a flash with "Comment was successfully created"
     And I should be in the resource section for users
+
+  Scenario: Commenting on a class with string id
+		Given a tag with the name "coolness" exists
+		Given a configuration of:
+		"""
+			ActiveAdmin.register Tag
+		"""
+		Given I am logged in
+		When I am on the index page for tags
+		And I follow "View"
+		When I add a comment "Tag Comment"
+		Then I should see a flash with "Comment was successfully created"
+		And I should be in the resource section for tags

data/features/index/index_scope_to.feature

@@ -27,3 +27,6 @@ Feature: Index Scope To
     Then I should see the scope "All" selected
     And I should see the scope "All" with the count 2
     And I should see 2 posts in the table
+
+    When I follow "Published"
+    Then I should see 1 posts in the table

data/features/index/index_scopes.feature

@@ -56,6 +56,19 @@ Feature: Index Scoping
     And I should see the scope "All" with no count
     And I should see 10 posts in the table
 
+  @scope
+  Scenario: Viewing resources with a scope and scope count turned off for a single scope
+    Given 10 posts exist
+    And an index configuration of:
+      """
+      ActiveAdmin.register Post do
+        scope :all, :default => true, :show_count => false
+      end
+      """
+    Then I should see the scope "All" selected
+    And I should see the scope "All" with no count
+    And I should see 10 posts in the table
+
   Scenario: Viewing resources when scoping
     Given 6 posts exist
     And 4 published posts exist

data/features/menu.feature

@@ -24,34 +24,3 @@ Feature: Menu
     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 the site title "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
-
-  Scenario: Set the site title image
-	Given a configuration of:
-	"""
-	  ActiveAdmin.application.site_title = "My Great Site"
-	  ActiveAdmin.application.site_title_image = "http://railscasts.com/assets/episodes/stills/284-active-admin.png?1316476106"
-	"""
-	When I am on the dashboard
-	And I should not see the site title "My Great Site"
-	And I should see the site title image "http://railscasts.com/assets/episodes/stills/284-active-admin.png?1316476106"
-	
-  Scenario: Set the site title image with link
-	Given a configuration of:
-	"""
-	  ActiveAdmin.application.site_title_link = "http://www.google.com"
-	  ActiveAdmin.application.site_title_image = "http://railscasts.com/assets/episodes/stills/284-active-admin.png?1316476106"
-	"""
-	When I am on the dashboard
-	And I should see the site title image "http://railscasts.com/assets/episodes/stills/284-active-admin.png?1316476106"
-	And I should see the site title image linked to "http://www.google.com"

data/features/new_page.feature

@@ -73,3 +73,26 @@ Feature: New Page
     Then I should see "Post was successfully created."
     And I should see the attribute "Title" with "Hello World"
     And I should see the attribute "Body" with "This is the body"
+
+  Scenario: Displaying fields at runtime
+    Given a configuration of:
+    """
+      ActiveAdmin.register Post do
+        form do |f|
+          f.inputs "Your Post" do
+            if current_admin_user && false
+              f.input :title
+            end
+
+            f.input :body
+          end
+          f.inputs "Publishing" do
+            f.input :published_at
+          end
+          f.buttons
+        end
+      end
+    """
+    Given I follow "New Post"
+    Then I should not see "Title"
+    And I should see "Body"

data/features/site_title.feature

@@ -0,0 +1,47 @@
+Feature: Site title
+
+  As a developer
+  In order to customize the site title
+  I want to set it in the configuration
+
+  Background:
+    Given I am logged in
+
+  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 = "/"
+    """
+    When I am on the dashboard
+    And I should see the site title "My Great Site"
+    When I follow "My Great Site"
+    Then I should see "Ruby on Rails: Welcome aboard"
+
+  Scenario: Set the site title image
+    Given a configuration of:
+    """
+      ActiveAdmin.application.site_title_image = "http://railscasts.com/assets/episodes/stills/284-active-admin.png?1316476106"
+    """
+    When I am on the dashboard
+    And I should not see the site title "My Great Site"
+    And I should see the site title image "http://railscasts.com/assets/episodes/stills/284-active-admin.png?1316476106"
+
+  Scenario: Set the site title image with link
+    Given a configuration of:
+    """
+      ActiveAdmin.application.site_title_link = "http://www.google.com"
+      ActiveAdmin.application.site_title_image = "http://railscasts.com/assets/episodes/stills/284-active-admin.png?1316476106"
+    """
+    When I am on the dashboard
+    And I should see the site title image "http://railscasts.com/assets/episodes/stills/284-active-admin.png?1316476106"
+    And I should see the site title image linked to "http://www.google.com"
+
+  Scenario: Set the site title to a proc
+    Given a configuration of:
+    """
+      ActiveAdmin.application.site_title_image = nil # Configuration is not reset between scenarios
+      ActiveAdmin.application.site_title = proc { "Hello #{controller.current_admin_user.email}" }
+    """
+    When I am on the dashboard
+    And I should see the site title "Hello admin@example.com"

data/features/step_definitions/comment_steps.rb

@@ -6,3 +6,8 @@ When /^I add a comment "([^"]*)"$/ do |comment|
   step %{I fill in "active_admin_comment_body" with "#{comment}"}
   step  %{I press "Add Comment"}
 end
+
+
+Given /^a tag with the name "([^"]*)" exists$/ do |tag_name|
+  Tag.create(:name => tag_name)
+end

data/features/step_definitions/user_steps.rb

@@ -18,9 +18,12 @@ Given /^I am logged in$/ do
 end
 
 Given /^an admin user "([^"]*)" exists$/ do |admin_email|
-  unless AdminUser.find_by_email(admin_email)
-    AdminUser.create! :email => admin_email,
-                      :password => "password",
-                      :password_confirmation => "password"
+  user = AdminUser.find_or_create_by_email :email => admin_email,
+                                           :password => "password",
+                                           :password_confirmation => "password"
+
+  unless user.persisted?
+    puts "Coult not create an admin user #{admin_email}: #{user.errors.full_messages}"
+    raise "Could not create an admin user"
   end
 end

data/lib/active_admin/arbre/builder.rb

@@ -103,10 +103,21 @@ module Arbre
       def append_return_block(tag)
         return nil if current_dom_context.children?
 
-        if !tag.is_a?(Arbre::HTML::Element) && tag.respond_to?(:to_s)
+        if appendable_return_block?(tag)
           current_dom_context << Arbre::HTML::TextNode.from_string(tag.to_s)
         end
       end
+      
+      def appendable_return_block?(tag)
+        appendable = !tag.is_a?(Arbre::HTML::Element) && tag.respond_to?(:to_s) 
+        
+        # Ruby 1.9 returns empty array as "[]"
+        if tag.respond_to?(:empty?) && tag.empty? 
+          appendable = false
+        end
+        
+        appendable
+      end
     end
 
   end

data/lib/active_admin/comments.rb

@@ -20,7 +20,7 @@ ActiveAdmin.application.view_factory.show_page.send :include, ActiveAdmin::Comme
 ActiveAdmin::Event.subscribe ActiveAdmin::Application::LoadEvent do |app|
   app.namespaces.values.each do |namespace|
     if namespace.comments?
-      namespace.register ActiveAdmin::Comment, :as => 'Comment' do
+      namespace.register ActiveAdmin::Comment, :as => "Comment" do
         actions :index, :show, :create
 
         # Don't display in the menu
@@ -60,7 +60,7 @@ ActiveAdmin::Event.subscribe ActiveAdmin::Application::LoadEvent do |app|
             create! do |success, failure|
               failure.html do 
                 resource_config = active_admin_config.namespace.resource_for(@comment.resource.class)
-                flash[:error] = "Comment wasn't saved, text was empty."
+                flash[:error] = I18n.t('active_admin.comments.errors.empty_text')
                 redirect_to send(resource_config.route_instance_path, @comment.resource)
               end
             end
@@ -69,9 +69,9 @@ ActiveAdmin::Event.subscribe ActiveAdmin::Application::LoadEvent do |app|
 
         # Display as a table
         index do
-          column("Resource"){|comment| auto_link(comment.resource) }
-          column("Author"){|comment| auto_link(comment.author) }
-          column :body
+          column(I18n.t('active_admin.comments.resource')){|comment| auto_link(comment.resource) }
+          column(I18n.t('active_admin.comments.author')){|comment| auto_link(comment.author) }
+          column(I18n.t('active_admin.comments.body')){|comment| comment.body }
         end
       end
     end

data/lib/active_admin/comments/views/active_admin_comments.rb

@@ -17,7 +17,7 @@ module ActiveAdmin
         protected
 
         def title_content
-          "Comments (#{record_comments.count})"
+          I18n.t('active_admin.comments.title_content', :count => record_comments.count)
         end
 
         def record_comments
@@ -51,7 +51,7 @@ module ActiveAdmin
 
         def build_empty_message
           span :class => "empty" do
-            "No comments yet."
+            I18n.t('active_admin.comments.no_comments_yet')
           end
         end
 
@@ -71,7 +71,7 @@ module ActiveAdmin
               form.input :body, :input_html => {:size => "80x8"}, :label => false
             end
             form.buttons do
-              form.commit_button 'Add Comment'
+              form.commit_button I18n.t('active_admin.comments.add')
             end
           end
         end

data/lib/active_admin/dependency_checker.rb

@@ -9,6 +9,10 @@ module ActiveAdmin
             warn "ActiveAdmin requires meta_search >= 1.1.0.pre and sass-rails ~> 3.1.0.rc to work with rails >= 3.1.0"
           end
         end
+
+        if pry_rails_before_0_1_6?
+          warn "ActiveAdmin is not compatible with pry-rails < 0.1.6. Please upgrade pry-rails."
+        end
       end
 
       def rails_3_1?
@@ -25,6 +29,14 @@ module ActiveAdmin
       rescue LoadError
         false
       end
+
+      def pry_rails_before_0_1_6?
+        begin
+          PryRails::VERSION < "0.1.6"
+        rescue NameError
+          false
+        end
+      end
     end
   end
 end

data/lib/active_admin/engine.rb

@@ -1,4 +1,9 @@
 module ActiveAdmin
   class Engine < Rails::Engine
+    if Rails.version > "3.1"
+      initializer "ActiveAdmin precompile hook" do |app|
+        app.config.assets.precompile += ['active_admin.js', 'active_admin.css']
+      end
+    end
   end
 end

data/lib/active_admin/inputs/filter_base.rb

@@ -21,7 +21,7 @@ module ActiveAdmin
       # Override the standard finder to accept a proc
       def collection_from_options
         if options[:collection].is_a?(Proc)
-          options[:collection].call
+          template.instance_eval(&options[:collection])
         else
           super
         end

data/lib/active_admin/locales/de.yml

@@ -42,3 +42,13 @@ de:
     blank_slate:
       content: "Es gibt noch keine %{resource_name}."
       link: "Erstellen"
+    comments:
+      body: "Inhalt"
+      author: "Autor"
+      title: "Kommentar"
+      resource: "Resource"
+      add: "Kommentar hinzufügen"
+      no_comments_yet: "Es gibt noch keine Kommentare."
+      title_content: "Kommentare (%{count})"
+      errors:
+        empty_text: "Der Kommentar wurde nicht gespeichert, da der Text fehlt."

data/lib/active_admin/locales/en.yml

@@ -42,4 +42,14 @@ en:
     any: "Any"
     blank_slate:
       content: "There are no %{resource_name} yet."
-      link: "Create one"
+      link: "Create one"
+    comments:    
+      body: "Body"
+      author: "Author"
+      title: "Comment"
+      add: "Add Comment"
+      resource: "Resource"
+      no_comments_yet: "No comments yet."
+      title_content: "Comments (%{count})"
+      errors:
+        empty_text: "Comment wasn't saved, text was empty."

data/lib/active_admin/locales/fr.yml

@@ -9,7 +9,9 @@ fr:
     delete: "Supprimer"
     delete_confirmation: "Êtes-vous certain de vouloir supprimer ceci ?"
     new_model: "Nouveau %{model}"
+    create_model: "Nouveau %{model}"
     edit_model: "Modifier %{model}"
+    update_model: "Modifier %{model}"
     delete_model: "Supprimer %{model}"
     details: "Détails de %{model}"
     cancel: "Annuler"
@@ -34,7 +36,20 @@ fr:
       one: "Affichage de <b>1</b> %{model}"
       one_page: "Affichage de <b>tous les %{n}</b> %{model}"
       multiple: "Affichage de %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b> sur un total de <b>%{total}</b>"
+      entry:
+        one: "entrée"
+        other: "entrées"
     any: "N'importe lequel"
     blank_slate:
       content: "Il n'y a pas encore de %{resource_name}."
       link: "Créez en un"
+    comments:    
+      body: "Corps"
+      author: "Auteur"
+      title: "Commentaire"
+      add: "Ajouter un commentaire"
+      resource: "Ressource"
+      no_comments_yet: "Aucun commentaire actuellement"
+      title_content: "Commentaires (%{count})"
+      errors:
+        empty_text: "Le commentaire n'a pas été enregistré puisque le texte était vide."

data/lib/active_admin/locales/zh-TW.yml

@@ -0,0 +1,45 @@
+"zh-TW":
+  active_admin:
+    dashboard: 儀表板
+    dashboard_welcome:
+      welcome: "歡迎來到 Active Admin 這是預設的儀表板頁面。"
+      call_to_action: "To add dashboard sections, checkout 'app/admin/dashboards.rb'"
+    view: "檢視"
+    edit: "編輯"
+    delete: "刪除"
+    delete_confirmation: "你確定要刪除嗎？"
+    new_model: "新增 %{model}"
+    create_model: "新增 %{model}"
+    edit_model: "編輯 %{model}"
+    update_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> 顯示 %{model} 中<b>%{from}&nbsp;-&nbsp;%{to}</b> 筆"
+      entry:
+        one: "筆"
+        other: "筆"
+    any: "任何"
+    blank_slate:
+      content: "尚無 %{resource_name}"
+      link: "建立一筆"

data/lib/active_admin/scope.rb

@@ -1,7 +1,7 @@
 module ActiveAdmin
   class Scope
 
-    attr_reader :name, :scope_method, :id, :scope_block, :display_if_block
+    attr_reader :name, :scope_method, :id, :scope_block, :display_if_block, :show_count
 
     # Create a Scope
     #
@@ -30,6 +30,7 @@ module ActiveAdmin
         @scope_block = block
       end
 
+      @show_count = options[:show_count].nil? ? true : options[:show_count]
       @display_if_block = options[:if]
     end
 

data/lib/active_admin/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdmin
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

data/lib/active_admin/view_helpers/method_or_proc_helper.rb

@@ -23,4 +23,16 @@ module MethodOrProcHelper
     end
   end
 
+  # Many configuration options (Ex: site_title, title_image) could either be
+  # static (String), methods (Symbol) or procs (Proc). This helper takes care of
+  # returning the content when String or call call_method_or_proc_on when Symbol or Proc.
+  #
+  def render_or_call_method_or_proc_on(obj, string_symbol_or_proc, options = {})
+    case string_symbol_or_proc
+    when Symbol, Proc
+      call_method_or_proc_on(obj, string_symbol_or_proc, options)
+    when String
+      string_symbol_or_proc
+    end
+  end
 end

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

@@ -38,7 +38,7 @@ module ActiveAdmin
             text_node scope_name
             span :class => 'count' do
               "(" + get_scope_count(scope).to_s + ")"
-            end if options[:scope_count]
+            end if options[:scope_count] && scope.show_count
           end
         end
       end

data/lib/active_admin/views/header_renderer.rb

@@ -13,29 +13,35 @@ module ActiveAdmin
 
       # Renders the title/branding area for the site
       def title
-        if active_admin_namespace.site_title_image.blank?
-         title_text
+        content_tag('h1', link_to_site_title(title_image_tag || title_text), :id => 'site_title')
+      end
+
+      def link_to_site_title(title_tag)
+        if active_admin_namespace.site_title_link.present?
+          link_to(title_tag, active_admin_namespace.site_title_link)
         else
-          title_image
+          title_tag
         end
       end
       
-      # Renders an image for the site's header/branding area
-      def title_image
-        if !active_admin_namespace.site_title_link.blank?
-          content_tag 'h1', link_to( image_tag(active_admin_namespace.site_title_image, :id => "site_title_image", :alt => active_admin_namespace.site_title), active_admin_namespace.site_title_link ), :id => "site_title" 
-        else
-          content_tag 'h1', image_tag( active_admin_namespace.site_title_image, :id => "site_title_image", :alt => active_admin_namespace.site_title ), :id => "site_title"
+      # @return [String] An HTML img tag with site_title_image. Return nil when
+      # site_title_image is blank.
+      def title_image_tag
+        if active_admin_namespace.site_title_image.present?
+          image_tag(title_image, 
+                    :id => "site_title_image", 
+                    :alt => active_admin_namespace.site_title)
         end
       end
-      
-      # Renders a the site's header/branding area as a string
+
+      # @return [String] The title image url
+      def title_image
+        render_or_call_method_or_proc_on(self, active_admin_namespace.site_title_image)
+      end
+
+      # @return [String] The site title
       def title_text
-        if !active_admin_namespace.site_title_link || active_admin_namespace.site_title_link == ""
-          content_tag 'h1', active_admin_namespace.site_title, :id => 'site_title'
-        else
-          content_tag 'h1', link_to(active_admin_namespace.site_title, active_admin_namespace.site_title_link), :id => 'site_title'
-        end
+        render_or_call_method_or_proc_on(self, active_admin_namespace.site_title)
       end
 
       # Renders the global navigation returned by

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

@@ -17,6 +17,7 @@ module ActiveAdmin
           @body.add_class(params[:action])
           @body.add_class(params[:controller].gsub('/', '_'))
           @body.add_class("logged_in")
+          @body.add_class(active_admin_namespace.name.to_s + "_namespace")
         end
 
         def build_active_admin_head

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

@@ -19,7 +19,9 @@ module ActiveAdmin
           if form_options[:partial]
             render(form_options[:partial])
           else
-            active_admin_form_for(resource, form_options, &form_presenter.block)
+            active_admin_form_for(resource, form_options) do |f|
+              instance_exec f, &form_presenter.block
+            end
           end
         end
 

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

@@ -2,7 +2,6 @@ module ActiveAdmin
   module Generators
     class DeviseGenerator < Rails::Generators::NamedBase
       desc "Creates an admin user and uses Devise for authentication"
-
       argument :name, :type => :string, :default => "AdminUser"
 
       class_option  :registerable, :type => :boolean, :default => false,

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

@@ -1,7 +1,8 @@
 module ActiveAdmin
   module Generators
-    class InstallGenerator < Rails::Generators::Base
+    class InstallGenerator < Rails::Generators::NamedBase
       desc "Installs Active Admin and generats the necessary migrations"
+      argument :name, :type => :string, :default => "AdminUser"
 
       hook_for :users, :default => "devise", :desc => "Admin user generator to run. Skip with --skip-users"
 
@@ -16,6 +17,7 @@ module ActiveAdmin
       end
 
       def copy_initializer
+        @underscored_user_name = name.underscore
         template 'active_admin.rb.erb', 'config/initializers/active_admin.rb'
       end
 

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

@@ -55,7 +55,7 @@ ActiveAdmin.setup do |config|
   #
   # This setting changes the method which Active Admin calls
   # within the controller.
-  config.authentication_method = :authenticate_admin_user!
+  config.authentication_method = :authenticate_<%= @underscored_user_name %>!
 
 
   # == Current User
@@ -65,7 +65,7 @@ ActiveAdmin.setup do |config|
   #
   # This setting changes the method which Active Admin calls
   # to return the currently logged in user.
-  config.current_user_method = :current_admin_user
+  config.current_user_method = :current_<%= @underscored_user_name %>
 
 
   # == Logging Out
@@ -78,7 +78,7 @@ ActiveAdmin.setup do |config|
   # will call the method to return the path.
   #
   # Default:
-  # config.logout_link_path = :destroy_admin_user_session_path
+  config.logout_link_path = :destroy_<%= @underscored_user_name %>_session_path
 
   # This setting changes the http method used when rendering the
   # link. For example :get, :delete, :put, etc..

data/lib/generators/active_admin/install/templates/migrations/1_create_admin_notes.rb

@@ -1,7 +1,8 @@
 class CreateAdminNotes < ActiveRecord::Migration
   def self.up
     create_table :admin_notes do |t|
-      t.references :resource, :polymorphic => true, :null => false
+      t.string :resource_id, :null => false
+      t.string :resource_type, :null => false
       t.references :admin_user, :polymorphic => true
       t.text :body
       t.timestamps

data/spec/support/rails_template.rb

@@ -17,6 +17,24 @@ generate :model, "publisher --migration=false --parent=User"
 generate :model, 'category name:string description:text'
 inject_into_file 'app/models/category.rb', "  has_many :posts\n", :after => "class Category < ActiveRecord::Base\n"
 
+# Generate a model with string ids
+generate :model, "tag name:string"
+gsub_file(Dir['db/migrate/*_create_tags.rb'][0], /\:tags\sdo\s.*/, ":tags, :id => false, :primary_key => :id do |t|\n\t\t\tt.string :id\n" )
+id_model_setup = <<-EOF
+  self.primary_key = :id
+  before_create :set_id
+  
+  private
+  def set_id
+    self.id = 8.times.inject("") { |s,e| s << (i = Kernel.rand(62); i += ((i < 10) ? 48 : ((i < 36) ? 55 : 61 ))).chr }
+  end
+EOF
+inject_into_file 'app/models/tag.rb', id_model_setup, :after => "class Tag < ActiveRecord::Base\n"
+
+if Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR == 1 #Rails 3.1 Gotcha
+  gsub_file 'app/models/tag.rb', /self\.primary_key.*$/, "define_attr_method :primary_key, :id"
+end
+
 # Add our local Active Admin to the load path
 inject_into_file "config/environment.rb", "\n$LOAD_PATH.unshift('#{File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'lib'))}')\nrequire \"active_admin\"\n", :after => "require File.expand_path('../application', __FILE__)"
 

data/spec/unit/arbre/html_spec.rb

@@ -215,5 +215,14 @@ HTML
 HTML
     end
   end
+  
+  it "should not render blank nodes" do
+    tbody = tbody do
+      []
+    end
+    tbody.to_s.should == <<-HTML
+<tbody></tbody>
+HTML
+  end
 
 end

data/spec/unit/comments_spec.rb

@@ -36,6 +36,19 @@ describe "Comments" do
         ActiveAdmin::Comment.find_for_resource_in_namespace(another_post, namespace_name).should == []
       end
     end
+    
+    describe "Commenting on resource with string id" do
+      let(:tag){ Tag.create!(:name => "cooltags") }
+      let(:namespace_name){ "admin" }
+      
+      it "should allow commenting" do
+        comment = ActiveAdmin::Comment.create! :resource => tag, 
+                                                :body => "Another Comment", 
+                                                :namespace => namespace_name
+                                                
+        ActiveAdmin::Comment.find_for_resource_in_namespace(tag, namespace_name).should == [comment]
+      end
+    end
   end
 
   describe ActiveAdmin::Comments::NamespaceHelper do

data/spec/unit/filter_form_builder_spec.rb

@@ -17,6 +17,10 @@ describe ActiveAdmin::ViewHelpers::FilterFormHelper do
       false
     end
 
+    def view.a_helper_method
+      "A Helper Method"
+    end
+
     view
   end
 
@@ -160,6 +164,11 @@ describe ActiveAdmin::ViewHelpers::FilterFormHelper do
           body.should have_tag("option", "Title One")
           body.should have_tag("option", "Title Two")
         end
+
+        it "should render the collection in the context of the view" do
+          body = filter(:title, :as => :select, :collection => proc{[a_helper_method]})
+          body.should have_tag("option", "A Helper Method")
+        end
       end
     end
 

data/spec/unit/form_builder_spec.rb

@@ -24,6 +24,10 @@ describe ActiveAdmin::FormBuilder do
       end
     end
 
+    def view.a_helper_method
+      "A Helper Method"
+    end
+
     view
   end
 
@@ -179,6 +183,7 @@ describe ActiveAdmin::FormBuilder do
         body.scan(/type=\"radio\"/).size.should == 2
       end
     end
+
   end
 
   context "with inputs 'for'" do

data/spec/unit/renderer_spec.rb

@@ -105,4 +105,22 @@ describe ActiveAdmin::Renderer do
       renderer.send(:call_method_or_proc_on, obj, p).should == obj.size
     end
   end
+
+  describe "#render_or_call_method_or_proc_on" do
+    let(:renderer){ Renderer.new(action_view) }
+    let(:obj){ "Hello World" }
+    it "should return nil if no symbol or proc given" do
+      renderer.send(:render_or_call_method_or_proc_on, obj, 1).should == nil
+    end
+    it "should return the string if a string is given" do
+      renderer.send(:render_or_call_method_or_proc_on, obj, "Hello!").should == "Hello!"
+    end
+    it "should call the method if a symbol is given" do
+      renderer.send(:render_or_call_method_or_proc_on, obj, :size).should == obj.size
+    end
+    it "should call the proc with the object if a proc is given" do
+      p = Proc.new{|string| string.size }
+      renderer.send(:render_or_call_method_or_proc_on, obj, p).should == obj.size
+    end
+  end
 end

data/spec/unit/scope_spec.rb

@@ -52,4 +52,18 @@ describe ActiveAdmin::Scope do
 
   end
 
+  describe "show_count" do
+
+    it "should allow setting of show_count to prevent showing counts" do
+      scope = ActiveAdmin::Scope.new(:default, nil, :show_count => false)
+      scope.show_count.should == false
+    end
+
+    it "should set show_count to true if not passed in" do
+      scope = ActiveAdmin::Scope.new(:default)
+      scope.show_count.should == true
+    end
+
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activeadmin
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Greg Bell
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-16 00:00:00 Z
+date: 2012-02-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -303,6 +303,7 @@ files:
 - features/show/default_content.feature
 - features/show/page_title.feature
 - features/sidebar_sections.feature
+- features/site_title.feature
 - features/specifying_actions.feature
 - features/step_definitions/action_item_steps.rb
 - features/step_definitions/action_link_steps.rb
@@ -407,6 +408,7 @@ files:
 - 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-TW.yml
 - lib/active_admin/locales/zh_cn.yml
 - lib/active_admin/menu.rb
 - lib/active_admin/menu_item.rb
@@ -649,6 +651,7 @@ test_files:
 - features/show/default_content.feature
 - features/show/page_title.feature
 - features/sidebar_sections.feature
+- features/site_title.feature
 - features/specifying_actions.feature
 - features/step_definitions/action_item_steps.rb
 - features/step_definitions/action_link_steps.rb