ActiveModel::Name does not inherit from string

2 files changed, 17 insertions, 12 deletions

diff --git a/activemodel/lib/active_model/lint.rb b/activemodel/lib/active_model/lint.rb
index a10fdefd1a..210f9a9468 100644
--- a/activemodel/lib/active_model/lint.rb
+++ b/activemodel/lib/active_model/lint.rb
@@ -78,7 +78,7 @@ module ActiveModel
       def test_model_naming
         assert model.class.respond_to?(:model_name), "The model should respond to model_name"
         model_name = model.class.model_name
-        assert_kind_of String, model_name
+        assert_kind_of ActiveModel::Name, model_name
         assert_kind_of String, model_name.human
         assert_kind_of String, model_name.singular
         assert_kind_of String, model_name.plural
diff --git a/activemodel/lib/active_model/naming.rb b/activemodel/lib/active_model/naming.rb
index b22d9539b0..a7ebf098a4 100644
--- a/activemodel/lib/active_model/naming.rb
+++ b/activemodel/lib/active_model/naming.rb
@@ -2,31 +2,36 @@ require 'active_support/inflector'
 require 'active_support/core_ext/hash/except'
 require 'active_support/core_ext/module/introspection'
 require 'active_support/core_ext/module/deprecation'
+require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/object/blank'
 
 module ActiveModel
-  class Name < String
+  class Name
+    include Comparable
+
     attr_reader :singular, :plural, :element, :collection,
-      :singular_route_key, :route_key, :param_key, :i18n_key
+      :singular_route_key, :route_key, :param_key, :i18n_key,
+      :name
 
     alias_method :cache_key, :collection
 
-    def initialize(klass, namespace = nil, name = nil)
-      name ||= klass.name
+    delegate :==, :===, :<=>, :=~, :"!~", :eql?, :to_s,
+             :to_str, :to => :name
 
-      raise ArgumentError, "Class name cannot be blank. You need to supply a name argument when anonymous class given" if name.blank?
+    def initialize(klass, namespace = nil, name = nil)
+      @name = name || klass.name
 
-      super(name)
+      raise ArgumentError, "Class name cannot be blank. You need to supply a name argument when anonymous class given" if @name.blank?
 
-      @unnamespaced = self.sub(/^#{namespace.name}::/, '') if namespace
+      @unnamespaced = @name.sub(/^#{namespace.name}::/, '') if namespace
       @klass        = klass
-      @singular     = _singularize(self).freeze
+      @singular     = _singularize(@name).freeze
       @plural       = ActiveSupport::Inflector.pluralize(@singular).freeze
-      @element      = ActiveSupport::Inflector.underscore(ActiveSupport::Inflector.demodulize(self)).freeze
+      @element      = ActiveSupport::Inflector.underscore(ActiveSupport::Inflector.demodulize(@name)).freeze
       @human        = ActiveSupport::Inflector.humanize(@element).freeze
-      @collection   = ActiveSupport::Inflector.tableize(self).freeze
+      @collection   = ActiveSupport::Inflector.tableize(@name).freeze
       @param_key    = (namespace ? _singularize(@unnamespaced) : @singular).freeze
-      @i18n_key     = self.underscore.to_sym
+      @i18n_key     = @name.underscore.to_sym
 
       @route_key          = (namespace ? ActiveSupport::Inflector.pluralize(@param_key) : @plural.dup)
       @singular_route_key = ActiveSupport::Inflector.singularize(@route_key).freeze