a little extra magic on matching

lib/http_router.rb

@@ -71,7 +71,7 @@ def pass_on_response(response)
   end
 
   def set_pass_on_response(&blk)
-    extend(Module.new{define_method(:pass_on_response, &blk)})
+    extend(Module.new { define_method(:pass_on_response, &blk) })
   end
 
   # Adds a path that only responds to the request method +GET+.
@@ -120,10 +120,10 @@ def call(env, perform_call = true)
     else
       request = Request.new(rack_request.path_info, rack_request, perform_call)
       response = catch(:success) { @root[request] }
-      if response.nil?
-        no_response(env, perform_call)
-      elsif response
+      if response
         response
+      elsif response.nil?
+        no_response(env, perform_call)
       elsif perform_call
         @default_app.call(env)
       else
@@ -134,10 +134,8 @@ def call(env, perform_call = true)
 
   # Resets the router to a clean state.
   def reset!
-    @root = Node.new(self)
+    @routes, @named_routes, @root = [], {}, Node.new(self)
     @default_app = Proc.new{ |env| ::Rack::Response.new("Your request couldn't be found", 404).finish }
-    @routes = []
-    @named_routes = {}
   end
 
   # Assigns the default application.

lib/http_router/route.rb

@@ -82,6 +82,7 @@ def user_agent(user_agent)
     end
 
     def matching(matchers)
+      matchers = Hash[*matchers] if matchers.is_a?(Array)
       @opts.merge!(matchers)
       self
     end

test/test_variable.rb

@@ -76,6 +76,11 @@ def test_var_with_optional_format
     assert_route r, '/foo', {:test => 'foo'}
   end
 
+  def test_var_with_optional_format_and_regex
+    r = router { add('/:test(.:format)', :format => /[^\.]+/) }
+    assert_route r, '/asd@asd.com.json', {:test => 'asd@asd.com', :format => 'json'}
+  end
+
   def test_glob
     assert_route '/test/*variable', 'test/one/two/three', {:variable => ['one', 'two', 'three']}
   end