joshbuddy-usher 0.4.10 → 0.4.11

data/README.rdoc

@@ -57,6 +57,15 @@ But not
 As well, the same logic applies for * variables as well, where only parts matchable by the supplied regex will
 actually be bound to the variable
 
+Variables can also have a greedy regex matcher. These matchers ignore all delimiters, and continue matching for as long as much as their 
+regex allows.
+
+<b>Example:</b>
+<tt>/product/{!id,hello/world|hello}</tt> would match
+
+* <tt>/product/hello/world</tt>
+* <tt>/product/hello</tt>
+
 ==== Static
 
 Static parts of literal character sequences. For instance, <tt>/path/something.html</tt> would match only the same path.

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 10
+:patch: 11
 :major: 0
 :minor: 4

data/lib/usher.rb

@@ -125,6 +125,15 @@ class Usher
   # As well, the same logic applies for * variables as well, where only parts matchable by the supplied regex will
   # actually be bound to the variable
   #
+  # Variables can also have a greedy regex matcher. These matchers ignore all delimiters, and continue matching for as long as much as their 
+  # regex allows.
+  #
+  # <b>Example:</b>
+  # <tt>/product/{!id,hello/world|hello}</tt> would match
+  # 
+  # * <tt>/product/hello/world</tt>
+  # * <tt>/product/hello</tt>
+  #
   # ==== Static
   #
   # Static parts of literal character sequences. For instance, <tt>/path/something.html</tt> would match only the same path.

data/spec/private/recognize_spec.rb

@@ -99,6 +99,14 @@ describe "Usher route recognition" do
     route_set.recognize(build_request({:method => 'get', :path => '/test/part/one/more/time'})).params.should == [[:test, 'one/more/time']]
   end
 
+  it "should recgonize a greedy regex that matches across / and not" do
+    target_route = route_set.add_route('/test/part/{!test,one/more|one}')
+    route_set.recognize(build_request({:method => 'get', :path => '/test/part/one/more'})).path.route.should == target_route
+    route_set.recognize(build_request({:method => 'get', :path => '/test/part/one/more'})).params.should == [[:test, 'one/more']]
+    route_set.recognize(build_request({:method => 'get', :path => '/test/part/one'})).path.route.should == target_route
+    route_set.recognize(build_request({:method => 'get', :path => '/test/part/one'})).params.should == [[:test, 'one']]
+  end
+
   it "should recgonize a greedy regex single variable with static parts after" do
     target_route = route_set.add_route('/test/part/{!test,one/more/time}/help')
     route_set.recognize(build_request({:method => 'get', :path => '/test/part/one/more/time/help'})).path.route.should == target_route

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: joshbuddy-usher
 version: !ruby/object:Gem::Version 
-  version: 0.4.10
+  version: 0.4.11
 platform: ruby
 authors: 
 - Joshua Hull