Browse files

Merge pull request #1169 from senny/specify_a_custom_active_model_name

Specify the name to be used for ActiveModel::Name fixes #1168
  • Loading branch information...
2 parents 499825e + e5429b7 commit 19ee8413deee4bf202e87d53bf6d99b24a795ac8 @josevalim josevalim committed May 20, 2011
Showing with 41 additions and 3 deletions.
  1. +3 −2 activemodel/lib/active_model/naming.rb
  2. +38 −1 activemodel/test/cases/naming_test.rb
View
5 activemodel/lib/active_model/naming.rb
@@ -7,8 +7,9 @@ class Name < String
attr_reader :singular, :plural, :element, :collection, :partial_path, :route_key, :param_key, :i18n_key
alias_method :cache_key, :collection
- def initialize(klass, namespace = nil)
- super(klass.name)
+ def initialize(klass, namespace = nil, name = nil)
+ name ||= klass.name
+ super(name)
@unnamespaced = self.sub(/^#{namespace.name}::/, '') if namespace
@klass = klass
View
39 activemodel/test/cases/naming_test.rb
@@ -114,6 +114,44 @@ def test_param_key
end
end
+class NamingWithSuppliedModelNameTest < ActiveModel::TestCase
+ def setup
+ @model_name = ActiveModel::Name.new(Blog::Post, nil, 'Article')
+ end
+
+ def test_singular
+ assert_equal 'article', @model_name.singular
+ end
+
+ def test_plural
+ assert_equal 'articles', @model_name.plural
+ end
+
+ def test_element
+ assert_equal 'article', @model_name.element
+ end
+
+ def test_collection
+ assert_equal 'articles', @model_name.collection
+ end
+
+ def test_partial_path
+ assert_equal 'articles/article', @model_name.partial_path
+ end
+
+ def test_human
+ 'Article'
+ end
+
+ def test_route_key
+ assert_equal 'articles', @model_name.route_key
+ end
+
+ def test_param_key
+ assert_equal 'article', @model_name.param_key
+ end
+end
+
class NamingHelpersTest < Test::Unit::TestCase
def setup
@klass = Contact
@@ -171,4 +209,3 @@ def method_missing(method, *args)
ActiveModel::Naming.send(method, *args)
end
end
-

0 comments on commit 19ee841

Please sign in to comment.