Ticket #7633: allow_regexp_for_id_in_map_resources.diff

lib/action_controller/resources.rb

@@ -389 +389 @@
-
-      def action_options_for(action, resource, method = nil)
-        default_options = { :action => action.to_s }
-
+resource.options[:id] || 
-        case default_options[:action]
-          when "index", "new" : default_options.merge(conditions_for(method || :get))
-          when "create"       : default_options.merge(conditions_for(method || :post))

test/controller/resources_test.rb

@@ -57 +57 @@
-    end
-  end
-
+  def test_irregular_id_with_no_regexp_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_regexp_should_pass
+    expected_options = {:controller => 'messages', :action => 'show', :id => '1.1.1'}
+    
+    with_restful_routing(:messages, :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
-    with_restful_routing :messages, :path_prefix => '/thread/:thread_id' do
-      assert_simply_restful_for :messages, :path_prefix => 'thread/5/', :options => { :thread_id => '5' }