Changeset 8785

Timestamp:

02/02/08 05:57:16 (10 months ago)

Author:

bitsweat

Message:

Introduce map.resources :cards, :as => 'tarjetas' to use a custom resource name in the URL: cards_path == '/tarjetas'. Closes #10578.

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/resources.rb (modified) (4 diffs)
• trunk/actionpack/test/controller/resources_test.rb (modified) (5 diffs)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Introduce map.resources :cards, :as => 'tarjetas' to use a custom resource name in the URL: cards_path == '/tarjetas'.  #10578 [blj]
-
-* TestSession supports indifferent access.  #7372 [tamc, Arsen7, mhackett, julik, jean.helou]

trunk/actionpack/lib/action_controller/resources.rb

@@ -45 +45 @@
-    class Resource #:nodoc:
-      attr_reader :collection_methods, :member_methods, :new_methods
-
+, :path_segment
-      attr_reader :plural, :singular
-      attr_reader :options
@@ -52 +52 @@
-        @plural   ||= entities
-        @singular ||= options[:singular] || plural.to_s.singularize
+        @path_segment = options.delete(:as) || @plural
-
-        @options = options
@@ -76 +77 @@
-
-      def path
-lural
+ath_segment
-      end
-
@@ -237 +238 @@
-    # * <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>:as</tt> - specify a different resource name to use in the URL path. For example:
+    #     # products_path == '/productos'
+    #     map.resources :products, :as => 'productos' do |product|
+    #       # product_reviews_path(product) == '/productos/1234/comentarios'
+    #       product.resources :product_reviews, :as => 'comentarios'
+    #     end
+    #
-    # * <tt>:path_prefix</tt> - set a prefix to the routes with required route variables.
-    #

trunk/actionpack/test/controller/resources_test.rb

@@ -610 +610 @@
-  end
-
+  def test_with_path_segment
+    with_restful_routing :messages, :as => 'reviews' do
+      assert_simply_restful_for :messages, :as => 'reviews'
+    end
+  end
+
+  def test_multiple_with_path_segment_and_controller
+    with_routing do |set|
+      set.draw do |map|
+        map.resources :products do |products|
+          products.resources :product_reviews, :as => 'reviews', :controller => 'messages'
+        end
+        map.resources :tutors do |tutors|
+          tutors.resources :tutor_reviews, :as => 'reviews', :controller => 'comments'
+        end
+      end
+
+      assert_simply_restful_for :product_reviews, :controller=>'messages', :as => 'reviews', :name_prefix => 'product_', :path_prefix => 'products/1/', :options => {:product_id => '1'}
+      assert_simply_restful_for :tutor_reviews,:controller=>'comments', :as => 'reviews', :name_prefix => 'tutor_', :path_prefix => 'tutors/1/', :options => {:tutor_id => '1'}
+    end
+  end
+
+  def test_with_path_segment_path_prefix_requirements
+    expected_options = {:controller => 'messages', :action => 'show', :thread_id => '1.1.1', :id => '1'}
+    with_restful_routing :messages, :as => '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)
@@ -640 +669 @@
-      options[:options][:controller] = options[:controller] || controller_name.to_s
-
-
+options[:as] || 
-      member_path                = "#{collection_path}/1"
-      new_path                   = "#{collection_path}/new"
@@ -693 +722 @@
-      options[:options].delete :action
-
-
+options[:as] || 
-      name_prefix = options[:name_prefix]
-
+
-      assert_named_route "#{full_prefix}",            "#{name_prefix}#{controller_name}_path",              options[:options]
-      assert_named_route "#{full_prefix}.xml",        "formatted_#{name_prefix}#{controller_name}_path",    options[:options].merge(            :format => 'xml')
@@ -713 +742 @@
-      options[:options][:controller] = options[:controller] || singleton_name.to_s.pluralize
-
-
+options[:as] || 
-      new_path            = "#{full_path}/new"
-      edit_path           = "#{full_path}/edit"
@@ -752 +781 @@
-      options[:options].delete :action
-
-
+options[:as] || 
-      name_prefix = options[:name_prefix]
-