Changeset 4677

Timestamp:

08/05/06 22:12:50 (2 years ago)

Author:

ulysses

Message:

Make Routing noisy when an anchor regexp is assigned to a segment. Closes #5674

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/routing.rb (modified) (2 diffs)
• trunk/actionpack/test/controller/routing_test.rb (modified) (5 diffs)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
-
+* Make Routing noisy when an anchor regexp is assigned to a segment. #5674 [francois.beausoleil@gmail.com]
+
-* Added months and years to the resolution of DateHelper#distance_of_time_in_words, such that "60 days ago" becomes "2 months ago" #5611 [pjhyett@gmail.com]
-
+>>>>>>> .r4676
-* Short documentation to mention use of Mime::Type.register. #5710 [choonkeat@gmail.com]
-

trunk/actionpack/lib/action_controller/routing.rb

@@ -680 +680 @@
-        [defaults, requirements, conditions]
-      end
-
+    
-      # Takes a hash of defaults and a hash of requirements, and assigns them to
-      # the segments. Any unused requirements (which do not correspond to a segment)
@@ -695 +695 @@
-          if segment
-            raise TypeError, "#{key}: requirements on a path segment must be regular expressions" unless requirement.is_a?(Regexp)
+            if requirement.source =~ %r{\\A|\\Z|\\z|\^|\$}
+              raise ArgumentError, "Regexp anchor characters are not allowed in routing requirements: #{requirement.inspect}"
+            end
-            segment.regexp = requirement
-          else

trunk/actionpack/test/controller/routing_test.rb

@@ -151 +151 @@
-    rs.draw do |map|
-      map.article 'page/:year/:month/:day/:title', :controller => 'page', :action => 'show',
-^\d+$/, :month => /^\d+$/, :day => /^\d+$
+\d+/, :month => /\d+/, :day => /\d+
-      map.connect ':controller/:action/:id'
-    end
@@ -1217 +1217 @@
-      controller.send(:multi_url, 7, "hello", 5)
-  end
-
+
-  def test_draw_default_route
-    ActionController::Routing.with_controllers(['users']) do
@@ -1223 +1223 @@
-        map.connect '/:controller/:action/:id'
-      end
-
+
-      assert_equal 1, set.routes.size
-      route = set.routes.first
-
+
-      assert route.segments.last.optional?
-
+
-      assert_equal '/users/show/10', set.generate(:controller => 'users', :action => 'show', :id => 10)
-      assert_equal '/users/index/10', set.generate(:controller => 'users', :id => 10)
-
+
-      assert_equal({:controller => 'users', :action => 'index', :id => '10'}, set.recognize_path('/users/index/10'))
-      assert_equal({:controller => 'users', :action => 'index', :id => '10'}, set.recognize_path('/users/index/10/'))
-    end
-  end
-
+
-  def test_route_with_parameter_shell
-    ActionController::Routing.with_controllers(['users', 'pages']) do
@@ -1243 +1243 @@
-        map.connect '/:controller/:action/:id'
-      end
-
+
-      assert_equal({:controller => 'pages', :action => 'index'}, set.recognize_path('/pages'))
-      assert_equal({:controller => 'pages', :action => 'index'}, set.recognize_path('/pages/index'))
-      assert_equal({:controller => 'pages', :action => 'list'}, set.recognize_path('/pages/list'))
-
+
-      assert_equal({:controller => 'pages', :action => 'show', :id => '10'}, set.recognize_path('/pages/show/10'))
-      assert_equal({:controller => 'pages', :action => 'show', :id => '10'}, set.recognize_path('/page/10'))
@@ -1253 +1253 @@
-  end
-
+  def test_route_requirements_with_anchor_chars_are_invalid
+    assert_raises ArgumentError do
+      set.draw do |map|
+        map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /^\d+/
+      end
+    end
+    assert_raises ArgumentError do
+      set.draw do |map|
+        map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /\A\d+/
+      end
+    end
+    assert_raises ArgumentError do
+      set.draw do |map|
+        map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /\d+$/
+      end
+    end
+    assert_raises ArgumentError do
+      set.draw do |map|
+        map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /\d+\Z/
+      end
+    end
+    assert_raises ArgumentError do
+      set.draw do |map|
+        map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /\d+\z/
+      end
+    end
+    assert_nothing_raised do
+      set.draw do |map|
+        map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /\d+/, :name => /^(david|jamis)/
+      end
+      assert_raises ActionController::RoutingError do
+        set.generate :controller => 'pages', :action => 'show', :id => 10
+      end
+    end
+  end
+  
+  def test_non_path_route_requirements_match_all
+    set.draw do |map|
+      map.connect 'page/37s', :controller => 'pages', :action => 'show', :name => /(jamis|david)/
+    end
+    assert_equal '/page/37s', set.generate(:controller => 'pages', :action => 'show', :name => 'jamis')
+    assert_raises ActionController::RoutingError do
+      set.generate(:controller => 'pages', :action => 'show', :name => 'not_jamis')
+    end
+    assert_raises ActionController::RoutingError do
+      set.generate(:controller => 'pages', :action => 'show', :name => 'nor_jamis_and_david')
+    end
+  end
+  
-  def test_recognize_with_encoded_id_and_regex
-    set.draw do |map|
-      map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /[a-zA-Z0-9 ]+/
-    end
-
+
-    assert_equal({:controller => 'pages', :action => 'show', :id => '10'}, set.recognize_path('/page/10'))
-    assert_equal({:controller => 'pages', :action => 'show', :id => 'hello world'}, set.recognize_path('/page/hello+world'))