usher 0.6.0 → 0.6.1

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :build: 
-:patch: 0
+:patch: 1
 :major: 0
 :minor: 6

data/lib/usher/interface/rack.rb

@@ -36,10 +36,9 @@ class Usher
       end
 
       attr_reader :router
-      attr_accessor :app
 
       def initialize(app = nil, &blk)
-        @app = app || lambda { |env| ::Rack::Response.new("No route found", 404).finish }
+        @_app = app || lambda { |env| ::Rack::Response.new("No route found", 404).finish }
         @router = Usher.new(:request_methods => [:request_method, :host, :port, :scheme], :generator => Usher::Util::Generators::URL.new)
         instance_eval(&blk) if blk
       end
@@ -56,11 +55,12 @@ class Usher
       def add(path, options = nil)
         @router.add_route(path, options)
       end
-
+      alias_method :path, :add
+      
       # default { |env| ... }
       # default DefaultApp
       def default(app = nil, &block)
-        @app = app ? app : block
+        @_app = app ? app : block
       end
 
       # shortcuts for adding routes for HTTP methods, for example:
@@ -135,13 +135,7 @@ class Usher
       #
       # @api private
       def determine_respondant(response)
-        unless response
-          app
-        else
-          respondant = response.path.route.destination
-          respondant = app unless respondant.respond_to?(:call)
-          respondant
-        end
+        response && response.destination || _app
       end
 
       # Consume the path from path_info to script_name
@@ -149,6 +143,14 @@ class Usher
         request.env["SCRIPT_NAME"] = (request.env["SCRIPT_NAME"] + response.matched_path)   || ""
         request.env["PATH_INFO"] = response.remaining_path    || ""
       end
+      
+      def default_app
+        _app
+      end
+      
+      private
+      attr_reader :_app
+      
     end
   end
 end

data/lib/usher/interface/sinatra.rb

@@ -38,7 +38,7 @@ class Usher
             end
 
             def route!(base = self.class)
-              if self.class.router and match = self.class.router.recognize(@request)
+              if self.class.router and match = self.class.router.recognize(@request, @request.path_info)
                 @block_params = match.params.map{|p| p.last}
                 @params = @params ? @params.merge(match.params_as_hash) : match.params_as_hash
                 route_eval(&match.destination)

data/lib/usher/route.rb

@@ -33,6 +33,14 @@ class Usher
       end
     end
 
+    def inspect
+      "#<Usher:Route:0x%x @paths=[%s]>" % [self.object_id, paths.collect{|p| p.parts.join}.join(', ')]
+    end
+
+    def to_s
+      inspect
+    end
+
     def grapher
       unless @grapher
         @grapher = Grapher.new(router)

data/lib/usher.rb

@@ -272,6 +272,14 @@ class Usher
     replacement
   end
 
+  def inspect
+    "#<Usher:0x%x route_count=%d delimiters=%s request_methods=%s ignore_trailing_delimiters? %s consider_destination_keys? %s can_generate? %s priority_lookups? %s>" % [self.object_id, route_count, self.delimiters.inspect, request_methods.inspect, ignore_trailing_delimiters.inspect, consider_destination_keys.inspect, can_generate?.inspect, priority_lookups.inspect]
+  end
+
+  def to_s
+    inspect
+  end
+
   private
 
   attr_accessor :request_methods, :ignore_trailing_delimiters, :consider_destination_keys
@@ -333,4 +341,5 @@ class Usher
     @grapher = Grapher.new(self)
     @routes.each{|r| @grapher.add_route(r)}
   end
+  
 end

data/spec/private/rack/dispatch_spec.rb

@@ -238,7 +238,7 @@ describe "Usher (for rack) route dispatching" do
       @app.should_receive(:call).with{|e| e['usher.params'].should == {:middle => :ware}}
 
       u = Usher::Interface.for(:rack)
-      u.app = @app
+      u.default @app
       u.add("/foo", :default_values => {:middle => :ware}).name(:foo)
 
       u.call(Rack::MockRequest.env_for("/foo"))
@@ -248,14 +248,14 @@ describe "Usher (for rack) route dispatching" do
       env = Rack::MockRequest.env_for("/not_a_route")
       @app.should_receive(:call).with(env)
       u = Usher::Interface.for(:rack)
-      u.app = @app
+      u.default @app
       u.call(env)
     end
 
     it "should allow me to set the application after initialization" do
       @app.should_receive(:call).with{|e| e['usher.params'].should == {:after => :stuff}}
       u = Usher::Interface.for(:rack)
-      u.app = @app
+      u.default @app
       u.add("/foo", :default_values => {:after => :stuff})
       u.call(Rack::MockRequest.env_for("/foo"))
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: usher
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors: 
 - Daniel Neighman
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-13 00:00:00 -05:00
+date: 2010-01-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency