http_router 0.6.0 → 0.6.1

data/lib/http_router/node/request.rb

@@ -2,15 +2,36 @@ class HttpRouter
   class Node
     class Request < Node
       def self.request_methods
-        [:host, :request_method, :scheme, :user_agent]
+        [:host, :scheme, :request_method, :user_agent]
       end
 
+      attr_reader :request_method
+
       def initialize(router)
         @router, @linear, @catchall, @lookup = router, [], nil, {}
       end
 
+      def transform_to(meth)
+        new_node = Request.new(router)
+        new_node.request_method = @request_method
+        new_node.instance_var_set(:@linear, @linear.dup)
+        new_node.instance_var_set(:@catchall, @catchall)
+        new_node.instance_var_set(:@lookup, @lookup.dup)
+        @linear.clear
+        @lookup.clear
+        @catchall = new_node
+        @request_method = meth
+        new_node
+      end
+
       def request_method=(meth)
         @request_method = meth == :method ? :request_method : meth
+        if @destination
+          next_node = add_catchall
+          next_node.instance_variable_set(:@destination, (next_node.instance_variable_get(:@destination) || []).concat(@destination))
+          @destination.clear
+        end
+        @request_method
       end
 
       def add_lookup(val)

data/lib/http_router/node.rb

@@ -95,16 +95,30 @@ class HttpRouter
       @request ||= Request.new(@router)
       next_requests = [@request]
       Request.request_methods.each do |method|
+        method_index = Request.request_methods.index(method)
         next_requests.map! do |next_request|
-          next_request.request_method = method
-          (opts[method].nil? ? [nil] : Array(opts[method])).map do |request_matcher|
-            case request_matcher
-            when nil
-              next_request.add_catchall
-            when String
-              next_request.add_lookup(request_matcher)
-            when Regexp
-              next_request.add_linear(request_matcher)
+          if opts[method].nil? && next_request.request_method.nil?
+            next_request
+          else
+            next_request_index = next_request.request_method && Request.request_methods.index(next_request.request_method)
+            rank = next_request_index ? method_index <=> next_request_index : 0
+            case rank
+            when 0
+              next_request.request_method = method
+              (opts[method].nil? ? [nil] : Array(opts[method])).map do |request_matcher|
+                case request_matcher
+                when nil
+                  next_request.add_catchall
+                when String
+                  next_request.add_lookup(request_matcher)
+                when Regexp
+                  next_request.add_linear(request_matcher)
+                end
+              end
+            when -1
+              next_request
+            when 1
+              next_request.transform_to(method)
             end
           end
         end

data/lib/http_router/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 class HttpRouter #:nodoc
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: http_router
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-17 00:00:00 -07:00
+date: 2011-03-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency