diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-04-22 00:33:00 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-04-22 00:33:00 -0700 |
commit | e6eb941d1bd192e1fc6f5c17cbe1944d534ca67a (patch) | |
tree | 82f3a22c0c4a2a004759767924e5dd1e29695db3 | |
parent | e9ed44af88fcffe75e1658e963e6dfb26b31edbe (diff) | |
download | rails-e6eb941d1bd192e1fc6f5c17cbe1944d534ca67a.tar.gz rails-e6eb941d1bd192e1fc6f5c17cbe1944d534ca67a.tar.bz2 rails-e6eb941d1bd192e1fc6f5c17cbe1944d534ca67a.zip |
Switch last module core extension to class reopen
-rw-r--r-- | activesupport/lib/active_support/core_ext/module.rb | 13 | ||||
-rw-r--r-- | activesupport/lib/active_support/core_ext/module/model_naming.rb | 14 |
2 files changed, 6 insertions, 21 deletions
diff --git a/activesupport/lib/active_support/core_ext/module.rb b/activesupport/lib/active_support/core_ext/module.rb index c37c9badca..fee91534e7 100644 --- a/activesupport/lib/active_support/core_ext/module.rb +++ b/activesupport/lib/active_support/core_ext/module.rb @@ -10,16 +10,3 @@ require 'active_support/core_ext/module/loading' require 'active_support/core_ext/module/model_naming' require 'active_support/core_ext/module/synchronization' require 'active_support/core_ext/module/setup' - -module ActiveSupport - module CoreExtensions - # Various extensions for the Ruby core Module class. - module Module - # Nothing here. Only defined for API documentation purposes. - end - end -end - -class Module - include ActiveSupport::CoreExtensions::Module -end diff --git a/activesupport/lib/active_support/core_ext/module/model_naming.rb b/activesupport/lib/active_support/core_ext/module/model_naming.rb index 3ec4f3ba11..004b96a3c1 100644 --- a/activesupport/lib/active_support/core_ext/module/model_naming.rb +++ b/activesupport/lib/active_support/core_ext/module/model_naming.rb @@ -10,14 +10,12 @@ module ActiveSupport @partial_path = "#{@cache_key}/#{demodulize.underscore}".freeze end end +end - module CoreExtensions - module 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 ||= ModelName.new(name) - 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 |