http_router 0.6.2 → 0.6.3

data/README.rdoc

@@ -8,7 +8,7 @@
 * Partial matches.
 * Supports interstitial variables (e.g. /my-:variable-brings.all.the.boys/yard) and unnamed variable /one/:/two
 * Very fast and small code base (~1,000 loc).
-* Sinatra compatibility.
+* Sinatra via https://github.com/joshbuddy/http_router_sinatra
 
 == Usage
 
@@ -36,12 +36,12 @@ As well, you can escape the following characters with a backslash: <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.
-  
+
   r = HttpRouter.new
   r.add('/test/:variable(.:format)').name(:my_test_path).to {|env| [200, {}, "Hey dude #{env['router.params'][:variable]}"]}
   r.add('/test').redirect("http://www.google.com/")
   r.add('/static').static('/my_file_system')
-  
+
 As well, you can support regex matching and request conditions. To add a regex match, use <tt>matching(:id => /\d+/)</tt>.
 To match on a request condition you can use <tt>condition(:request_method => %w(POST HEAD))</tt> or more succinctly <tt>request_method('POST', 'HEAD')</tt>.
 

data/benchmarks/rack_mount.rb

@@ -42,6 +42,6 @@ simple_and_dynamic_env = Rack::MockRequest.env_for('/dynamic/anything')
     report "4 levels, 1 dynamic" do
       set.url(simple_env, :variable, {:variable => 'onemore'})
     end
-  
+
   end
 end

data/benchmarks/rack_recognition_bm.rb

@@ -28,19 +28,19 @@ RBench.run(TIMES) do
   report "4 levels, static" do
     u.call(simple2_env).first == 200 or raise
   end
-  
+
   report "8 levels, static" do
     u.call(simple3_env).first == 200 or raise
   end
-  
+
   report "4 levels, 1 dynamic" do
     u.call(simple_and_dynamic_env).first == 200 or raise
   end
-  
+
   report "8 levels, 3 dynamic" do
     u.call(simple_and_dynamic_env1).first == 200 or raise
   end
-  
+
   report "4 levels, 1 greedy" do
     u.call(simple_and_dynamic_env2).first == 200 or raise
   end

data/http_router.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |s|
   s.version = HttpRouter::VERSION
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joshua Hull"]
-  s.summary = "A kick-ass HTTP router for use in Rack & Sinatra"
-  s.description = "This library allows you to recognize and build URLs in a Rack application. As well it contains an interface for use within Sinatra."
+  s.summary = "A kick-ass HTTP router for use in Rack"
+  s.description = "This library allows you to recognize and build URLs in a Rack application."
   s.email = %q{joshbuddy@gmail.com}
   s.extra_rdoc_files = ['README.rdoc']
   s.files = `git ls-files`.split("\n")

data/lib/http_router.rb

@@ -9,17 +9,19 @@ require 'http_router/regex_route'
 require 'http_router/optional_compiler'
 
 class HttpRouter
-  
+
   attr_reader :root, :routes, :known_methods, :named_routes
-  attr_accessor :default_app
+  attr_accessor :default_app, :url_mount
 
   UngeneratableRouteException = Class.new(RuntimeError)
   InvalidRouteException       = Class.new(RuntimeError)
   MissingParameterException   = Class.new(RuntimeError)
 
-  def initialize(opts = nil, &blk)
+  def initialize(options = nil, &blk)
     reset!
-    @ignore_trailing_slash = opts && opts.key?(:ignore_trailing_slash) ? opts[:ignore_trailing_slash] : true
+    @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
     instance_eval(&blk) if blk
   end
 
@@ -30,11 +32,15 @@ class HttpRouter
     else
       Route.new(self, path, opts)
     end
-    @routes << route
+    add_route(route)
     route.to(app) if app
     route
   end
 
+  def add_route(route)
+    @routes << route
+  end
+
   def add_with_request_method(path, method, opts = {}, &app)
     route = add(path, opts).send(method.to_sym)
     route.to(app) if app
@@ -68,7 +74,7 @@ class HttpRouter
       @default_app.call(env)
     end
   end
-  
+
   def reset!
     @root = Node.new(self)
     @default_app = Proc.new{ |env| Rack::Response.new("Your request couldn't be found", 404).finish }
@@ -104,4 +110,20 @@ class HttpRouter
     end
     uri
   end
+
+  # Creates a deep-copy of the router.
+  def clone(klass = self.class)
+    cloned_router = klass.new(@options)
+    @routes.each do |route|
+      new_route = route.clone(cloned_router)
+      cloned_router.add_route(new_route)
+      new_route.name(route.named) if route.named
+      begin
+        new_route.to route.dest.clone
+      rescue
+        new_route.to route.dest
+      end
+    end
+    cloned_router
+  end
 end

data/lib/http_router/node.rb

@@ -29,26 +29,26 @@ class HttpRouter
     def linear(request)
       @linear && @linear.each{|n| n[request]}
     end
-  
+
     def lookup(request)
       if @lookup && @lookup[request.path.first]
         request = request.clone
         @lookup[request.path.shift][request]
       end
     end
-  
+
     def variable(request)
       @variable && @variable[request]
     end
-  
+
     def glob(request)
       @glob && @glob[request]
     end
-  
+
     def request(request)
       @request && @request[request]
     end
-  
+
     def arbitrary(request)
       @arbitrary && @arbitrary.each{|n| n[request]}
     end
@@ -132,38 +132,40 @@ class HttpRouter
       @arbitrary << Arbitrary.new(@router, allow_partial, blk, param_names)
       @arbitrary.last
     end
-  
-    def add_match(regexp, matching_indicies = [0], priority = 0)
+
+    def add_match(regexp, matching_indicies = [0], priority = 0, splitting_indicies = nil)
+      add_prioritized_match(Regex.new(@router, regexp, matching_indicies, priority, splitting_indicies))
+    end
+
+    def add_spanning_match(regexp, matching_indicies = [0], priority = 0, splitting_indicies = nil)
+      add_prioritized_match(SpanningRegex.new(@router, regexp, matching_indicies, priority, splitting_indicies))
+    end
+
+    def add_prioritized_match(match)
       @linear ||= []
-      if priority != 0
+      if match.priority != 0
         @linear.each_with_index { |n, i|
-          if priority > (n.priority || 0)
-            @linear[i, 0] = Regex.new(@router, regexp, matching_indicies, priority)
+          if match.priority > (n.priority || 0)
+            @linear[i, 0] = match
             return @linear[i]
           end
         }
       end
-      @linear << Regex.new(@router, regexp, matching_indicies, priority)
+      @linear << match
       @linear.last
     end
 
-    def add_spanning_match(regexp, matching_indicies = [0])
-      @linear ||= []
-      @linear << SpanningRegex.new(@router, regexp, matching_indicies)
-      @linear.last
-    end
-  
     def add_free_match(regexp)
       @linear ||= []
       @linear << FreeRegex.new(@router, regexp)
       @linear.last
     end
-  
+
     def add_destination(route)
       @destination ||= []
       @destination << route
     end
-  
+
     def add_lookup(part)
       @lookup ||= {}
       @lookup[part] ||= Node.new(@router)

data/lib/http_router/node/regex.rb

@@ -2,11 +2,10 @@ class HttpRouter
   class Node
     class Regex < Node
       alias_method :node_lookup, :[]
+      attr_reader :matcher, :splitting_indicies
 
-      attr_reader :matcher
-
-      def initialize(router, matcher, capturing_indicies, priority = 0)
-        @router, @matcher, @capturing_indicies, @priority = router, matcher, capturing_indicies, priority
+      def initialize(router, matcher, capturing_indicies, priority = 0, splitting_indicies = nil)
+        @router, @matcher, @capturing_indicies, @priority, @splitting_indicies = router, matcher, capturing_indicies, priority, splitting_indicies
       end
 
       def [](request)
@@ -19,6 +18,7 @@ class HttpRouter
       end
 
       def add_params(request, match)
+        @splitting_indicies.each { |idx| request.params << unescape(match[idx]).split(/\//) } if @splitting_indicies
         @capturing_indicies.each { |idx| request.params << unescape(match[idx]) }
       end
     end

data/lib/http_router/optional_compiler.rb

@@ -22,7 +22,7 @@ class HttpRouter
     def add_to_current_set(c)
       (@start_index...@end_index).each { |path_index| @paths[path_index] << c }
     end
-    
+
     # over current working set, double @paths
     def double_paths 
       (@start_index...@end_index).each { |path_index| @paths << @paths[path_index].dup }

data/lib/http_router/regex_route.rb

@@ -1,11 +1,11 @@
 class HttpRouter
   class RegexRoute < Route
     def initialize(router, path, opts = {})
-      @router, @path, @opts = router, path, opts
+      @router, @original_path, @opts = router, path, opts
     end
 
     def compile
-      add_non_path_to_tree(@router.root.add_free_match(path), path, [])
+      add_non_path_to_tree(@router.root.add_free_match(@original_path), path, [])
       @compiled = true
     end
 

data/lib/http_router/request.rb

@@ -21,7 +21,7 @@ class HttpRouter
     def to_s
       "request path, #{path.inspect}"
     end
-    
+
     def clone
       dup_obj = super
       dup_obj.path = path.dup

data/lib/http_router/route.rb

@@ -1,3 +1,5 @@
+require 'url_mount'
+
 class HttpRouter
   class Route
     attr_reader :default_values, :matches_with, :router, :path, :conditions
@@ -126,6 +128,10 @@ class HttpRouter
       @router.append_querystring(result, extra_params)
     end
 
+    def clone(new_router)
+      Route.new(new_router, @original_path.dup, as_options)
+    end
+
     def url_with_params(*args)
       options = args.last.is_a?(Hash) ? args.pop : nil
       options = options.nil? ? default_values.dup : default_values.merge(options) if default_values
@@ -137,9 +143,8 @@ class HttpRouter
       end
       raise UngeneratableRouteException unless path
       result, params = path.url(args, options)
-      #mount_point = router.url_mount && router.url_mount.url(options)
-      #mount_point ? [File.join(mount_point, result), params] : [result, params]
-      [result, params]
+      mount_point = router.url_mount && router.url_mount.url(options)
+      mount_point ? [File.join(mount_point, result), params] : [result, params]
     end
 
     def significant_variable_names
@@ -203,14 +208,26 @@ class HttpRouter
               node.add_lookup(parts[0])
             end
           else
+            capturing_indicies = []
+            splitting_indicies = []
             captures = 0
             priority = 0
+            spans = false
             regex = parts.inject('') do |reg, part|
               reg << case part[0]
               when ?\\
                 Regexp.quote(part[1].chr)
               when ?:
                 captures += 1
+                capturing_indicies << captures
+                name = part[1, part.size].to_sym
+                param_names << name
+                matches_with[name] = @opts[name]
+                "(#{(@opts[name] || '[^/]*?')})"
+              when ?*
+                spans = true
+                captures += 1
+                splitting_indicies << captures
                 name = part[1, part.size].to_sym
                 param_names << name
                 matches_with[name] = @opts[name]
@@ -220,9 +237,8 @@ class HttpRouter
                 Regexp.quote(part)
               end
             end
-            capturing_indicies = []
-            captures.times {|i| capturing_indicies << i + 1}
-            node = node.add_match(Regexp.new("#{regex}$"), capturing_indicies, priority)
+            node = spans ? node.add_spanning_match(Regexp.new("#{regex}$"), capturing_indicies, priority, splitting_indicies) :
+              node.add_match(Regexp.new("#{regex}$"), capturing_indicies, priority, splitting_indicies)
           end
         end
         add_non_path_to_tree(node, path, param_names)
@@ -239,6 +255,11 @@ class HttpRouter
       @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)}
+      if dest.respond_to?(:url_mount=)
+        urlmount = UrlMount.new(@original_path, @default_values)
+        urlmount.url_mount = router.url_mount if router.url_mount
+        dest.url_mount = urlmount
+      end
       path_obj
     end
   end

data/lib/http_router/version.rb

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

data/test/helper.rb

@@ -29,7 +29,7 @@ class MiniTest::Unit::TestCase
     response.last.each {|p| body << p}
     assert_equal expect, body
   end
-  
+
   def assert_header(header, response)
     response = Rack::MockRequest.env_for(response) if response.is_a?(String)
     response = router.call(response) if response.is_a?(Hash)
@@ -64,7 +64,7 @@ class MiniTest::Unit::TestCase
       assert_equal 404, response.first
     end
   end
-  
+
   def assert_generate(path, route, *args)
     if route.is_a?(String)
       router.reset!

data/test/rack/test_route.rb

@@ -1,5 +1,5 @@
 class TestRouteExtensions < MiniTest::Unit::TestCase
-  
+
   def test_redirect
     router.get("/index.html").redirect("/")
     response = router.call(Rack::MockRequest.env_for("/index.html"))

data/test/test_generate.rb

@@ -19,12 +19,12 @@ class TestGenerate < MiniTest::Unit::TestCase
     assert_generate '/test', '/:var', :var => 'test'
     assert_generate '/test', '/:var', 'test'
   end
-  
+
   def test_array_with_extras
     assert_generate '/test?query=string', '/:var', :var => 'test', :query => 'string'
     assert_generate '/test?query=string', '/:var', 'test', :query => 'string'
   end
-  
+
   def test_multiple_dynamics
     assert_generate '/one/two', "/:var/:baz", :var => 'one', :baz => 'two'
     assert_generate '/one/two', "/:var/:baz", 'one', 'two'
@@ -60,7 +60,7 @@ class TestGenerate < MiniTest::Unit::TestCase
     assert_generate '/var/fooz', "/:var1(/:var2)", :var1 => 'var', :var2 => 'fooz'
     assert_raises(HttpRouter::UngeneratableRouteException) { router.url(router.add("/:var1(/:var2)").to(:test), :var2 => 'fooz') }
   end
-    
+
   def test_optionals_with_format
     assert_generate '/var',           "/:var1(/:var2.:format)", 'var'
     assert_generate '/var/fooz.html', "/:var1(/:var2.:format)", 'var', 'fooz', 'html'

data/test/test_interstitial.rb

@@ -35,7 +35,7 @@ class TestInterstitial < MiniTest::Unit::TestCase
     assert_route r5, '/one-value-time-one-variable',   {:var1 => 'one', :var2 => 'value', :var3 => 'time', :var4 => 'one', :var5 => 'variable'}
     assert_route r6, '/one-value-time-one-value-time', {:var1 => 'one', :var2 => 'value', :var3 => 'time', :var4 => 'one', :var5 => 'value', :var6 => 'time'}    
   end
-  
+
   def test_regex_with_mutliple_variables
     with_regex, without_regex = router {
       add("/:common_variable.:matched").matching(:matched => /\d+/)

data/test/test_misc.rb

@@ -1,30 +1,24 @@
 class TestMisc < MiniTest::Unit::TestCase
-  #def test_exceptions
-  #  assert_raises(HttpRouter::AmbiguousRouteException) {HttpRouter.new.add("/:var1(/:var2)(/:var3)").compile}
-  #  assert_raises(HttpRouter::AmbiguousVariableException) {HttpRouter.new.add("/:var1(/:var1)(/:var1)").compile}
-  #  assert_raises(HttpRouter::UnsupportedRequestConditionError) {HttpRouter.new.add("/").condition(:flibberty => 'gibet').compile}
-  #end
-  #
-  #def test_cloning
-  #  r1 = HttpRouter.new {
-  #    add('/test').name(:test_route).to :test
-  #  }
-  #  r2 = r1.clone
-  #
-  #  r2.add('/test2').name(:test).to(:test2)
-  #  assert_equal 2, r2.routes.size
-  #
-  #  assert r1.recognize(Rack::Request.new(Rack::MockRequest.env_for('/test2'))).nil?
-  #  assert !r2.recognize(Rack::Request.new(Rack::MockRequest.env_for('/test2'))).nil?
-  #  assert_equal r1.routes.first, r1.named_routes[:test_route]
-  #  assert_equal r2.routes.first, r2.named_routes[:test_route]
-  #
-  #  r1.add('/another').name(:test).to(:test2)
-  #
-  #  assert_equal r1.routes.size, r2.routes.size
-  #  assert_equal '/another', r1.url(:test)
-  #  assert_equal '/test2',   r2.url(:test)
-  #  assert_equal :test, r1.routes.first.dest
-  #  assert_equal :test, r2.routes.first.dest
-  #end
+  def test_cloning
+    r1 = HttpRouter.new {
+      add('/test').name(:test_route).to :test
+    }
+    r2 = r1.clone
+
+    r2.add('/test2').name(:test).to(:test2)
+    assert_equal 2, r2.routes.size
+
+    assert_equal 404, r1.recognize(Rack::Request.new(Rack::MockRequest.env_for('/test2'))).first
+    assert r2.recognize(Rack::Request.new(Rack::MockRequest.env_for('/test2')))
+    assert_equal r1.routes.first, r1.named_routes[:test_route]
+    assert_equal r2.routes.first, r2.named_routes[:test_route]
+
+    r1.add('/another').name(:test).to(:test2)
+
+    assert_equal r1.routes.size, r2.routes.size
+    assert_equal '/another', r1.url(:test)
+    assert_equal '/test2',   r2.url(:test)
+    assert_equal :test, r1.routes.first.dest
+    assert_equal :test, r2.routes.first.dest
+  end
 end

data/test/test_mounting.rb

@@ -1,89 +1,83 @@
 class TestMounting < MiniTest::Unit::TestCase
-  #def setup
-  #  @r1 = HttpRouter.new
-  #  @r2 = HttpRouter.new
-  #  @r2.add("/bar").name(:test).compile
-  #end
-  #
-  #def test_url_mount_for_child_route
-  #  route = @r1.add("/foo").to(@r2)
-  #  assert_equal "/foo", @r2.url_mount.url
-  #  assert_equal "/foo/bar", @r2.url(:test)
-  #end
-  #
-  #def test_default_values
-  #  route = @r1.add("/foo/:bar").default(:bar => "baz").to(@r2)
-  #  assert_equal "/foo/baz/bar", @r2.url(:test)
-  #  assert_equal "/foo/haha/bar", @r2.url(:test, :bar => "haha")
-  #end
-  #
-  #def test_multiple_values
-  #  @r1.add("/foo/:bar/:baz").default(:bar => "bar").to(@r2)
-  #  assert_equal "/foo/bar/baz/bar", @r2.url(:test, :baz => "baz")
-  #end
-  #
-  #def test_bubble_params
-  #  route = @r1.add("/foo/:bar").default(:bar => "baz").to(@r2)
-  #  assert_equal "/foo/baz/bar?bang=ers",  @r2.url(:test, :bang => "ers")
-  #  assert_equal "/foo/haha/bar?bang=ers", @r2.url(:test, :bar => "haha", :bang => "ers")
-  #end
-  #
-  #def test_path_with_optional
-  #  @r1.add("/foo(/:bar)").to(@r2)
-  #  @r2.add("/hey(/:there)").name(:test).compile
-  #  assert_equal "/foo/hey", @r2.url(:test)
-  #  assert_equal "/foo/bar/hey", @r2.url(:test, :bar => "bar")
-  #  assert_equal "/foo/bar/hey/there", @r2.url(:test, :bar => "bar", :there => "there")
-  #end
-  #
-  #def test_nest3
-  #  @r3 = HttpRouter.new
-  #  @r1.add("/foo(/:bar)").default(:bar => "barry").to(@r2)
-  #  @r2.add("/hi").name(:hi).compile
-  #  @r2.add("/mounted").to(@r3)
-  #  @r3.add("/endpoint").name(:endpoint).compile
-  #  
-  #  assert_equal "/foo/barry/hi",                @r2.url(:hi)
-  #  assert_equal "/foo/barry/mounted/endpoint",  @r3.url(:endpoint)
-  #  assert_equal "/foo/flower/mounted/endpoint", @r3.url(:endpoint, :bar => "flower")
-  #end
-  #
-  #def test_with_default_host
-  #  @r1.add("/mounted").default(:host => "example.com").to(@r2)
-  #  assert_equal "http://example.com/mounted/bar", @r2.url(:test)
-  #end
-  #
-  #def test_with_host
-  #  @r1.add("/mounted").to(@r2)
-  #  assert_equal "/mounted/bar", @r2.url(:test)
-  #  assert_equal "http://example.com/mounted/bar", @r2.url(:test, :host => "example.com")
-  #end
-  #
-  #def test_with_scheme
-  #  @r1.add("/mounted").to(@r2)
-  #  assert_equal "/mounted/bar", @r2.url(:test)
-  #  assert_equal "https://example.com/mounted/bar", @r2.url(:test, :scheme => "https", :host => "example.com")
-  #end
-  #
-  #def test_clone
-  #  @r3 = HttpRouter.new
-  #  @r1.add("/first").to(@r2)
-  #  @r2.add("/second").to(@r3)
-  #  r1 = @r1.clone
-  #  assert @r1.routes.first
-  #  r2 = r1.routes.first.dest
-  #  assert r2
-  #  assert_equal @r1.routes.first.dest.object_id, @r2.object_id
-  #  assert r2.object_id != @r2.object_id
-  #  assert_equal 2, r2.routes.size
-  #  r3 = r2.routes.last.dest
-  #  assert_instance_of HttpRouter, r3
-  #  assert r3.object_id != @r3.object_id
-  #end
-end
+  def setup
+    @r1 = HttpRouter.new
+    @r2 = HttpRouter.new
+    @r2.add("/bar").name(:test).to{|env| [200, {}, []]}
+  end
+
+  def test_url_mount_for_child_route
+    route = @r1.add("/foo").to(@r2)
+    assert_equal "/foo", @r2.url_mount.url
+    assert_equal "/foo/bar", @r2.url(:test)
+  end
+
+  def test_default_values
+    route = @r1.add("/foo/:bar").default(:bar => "baz").to(@r2)
+    assert_equal "/foo/baz/bar", @r2.url(:test)
+    assert_equal "/foo/haha/bar", @r2.url(:test, :bar => "haha")
+  end
+
+  def test_multiple_values
+    @r1.add("/foo/:bar/:baz").default(:bar => "bar").to(@r2)
+    assert_equal "/foo/bar/baz/bar", @r2.url(:test, :baz => "baz")
+  end
+
+  def test_bubble_params
+    route = @r1.add("/foo/:bar").default(:bar => "baz").to(@r2)
+    assert_equal "/foo/baz/bar?bang=ers",  @r2.url(:test, :bang => "ers")
+    assert_equal "/foo/haha/bar?bang=ers", @r2.url(:test, :bar => "haha", :bang => "ers")
+  end
+
+  def test_path_with_optional
+    @r1.add("/foo(/:bar)").to(@r2)
+    @r2.add("/hey(/:there)").name(:test).to{|env| [200, {}, []]}
+    assert_equal "/foo/hey", @r2.url(:test)
+    assert_equal "/foo/bar/hey", @r2.url(:test, :bar => "bar")
+    assert_equal "/foo/bar/hey/there", @r2.url(:test, :bar => "bar", :there => "there")
+  end
 
-#      it "should clone my nested structure" do
-#      end
-#    end
-#  end
-#end
+  def test_nest3
+    @r3 = HttpRouter.new
+    @r1.add("/foo(/:bar)").default(:bar => "barry").to(@r2)
+    @r2.add("/hi").name(:hi).to{|env| [200, {}, []]}
+    @r2.add("/mounted").to(@r3)
+    @r3.add("/endpoint").name(:endpoint).to{|env| [200, {}, []]}
+
+    assert_equal "/foo/barry/hi",                @r2.url(:hi)
+    assert_equal "/foo/barry/mounted/endpoint",  @r3.url(:endpoint)
+    assert_equal "/foo/flower/mounted/endpoint", @r3.url(:endpoint, :bar => "flower")
+  end
+
+  def test_with_default_host
+    @r1.add("/mounted").default(:host => "example.com").to(@r2)
+    assert_equal "http://example.com/mounted/bar", @r2.url(:test)
+  end
+
+  def test_with_host
+    @r1.add("/mounted").to(@r2)
+    assert_equal "/mounted/bar", @r2.url(:test)
+    assert_equal "http://example.com/mounted/bar", @r2.url(:test, :host => "example.com")
+  end
+
+  def test_with_scheme
+    @r1.add("/mounted").to(@r2)
+    assert_equal "/mounted/bar", @r2.url(:test)
+    assert_equal "https://example.com/mounted/bar", @r2.url(:test, :scheme => "https", :host => "example.com")
+  end
+
+  def test_clone
+    @r3 = HttpRouter.new
+    @r1.add("/first").to(@r2)
+    @r2.add("/second").to(@r3)
+    r1 = @r1.clone
+    assert @r1.routes.first
+    r2 = r1.routes.first.dest
+    assert r2
+    assert_equal @r1.routes.first.dest.object_id, @r2.object_id
+    assert r2.object_id != @r2.object_id
+    assert_equal 2, r2.routes.size
+    r3 = r2.routes.last.dest
+    assert_instance_of HttpRouter, r3
+    assert r3.object_id != @r3.object_id
+  end
+end

data/test/test_recognize.rb

@@ -40,7 +40,7 @@ class TestRecognition < MiniTest::Unit::TestCase
     assert_body '/optional', router.call(Rack::MockRequest.env_for('/test/optional'))
     assert_body '/',         router.call(Rack::MockRequest.env_for('/test'))
   end
-  
+
   def test_partial_root
     router.add("/*").to { |env| Rack::Response.new(env['PATH_INFO']).finish }
     assert_body '/optional', router.call(Rack::MockRequest.env_for('/optional'))

data/test/test_request.rb

@@ -83,7 +83,7 @@ class TestRequest < MiniTest::Unit::TestCase
     }
     assert_route router.add("/test").host('host2'), Rack::MockRequest.env_for('http://host2/test', :method => 'POST')
   end
-  
+
   def test_match_on_scheme
     http, https = router { get("/test").scheme('http'); get("/test").scheme('https') }
     assert_status 405, Rack::MockRequest.env_for('https://example.org/test', :method => 'POST')

data/test/test_variable.rb

@@ -19,7 +19,7 @@ class TestVariable < MiniTest::Unit::TestCase
     assert_route static,       '/one'
     assert_route nil,          '/two'
   end
-  
+
   def test_variable_and_static
     dynamic, static = router {
       add("/foo/:id")
@@ -83,13 +83,25 @@ class TestVariable < MiniTest::Unit::TestCase
   def test_glob_with_static
     assert_route '/test/*variable/test', '/test/one/two/three/test', {:variable => ['one', 'two', 'three']}
   end
-  
+
+  def test_glob_with_variable
+    assert_route '/test/*variable/:test', '/test/one/two/three', {:variable => ['one', 'two'], :test => 'three'}
+  end
+
+  def test_glob_with_format
+    assert_route '/test/*variable.:format', 'test/one/two/three.html', {:variable => ['one', 'two', 'three'], :format => 'html'}
+  end
+
+  def test_glob_with_literal
+    assert_route '/test/*variable.html', 'test/one/two/three.html', {:variable => ['one', 'two', 'three']}
+  end
+
   def test_glob_with_regex
     r = router { add('/test/*variable/anymore')}
     assert_route r, '/test/123/345/567/anymore', {:variable => ['123', '345', '567']}
     assert_route nil, '/test/123/345/567'
   end
-  
+
   def test_regex_and_greedy
     with_regex, without_regex = router {
       add("/:common_variable/:matched").matching(:matched => /\d+/)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: http_router
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 6
-  - 2
-  version: 0.6.2
+  - 3
+  version: 0.6.3
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-21 00:00:00 -07:00
+date: 2011-03-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -138,7 +138,7 @@ dependencies:
         version: 1.0.0
   type: :development
   version_requirements: *id008
-description: This library allows you to recognize and build URLs in a Rack application. As well it contains an interface for use within Sinatra.
+description: This library allows you to recognize and build URLs in a Rack application.
 email: joshbuddy@gmail.com
 executables: []
 
@@ -236,6 +236,6 @@ rubyforge_project: http_router
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: A kick-ass HTTP router for use in Rack & Sinatra
+summary: A kick-ass HTTP router for use in Rack
 test_files: []