Ticket #883: route_paths_as_arrays.3.patch

actionpack/test/controller/routing_tests.rb

@@ -329 +329 @@
-  def test_path_collection
-    route '*path_info', :controller => 'content', :action => 'fish'
-    verify_recognize'path/with/slashes',
-'path/with/slashes'
+%w(path with slashes)
-    verify_generate('path/with/slashes', {},
-       
+        
-        {})
-  end
+  def test_path_collection_with_array
+    route '*path_info', :controller => 'content', :action => 'fish'
+    verify_recognize'path/with/slashes',
+        :controller => 'content', :action => 'fish', :path_info => %w(path with slashes)
+    verify_generate('path/with/slashes', {},
+        {:controller => 'content', :action => 'fish', :path_info => %w(path with slashes)},
+        {})
+  end
+
+
-  
-  def test_special_characters
-    route ':id', :controller => 'content', :action => 'fish'

actionpack/lib/action_controller/routing.rb

@@ -47 +47 @@
-        
-        used_names = @requirements.inject({}) {|hash, (k, v)| hash[k] = true; hash} # Mark requirements as used so they don't get put in the query params
-        components = @items.collect do |item|
+
-          if item.kind_of? Symbol
-            collection = false
-
@@ -64 +65 @@
-            if value.nil? || item == :controller
-              value
-            elsif collection
-
+
+
+
+
+
+
-            else
-              Routing.extract_parameter_value(value)
-            end
@@ -113 +119 @@
-            options[:controller] = controller_class.controller_path
-            return nil, requirements_for(:controller) unless passes_requirements?(:controller, options[:controller])
-          elsif /^\*/ =~ item.to_s
-
+
+
-            components = []
-
+
+
-          elsif item.kind_of? Symbol
-            value = components.shift || @defaults[item]
-            return nil, requirements_for(item) unless passes_requirements?(item, value)