http_router 0.3.6 → 0.3.7

data/README.rdoc

@@ -39,6 +39,8 @@ Maps a route. The format for variables in paths is:
 
 Everything else is treated literally. Optional parts are surrounded by brackets. Partially matching paths have a trailing <tt>*</tt>. Optional trailing slash matching is done with <tt>/?</tt>.
 
+As well, you can escape the following characters with a backslash: <tt>( ) : *</tt>
+
 Once you have a route object, use <tt>HttpRouter::Route#to</tt> to add a destination and <tt>HttpRouter::Route#name</tt> to name it.
 
 e.g.

data/lib/http_router/node.rb

@@ -103,17 +103,16 @@ class HttpRouter
             end
             case RequestNode::RequestMethods.index(method) <=> RequestNode::RequestMethods.index(current_node.request_method)
             when 0 #use this node
-              if request_options[method].is_a?(Regexp)
-                new_node = router.request_node
-                current_nodes[current_node_index] = new_node
-                current_node.create_linear
-                current_node.linear << [request_options[method], new_node]
-              elsif request_options[method].is_a?(Array)
-                current_node.create_lookup
-                current_nodes[current_node_index] = request_options[method].map{|val| current_node.lookup[val] ||= router.request_node}
-              else
-                current_node.create_lookup
-                current_nodes[current_node_index] = (current_node.lookup[request_options[method]] ||= router.request_node)
+              Array(request_options[method]).each_with_index do |request_value, index|
+                if request_value.is_a?(Regexp)
+                  new_node = router.request_node
+                  current_nodes[index == 0 ? current_node_index : current_nodes.length] = new_node
+                  current_node.create_linear
+                  current_node.linear << [request_value, new_node]
+                else
+                  current_node.create_lookup
+                  current_nodes[index == 0 ? current_node_index : current_nodes.length] = (current_node.lookup[request_value] ||= router.request_node)
+                end
               end
             when 1 #this node is farther ahead
               current_nodes[current_node_index] = (current_node.catchall ||= router.request_node)
@@ -201,7 +200,7 @@ class HttpRouter
   end
   
   class RequestNode < Node
-    RequestMethods =  [:request_method, :host, :port, :scheme]
+    RequestMethods =  [:request_method, :host, :port, :scheme, :user_agent, :ip, :fullpath, :query_string]
     attr_accessor :request_method
 
     def find_on_request_methods(request, alternate_request_methods)
@@ -211,7 +210,7 @@ class HttpRouter
           next_node = @linear.find do |(regexp, node)|
             regexp === request_value
           end
-          next_node &&= next_node.find_on_request_methods(request, alternate_request_methods)
+          next_node &&= next_node.last.find_on_request_methods(request, alternate_request_methods)
           return next_node if next_node
         end
         if @lookup and next_node = (@lookup[request_value] && @lookup[request_value].find_on_request_methods(request, alternate_request_methods))

data/lib/http_router/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 class HttpRouter #:nodoc
-  VERSION = '0.3.6'.freeze
+  VERSION = '0.3.7'
 end

data/spec/recognize_spec.rb

@@ -20,13 +20,23 @@ describe "HttpRouter#recognize" do
       end
     end
 
-    context("with escaped ()'s") do
+    context("with escaping") do
       it "should recognize ()" do
         route = @router.add('/test\(:variable\)').to(:test)
         response = @router.recognize(Rack::MockRequest.env_for('/test(hello)'))
         response.route.should == route
         response.params.first.should == 'hello'
       end
+
+      it "should recognize :" do
+        route = @router.add('/test\:variable').to(:test)
+        @router.recognize(Rack::MockRequest.env_for('/test:variable')).dest.should == :test
+      end
+
+      it "should recognize *" do
+        route = @router.add('/test\*variable').to(:test)
+        @router.recognize(Rack::MockRequest.env_for('/test*variable')).dest.should == :test
+      end
     end
 
     context("with partial matching") do
@@ -169,6 +179,13 @@ describe "HttpRouter#recognize" do
       @router.recognize(Rack::MockRequest.env_for('http://host2/test', :method => 'POST')).dest.should == :host2_post
     end
 
+    it "should be able to use regexp in request method conditions" do
+      @router.get("/test").host(/host1/).to(:with_regexp)
+      @router.get("/test").to(:without_regexp)
+      @router.recognize(Rack::MockRequest.env_for('http://host2/test')).dest.should == :without_regexp
+      @router.recognize(Rack::MockRequest.env_for('http://host2.host1.com/test')).dest.should == :with_regexp
+    end
+
     it "should try both specific and non-specifc routes" do
       @router.post("/test").host('host1').to(:post_host1)
       @router.add("/test").host('host2').to(:any_post2)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: http_router
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 3
-  - 6
-  version: 0.3.6
+  - 7
+  version: 0.3.7
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-31 00:00:00 -04:00
+date: 2010-07-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency