Changeset 7487

Timestamp:

09/15/07 22:10:20 (1 year ago)

Author:

bitsweat

Message:

Fixed optimized route segment escaping. Closes #9562.

Files:

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

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Fixed optimized route segment escaping.  #9562 [wildchild, Jeremy Kemper]
-
-* root_path returns '/' not ''.  #9563 [lifofifo]

trunk/actionpack/lib/action_controller/routing_optimisation.rb

@@ -57 +57 @@
-          idx = 0
-
-
-          if kind == :url
-            elements << '#{request.protocol}'
@@ -68 +67 @@
-          ((route.segments.size == 1 && kind == :path) ? route.segments : route.segments[0..-2]).each do |segment|
-            if segment.is_a?(DynamicSegment)
-"\#{URI.escape(args[#{idx}].to_param, ActionController::Routing::Segment::UNSAFE_PCHAR)}"
+segment.interpolation_chunk("args[#{idx}].to_param")
-              idx += 1
-            else
-to_s
+interpolation_chunk
-            end
-          end

trunk/actionpack/lib/action_controller/routing.rb

@@ -719 +719 @@
-      end
-  
-
-local_name}.to_s
+(value_code = "#{local_name}.to_s")
+value_code}
-      end
-  
@@ -777 +777 @@
-
-      # Don't URI.escape the controller name since it may contain slashes.
-
-local_name}.to_s
+(value_code = "#{local_name}.to_s")
+value_code}
-      end
-
@@ -800 +800 @@
-      UNSAFE_PCHAR = Regexp.new("[^#{URI::REGEXP::PATTERN::UNRESERVED}#{RESERVED_PCHAR}]", false, 'N').freeze
-
-
-local_name}.to_s
+(value_code = "#{local_name}.to_s")
+value_code}
-      end
-
@@ -1151 +1151 @@
-            helpers << selector
-          end
-
+
-          def define_url_helper(route, name, kind, options)
-            selector = url_helper_name(name, kind)
-            # The segment keys used for positional paramters
-
+
-            hash_access_method = hash_access_name(name, kind)
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            @module.send :module_eval, <<-end_eval # We use module_eval to avoid leaks
-              def #{selector}(*args)
-
-                #{generate_optimisation_block(route, kind)}
-
+
-                opts = if args.empty? || Hash === args.first
-                  args.first || {}
-                else
-                  # allow ordered parameters to be associated with corresponding
-                  # dynamic segments, so you can do
-                  #
-                  #   foo_url(bar, baz, bang)
-                  #
-                  # instead of
-                  #
-                  #   foo_url(:bar => bar, :baz => baz, :bang => bang)
-                  #
-                  # Also allow options hash, so you can do
-                  #
-                  #   foo_url(bar, baz, bang, :sort_by => 'baz')
-                  #
-                  options = args.last.is_a?(Hash) ? args.pop : {}
-                  args = args.zip(#{route.segment_keys.inspect}).inject({}) do |h, (v, k)|
@@ -1186 +1185 @@
-                  options.merge(args)
-                end
-
+
-                url_for(#{hash_access_method}(opts))
-              end
@@ -1194 +1193 @@
-          end
-      end
-
+
-      attr_accessor :routes, :named_routes
-  

trunk/actionpack/test/controller/routing_test.rb

@@ -274 +274 @@
-  end
-  
+  def test_paths_slashes_unescaped_with_ordered_parameters
+    rs.add_named_route :path, '/file/*path', :controller => 'content' 
+
+    # No / to %2F in URI, only for query params. 
+    x = setup_for_named_route 
+    assert_equal("/file/hello/world", x.send(:path_path, 'hello/world'))
+  end
+  
-  def test_non_controllers_cannot_be_matched
-    rs.draw do |map|