http_router 0.6.5 → 0.6.6

data/Rakefile

@@ -1,22 +1,66 @@
-require 'rubygems'
-require 'bundler'
-require 'code_stats'
-
-desc "Run tests"
-task :test do
-  $: << 'lib'
-  require 'http_router'
-  require './test/helper'
-  Dir['./test/**/test_*.rb'].each { |test| require test }
-end
-
-require 'rake/rdoctask'
-desc "Generate documentation"
-Rake::RDocTask.new do |rd|
-  rd.main = "README.rdoc"
-  rd.rdoc_files.include("README.rdoc", "lib/**/*.rb")
-  rd.rdoc_dir = 'rdoc'
-end
-
-Bundler::GemHelper.install_tasks
-CodeStats::Tasks.new(:reporting_depth => 3)
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
+desc "Run all tests"
+task :test => ['test:integration', 'test:examples']
+
+namespace :test do
+  desc "Run integration tests"
+  task :integration do
+    $: << 'lib'
+    require 'http_router'
+    require './test/helper'
+    Dir['./test/**/test_*.rb'].each { |test| require test }
+  end
+  desc "Run example tests"
+  task :examples do
+    $: << 'lib'
+    require 'http_router'
+    require 'thin'
+    Dir['./examples/**/*.ru'].each do |example|
+      print "running example #{example}..."
+      comments = File.read(example).split(/\n/).select{|l| l[0] == ?#}
+      pid = nil
+      Thin::Logging.silent = true
+      begin
+        pid = fork {
+          code = "Proc.new { \n#{File.read(example)}\n }"
+          r = eval(code, binding, example, 2)
+          Thin::Server.start(:signals => false, &r)
+        }
+        sleep 0.5
+        out = nil
+        assertion_count = 0
+        comments.each do |c|
+          c.gsub!(/^# ?/, '')
+          case c
+          when /^\$/
+            out = `#{c[1, c.size]} 2>/dev/null`.split(/\n/)
+            raise "#{c} produced #{out}" unless $?.success?
+          when /^=> ?(.*)/
+            c = $1
+            raise "out was nil" if out.nil?
+            test = out.shift
+            raise "excepted #{c.inspect}, recieved #{test.inspect}" unless c.strip == test.strip
+            assertion_count += 1
+          end
+        end
+        raise "no assertions were raised in #{example}" if assertion_count.zero?
+        puts "✔"
+      ensure
+        Process.kill('HUP', pid) if pid
+      end
+    end
+  end
+end
+
+require 'rake/rdoctask'
+desc "Generate documentation"
+Rake::RDocTask.new do |rd|
+  rd.main = "README.rdoc"
+  rd.rdoc_files.include("README.rdoc", "lib/**/*.rb")
+  rd.rdoc_dir = 'rdoc'
+end
+
+require 'code_stats'
+CodeStats::Tasks.new(:reporting_depth => 3)

data/examples/glob.ru

@@ -4,8 +4,8 @@ run HttpRouter.new {
   get('/*glob').to { |env| [200, {'Content-type' => 'text/plain'}, ["My glob is\n#{env['router.params'][:glob].map{|v| " * #{v}\n"}.join}"]]}
 }
 
-# crapbook-pro:~ joshua$ curl http://127.0.0.1:3000/123/345/123
-# My glob is
-#  * 123
-#  * 345
-#  * 123
+# $ curl http://127.0.0.1:3000/123/345/123
+# => My glob is
+# =>  * 123
+# =>  * 345
+# =>  * 123

data/examples/rack_mapper.ru

@@ -1,5 +1,5 @@
 require 'http_router'
-HttpRouter.override_rack_mapper!
+HttpRouter::Rack.override_rack_builder!
 
 map('/get/:id') { |env|
   [200, {'Content-type' => 'text/plain'}, ["My id is #{env['router.params'][:id]}\n"]]
@@ -14,9 +14,9 @@ map('/get/:id', :matching => {:id => /\d+/}) { |env|
   [200, {'Content-type' => 'text/plain'}, ["My id is #{env['router.params'][:id]}, which is a number\n"]]
 }
 
-# crapbook-pro:~ joshua$ curl http://127.0.0.1:3000/get/foo
-# My id is foo
-# crapbook-pro:~ joshua$ curl -X POST http://127.0.0.1:3000/get/foo
-# My id is foo and you posted!
-# crapbook-pro:~ joshua$ curl -X POST http://127.0.0.1:3000/get/123
-# My id is 123, which is a number
+# $ curl http://127.0.0.1:3000/get/foo
+# => My id is foo
+# $ curl -X POST http://127.0.0.1:3000/get/foo
+# => My id is foo and you posted!
+# $ curl -X POST http://127.0.0.1:3000/get/123
+# => My id is 123, which is a number

data/examples/simple.ru

@@ -4,5 +4,5 @@ run HttpRouter.new {
   get('/hi').to { |env| [200, {'Content-type' => 'text/plain'}, ["hi!\n"]]}
 }
 
-# crapbook-pro:~ joshua$ curl http://127.0.0.1:3000/hi
-# hi!
+# $ curl http://127.0.0.1:3000/hi
+# => hi!

data/examples/static/config.ru

@@ -5,22 +5,22 @@ require 'http_router'
 base = File.expand_path(File.dirname(__FILE__))
 
 run HttpRouter.new {
-  get('/favicon.ico').static("#{base}/favicon.ico")  # from a single file
-  get('/images').static("#{base}/images")            # or from a directory
+  add('/favicon.ico').static("#{base}/favicon.ico")  # from a single file
+  add('/images').static("#{base}/images")            # or from a directory
 }
 
-# crapbook-pro:~ joshua$ curl -I http://localhost:3000/favicon.ico
-# HTTP/1.1 200 OK
-# Last-Modified: Fri, 11 Jun 2010 21:02:22 GMT
-# Content-Type: image/vnd.microsoft.icon
-# Content-Length: 1150
-# Connection: keep-alive
-# Server: thin 1.2.7 codename No Hup
+# $ curl -I http://localhost:3000/favicon.ico
+# => HTTP/1.1 200 OK
+# => Last-Modified: Sat, 26 Mar 2011 18:04:26 GMT
+# => Content-Type: image/vnd.microsoft.icon
+# => Content-Length: 1150
+# => Connection: keep-alive
+# => Server: thin 1.2.7 codename No Hup
 # 
-# crapbook-pro:~ joshua$ curl -I http://localhost:3000/images/cat1.jpg
-# HTTP/1.1 200 OK
-# Last-Modified: Fri, 11 Jun 2010 21:54:16 GMT
-# Content-Type: image/jpeg
-# Content-Length: 29817
-# Connection: keep-alive
-# Server: thin 1.2.7 codename No Hup
+# $ curl -I http://localhost:3000/images/cat1.jpg
+# => HTTP/1.1 200 OK
+# => Last-Modified: Sat, 26 Mar 2011 18:04:26 GMT
+# => Content-Type: image/jpeg
+# => Content-Length: 29817
+# => Connection: keep-alive
+# => Server: thin 1.2.7 codename No Hup

data/examples/variable.ru

@@ -4,6 +4,6 @@ run HttpRouter.new {
   get('/:variable').to { |env| [200, {'Content-type' => 'text/plain'}, ["my variables are\n#{env['router.params'].inspect}\n"]]}
 }
 
-# crapbook-pro:~ joshua$ curl http://127.0.0.1:3000/heyguys
-# my variables are
-# {:variable=>"heyguys"}
+# $ curl http://127.0.0.1:3000/heyguys
+# => my variables are
+# => {:variable=>"heyguys"}

data/examples/variable_with_regex.ru

@@ -4,7 +4,7 @@ run HttpRouter.new {
   get('/get/:id').matching(:id => /\d+/).to { |env| [200, {'Content-type' => 'text/plain'}, ["id is #{Integer(env['router.params'][:id]) * 2} * 2\n"]]}
 }
 
-# crapbook-pro:~ joshua$ curl http://127.0.0.1:3000/get/123
-# id is 246 * 2
-# crapbook-pro:~ joshua$ curl http://127.0.0.1:3000/get/asd
-# Not Found
+# $ curl http://127.0.0.1:3000/get/123
+# => id is 246 * 2
+# $ curl http://127.0.0.1:3000/get/asd
+# => Your request couldn't be found

data/lib/http_router/node/request.rb

@@ -1,10 +1,6 @@
 class HttpRouter
   class Node
     class Request < Node
-      def self.request_methods
-        [:host, :scheme, :request_method, :user_agent]
-      end
-
       attr_reader :request_method
 
       def initialize(router)
@@ -28,13 +24,14 @@ class HttpRouter
         @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
+          next_node.instance_variable_set(:@destination, @destination)
+          @destination = nil
         end
         @request_method
       end
 
       def add_lookup(val)
+        @router.known_methods << val if @request_method == :request_method
         @lookup[val] ||= Request.new(@router)
       end
 

data/lib/http_router/node.rb

@@ -60,27 +60,7 @@ class HttpRouter
     def destination(request_obj, match_partially = true)
       request(request_obj)
       arbitrary(request_obj)
-      if match_partially or request_obj.path.empty?
-        @destination && @destination.each do |d|
-          if request_obj.path.empty? or d.route.match_partially? or (@router.ignore_trailing_slash? and request_obj.path.size == 1 and request_obj.path.last == '')
-            if request_obj.perform_call
-              env = request_obj.rack_request.dup.env
-              env['router.params'] ||= {}
-              env['router.params'].merge!(d.hashify_params(request_obj.params))
-              matched = if d.route.match_partially?
-                env['PATH_INFO'] = "/#{request_obj.path.join('/')}"
-                env['SCRIPT_NAME'] += request_obj.rack_request.path_info[0, request_obj.rack_request.path_info.size - env['PATH_INFO'].size]
-              else
-                env["PATH_INFO"] = ''
-                env["SCRIPT_NAME"] += request_obj.rack_request.path_info
-              end
-              throw :success, d.route.dest.call(env)
-            else
-              throw :success, Response.new(request_obj, d)
-            end
-          end
-        end
-      end
+      @destination.call(request_obj, match_partially) if @destination
     end
 
     def add_variable
@@ -94,31 +74,25 @@ class HttpRouter
     def add_request(opts)
       @request ||= Request.new(@router)
       next_requests = [@request]
-      Request.request_methods.each do |method|
-        method_index = Request.request_methods.index(method)
+      @router.request_methods.each_with_index do |method, method_index|
         next_requests.map! do |next_request|
           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)
+            next_request_index = next_request.request_method && @router.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)
+                when nil    then next_request.add_catchall
+                when String then next_request.add_lookup(request_matcher)
+                when Regexp then next_request.add_linear(request_matcher)
                 end
               end
-            when -1
-              next_request
-            when 1
-              next_request.transform_to(method)
+            when -1 then next_request
+            when  1 then next_request.transform_to(method)
             end
           end
         end
@@ -147,9 +121,8 @@ class HttpRouter
       @linear.last
     end
 
-    def add_destination(route)
-      @destination ||= []
-      @destination << route
+    def add_destination(&dest)
+      @destination = dest
     end
 
     def add_lookup(part)

data/lib/http_router/rack/builder.rb

@@ -0,0 +1,69 @@
+require 'http_router'
+
+# Replacement for {Rack::Builder} which using HttpRouter to map requests instead of a simple Hash.
+# As well, add convenience methods for the request methods.
+module HttpRouter::Rack::BuilderMixin
+  def router
+    @router ||= HttpRouter.new
+  end
+
+  # Maps a path to a block.
+  # @param path [String] Path to map to.
+  # @param options [Hash] Options for added path.
+  # @see HttpRouter#add
+  def map(path, options = {}, method = nil, &block)
+    route = router.add(path, options)
+    route.send(method) if method
+    route.to(&block)
+    @ins << router unless @ins.last == router
+    route
+  end
+
+  # Maps a path with request methods `HEAD` and `GET` to a block.
+  # @param path [String] Path to map to.
+  # @param options [Hash] Options for added path.
+  # @see HttpRouter#add
+  def get(path, options = {}, &block)
+    map(path, options, :get, &block)
+  end
+
+  # Maps a path with request methods `POST` to a block.
+  # @param path [String] Path to map to.
+  # @param options [Hash] Options for added path.
+  # @see HttpRouter#add
+  def post(path, options = {}, &block)
+    map(path, options, :post, &block)
+  end
+
+  # Maps a path with request methods `PUT` to a block.
+  # @param path [String] Path to map to.
+  # @param options [Hash] Options for added path.
+  # @see HttpRouter#add
+  def put(path, options = {}, &block)
+    map(path, options, :put, &block)
+  end
+
+  # Maps a path with request methods `DELETE` to a block.
+  # @param path [String] Path to map to.
+  # @param options [Hash] Options for added path.
+  # @see HttpRouter#add
+  def delete(path, options = {}, &block)
+    map(path, options, :delete, &block)
+  end
+
+  # Maps a path with request methods `HEAD` to a block.
+  # @param path [String] Path to map to.
+  # @param options [Hash] Options for added path.
+  # @see HttpRouter#add
+  def head(path, options = {}, &block)
+    map(path, options, :head, &block)
+  end
+
+  def options(path, options = {}, &block)
+    map(path, options, :options, &block)
+  end
+end
+
+class HttpRouter::Rack::Builder < ::Rack::Builder
+  include HttpRouter::Rack::BuilderMixin
+end

data/lib/http_router/rack/url_map.rb

@@ -0,0 +1,16 @@
+require 'http_router'
+
+class HttpRouter
+  module Rack
+    class URLMap < ::Rack::URLMap
+      def initialize(map = {})
+        @router = HttpRouter.new
+        map.each { |path, app| (path =~ /^(https?):\/\/(.*?)(\/.*)/ ? @router.add($3).host($2).scheme($1) : @router.add(path)).partial.to(app) }
+      end
+
+      def call(env)
+        @router.call(env)
+      end
+    end
+  end
+end

data/lib/http_router/rack.rb

@@ -0,0 +1,19 @@
+class HttpRouter
+  module Rack
+    autoload :URLMap,       'http_router/rack/url_map'
+    autoload :Builder,      'http_router/rack/builder'
+    autoload :BuilderMixin, 'http_router/rack/builder'
+
+    # Monkey-patches Rack::Builder to use HttpRouter.
+    # See examples/rack_mapper.rb
+    def self.override_rack_builder!
+      ::Rack::Builder.class_eval("remove_method :map; include HttpRouter::Rack::BuilderMixin")
+    end
+
+    # Monkey-patches Rack::URLMap to use HttpRouter.
+    # See examples/rack_mapper.rb
+    def self.override_rack_urlmap!
+      ::Rack.class_eval("OriginalURLMap = URLMap; HttpRouterURLMap = HttpRouter::Rack::URLMap; remove_const :URLMap; URLMap = HttpRouterURLMap")
+    end
+  end
+end

data/lib/http_router/route.rb

@@ -11,12 +11,15 @@ class HttpRouter
       @opts = opts
       @arbitrary = opts[:arbitrary] || opts[:__arbitrary__]
       @conditions = opts[:conditions] || opts[:__conditions__] || {}
-      name(opts.delete(:name)) if opts.key?(:name)
+      name(opts[:name]) if opts.key?(:name)
+      @opts.merge!(opts[:matching]) if opts[:matching]
       @matches_with = {}
       @default_values = opts[:default_values] || {}
       if @original_path[-1] == ?*
         @match_partially = true
         path.slice!(-1)
+      elsif opts.key?(:partial)
+        @match_partially = opts[:partial]
       end
       @paths = OptionalCompiler.new(path).paths
     end
@@ -106,11 +109,12 @@ class HttpRouter
       self
     end
 
-    def post;   request_method('POST');   end
-    def get;    request_method('GET');    end
-    def put;    request_method('PUT');    end
-    def delete; request_method('DELETE'); end
-    def head;   request_method('HEAD');   end
+    def post;    request_method('POST');    end
+    def get;     request_method('GET');     end
+    def put;     request_method('PUT');     end
+    def delete;  request_method('DELETE');  end
+    def head;    request_method('HEAD');    end
+    def options; request_method('OPTIONS'); end
 
     def arbitrary(blk = nil, &blk2)
       arbitrary_with_continue { |req, params|
@@ -247,14 +251,31 @@ class HttpRouter
     end
 
     def add_non_path_to_tree(node, path, names)
-      nodes = if @conditions && !@conditions.empty?
-        node.add_request(@conditions)
-      else
-        [node]
-      end
-      @arbitrary.each{|a| nodes.map!{|n| n.add_arbitrary(a, match_partially?, names)} } if @arbitrary
       path_obj = Path.new(self, path, names)
-      nodes.each{|n| n.add_destination(path_obj)}
+      destination = Proc.new { |req, use_partial_matching|
+        if (use_partial_matching or req.path.empty?)
+          if req.path.empty? or match_partially? or (@router.ignore_trailing_slash? and req.path.size == 1 and req.path.last == '')
+            if req.perform_call
+              env = req.rack_request.dup.env
+              env['router.params'] ||= {}
+              env['router.params'].merge!(path_obj.hashify_params(req.params))
+              matched = if match_partially?
+                env['PATH_INFO'] = "/#{req.path.join('/')}"
+                env['SCRIPT_NAME'] += req.rack_request.path_info[0, req.rack_request.path_info.size - env['PATH_INFO'].size]
+              else
+                env["PATH_INFO"] = ''
+                env["SCRIPT_NAME"] += req.rack_request.path_info
+              end
+              throw :success, @app.call(env)
+            else
+              throw :success, Response.new(req, path_obj)
+            end
+          end
+        end
+      }
+      nodes = @conditions && !@conditions.empty? ? node.add_request(@conditions) : [node]
+      @arbitrary.each{|a| nodes.map!{|n| n.add_arbitrary(a, match_partially?, names)} } if @arbitrary
+      nodes.map!{|n| n.add_destination(&destination)}
       if dest.respond_to?(:url_mount=)
         urlmount = UrlMount.new(@original_path, @default_values)
         urlmount.url_mount = router.url_mount if router.url_mount

data/lib/http_router/version.rb

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

data/lib/http_router.rb

@@ -5,12 +5,13 @@ require 'http_router/request'
 require 'http_router/response'
 require 'http_router/route'
 require 'http_router/path'
+require 'http_router/rack'
 require 'http_router/regex_route'
 require 'http_router/optional_compiler'
 
 class HttpRouter
 
-  attr_reader :root, :routes, :known_methods, :named_routes
+  attr_reader :root, :routes, :known_methods, :named_routes, :request_methods
   attr_accessor :default_app, :url_mount
 
   # Raised when a Route is not able to be generated.
@@ -27,12 +28,16 @@ class HttpRouter
   # * :default_app -- Default application used if there is a non-match on #call. Defaults to 404 generator.
   # * :ignore_trailing_slash -- Ignore a trailing / when attempting to match. Defaults to +true+.
   # * :redirect_trailing_slash -- On trailing /, redirect to the same path without the /. Defaults to +false+.
+  # * :known_methods -- Array of http methods tested for 405s.
+  # * :request_methods -- Array of methods to use on request
   def initialize(*args, &blk)
-    default_app, options = args.first.is_a?(Hash) ? [nil, args.first] : [args.first, args[1]]
+    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
+    @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
+    @known_methods           = Set.new(options && options[:known_methods] || [])
+    @request_methods         = options && options[:request_methods] || [:host, :scheme, :request_method, :user_agent]
     reset!
     instance_eval(&blk) if blk
   end
@@ -71,17 +76,17 @@ class HttpRouter
   # Adds a path that only responds to the request method +GET+.
   #
   # Returns the route object.
-  def get(path, opts = {}, &app);    add_with_request_method(path, :get, opts, &app);    end
+  def get(path, opts = {}, &app); add_with_request_method(path, :get, opts, &app); end
 
   # Adds a path that only responds to the request method +POST+.
   #
   # Returns the route object.
-  def post(path, opts = {}, &app);   add_with_request_method(path, :post, opts, &app);   end
+  def post(path, opts = {}, &app); add_with_request_method(path, :post, opts, &app); end
 
   # Adds a path that only responds to the request method +HEAD+.
   #
   # Returns the route object.
-  def head(path, opts = {}, &app);   add_with_request_method(path, :head, opts, &app);   end
+  def head(path, opts = {}, &app); add_with_request_method(path, :head, opts, &app); end
 
   # Adds a path that only responds to the request method +DELETE+.
   #
@@ -91,7 +96,12 @@ class HttpRouter
   # Adds a path that only responds to the request method +PUT+.
   #
   # Returns the route object.
-  def put(path, opts = {}, &app);    add_with_request_method(path, :put, opts, &app);    end
+  def put(path, opts = {}, &app); add_with_request_method(path, :put, opts, &app); end
+
+  # Adds a path that only responds to the request method +OPTIONS+.
+  #
+  # Returns the route object.
+  def options(path, opts = {}, &app); add_with_request_method(path, :options, opts, &app); end
 
   def recognize(env)
     call(env, false)
@@ -101,7 +111,7 @@ class HttpRouter
   # the default application will be called. The router will be available in the env under the key <tt>router</tt>. And parameters matched will
   # be available under the key <tt>router.params</tt>.
   def call(env, perform_call = true)
-    rack_request = Rack::Request.new(env)
+    rack_request = ::Rack::Request.new(env)
     if redirect_trailing_slash? && (rack_request.head? || rack_request.get?) && rack_request.path_info[-1] == ?/
       response = ::Rack::Response.new
       response.redirect(request.path_info[0, request.path_info.size - 1], 302)
@@ -111,9 +121,9 @@ class HttpRouter
       response = catch(:success) { @root[request] }
       if !response
         supported_methods = (@known_methods - [env['REQUEST_METHOD']]).select do |m| 
-          test_env = Rack::Request.new(rack_request.env.clone)
+          test_env = ::Rack::Request.new(rack_request.env.clone)
           test_env.env['REQUEST_METHOD'] = m
-          test_env.env['HTTP_ROUTER_405_TESTING_ACCEPTANCE'] = true
+          test_env.env['_HTTP_ROUTER_405_TESTING_ACCEPTANCE'] = true
           test_request = Request.new(test_env.path_info, test_env, 405)
           catch(:success) { @root[test_request] }
         end
@@ -129,10 +139,9 @@ class HttpRouter
   # Resets the router to a clean state.
   def reset!
     @root = Node.new(self)
-    @default_app = Proc.new{ |env| Rack::Response.new("Your request couldn't be found", 404).finish }
+    @default_app = Proc.new{ |env| ::Rack::Response.new("Your request couldn't be found", 404).finish }
     @routes = []
     @named_routes = {}
-    @known_methods = ['GET', "POST", "PUT", "DELETE"]
   end
 
   # Assigns the default application.

data/test/test_variable.rb

@@ -107,12 +107,15 @@ class TestVariable < MiniTest::Unit::TestCase
   end
 
   def test_regex_and_greedy
-    with_regex, without_regex = router {
+    with_regex, without_regex, with_post = router {
       add("/:common_variable/:matched").matching(:matched => /\d+/)
       add("/:common_variable/:unmatched")
+      post("/:common_variable/:unmatched")
     }
     assert_route with_regex,    '/common/123',   {:common_variable => 'common', :matched => '123'}
     assert_route without_regex, '/common/other', {:common_variable => 'common', :unmatched => 'other'}
+    assert_route with_regex,    Rack::MockRequest.env_for('/common/123', :method => 'POST'),   {:common_variable => 'common', :matched => '123'}
+    assert_route with_post, Rack::MockRequest.env_for('/common/other', :method => 'POST'), {:common_variable => 'common', :unmatched => 'other'}
   end
 
   if //.respond_to?(:names)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: http_router
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 6
-  - 5
-  version: 0.6.5
+  - 6
+  version: 0.6.6
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-23 00:00:00 -07:00
+date: 2011-03-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -160,7 +160,6 @@ files:
 - benchmarks/rec2.rb
 - benchmarks/recognition_bm.rb
 - examples/glob.ru
-- examples/middleware.ru
 - examples/rack_mapper.ru
 - examples/simple.ru
 - examples/static/config.ru
@@ -168,7 +167,6 @@ files:
 - examples/static/images/cat1.jpg
 - examples/static/images/cat2.jpg
 - examples/static/images/cat3.jpg
-- examples/unnamed_variable.ru
 - examples/variable.ru
 - examples/variable_with_regex.ru
 - http_router.gemspec
@@ -184,6 +182,9 @@ files:
 - lib/http_router/node/variable.rb
 - lib/http_router/optional_compiler.rb
 - lib/http_router/path.rb
+- lib/http_router/rack.rb
+- lib/http_router/rack/builder.rb
+- lib/http_router/rack/url_map.rb
 - lib/http_router/regex_route.rb
 - lib/http_router/request.rb
 - lib/http_router/response.rb

data/examples/middleware.ru

@@ -1,46 +0,0 @@
-require 'http_router'
-
-use(HttpRouter, :middleware => true) {
-  add('/test').name(:test)
-  add('/:variable').name(:var)
-  add('/more/*glob').name(:glob)
-  add('/get/:id').matching(:id => /\d+/).name(:get)
-}
-
-run proc {|env|
-  [
-    200,
-    {'Content-type' => 'text/plain'},
-    [<<-HEREDOC
-We matched? #{env['router.response'] && env['router.response'].matched? ? 'yes!' : 'no'}      
-Params are #{env['router.response'] && env['router.response'].matched? ? env['router.response'].params_as_hash.inspect : 'we had no params'}
-That was fun
-    HEREDOC
-    ]
-  ]
-}
-
-# crapbook-pro:polleverywhere joshua$ curl http://127.0.0.1:3000/hi
-# We matched? yes!      
-# Params are {:variable=>"hi"}
-# That was fun
-# crapbook-pro:polleverywhere joshua$ curl http://127.0.0.1:3000/test
-# We matched? yes!      
-# Params are {}
-# That was fun
-# crapbook-pro:polleverywhere joshua$ curl http://127.0.0.1:3000/hey
-# We matched? yes!      
-# Params are {:variable=>"hey"}
-# That was fun
-# crapbook-pro:polleverywhere joshua$ curl http://127.0.0.1:3000/more/fun/in/the/sun
-# We matched? yes!      
-# Params are {:glob=>["fun", "in", "the", "sun"]}
-# That was fun
-# crapbook-pro:polleverywhere joshua$ curl http://127.0.0.1:3000/get/what
-# We matched? no      
-# Params are we had no params
-# That was fun
-# crapbook-pro:polleverywhere joshua$ curl http://127.0.0.1:3000/get/123
-# We matched? yes!      
-# Params are {:id=>"123"}
-# That was fun

data/examples/unnamed_variable.ru

@@ -1,9 +0,0 @@
-require 'http_router'
-
-run HttpRouter.new {
-  get('/:').to { |env| [200, {'Content-type' => 'text/plain'}, ["my variables are\n#{env['router.params'].inspect}\n"]]}
-}
-
-# crapbook-pro:~ joshua$ curl http://127.0.0.1:3000/heyguys
-# my variables are
-# {:$1=>"heyguys"}