usher 0.5.2 → 0.5.3

data/README.rdoc

@@ -68,6 +68,7 @@ regex allows.
 * <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 @@
 --- 
 :minor: 5
-:patch: 2
+:patch: 3
 :major: 0

data/lib/usher/interface/rack_interface.rb

@@ -4,6 +4,22 @@ class Usher
   module Interface
     class RackInterface
       
+      attr_reader :router
+      
+      class Builder < Rack::Builder
+        
+        def initialize(&block)
+          @usher = Usher::Interface::RackInterface.new
+          super
+        end
+        
+        def map(path, options = nil, &block)
+          @usher.add(path, options).to(&block)
+          @ins << @usher unless @ins.last == @usher
+        end
+        
+      end
+      
       def initialize(&blk)
         @router = Usher.new(:request_methods => [:request_method, :host, :port, :scheme], :generator => Usher::Util::Generators::URL.new)
         instance_eval(&blk) if blk

data/lib/usher/node.rb

@@ -145,7 +145,7 @@ class Usher
       end
       
       current_node = self
-      until parts.size.zero?
+      while !parts.size.zero? || current_node.exclusive_type
         key = parts.shift
         target_node = case key
         when Route::RequestMethod
@@ -174,11 +174,13 @@ class Usher
             current_node.send(lookup_method)[nil] ||= Node.new(current_node, key)
           end  
         else
+          
           current_node.upgrade_lookup if key.is_a?(Regexp)
           current_node.lookup[key] ||= Node.new(current_node, key)
         end
         current_node = target_node
       end
+      
       current_node.terminates = destination
     end
     

data/spec/private/rack/dispatch_spec.rb

@@ -9,10 +9,14 @@ describe "Usher (for rack) route dispatching" do
   before(:each) do
     route_set.reset!
     @app = MockApp.new("Hello World!")
-    route_set.add('/sample').to(@app)
   end
 
   describe "HTTP GET" do
+    before(:each) do
+      route_set.reset!
+      route_set.add('/sample', :conditions => {:request_method => 'GET'}).to(@app)
+    end
+
     it "should dispatch a request" do
       response = route_set.call_with_mock_request
       response.body.should eql("Hello World!")
@@ -26,18 +30,23 @@ describe "Usher (for rack) route dispatching" do
 
   describe "HTTP POST" do
     before(:each) do
-      bad_app = MockApp.new("You shouldn't get here if you are using POST")
-      route_set.add('/sample').to(bad_app)
-      route_set.add('/sample', :requirements => {:request_method => 'POST'}).to(@app)
+      route_set.reset!
+      route_set.add('/sample', :conditions => {:request_method => 'POST'}).to(@app)
+      route_set.add('/sample').to(MockApp.new("You shouldn't get here if you are using POST"))
     end
 
-    it "should dispatch a request" do
-      response = route_set.call_with_mock_request
+    it "should dispatch a POST request" do
+      response = route_set.call_with_mock_request('/sample', 'POST')
       response.body.should eql("Hello World!")
     end
 
+    it "shouldn't dispatch a GET request" do
+      response = route_set.call_with_mock_request('/sample', 'GET')
+      response.body.should eql("You shouldn't get here if you are using POST")
+    end
+
     it "should write usher.params" do
-      response = route_set.call_with_mock_request("/sample", :request_method => 'POST')
+      response = route_set.call_with_mock_request("/sample", 'POST')
       @app.env["usher.params"].should == {}
     end
   end

data/spec/private/recognize_spec.rb

@@ -31,10 +31,10 @@ describe "Usher route recognition" do
     end
 
     it "should recognize a specific route when several http-style restrictions are used" do
-      target_route_http_admin = route_set.add_route('/sample', :controller => 'sample', :action => 'action', :conditions => {:protocol => 'http', :domain => 'admin.spec.com'})
-      target_route_http_www = route_set.add_route('/sample', :controller => 'sample', :action => 'action', :conditions => {:protocol => 'http', :domain => 'www.spec.com'})
-      target_route_https_msie = route_set.add_route('/sample', :controller => 'sample', :action => 'action2', :conditions => {:protocol => 'https', :user_agent => 'MSIE 6.0'})
-      target_route_https_admin = route_set.add_route('/sample', :controller => 'sample', :action => 'action2', :conditions => {:protocol => 'https', :domain => 'admin.spec.com'})
+      target_route_http_admin = route_set.add_route('/sample', :conditions => {:protocol => 'http', :domain => 'admin.spec.com'})
+      target_route_http_www = route_set.add_route('/sample', :conditions => {:protocol => 'http', :domain => 'www.spec.com'})
+      target_route_https_msie = route_set.add_route('/sample', :conditions => {:protocol => 'https', :user_agent => 'MSIE 6.0'})
+      target_route_https_admin = route_set.add_route('/sample', :conditions => {:protocol => 'https', :domain => 'admin.spec.com'})
       route_set.recognize(build_request({:method => 'get', :path => '/sample', :protocol => 'http', :domain => 'admin.spec.com', :user_agent => nil})).path.route.should == target_route_http_admin
       route_set.recognize(build_request({:method => 'get', :path => '/sample', :protocol => 'http', :domain => 'www.spec.com', :user_agent => nil})).path.route.should == target_route_http_www
       route_set.recognize(build_request({:method => 'get', :path => '/sample', :protocol => 'https', :domain => 'admin.spec.com', :user_agent => 'MSIE 6.0'})).path.route.should == target_route_https_msie

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: usher
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors: 
 - Joshua Hull
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-26 00:00:00 -04:00
+date: 2009-08-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency