Resource names are now titleized.

Author: pcreux

lib/active_admin/resource/naming.rb

@@ -1,14 +1,14 @@
 module ActiveAdmin
   class Resource < Config
     module Naming
-      # Returns the name to call this resource.
+      # Returns the name to call this resource such as "Bank Account"
       def resource_name
         @resource_name ||= @options[:as]
         @resource_name ||= singular_human_name
         @resource_name ||= resource.name.gsub('::',' ')
       end
 
-      # Returns the plural version of this resource
+      # Returns the plural version of this resource such as "Bank Accounts"
       def plural_resource_name
         @plural_resource_name ||= @options[:as].pluralize if @options[:as]
         @plural_resource_name ||= plural_human_name
@@ -17,18 +17,18 @@ def plural_resource_name
 
       private
 
-      # @return [String] Human name via ActiveRecord I18n or nil
+      # @return [String] Titleized human name via ActiveRecord I18n or nil
       def singular_human_name
         return nil unless resource.respond_to?(:model_name)
-        resource.model_name.human
+        resource.model_name.human.titleize
       end
 
-      # @return [String] Plural human name via ActiveRecord I18n or nil
+      # @return [String] Titleized plural human name via ActiveRecord I18n or nil
       def plural_human_name
         return nil unless resource.respond_to?(:model_name)
+
         begin
-          I18n.translate!("activerecord.models.#{resource.model_name.i18n_key}")
-          resource.model_name.human(:count => 3)
+          I18n.translate!("activerecord.models.#{resource.model_name.underscore}.other").titleize
         rescue I18n::MissingTranslationData
           nil
         end

spec/unit/resource/naming_spec.rb

@@ -34,40 +34,45 @@ module ::Mock; class Resource; end; end
 
     describe "camelized resource name" do
       it "should return a camelized version of the underscored resource name" do
-        config(:as => "Blog Category").camelized_resource_name.should == "BlogCategory"
+        config(:as => "Blog category").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
         config.resource_name.should == "Category"
       end
+
       it "should return the plural version" do
         config.plural_resource_name.should == "Categories"
       end
+
       context "when the :as option is given" do
         it "should return the custom name" do
           config(:as => "My Category").resource_name.should == "My Category"
         end
       end
-      context "I18n" do
-        before do
-          I18n.stub(:translate) { 'Categorie' }
+
+      describe "I18n integration" do
+        describe "singular name" do
+          it "should return the titleized model_name.human" do
+            Category.model_name.should_receive(:human).and_return "Da category"
+
+            config.resource_name.should == "Da Category"
+          end
         end
-        it "should return the plural version defined in the i18n if available" do
-          config.plural_resource_name.should == "Categorie"
+
+        describe "plural name" do
+          it "should return the titleized plural version defined by i18n if available" do
+            Category.model_name.should_receive(:underscore).and_return "category"
+            Category.model_name.should_not_receive(:i18n_key) # Not implemented in Rails 3.0.0
+            I18n.should_receive(:translate!).
+              with("activerecord.models.category.other").
+              and_return("Da categories")
+            config.plural_resource_name.should == "Da Categories"
+          end
         end
+
       end
     end