From b6b6e81a5c29d4adb3007659ca30e02444ad0c9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 1 Aug 2011 11:42:00 +0200
Subject: Rename new method to_path to to_partial_path to avoid conflicts with
 File#to_path and similar.

---
 activemodel/lib/active_model/conversion.rb | 10 +++++-----
 activemodel/lib/active_model/lint.rb       |  8 ++++----
 activemodel/lib/active_model/naming.rb     |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'activemodel/lib')

diff --git a/activemodel/lib/active_model/conversion.rb b/activemodel/lib/active_model/conversion.rb
index 39977f12c3..80a3ba51c3 100644
--- a/activemodel/lib/active_model/conversion.rb
+++ b/activemodel/lib/active_model/conversion.rb
@@ -4,7 +4,7 @@ require 'active_support/inflector'
 module ActiveModel
   # == Active Model Conversions
   #
-  # Handles default conversions: to_model, to_key, to_param, and to_path.
+  # Handles default conversions: to_model, to_key, to_param, and to_partial_path.
   #
   # Let's take for example this non-persisted object.
   #
@@ -54,15 +54,15 @@ module ActiveModel
 
     # Returns a string identifying the path associated with the object.
     # ActionPack uses this to find a suitable partial to represent the object.
-    def to_path
-      self.class._to_path
+    def to_partial_path
+      self.class._to_partial_path
     end
 
     module ClassMethods #:nodoc:
       # Provide a class level cache for the to_path. This is an
       # internal method and should not be accessed directly.
-      def _to_path #:nodoc:
-        @_to_path ||= begin
+      def _to_partial_path #:nodoc:
+        @_to_partial_path ||= begin
           element = ActiveSupport::Inflector.underscore(ActiveSupport::Inflector.demodulize(self))
           collection = ActiveSupport::Inflector.tableize(self)
           "#{collection}/#{element}".freeze
diff --git a/activemodel/lib/active_model/lint.rb b/activemodel/lib/active_model/lint.rb
index 08c2e5fcf3..bfe7ea1869 100644
--- a/activemodel/lib/active_model/lint.rb
+++ b/activemodel/lib/active_model/lint.rb
@@ -43,14 +43,14 @@ module ActiveModel
         assert model.to_param.nil?, "to_param should return nil when `persisted?` returns false"
       end
 
-      # == Responds to <tt>to_path</tt>
+      # == Responds to <tt>to_partial_path</tt>
       #
       # Returns a string giving a relative path.  This is used for looking up
       # partials. For example, a BlogPost model might return "blog_posts/blog_post"
       #
-      def test_to_path
-        assert model.respond_to?(:to_path), "The model should respond to to_path"
-        assert_kind_of String, model.to_path
+      def test_to_partial_path
+        assert model.respond_to?(:to_partial_path), "The model should respond to to_partial_path"
+        assert_kind_of String, model.to_partial_path
       end
 
       # == Responds to <tt>valid?</tt>
diff --git a/activemodel/lib/active_model/naming.rb b/activemodel/lib/active_model/naming.rb
index 26fa3062eb..f16459ede2 100644
--- a/activemodel/lib/active_model/naming.rb
+++ b/activemodel/lib/active_model/naming.rb
@@ -8,7 +8,7 @@ module ActiveModel
     attr_reader :singular, :plural, :element, :collection, :partial_path, :route_key, :param_key, :i18n_key
     alias_method :cache_key, :collection
 
-    deprecate :partial_path => "ActiveModel::Name#partial_path is deprecated. Call #to_path on model instances directly instead."
+    deprecate :partial_path => "ActiveModel::Name#partial_path is deprecated. Call #to_partial_path on model instances directly instead."
 
     def initialize(klass, namespace = nil, name = nil)
       name ||= klass.name
-- 
cgit v1.2.3