joshbuddy-usher 0.4.0 → 0.4.1

data/VERSION.yml

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

data/lib/usher/node.rb

@@ -107,18 +107,42 @@ class Usher
         end
       elsif next_part = @lookup[part]
         if next_part.value.is_a?(Route::Variable)
-          part = next_part.value.transform!(part)
-          next_part.value.valid!(part)
-          var = next_part.value
-          params << [next_part.value.name, part]
-          until (path.first == var.look_ahead) || path.empty?
-            params.last.last << path.shift.to_s 
+          case next_part.value.type
+          when :*
+            params << [next_part.value.name, []] unless params.last && params.last.first == next_part.value.name
+            loop do
+              if (next_part.value.look_ahead === part || (!part.is_a?(Symbol) && !next_part.value.regex_matcher.match(part)))
+                path.unshift(part)
+                path.unshift(next_part.parent.value) if next_part.parent.value.is_a?(Symbol)
+                break
+              else
+                unless part.is_a?(Symbol)
+                  part = next_part.value.transform!(part)
+                  next_part.value.valid!(part)
+                  params.last.last << part
+                end
+              end
+              if path.size.zero?
+                break
+              else
+                part = path.shift
+              end
+            end
+            next_part.find(request, path, params)
+          when :':'
+            part = next_part.value.transform!(part)
+            next_part.value.valid!(part)
+            var = next_part.value
+            params << [next_part.value.name, part]
+            until (path.first == var.look_ahead) || path.empty?
+              params.last.last << path.shift.to_s 
+            end
+            next_part.find(request, path, params)
           end
-          next_part.find(request, path, params)
         else
           next_part.find(request, path, params)
         end
-      elsif next_part = @lookup[part] || next_part = @lookup[nil]
+      elsif next_part = @lookup[nil]
         if next_part.value.is_a?(Route::Variable)
           case next_part.value.type
           when :*

data/lib/usher/splitter.rb

@@ -53,7 +53,7 @@ class Usher
           when ?{
             pattern = ''
             count = 1
-            variable = ss.scan(/:([^,]+),/)
+            variable = ss.scan(/[:\*]([^,]+),/)
             until count.zero?
               regex_part = ss.scan(/\{|\}|[^\{\}]+/)
               case regex_part[0]
@@ -73,7 +73,6 @@ class Usher
             else
               current_group << regex
             end
-            
           when ?(
             new_group = Group.new(:any, current_group)
             current_group << new_group

data/spec/{recognize_spec.rb → private/recognize_spec.rb}

@@ -61,7 +61,7 @@ describe "Usher route recognition" do
     route_set.recognize(build_request({:method => 'get', :path => '/test/part/oooo'})).should == nil
   end
   
-  it "should recgonize a regex static part containing {}'s" do
+  it "should recgonize a regex single variable" do
     target_route = route_set.add_route('/test/part/{:test,hello|again}')
     route_set.recognize(build_request({:method => 'get', :path => '/test/part/hello'})).path.route.should == target_route
     route_set.recognize(build_request({:method => 'get', :path => '/test/part/hello'})).params.should == [[:test, 'hello']]
@@ -70,6 +70,19 @@ describe "Usher route recognition" do
     route_set.recognize(build_request({:method => 'get', :path => '/test/part/world'})).should == nil
   end
   
+  it "should recgonize a regex glob variable" do
+    target_route = route_set.add_route('/test/part/{*test,^(hello|again|\d+)$}')
+    route_set.recognize(build_request({:method => 'get', :path => '/test/part/hello/again/123/hello/again'})).path.route.should == target_route
+    route_set.recognize(build_request({:method => 'get', :path => '/test/part/hello/again/123/hello/again'})).params.should == [[:test, ['hello', 'again', '123', 'hello', 'again']]]
+    route_set.recognize(build_request({:method => 'get', :path => '/test/part/hello/agaim/123/hello/again'})).should == nil
+  end
+  
+  it "should recgonize a regex glob variable terminated by a static part" do
+    target_route = route_set.add_route('/test/part/{*test,^(hello|again|\d+)$}/onemore')
+    route_set.recognize(build_request({:method => 'get', :path => '/test/part/hello/again/123/hello/again/onemore'})).path.route.should == target_route
+    route_set.recognize(build_request({:method => 'get', :path => '/test/part/hello/again/123/hello/again/onemore'})).params.should == [[:test, ['hello', 'again', '123', 'hello', 'again']]]
+  end
+  
   it "should recgonize two glob-style variables separated by a static part" do
     target_route = route_set.add_route('/*format/innovate/*onemore')
     response = route_set.recognize(build_request({:method => 'get', :path => '/sample/html/innovate/apple'}))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: joshbuddy-usher
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Joshua Hull
@@ -57,20 +57,21 @@ files:
 - lib/usher/route.rb
 - lib/usher/splitter.rb
 - lib/usher.rb
-- spec/generate_spec.rb
-- spec/grapher_spec.rb
-- spec/path_spec.rb
-- spec/rack
-- spec/rack/dispatch_spec.rb
-- spec/rails
-- spec/rails/compat.rb
-- spec/rails/generate_spec.rb
-- spec/rails/path_spec.rb
-- spec/rails/recognize_spec.rb
-- spec/recognize_spec.rb
-- spec/request_method_spec.rb
+- spec/private
+- spec/private/generate_spec.rb
+- spec/private/grapher_spec.rb
+- spec/private/path_spec.rb
+- spec/private/rack
+- spec/private/rack/dispatch_spec.rb
+- spec/private/rails
+- spec/private/rails/compat.rb
+- spec/private/rails/generate_spec.rb
+- spec/private/rails/path_spec.rb
+- spec/private/rails/recognize_spec.rb
+- spec/private/recognize_spec.rb
+- spec/private/request_method_spec.rb
+- spec/private/split_spec.rb
 - spec/spec.opts
-- spec/split_spec.rb
 - rails/init.rb
 has_rdoc: true
 homepage: http://github.com/joshbuddy/usher