Changeset 4763

Timestamp:

08/15/06 02:04:11 (4 years ago)

Author:

ulysses

Message:

Relax Routing's anchor pattern warning; it was preventing use of [^{/] inside restrictions.}

Files:

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

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Relax Routing's anchor pattern warning; it was preventing use of [^/] inside restrictions. [Nicholas Seckar]
-
-* Add controller_paths variable to Routing. [Nicholas Seckar]

trunk/actionpack/lib/action_controller/routing.rb

@@ -682 +682 @@
-          if segment
-            raise TypeError, "#{key}: requirements on a path segment must be regular expressions" unless requirement.is_a?(Regexp)
-\A|\\Z|\\z|\^|\$
+A(\\A|\^)|(\\Z|\\z|\$)\Z
-              raise ArgumentError, "Regexp anchor characters are not allowed in routing requirements: #{requirement.inspect}"
-            end

trunk/actionpack/test/controller/routing_test.rb

@@ -109 +109 @@
-    assert_equal '/admin/user/foo', rs.generate(:controller => "admin/user", :admintoken => "foo", :action => "index")
-    assert_equal '/content/foo', rs.generate(:controller => "content", :action => "foo")
+  end
+
+  def test_route_with_regexp_and_dot
+    rs.draw do |map|
+      map.connect ':controller/:action/:file',
+                        :controller => /admin|user/,
+                        :action => /upload|download/,
+                        :defaults => {:file => nil},
+                        :requirements => {:file => %r{[^/]+(\.[^/]+)?}}
+    end
+    # Without a file extension
+    assert_equal '/user/download/file',
+      rs.generate(:controller => "user", :action => "download", :file => "file")
+    assert_equal(
+      {:controller => "user", :action => "download", :file => "file"},
+      rs.recognize_path("/user/download/file"))
+
+    # Now, let's try a file with an extension, really a dot (.)
+    assert_equal '/user/download/file.jpg',
+      rs.generate(
+        :controller => "user", :action => "download", :file => "file.jpg")
+    assert_equal(
+      {:controller => "user", :action => "download", :file => "file.jpg"},
+      rs.recognize_path("/user/download/file.jpg"))
-  end
-  
@@ -1010 +1034 @@
-    assert segments[7].optional?
-  end
+  
+  def test_assign_route_options_with_anchor_chars
+    segments = builder.segments_for_route_path '/cars/:action/:person/:car/'
+    defaults = {:action => 'buy', :person => nil, :car => nil}
+    requirements = {:person => /\w+/, :car => /^\w+$/}
+    
+    assert_raises ArgumentError do
+      route_requirements = builder.assign_route_options(segments, defaults, requirements)
+    end
+    
+    requirements[:car] = /[^\/]+/
+    route_requirements = builder.assign_route_options(segments, defaults, requirements)
+  end
+  
-
-  def test_optional_segments_preceding_required_segments