Merge commit 'rails/master'

2 files changed, 0 insertions, 26 deletions

diff --git a/activesupport/lib/active_support/core_ext/module.rb b/activesupport/lib/active_support/core_ext/module.rb
index 215c47b114..fbe89fe07c 100644
--- a/activesupport/lib/active_support/core_ext/module.rb
+++ b/activesupport/lib/active_support/core_ext/module.rb
@@ -7,5 +7,4 @@ require 'active_support/core_ext/module/attr_internal'
 require 'active_support/core_ext/module/attr_accessor_with_default'
 require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/module/loading'
-require 'active_support/core_ext/module/model_naming'
 require 'active_support/core_ext/module/synchronization'
diff --git a/activesupport/lib/active_support/core_ext/module/model_naming.rb b/activesupport/lib/active_support/core_ext/module/model_naming.rb
deleted file mode 100644
index 13420bab07..0000000000
--- a/activesupport/lib/active_support/core_ext/module/model_naming.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require 'active_support/inflector'
-
-module ActiveSupport
-  class ModelName < String
-    attr_reader :singular, :plural, :element, :collection, :partial_path
-    alias_method :cache_key, :collection
-
-    def initialize(name)
-      super
-      @singular = ActiveSupport::Inflector.underscore(self).tr('/', '_').freeze
-      @plural = ActiveSupport::Inflector.pluralize(@singular).freeze
-      @element = ActiveSupport::Inflector.underscore(ActiveSupport::Inflector.demodulize(self)).freeze
-      @collection = ActiveSupport::Inflector.tableize(self).freeze
-      @partial_path = "#{@collection}/#{@element}".freeze
-    end
-  end
-end
-
-class Module
-  # Returns an ActiveSupport::ModelName object for module. It can be
-  # used to retrieve all kinds of naming-related information.
-  def model_name
-    @model_name ||= ActiveSupport::ModelName.new(name)
-  end
-end