http_router 0.3.11 → 0.3.12

data/lib/http_router.rb

@@ -30,7 +30,7 @@ class HttpRouter
   # Raised when there is a potential conflict of variable names within your Route.
   AmbiguousVariableException       = Class.new(RuntimeError)
 
-  attr_reader :named_routes, :routes, :root
+  attr_reader :named_routes, :routes, :root, :request_methods_specified
   attr_accessor :url_mount
 
   # Monkey-patches Rack::Builder to use HttpRouter.
@@ -56,14 +56,15 @@ class HttpRouter
   def initialize(*args, &block)
     default_app, options = args.first.is_a?(Hash) ? [nil, args.first] : [args.first, args[1]]
 
-    @options                 = options
-    @default_app             = default_app || options && options[:default_app] || proc{|env| Rack::Response.new("Not Found", 404).finish }
-    @ignore_trailing_slash   = options && options.key?(:ignore_trailing_slash) ? options[:ignore_trailing_slash] : true
-    @redirect_trailing_slash = options && options.key?(:redirect_trailing_slash) ? options[:redirect_trailing_slash] : false
-    @middleware              = options && options.key?(:middleware) ? options[:middleware] : false
-    @routes                  = []
-    @named_routes            = {}
-    @init_block              = block
+    @options                   = options
+    @default_app               = default_app || options && options[:default_app] || proc{|env| Rack::Response.new("Not Found", 404).finish }
+    @ignore_trailing_slash     = options && options.key?(:ignore_trailing_slash) ? options[:ignore_trailing_slash] : true
+    @redirect_trailing_slash   = options && options.key?(:redirect_trailing_slash) ? options[:redirect_trailing_slash] : false
+    @middleware                = options && options.key?(:middleware) ? options[:middleware] : false
+    @request_methods_specified = Set.new
+    @routes                    = []
+    @named_routes              = {}
+    @init_block                = block
     reset!
     if block
       instance_eval(&block)

data/lib/http_router/node.rb

@@ -110,6 +110,7 @@ class HttpRouter
                   current_node.create_linear
                   current_node.linear << [request_value, new_node]
                 else
+                  router.request_methods_specified << request_value if method == :request_method
                   current_node.create_lookup
                   current_nodes[index == 0 ? current_node_index : current_nodes.length] = (current_node.lookup[request_value] ||= router.request_node)
                 end

data/lib/http_router/root.rb

@@ -1,7 +1,5 @@
 class HttpRouter
   class Root < Node
-    HttpRequestMethods = %w(HEAD GET HEAD POST DELETE PUT)
-    
     class AlternativeRequestMethods < Array
       attr_accessor :request_method_found
     end
@@ -35,19 +33,16 @@ class HttpRouter
         else
           nil
         end
-      else
-        alternate_methods = (HttpRequestMethods - [request.request_method]).select do |alternate_method|
+      elsif !router.request_methods_specified.empty?
+        alternate_methods = (router.request_methods_specified - [request.request_method]).select do |alternate_method|
           test_request = request.dup
           test_request.env['REQUEST_METHOD'] = alternate_method
           node = find_on_parts(test_request, get_parts(request), [])
           node && node.value
         end
-
-        if alternate_methods.empty?
-          nil
-        else
-          Response.unmatched(405, {"Allow" => alternate_methods.join(", ")})
-        end
+        alternate_methods.empty? ? nil : Response.unmatched(405, {"Allow" => alternate_methods.join(", ")})
+      else
+        nil
       end
     end
   end

data/lib/http_router/route.rb

@@ -294,7 +294,7 @@ class HttpRouter
     end
 
     def anonymous_variable(pos)
-      "$#{pos}"
+      "$#{pos}".to_sym
     end
 
     def compile_paths
@@ -309,11 +309,11 @@ class HttpRouter
         new_path = split_path.map do |part|
           processed_parts = case part
           when /^:([a-zA-Z_0-9]*)$/
-            v_name = ($1.empty? ? anonymous_variable(counter += 1) : $1).to_sym
+            v_name = $1.empty? ? anonymous_variable(counter += 1) : $1.to_sym
             router.variable(v_name, @matches_with[v_name])
           when /^\*([a-zA-Z_0-9]*)$/
             if position != split_path.size - 1
-              v_name = ($1.empty? ? anonymous_variable(counter += 1) : $1).to_sym
+              v_name = $1.empty? ? anonymous_variable(counter += 1) : $1.to_sym
               splitting_indexes << variable_position
               remaining_path_parts = split_path[position + 1, split_path.size]
               look_ahead_variable = remaining_path_parts.find{|p| p[0] == ?: || p[0] == ?*}
@@ -321,7 +321,7 @@ class HttpRouter
               remaining_path_parts.index(look_ahead_variable) if look_ahead_variable
               router.variable(v_name, /^(#{@matches_with[v_name] || '[^\/]*?'}\/)+(?=#{Regexp.quote(remaining_matcher)})/)
             else
-              v_name = ($1.empty? ? anonymous_variable(counter += 1) : $1).to_sym
+              v_name = $1.empty? ? anonymous_variable(counter += 1) : $1.to_sym
               router.glob(v_name, @matches_with[v_name])
             end
           else

data/lib/http_router/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: http_router
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 3
-  - 11
-  version: 0.3.11
+  - 12
+  version: 0.3.12
 platform: ruby
 authors: 
 - Joshua Hull