joshbuddy-usher 0.3.4 → 0.3.5

data/VERSION.yml

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

data/lib/usher/interface/rack_interface.rb

@@ -9,8 +9,9 @@ class Usher
       RequestMethods = [:method, :host, :port, :scheme]
       Request = Struct.new(:path, *RequestMethods)
       
-      def initialize
+      def initialize(&blk)
         @routes = Usher.new(:request_methods => RequestMethods)
+        instance_eval(&blk) if blk
       end
       
       def add(path, options = {})

data/lib/usher/interface.rb

@@ -6,14 +6,14 @@ class Usher
     autoload :MerbInterface, 'interface/merb_interface'
     autoload :RackInterface, 'interface/rack_interface'
     
-    def self.for(type)
+    def self.for(type, &blk)
       case type
       when :rails2
-        Rails2Interface.new
+        Rails2Interface.new(&blk)
       when :merb
-        MerbInterface.new
+        MerbInterface.new(&blk)
       when :rack
-        RackInterface.new
+        RackInterface.new(&blk)
       end
     end
     

data/lib/usher/node.rb

@@ -100,7 +100,11 @@ class Usher
             params.last.last << part unless part.is_a?(Symbol)
             find(request, path, params)
           when :':'
+            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
         end

data/lib/usher/route/variable.rb

@@ -2,6 +2,7 @@ class Usher
   class Route
     class Variable
       attr_reader :type, :name, :validator, :transformer
+      attr_accessor :look_ahead
       
       def initialize(type, name, opts = {})
         @type = type

data/lib/usher/splitter.rb

@@ -73,7 +73,24 @@ class Usher
             current_group << part
           end
         end unless !path || path.empty?
-        calc_paths(parts)
+        paths = calc_paths(parts)
+        paths.each do |path|
+          last_delimiter = nil
+          last_variable = nil
+          path.each do |part|
+            case part
+            when Symbol
+              last_delimiter = part
+            when Usher::Route::Variable
+              if last_variable
+                last_variable.look_ahead = last_delimiter || @delimiters.first.to_sym
+              end
+              last_variable = part
+            end
+          end
+          last_variable.look_ahead = last_delimiter || @delimiters.first.to_sym if last_variable
+        end
+        paths
       end
 
       private

data/spec/recognize_spec.rb

@@ -102,6 +102,11 @@ describe "Usher route recognition" do
     route_set.recognize(build_request({:method => 'get', :path => '/!asd,qwe/hjk$qwe/09AZaz$-_+!*\'', :domain => 'admin.host.com'})).params.rassoc('09AZaz$-_+!*\'').first.should == :id
   end
   
+  it "shouldn't care about non-primary delimiters in the path" do
+    route = route_set.add_route('/testing/:id/testing2/:id2/:id3')
+    route_set.recognize(build_request({:method => 'get', :path => '/testing/asd.qwe/testing2/poi.zxc/oiu.asd'})).params.should == [[:id, 'asd.qwe'], [:id2, 'poi.zxc'], [:id3, 'oiu.asd']]
+  end
+  
   it "should use a transformer (symbol) on incoming variables" do
     route_set.add_route('/:controller/:action/:id', :transformers => {:id => :to_i})
     route_set.recognize(build_request({:method => 'get', :path => '/products/show/123asd', :domain => 'admin.host.com'})).params.rassoc(123).first.should == :id

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: joshbuddy-usher
 version: !ruby/object:Gem::Version 
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors: 
 - Joshua Hull
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-07 00:00:00 -07:00
+date: 2009-04-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency