Changeset 6232

Timestamp:

02/25/07 20:13:19 (2 years ago)

Author:

david

Message:

Allow routing requirements on map.resource(s) (closes #7633) [quixoten]

Files:

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

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Allow routing requirements on map.resource(s) #7633 [quixoten]. Example:
+
+  map.resources :network_interfaces, :requirements => { :id => /^\d+\.\d+\.\d+\.\d+$/ }
-
-* Cookie session store: empty and unchanged sessions don't write a cookie.  [Jeremy Kemper]

trunk/actionpack/lib/action_controller/resources.rb

@@ -12 +12 @@
-        
-        @options = options
-
+
-        arrange_actions
-        add_default_actions
@@ -20 +20 @@
-      def controller
-        @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
-      
@@ -390 +397 @@
-      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

trunk/actionpack/test/controller/resources_test.rb

@@ -55 +55 @@
-      assert_simply_restful_for :messages
-      assert_simply_restful_for :comments
+    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