activesupport/lib/active_support/core_ext/module/model_naming.rb activesupport/test/core_ext/module/model_naming_test.rb @@ -1,19 +1,3 @@ -class Class - def model_name - @model_name ||= ModelName.new(name) - end - - class ModelName - attr_reader :singular, :plural, :path - - def initialize(name) - @singular = name.underscore.tr('/', '_').freeze - @plural = @singular.pluralize.freeze - @path = "#{name.tableize}/#{name.demodulize.underscore}".freeze - end - end -end - module ActionController # The record identifier encapsulates a number of naming conventions for dealing with records, like Active Records or # Active Resources or pretty much any other model type that has an id. These patterns are then used to try elevate @@ -59,9 +43,9 @@ module ActionController name = model_name_from_record_or_class(record_or_class) if controller_path && controller_path.include?("/") - "#{File.dirname(controller_path)}/#{name.path}" + "#{File.dirname(controller_path)}/#{name.partial_path}" else - name.path + name.partial_path end end actionpack/lib/action_controller/record_identifier.rb @@ -6,3 +6,8 @@ require 'active_support/core_ext/module/delegation' require 'active_support/core_ext/module/introspection' require 'active_support/core_ext/module/loading' require 'active_support/core_ext/module/aliasing' +require 'active_support/core_ext/module/model_naming' + +class Module + include ActiveSupport::CoreExt::Module::ModelNaming +end activesupport/lib/active_support/core_ext/module.rb c1a98209da7422965f5dd4f475603b8a3cc887e4 Jeremy Kemper jeremy jeremy@bitsweat.net http://github.com/rails/rails/commit/566d717d783f56563cd602198be2177c972c9a81 566d717d783f56563cd602198be2177c972c9a81 2008-06-06T03:38:05-07:00 2008-06-06T03:38:05-07:00 Move Class::ModelName to Active Support module core_ext ff384a6a8c8c83054ff9db6335e6a28d6433aafe Jeremy Kemper jeremy jeremy@bitsweat.net