Changeset 927

Timestamp:

03/20/05 14:04:33 (4 years ago)

Author:

david

Message:

Added path collection syntax for Routes that will gobble up the rest of the url and pass it on to the controller #830 [rayners]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/routing.rb (modified) (4 diffs)
• trunk/actionpack/test/controller/routing_tests.rb (modified) (1 diff)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Added path collection syntax for Routes that will gobble up the rest of the url and pass it on to the controller #830 [rayners]. Example:
+
+    map.connect 'categories/*path_info', :controller => 'categories', :action => 'show'
+
+  A request for /categories/top-level-cat, would give @params[:path_info] with "top-level-cat".
+  A request for /categories/top-level-cat/level-1-cat, would give @params['path_info'] with "top-level-cat/level-1-cat" and so forth.
-
-* Fixed options_for_select on selected line issue #624 [Florian Weber]

trunk/actionpack/lib/action_controller/routing.rb

@@ -49 +49 @@
-        components = @items.collect do |item|
-          if item.kind_of? Symbol
+            collection = false
+
+            if /^\*/ =~ item.to_s
+              collection = true
+              item = item.to_s.sub(/^\*/,"").intern
+            end
+
-            used_names[item] = true
-            value = options[item] || defaults[item] || @defaults[item]
-            return nil, requirements_for(item) unless passes_requirements?(item, value)
+
-            defaults = {} unless defaults == {} || value == defaults[item] # Stop using defaults if this component isn't the same as the default.
-
-
+
+
+
+
+
+
+
+
+
+
-          end
-        end
@@ -97 +113 @@
-            options[:controller] = controller_class.controller_path
-            return nil, requirements_for(:controller) unless passes_requirements?(:controller, options[:controller])
+          elsif /^\*/ =~ item.to_s
+            value = components.join("/") || @defaults[item]
+            components = []
+            options[item.to_s.sub(/^\*/,"").intern] = value.nil? ? value : CGI.unescape(value)
-          elsif item.kind_of? Symbol
-            value = components.shift || @defaults[item]
@@ -143 +163 @@
-      
-        def items=(path)
-:(\w+)$/ =~ c) ? $1.intern
+(:|\*)(\w+)$/ =~ c) ? (($1 == ':' ) ? $2.intern : "*#{$2}".intern)
-          items.shift if items.first == ""
-          items.pop if items.last == ""
@@ -173 +193 @@
-        end
-        def requirements_for(name)
+          name = name.to_s.sub(/^\*/,"").intern if (/^\*/ =~ name.inspect)
-          presence = (@defaults.key?(name) && @defaults[name].nil?)
-          requirement = case @requirements[name]

trunk/actionpack/test/controller/routing_tests.rb

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