Rename new method to_path to to_partial_path to avoid conflicts with File#to_path and similar.

6 files changed, 18 insertions, 18 deletions

diff --git a/activemodel/CHANGELOG b/activemodel/CHANGELOG
index 597f5ab395..9b7d2d026d 100644
--- a/activemodel/CHANGELOG
+++ b/activemodel/CHANGELOG
@@ -1,4 +1,4 @@
-* Deprecate "Model.model_name.partial_path" in favor of "model.to_path" [Grant Hutchins, Peter Jaros]
+* Deprecate "Model.model_name.partial_path" in favor of "model.to_partial_path" [Grant Hutchins, Peter Jaros]
 
 * Provide mass_assignment_sanitizer as an easy API to replace the sanitizer behavior. Also support both :logger (default) and :strict sanitizer behavior [Bogdan Gusiev]
 
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
diff --git a/activemodel/test/cases/conversion_test.rb b/activemodel/test/cases/conversion_test.rb
index 2eccc4e56d..24552bcaf2 100644
--- a/activemodel/test/cases/conversion_test.rb
+++ b/activemodel/test/cases/conversion_test.rb
@@ -25,8 +25,8 @@ class ConversionTest < ActiveModel::TestCase
   end
 
   test "to_path default implementation returns a string giving a relative path" do
-    assert_equal "contacts/contact", Contact.new.to_path
-    assert_equal "helicopters/helicopter", Helicopter.new.to_path,
-      "ActiveModel::Conversion#to_path caching should be class-specific"
+    assert_equal "contacts/contact", Contact.new.to_partial_path
+    assert_equal "helicopters/helicopter", Helicopter.new.to_partial_path,
+      "ActiveModel::Conversion#to_partial_path caching should be class-specific"
   end
 end
diff --git a/activemodel/test/cases/naming_test.rb b/activemodel/test/cases/naming_test.rb
index bafe4f3c0c..1777ce2aae 100644
--- a/activemodel/test/cases/naming_test.rb
+++ b/activemodel/test/cases/naming_test.rb
@@ -26,7 +26,7 @@ class NamingTest < ActiveModel::TestCase
   end
 
   def test_partial_path
-    assert_deprecated(/#partial_path.*#to_path/) do
+    assert_deprecated(/#partial_path.*#to_partial_path/) do
       assert_equal 'post/track_backs/track_back', @model_name.partial_path
     end
   end
@@ -58,7 +58,7 @@ class NamingWithNamespacedModelInIsolatedNamespaceTest < ActiveModel::TestCase
   end
 
   def test_partial_path
-    assert_deprecated(/#partial_path.*#to_path/) do
+    assert_deprecated(/#partial_path.*#to_partial_path/) do
       assert_equal 'blog/posts/post', @model_name.partial_path
     end
   end
@@ -102,7 +102,7 @@ class NamingWithNamespacedModelInSharedNamespaceTest < ActiveModel::TestCase
   end
 
   def test_partial_path
-    assert_deprecated(/#partial_path.*#to_path/) do
+    assert_deprecated(/#partial_path.*#to_partial_path/) do
       assert_equal 'blog/posts/post', @model_name.partial_path
     end
   end
@@ -142,7 +142,7 @@ class NamingWithSuppliedModelNameTest < ActiveModel::TestCase
   end
 
   def test_partial_path
-    assert_deprecated(/#partial_path.*#to_path/) do
+    assert_deprecated(/#partial_path.*#to_partial_path/) do
       assert_equal 'articles/article', @model_name.partial_path
     end
   end