Refactor Naming for Config and Resource!

Note: The documentation says that when registering a resource you can
set its name doing:

```
ActiveAdmin.register Post, :as => "Article"
```

The code however was made so that the :as resource would get a
plural. For instance:

```
ActiveAdmin.register Post, :as => "Articles"
```

I fixed this. It might be worth mentioning in the release notes.

Author: pcreux

lib/active_admin/config/naming.rb

@@ -1,27 +1,35 @@
 module ActiveAdmin
   class Config
     module Naming
+      # @return [String] Example: "My Post"
       def resource_name
         raise "Subclasses of Config should implement resource_name"
       end
 
+      # @return [String] Example: "My Posts"
       def plural_resource_name
         raise "Subclasses of Config should implement plural_resource_name"
       end
 
-      def underscored_resource_name
-        raise "Subclasses of Config should implement underscored_resource_name"
-      end
-
       # A camelized safe representation for this resource
       def camelized_resource_name
-        underscored_resource_name.camelize
+        resource_name.gsub(' ', '')
+      end
+
+      def plural_camelized_resource_name
+        plural_resource_name.gsub(' ', '')
+      end
+
+      # An underscored safe representation internally for this resource
+      def underscored_resource_name
+        camelized_resource_name.underscore
       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/, '_')
+        plural_camelized_resource_name.underscore
       end
+
     end
   end
 end

lib/active_admin/page.rb

@@ -13,16 +13,8 @@ def plural_resource_name
       name
     end
 
-    # Overwrite Naming defaults as they require a resource object.
-    # @todo Refactor Naming to remove the dependency with Resources
     def resource_name
       name
     end
-
-    # Overwrite Naming defaults as they require a resource object.
-    # @todo Refactor Naming to remove the dependency with Resources
-    def underscored_resource_name
-      resource_name.underscore
-    end
   end
 end

lib/active_admin/resource/naming.rb

@@ -1,37 +1,36 @@
 module ActiveAdmin
   class Resource < Config
     module Naming
-      # An underscored safe representation internally for this resource
-      def underscored_resource_name
-        @underscored_resource_name ||= if @options[:as]
-          @options[:as].gsub(' ', '').underscore.singularize
-        else
-          resource.name.gsub('::','').underscore
-        end
-      end
-
       # Returns the name to call this resource.
-      # By default will use resource.model_name.human
       def resource_name
-        @resource_name ||= if @options[:as] || !resource.respond_to?(:model_name)
-          underscored_resource_name.titleize
-        else
-          resource.model_name.human.titleize
-        end
+        @resource_name ||= @options[:as]
+        @resource_name ||= singular_human_name
+        @resource_name ||= resource.name.gsub('::',' ')
       end
 
       # Returns the plural version of this resource
       def plural_resource_name
-        @plural_resource_name ||= if @options[:as] || !resource.respond_to?(:model_name)
-          resource_name.pluralize
-        else
-          # Check if we have a translation available otherwise pluralize
-          begin
-            I18n.translate!("activerecord.models.#{resource.model_name.underscore}")
-            resource.model_name.human(:count => 3)
-          rescue I18n::MissingTranslationData
-            resource_name.pluralize
-          end
+        @plural_resource_name ||= @options[:as].pluralize if @options[:as]
+        @plural_resource_name ||= plural_human_name
+        @plural_resource_name ||= resource_name.pluralize
+      end
+
+      private
+
+      # @return [String] Human name via ActiveRecord I18n or nil
+      def singular_human_name
+        return nil unless resource.respond_to?(:model_name)
+        resource.model_name.human
+      end
+
+      # @return [String] 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)
+        rescue I18n::MissingTranslationData
+          nil
         end
       end
     end

spec/unit/config_shared_examples.rb

@@ -29,20 +29,23 @@
       expect { config.plural_resource_name }.should_not raise_error
     end
 
-    it "implements #underscored_resource_name" do
-      expect { config.underscored_resource_name }.should_not raise_error
-    end
-
     describe "#camelized_resource_name" do
-      it "returns the underscored_resource_name camelized" do
-        config.should_receive(:underscored_resource_name).and_return "my_resource"
+      it "returns the resource_name without spaces" do
+        config.should_receive(:resource_name).and_return "My Resource"
         config.camelized_resource_name.should == "MyResource"
       end
     end
 
+    describe "#underscored_resource_name" do
+      it "returns the camelized_resource_name underscored" do
+        config.should_receive(:camelized_resource_name).and_return "MyResource"
+        config.underscored_resource_name.should == "my_resource"
+      end
+    end
+
     describe "#plural_underscored_resource_name" do
-      it "returns the plural_resource_name underscored" do
-        config.should_receive(:plural_resource_name).and_return "My Resources"
+      it "returns the plural_camelized_resource_name underscored" do
+        config.should_receive(:plural_camelized_resource_name).and_return "MyResources"
         config.plural_underscored_resource_name.should == "my_resources"
       end
     end

spec/unit/resource/naming_spec.rb

@@ -26,15 +26,15 @@ module ::Mock; class Resource; end; end
         end
       end
       context "when you pass the 'as' option" do
-        it "should underscore the passed through string and singulralize" do
-          config(:as => "Blog Categories").underscored_resource_name.should == "blog_category"
+        it "should underscore the passed through string" do
+          config(:as => "Blog Category").underscored_resource_name.should == "blog_category"
         end
       end
     end
 
     describe "camelized resource name" do
       it "should return a camelized version of the underscored resource name" do
-        config(:as => "Blog Categories").camelized_resource_name.should == "BlogCategory"
+        config(:as => "Blog Category").camelized_resource_name.should == "BlogCategory"
       end
     end