Ticket #7544: routing.patch

test/controller/routing_test.rb

@@ -13 +13 @@
-  end
-end
-
+class UriReservedCharactersRoutingTest < Test::Unit::TestCase
+  # See RFC 3986, section 2.2 Reserved Characters
+  
+  def setup
+    ActionController::Routing.use_controllers! ['controller']
+    @set = ActionController::Routing::RouteSet.new
+    @set.draw do |map|
+      map.connect ':controller/:action/:var'
+    end
+  end
+  
+  def test_should_escape_reserved_uri_characters_within_individual_path_components
+    assert_equal '/controller/action/p1%3Ap2', @set.generate(:controller => 'controller', :action => 'action', :var => 'p1:p2')
+    assert_equal '/controller/action/p1%2Fp2', @set.generate(:controller => 'controller', :action => 'action', :var => 'p1/p2')
+    assert_equal '/controller/action/p1%3Fp2', @set.generate(:controller => 'controller', :action => 'action', :var => 'p1?p2')
+    assert_equal '/controller/action/p1%23p2', @set.generate(:controller => 'controller', :action => 'action', :var => 'p1#p2')
+    assert_equal '/controller/action/p1%5Bp2', @set.generate(:controller => 'controller', :action => 'action', :var => 'p1[p2')
+    assert_equal '/controller/action/p1%5Dp2', @set.generate(:controller => 'controller', :action => 'action', :var => 'p1]p2')
+    assert_equal '/controller/action/p1%40p2', @set.generate(:controller => 'controller', :action => 'action', :var => 'p1@p2')
+  end
+  
+  def test_should_recognize_escaped_path_component_and_unescape
+    expected_options = {:var => "p1:p2", :controller => "controller", :action => "action"}
+    assert_equal expected_options, @set.recognize_path('/controller/action/p1%3Ap2')
+    expected_options = {:var => "p1/p2", :controller => "controller", :action => "action"}
+    assert_equal expected_options, @set.recognize_path('/controller/action/p1%2Fp2')
+    expected_options = {:var => "p1?p2", :controller => "controller", :action => "action"}
+    assert_equal expected_options, @set.recognize_path('/controller/action/p1%3Fp2')
+    expected_options = {:var => "p1#p2", :controller => "controller", :action => "action"}
+    assert_equal expected_options, @set.recognize_path('/controller/action/p1%23p2')
+    expected_options = {:var => "p1[p2", :controller => "controller", :action => "action"}
+    assert_equal expected_options, @set.recognize_path('/controller/action/p1%5Bp2')
+    expected_options = {:var => "p1]p2", :controller => "controller", :action => "action"}
+    assert_equal expected_options, @set.recognize_path('/controller/action/p1%5Dp2')
+    expected_options = {:var => "p1@p2", :controller => "controller", :action => "action"}
+    assert_equal expected_options, @set.recognize_path('/controller/action/p1%40p2')
+  end
+  
+end
+
-class LegacyRouteSetTests < Test::Unit::TestCase
-  attr_reader :rs
-  def setup
@@ -1514 +1554 @@
-    end
-
-    assert_equal({:controller => 'pages', :action => 'show', :id => '10'}, set.recognize_path('/page/10'))
-+
+ 
-  end
-
-  def test_recognize_with_conditions

lib/action_controller/routing.rb

@@ -412 +412 @@
-      def recognition_extraction
-        next_capture = 1
-        extraction = segments.collect do |segment|
- next_capture
+(next_capture)
-          next_capture += Regexp.new(segment.regexp_chunk).number_of_captures
-          x
-        end
@@ -694 +694 @@
-      end
-  
-      def interpolation_chunk
-UR
+CG
-      end
-  
-      def string_structure(prior_segments)
@@ -725 +725 @@
-        optional? ? Regexp.optionalize(pattern) : pattern
-      end
-      def match_extraction(next_capture)
-        hangon = (default ? "|| #{default.inspect}" : "if match[#{next_capture}]")
-        
-        # All non code-related keys (such as :id, :slug) have to be unescaped as other CGI params
-
+
+
+
-      end
-  
-      def optionality_implied?
@@ -1292 +1292 @@
-      end
-  
-      def recognize_path(path, environment={})
-        path = URI.unescape(path)
-        routes.each do |route|
-          result = route.recognize(path, environment) and return result
-        end