Ticket #7633: pass_resource_id_requirements_to_member_actions.diff

actionpack/lib/action_controller/resources.rb

@@ -63 +63 @@
-        @requirements   ||= @options[:requirements] || {}
-        @id_requirement ||= { :id => @requirements.delete(:id) || /[^#{Routing::SEPARATORS.join}]+/ }
-        
-with_id
+(with_id && !self.kind_of?(SingletonResource))
-      end
-      
-      def path
@@ -444 +444 @@
-      def map_member_actions(map, resource)
-        resource.member_methods.each do |method, actions|
-          actions.each do |action|
-
+, true
-            map.named_route("#{resource.name_prefix}#{action}_#{resource.singular}", "#{resource.member_path}/#{action}", action_options)
-            map.named_route("formatted_#{resource.name_prefix}#{action}_#{resource.singular}", "#{resource.member_path}/#{action}.:format",action_options)
-          end
-        end
-
-
+, nil, true
-        map.named_route("#{resource.name_prefix}#{resource.singular}", resource.member_path, show_action_options)
-        map.named_route("formatted_#{resource.name_prefix}#{resource.singular}", "#{resource.member_path}.:format", show_action_options)
-
-
+, nil, true
-        map.connect(resource.member_path, update_action_options)
-        map.connect("#{resource.member_path}.:format", update_action_options)
-
-
+, nil, true
-        map.connect(resource.member_path, destroy_action_options)
-        map.connect("#{resource.member_path}.:format", destroy_action_options)
-      end
@@ -467 +467 @@
-        { :conditions => method == :any ? {} : { :method => method } }
-      end
-
-
+, require_id = false
-        default_options = { :action => action.to_s }
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-        end
+        
+        default_options.merge(conditions_for(method)).merge(resource.requirements(require_id))
-      end
-  end
-end

actionpack/test/controller/resources_test.rb

@@ -81 +81 @@
-    end
-  end
-  
+  def test_irregular_id_requirements_should_get_passed_to_member_actions
+    expected_options = {:controller => 'messages', :action => 'custom', :id => '1.1.1'}
+    
+    with_restful_routing(:messages, :member => {:custom => :get}, :requirements => {:id => /[0-9]\.[0-9]\.[0-9]/}) do
+      assert_recognizes(expected_options, :path => 'messages/1.1.1/custom', :method => :get)
+    end
+  end
+  
-  def test_with_path_prefix_requirements
-    expected_options = {:controller => 'messages', :action => 'show', :thread_id => '1.1.1', :id => '1'}
-    with_restful_routing :messages, :path_prefix => '/thread/:thread_id', :requirements => {:thread_id => /[0-9]\.[0-9]\.[0-9]/} do