usher 0.7.2 → 0.7.3

data/benchmarks/generation_bm.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'rbench'
 require 'lib/usher'
+#require 'usher'
 
 u = Usher.new(:generator => Usher::Util::Generators::URL.new)
 u.add_route('/simple')                                                                                     .name(:simple)

data/lib/usher.rb

@@ -51,7 +51,7 @@ class Usher
   #     set.reset!
   #     set.empty? => true
   def reset!
-    @root = Node::Root.new(self, request_methods)
+    @root = class_for_root.new(self, request_methods)
     @named_routes = {}
     @routes = []
     @grapher = Grapher.new(self)
@@ -254,16 +254,7 @@ class Usher
   #     route = set.add_route('/test')
   #     set.recognize(Request.new('/test')).path.route == route => true
   def recognize(request, path = request.path)
-    if ignore_trailing_delimiters? and path.size > 1
-      path_size = path.size
-      path = path.gsub(/#{Regexp.quote(delimiters.first)}$/, '')
-      response = root.find(request, path, splitter.split(path))
-      response.only_trailing_delimiters = (path.size != path_size) if response
-      response
-    else
-      root.find(request, path, splitter.split(path))
-    end
-
+    root.lookup(request, path)
   end
 
   # Recognizes a `path`
@@ -396,4 +387,8 @@ class Usher
     routes.each{|r| grapher.add_route(r)}
   end
 
+  def class_for_root
+    ignore_trailing_delimiters? ? Node::RootIgnoringTrailingDelimiters : Node::Root
+  end
+  
 end

data/lib/usher/node.rb

@@ -1,4 +1,5 @@
 require File.join('usher', 'node', 'root')
+require File.join('usher', 'node', 'root_ignoring_trailing_delimiters')
 require File.join('usher', 'node', 'response')
 
 class Usher
@@ -51,6 +52,8 @@ class Usher
       out
     end
 
+    protected
+
     def find(request_object, original_path, path, params = [])
       # terminates or is partial
 

data/lib/usher/node/root.rb

@@ -26,6 +26,10 @@ class Usher
         routes
       end
 
+      def lookup(request_object, path)
+        find(request_object, path, route_set.splitter.split(path))
+      end
+      
       private
       
       def set_path_with_destination(path, destination = path)

data/lib/usher/node/root_ignoring_trailing_delimiters.rb

@@ -0,0 +1,24 @@
+class Usher
+  class Node
+    class RootIgnoringTrailingDelimiters < Root
+
+      alias_method :lookup_without_stripping, :lookup
+    
+      def initialize(route_set, request_methods)
+        super
+        @stripper = /#{Regexp.quote(route_set.delimiters.first)}$/
+      end
+    
+      def lookup(request_object, path)
+        if path.size > 1
+          new_path = path.gsub(@stripper, '')
+          response = lookup_without_stripping(request_object, new_path)
+          response.only_trailing_delimiters = (new_path.size != path.size) if response
+          response
+        else
+          lookup_without_stripping(request_object, path)
+        end
+      end
+    end
+  end
+end

data/lib/usher/route/path.rb

@@ -8,6 +8,7 @@ class Usher
       def initialize(route, parts)
         self.route = route
         self.parts = parts
+        build_generator
       end
 
       def convert_params_array(ary)
@@ -64,12 +65,81 @@ class Usher
         Path.new(route, new_parts)
       end
 
+      def generate
+        nil
+      end
+
+      def generate_from_hash(params = nil)
+        generate
+      end
+
       private
       def parts=(parts)
         @parts = parts
         @dynamic = @parts && @parts.any?{|p| p.is_a?(Variable)}
       end
-
+      
+      def build_generator
+        if parts
+          interpolating_path = ''
+        
+          parts.each_with_index do |part, index|
+            case part
+            when String
+              interpolating_path << part
+            when Static::Greedy
+              interpolating_path << part.generate_with
+            when Variable::Glob
+              interpolating_path << '#{('
+              interpolating_path << "Array(arg#{index})"
+              if part.default_value
+                interpolating_path << ' || '
+                interpolating_path << part.default_value.inspect
+              end
+              interpolating_path << ').join(route.router.delimiters.first)}'
+            when Variable
+              interpolating_path << '#{'
+              interpolating_path << "arg#{index}"
+              if part.default_value
+                interpolating_path << ' || '
+                interpolating_path << part.default_value.inspect
+              end
+              interpolating_path << '}'
+            end
+          end
+        
+          generating_method =  "def generate"
+          if dynamic?
+            generating_method << "("
+            generating_method << dynamic_indicies.map{|di| "arg#{di}"}.join(", ")
+            generating_method << ")\n"
+            dynamic_indicies.each do |di|
+              dp = parts.at(di)
+              generating_method << "@parts.at(#{di}).valid!(arg#{di})\n" if dp.validates?
+            end
+          else
+            generating_method << "\n"
+          end
+        
+          generating_method << '"'
+          generating_method << interpolating_path
+          generating_method << '"'
+          generating_method << "\nend\n\n"
+          generating_method << "def generate_from_hash(params = nil)\n"
+          generating_method << "generate("
+          if parts && dynamic?
+            generating_method << dynamic_indicies.map { |di|
+              dp = parts.at(di)
+              arg = "params && params.delete(:#{dp.name}) "
+              arg << "|| @parts.at(#{di}).default_value " if dp.default_value
+              arg << "|| raise(MissingParameterException.new(\"expected a value for #{dp.name}\"))"
+            }.join(', ')
+          end
+          generating_method << ")\nend\n\n"
+          instance_eval generating_method
+        end
+      end
+      
     end
   end
 end

data/lib/usher/route/variable.rb

@@ -2,7 +2,14 @@ class Usher
   class Route
     class Variable
 
+      module Validator
+        def validates?
+          true
+        end
+      end
+
       module ProcValidator
+        include Validator
         def valid!(val)
           begin
             @validator.call(val)
@@ -13,6 +20,7 @@ class Usher
       end
 
       module CaseEqualsValidator
+        include Validator
         def valid!(val)
           @validator === val.to_s or raise(ValidationException.new("#{val} does not conform to #{@validator}"))
         end
@@ -40,6 +48,10 @@ class Usher
       def valid!(val)
       end
       
+      def validates?
+        false
+      end
+      
       def ==(o)
         o && (o.class == self.class && o.name == @name && o.validator == @validator)
       end

data/lib/usher/util/generate.rb

@@ -21,55 +21,11 @@ class Usher
         end
 
         def generate_path_for_base_params_with_hash(path, params)
-          result = ''
-          path.parts.each do |part|
-            case part
-            when String
-              result << part
-            when Route::Variable::Glob
-              value = (params && params.delete(part.name)) || part.default_value || raise(MissingParameterException.new("expected a value for #{part.name}"))
-              value.each_with_index do |current_value, index|
-                part.valid!(current_value)
-                result << current_value.to_s
-                result << usher.delimiters.first if index != value.size - 1
-              end
-            when Route::Variable
-              value = (params && params.delete(part.name)) || part.default_value || raise(MissingParameterException.new("expected a value for #{part.name}"))
-              part.valid!(value)
-              result << value.to_s
-            when Route::Static::Greedy
-              result << part.generate_with
-            else
-              raise
-            end
-          end
-          result
+          path.generate_from_hash(params)
         end
         
         def generate_path_for_base_params_with_array(path, params)
-          result = ''
-          path.parts.each do |part|
-            case part
-            when String
-              result << part
-            when Route::Variable::Glob
-              value = (params && params.shift) || part.default_value || raise(MissingParameterException.new)
-              value.each_with_index do |current_value, index|
-                part.valid!(current_value)
-                result << current_value.to_s
-                result << usher.delimiters.first if index != value.size - 1
-              end
-            when Route::Variable
-              value = (params && params.shift) || part.default_value || raise(MissingParameterException.new)
-              part.valid!(value)
-              result << value.to_s
-            when Route::Static::Greedy
-              result << value.generate_with
-            else
-              raise
-            end
-          end
-          result
+          path.generate(*params.slice!(0, path.dynamic_parts.size))
         end
         
       end

data/spec/private/sinatra/recognize_spec.rb

@@ -49,6 +49,23 @@ describe "Usher (for Sinatra) route recognition" do
       response.body.should == "bar"
     end
 
+    it "should ignore trailing delimiters with an optional param" do
+      @app.get("/foo/(:bar)") { params[:bar] }
+      @app.get("/bar(/:foo)") { params[:foo] }
+      response = @app.call_with_mock_request('/foo/bar')
+      response.status.should == 200
+      response.body.should == "bar"
+      response = @app.call_with_mock_request('/bar/foo')
+      response.status.should == 200
+      response.body.should == "foo"
+      response = @app.call_with_mock_request('/bar')
+      response.status.should == 200
+      response.body.should == ""
+      response = @app.call_with_mock_request('/bar/')
+      response.status.should == 200
+      response.body.should == ""
+    end
+
     it "should use sinatra optionals trailing delimiters" do
       @app.get("/foo/?") { "foo" }
       response = @app.call_with_mock_request('/foo')
@@ -99,4 +116,25 @@ describe "Usher (for Sinatra) route recognition" do
       response.body.should_not match(/__sinatra__/)
     end
   end
+
+  describe "recognize paths" do
+
+    it "should recognize basic routes" do
+      pending "undefined method `request_method' for nil:NilClass"
+      @app.get("/foo/:bar") { "foo" }
+      @app.router.recognize_path("/foo/:bar").should == nil
+    end
+  end
+
+  describe "priority" do
+
+    it "should set correctly priorities" do
+      pending "match the wrong route"
+      @app.get("/:id/:right", :priority => 10) { "right" }
+      @app.get("/:id/:wrong") { "wrong" }
+      response = @app.call_with_mock_request('/foo/bar')
+      response.status.should == 200
+      response.body.should == "right"
+    end
+  end
 end

data/usher.gemspec

@@ -5,7 +5,7 @@ require "base64"
 
 Gem::Specification.new do |s|
   s.name = "usher"
-  s.version = "0.7.2"
+  s.version = "0.7.3"
   s.authors = ["Daniel Neighman", "Daniel Vartanov", "Jakub Šťastný", "Joshua Hull"]
   s.homepage = "http://github.com/joshbuddy/usher"
   s.summary = "Pure ruby general purpose router with interfaces for rails, rack, email or choose your own adventure"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 2
-  version: 0.7.2
+  - 3
+  version: 0.7.3
 platform: ruby
 authors: 
 - Daniel Neighman
@@ -18,7 +18,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: 
-date: 2010-04-29 00:00:00 -04:00
+date: 2010-05-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -124,6 +124,7 @@ files:
 - lib/usher/node.rb
 - lib/usher/node/response.rb
 - lib/usher/node/root.rb
+- lib/usher/node/root_ignoring_trailing_delimiters.rb
 - lib/usher/route.rb
 - lib/usher/route/path.rb
 - lib/usher/route/request_method.rb