Ticket #10578: patch-resources-path-replace.diff

actionpack/test/controller/resources_test.rb

@@ -609 +609 @@
-    end
-  end
-
+  def test_with_path_replace
+    with_restful_routing :messages, :path_replace => 'reviews' do
+      assert_simply_restful_for :messages, :path_replace => 'reviews'
+    end
+  end
+
+  def test_multiple_with_path_replace_and_controller
+    with_routing do |set|
+      set.draw do |map|
+        map.resources :products do |products|
+          products.resources :product_reviews, :path_replace=>'reviews', :controller=>'messages'
+        end
+        map.resources :tutors do |tutors|
+          tutors.resources :tutor_reviews, :path_replace=>'reviews', :controller=>'comments'
+        end
+      end
+
+      assert_simply_restful_for :product_reviews, :controller=>'messages', :path_replace => 'reviews', :name_prefix => 'product_', :path_prefix => 'products/1/', :options => {:product_id => '1'}
+      assert_simply_restful_for :tutor_reviews,:controller=>'comments', :path_replace => 'reviews', :name_prefix => 'tutor_', :path_prefix => 'tutors/1/', :options => {:tutor_id => '1'}
+    end 
+  end
+  
+  def test_with_path_replace_path_prefix_requirements
+    expected_options = {:controller => 'messages', :action => 'show', :thread_id => '1.1.1', :id => '1'}
+    with_restful_routing :messages, :path_replace=>'comments',:path_prefix => '/thread/:thread_id', :requirements => {:thread_id => /[0-9]\.[0-9]\.[0-9]/} do
+      assert_recognizes(expected_options, :path => 'thread/1.1.1/comments/1', :method => :get)
+    end
+  end
+  
-  protected
-    def with_restful_routing(*args)
-      with_routing do |set|
@@ -639 +668 @@
-      options[:options] ||= {}
-      options[:options][:controller] = options[:controller] || controller_name.to_s
-
-
+options[:path_replace] || 
-      member_path                = "#{collection_path}/1"
-      new_path                   = "#{collection_path}/new"
-      edit_member_path           = "#{member_path}/edit"
@@ -692 +721 @@
-      get :index, options[:options]
-      options[:options].delete :action
-
-
+options[:path_replace] || 
-      name_prefix = options[:name_prefix]
-      
-      assert_named_route "#{full_prefix}",            "#{name_prefix}#{controller_name}_path",              options[:options]
@@ -712 +741 @@
-      options[:options] ||= {}
-      options[:options][:controller] = options[:controller] || singleton_name.to_s.pluralize
-
-
+options[:path_replace] || 
-      new_path            = "#{full_path}/new"
-      edit_path           = "#{full_path}/edit"
-      formatted_edit_path = "#{full_path}/edit.xml"
@@ -751 +780 @@
-      get :show, options[:options]
-      options[:options].delete :action
-
-
+options[:path_replace] || 
-      name_prefix = options[:name_prefix]
-
-      assert_named_route "#{full_path}",          "#{name_prefix}#{singleton_name}_path",                options[:options]

actionpack/lib/action_controller/resources.rb

@@ -44 +44 @@
-  module Resources
-    class Resource #:nodoc:
-      attr_reader :collection_methods, :member_methods, :new_methods
-
+, :path_replace
-      attr_reader :plural, :singular
-      attr_reader :options
-
@@ -57 +57 @@
-        arrange_actions
-        add_default_actions
-        set_prefixes
+        @path_replace = options.delete(:path_replace)
-      end
-
-      def controller
@@ -75 +76 @@
-      end
-
-      def path
-
+ath_replace || p
-      end
-
-      def new_path
@@ -236 +237 @@
-    # * <tt>:singular</tt> - specify the singular name used in the member routes.
-    # * <tt>:requirements</tt> - set custom routing parameter requirements.
-    # * <tt>:conditions</tt> - specify custom routing recognition conditions.  Resources sets the :method value for the method-specific routes.
+    # * <tt>:path_replace</tt> - specify custom path that will replace the default path based on the resource name
+    #
+    #   Use this if the path generated by the resources needs to be changed, for e.g.:
+    #
+    #     map.resources :products, :path_replace=>'productos' do |product|
+    #       product.resources :product_reviews, :path_replace => 'comentarios'
+    #     end 
+    #     map.resources :tutors, :path_replace=>'tutores' do |tutor|
+    #      product.resources :tutor_reviews, :path_replace => 'comentarios'
+    #     end 
+    #
+    #   These will yield paths like the following:
+    # 
+    #     productos/:product_id/comentarios
+    #     tutores/:tutor_id/comentarios
+    # 
-    # * <tt>:path_prefix</tt> - set a prefix to the routes with required route variables.
-    #
-    #   Weblog comments usually belong to a post, so you might use resources like: