From 071fe79279e89e650acce6613f13027527d01650 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Tue, 24 Jun 2008 22:07:09 -0700
Subject: [PATCH] Include cache key in ModelName

---
 activerecord/lib/active_record/base.rb                    | 8 ++++----
 .../lib/active_support/core_ext/module/model_naming.rb    | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index e6ab87e8fc983..021aaf4ca1dbf 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -2170,11 +2170,11 @@ def to_param
       def cache_key
         case
         when new_record?
-          "#{self.class.name.tableize}/new"
-        when self[:updated_at]
-          "#{self.class.name.tableize}/#{id}-#{updated_at.to_s(:number)}"
+          "#{self.class.model_name.cache_key}/new"
+        when timestamp = self[:updated_at]
+          "#{self.class.model_name.cache_key}/#{id}-#{timestamp.to_s(:number)}"
         else
-          "#{self.class.name.tableize}/#{id}"
+          "#{self.class.model_name.cache_key}/#{id}"
         end
       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 26e76ab556755..abb02f1f70520 100644
--- a/activesupport/lib/active_support/core_ext/module/model_naming.rb
+++ b/activesupport/lib/active_support/core_ext/module/model_naming.rb
@@ -1,12 +1,13 @@
 module ActiveSupport
   class ModelName < String
-    attr_reader :singular, :plural, :partial_path
+    attr_reader :singular, :plural, :cache_key, :partial_path
 
     def initialize(name)
       super
       @singular = underscore.tr('/', '_').freeze
       @plural = @singular.pluralize.freeze
-      @partial_path = "#{tableize}/#{demodulize.underscore}".freeze
+      @cache_key = tableize
+      @partial_path = "#{@cache_key}/#{demodulize.underscore}".freeze
     end
   end