Ticket #7633: allow_requirements_option_in_map_resources.diff

lib/action_controller/resources.rb

@@ -11 +11 @@
-        @singular = options[:singular] || plural.to_s.singularize
-        
-        @options = options
-
+
-        arrange_actions
-        add_default_actions
-        set_prefixes
@@ -21 +21 @@
-        @controller ||= (options[:controller] || plural).to_s
-      end
-      
+      def requirements(with_id = false)
+        @requirements   ||= @options[:requirements] || {}
+        @id_requirement ||= { :id => @requirements.delete(:id) || /[^#{Routing::SEPARATORS.join}]+/ }
+        
+        with_id ? @requirements.merge(@id_requirement) : @requirements
+      end
+      
-      def path
-        @path ||= "#{path_prefix}/#{plural}"
-      end
@@ -389 +396 @@
-
-      def action_options_for(action, resource, method = nil)
-        default_options = { :action => action.to_s }
-resource.kind_of?(SingletonResource) ? {} : { :requirements => { :id => Regexp.new("[^#{Routing::SEPARATORS.join}]+") } }
+!resource.kind_of?(SingletonResource)
-        case default_options[:action]
-
-
-quire_id
-quire_id
-quire_id
-
+.merge(resource.requirements)
+.merge(resource.requirements)
+source.requirements(require_id)
+source.requirements(require_id)
+source.requirements(require_id)
+.merge(resource.requirements)
-        end
-      end
-  end

test/controller/resources_test.rb

@@ -57 +57 @@
-    end
-  end
-
+  def test_irregular_id_with_no_requirements_should_raise_error
+    expected_options = {:controller => 'messages', :action => 'show', :id => '1.1.1'}
+    
+    with_restful_routing :messages do
+      assert_raises(ActionController::RoutingError) do
+        assert_recognizes(expected_options, :path => 'messages/1.1.1', :method => :get)
+      end
+    end
+  end
+  
+  def test_irregular_id_with_requirements_should_pass
+    expected_options = {:controller => 'messages', :action => 'show', :id => '1.1.1'}
+    
+    with_restful_routing(:messages, :requirements => {:id => /[0-9]\.[0-9]\.[0-9]/}) do
+      assert_recognizes(expected_options, :path => 'messages/1.1.1', :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
+      assert_recognizes(expected_options, :path => 'thread/1.1.1/messages/1', :method => :get)
+    end
+  end
+
-  def test_with_path_prefix
-    with_restful_routing :messages, :path_prefix => '/thread/:thread_id' do
-      assert_simply_restful_for :messages, :path_prefix => 'thread/5/', :options => { :thread_id => '5' }