http_router 0.2.3 → 0.2.4

data/.gitignore

@@ -1 +1,4 @@
 pkg
+*.gem
+.bundle
+rdoc

data/Gemfile

@@ -0,0 +1,11 @@
+source :rubygems
+
+gem 'rack',       '>=1.0'
+gem 'url_mount',  '>=0.2.1'
+
+group :development do
+  gem 'rspec'
+  gem 'rake'
+  gem 'sinatra'
+  gem 'rbench'
+end

data/Gemfile.lock

@@ -0,0 +1,43 @@
+--- 
+dependencies: 
+  rake: 
+    group: 
+    - :development
+    version: ">= 0"
+  url_mount: 
+    group: 
+    - :default
+    version: ">= 0.2.1"
+  rspec: 
+    group: 
+    - :development
+    version: ">= 0"
+  rack: 
+    group: 
+    - :default
+    version: ">= 1.0"
+  sinatra: 
+    group: 
+    - :development
+    version: ">= 0"
+  rbench: 
+    group: 
+    - :development
+    version: ">= 0"
+specs: 
+- rake: 
+    version: 0.8.7
+- rack: 
+    version: 1.1.0
+- rbench: 
+    version: 0.2.3
+- rspec: 
+    version: 1.3.0
+- sinatra: 
+    version: "1.0"
+- url_mount: 
+    version: 0.2.1
+hash: 31358295b6fc19c69280f917c4fa3db0d1a7d48d
+sources: 
+- Rubygems: 
+    uri: http://gemcutter.org

data/Rakefile

@@ -1,11 +1,8 @@
+require 'rubygems'
 require 'spec'
 require 'spec/rake/spectask'
 Spec::Rake::SpecTask.new(:spec) do |t|
   t.spec_opts ||= []
-  t.ruby_opts << "-rrubygems"
-  t.ruby_opts << "-Ilib"
-  t.ruby_opts << "-rhttp_router"
-  t.ruby_opts << "-rspec/spec_helper"
   t.spec_opts << "--options" << "spec/spec.opts"
   t.spec_files = FileList['spec/**/*_spec.rb']
 end

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/http_router.gemspec

@@ -21,7 +21,8 @@ Gem::Specification.new do |s|
   s.test_files = `git ls-files spec`.split("\n")
 
   # dependencies
-  s.add_dependency "rack", ">= 1.0.0"
+  s.add_dependency "rack",      ">= 1.0.0"
+  s.add_dependency "url_mount", ">=0.2"
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/lib/http_router/glob.rb

@@ -1,13 +1,13 @@
 class HttpRouter
   class Glob < Variable
-    def matches?(parts, whole_path)
-      @matches_with.nil? or (!parts.empty? and match = @matches_with.match(parts.first) and match.begin(0))
+    def matches?(parts)
+      @matches_with.nil? or (!parts.empty? and match = @matches_with.match(parts.first) and match.begin(0)) ? match : nil
     end
 
-    def consume(parts, whole_path)
+    def consume(match, parts)
       if @matches_with
         params = [parts.shift]
-        params << parts.shift while matches?(parts, whole_path)
+        params << parts.shift while matches?(parts)
         params
       else
         params = parts.dup

data/lib/http_router/node.rb

@@ -139,7 +139,6 @@ class HttpRouter
 
     def find_on_parts(request, parts, params)
       if parts and !parts.empty?
-        whole_path = parts.join('/')
         if parts.size == 1 and parts.first == ''
           potential_match = find_on_parts(request, [], params)
           if potential_match and (router.ignore_trailing_slash? or potential_match.value && potential_match.value.route.trailing_slash_ignore?)
@@ -151,12 +150,12 @@ class HttpRouter
           response = nil
           dupped_parts = nil
           next_node = @linear.find do |(tester, node)|
-            if tester.respond_to?(:matches?) and tester.matches?(parts, whole_path)
+            if tester.respond_to?(:matches?) and match = tester.matches?(parts)
               dupped_parts = parts.dup
-              params << tester.consume(dupped_parts, whole_path)
+              params << tester.consume(match, dupped_parts)
               parts.replace(dupped_parts) if response = node.find_on_parts(request, dupped_parts, params)
-            elsif tester.respond_to?(:match) and match = tester.match(whole_path) and match.begin(0) == 0
-              dupped_parts = router.split(whole_path[match[0].size, whole_path.size])
+            elsif tester.respond_to?(:match) and match = tester.match(parts.whole_path) and match.begin(0) == 0
+              dupped_parts = router.split(parts.whole_path[match[0].size, parts.whole_path.size])
               parts.replace(dupped_parts) if response = node.find_on_parts(request, dupped_parts, params)
             else
               nil
@@ -168,7 +167,7 @@ class HttpRouter
           parts.shift
           return match.find_on_parts(request, parts, params)
         elsif @catchall
-          params << @catchall.variable.consume(parts, whole_path)
+          params << @catchall.variable.consume(nil, parts)
           return @catchall.find_on_parts(request, parts, params)
         end
       end

data/lib/http_router/parts.rb

@@ -0,0 +1,21 @@
+class HttpRouter
+  class Parts < Array
+    def initialize(path)
+      super((path[0] == ?/ ? path[1, path.size] : path).split('/'))
+    end
+
+    def whole_path
+      @whole_path ||= join('/')
+    end
+
+    def shift
+      @whole_path = nil
+      super
+    end
+
+    def replace(ary)
+      @whole_path = nil
+      super
+    end
+  end
+end

data/lib/http_router/path.rb

@@ -1,4 +1,3 @@
-require 'cgi'
 class HttpRouter
   class Path
     attr_reader :parts, :route
@@ -58,9 +57,9 @@ class HttpRouter
         params.each do |k,v|
           case v
           when Array
-            v.each { |v_part| uri << '&' << CGI.escape(k.to_s) << '%5B%5D=' << CGI.escape(v_part.to_s) }
+            v.each { |v_part| uri << '&' << Rack::Utils.escape(k.to_s) << '%5B%5D=' << Rack::Utils.escape(v_part.to_s) }
           else
-            uri << '&' << CGI.escape(k.to_s) << '=' << CGI.escape(v.to_s)
+            uri << '&' << Rack::Utils.escape(k.to_s) << '=' << Rack::Utils.escape(v.to_s)
           end
         end
         uri[uri_size] = ??

data/lib/http_router/route.rb

@@ -30,8 +30,8 @@ class HttpRouter
     end
 
     # Creates a deep uncompiled copy of this route.
-    def clone
-      Route.new(@router, @original_path.dup).with_options(as_options)
+    def clone(new_router)
+      Route.new(new_router, @original_path.dup).with_options(as_options)
     end
 
     # Uses an option hash to apply conditions to a Route.
@@ -75,27 +75,27 @@ class HttpRouter
     def get
       request_method('GET')
     end
-    
+
     # Causes this route to recognize the POST request method. Returns +self+.
     def post
       request_method('POST')
     end
-    
+
     # Causes this route to recognize the HEAD request method. Returns +self+.
     def head
       request_method('HEAD')
     end
-    
+
     # Causes this route to recognize the PUT request method. Returns +self+.
     def put
       request_method('PUT')
     end
-    
+
     # Causes this route to recognize the DELETE request method. Returns +self+.
     def delete
       request_method('DELETE')
     end
-    
+
     # Sets a request condition for the route
     # Returns +self+.
     #
@@ -147,6 +147,11 @@ class HttpRouter
     def to(dest = nil, &block)
       compile
       @dest = dest || block
+      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
       self
     end
 
@@ -161,12 +166,12 @@ class HttpRouter
       @arbitrary << (proc || block)
       self
     end
-  
+
     # Compile state for route. Returns +true+ or +false+.
     def compiled?
       !@paths.nil?
     end
-  
+
     # Compiles the route and inserts it into the tree. This is called automatically when you add a destination via #to to the route. Until a route
     # is compiled, it will not be recognized.
     def compile
@@ -189,7 +194,7 @@ class HttpRouter
       end
       self
     end
-  
+
     # Sets the destination of this route to redirect to an arbitrary URL.
     def redirect(path, status = 302)
       raise(ArgumentError, "Status has to be an integer between 300 and 399") unless (300..399).include?(status)
@@ -201,7 +206,7 @@ class HttpRouter
       }
       self
     end
-    
+
     # Sets the destination of this route to serve static files from either a directory or a single file.
     def static(root)
       if File.directory?(root)
@@ -233,11 +238,18 @@ class HttpRouter
         matching_path(args, options)
       end
       raise UngeneratableRouteException.new unless path
-      path.url(args, options)
+
+      mount_point = nil
+      if !router.url_mount.nil?
+        mount_point = router.url_mount.url(options)
+      end
+
+      result = path.url(args, options)
+      mount_point.nil? ? result : File.join(mount_point, result)
     end
 
     private
-    
+
     attr_reader :router
 
     def matching_path(params, other_hash = nil)
@@ -246,7 +258,7 @@ class HttpRouter
       else
         if params.is_a?(Array)
           significant_keys = other_hash && significant_variable_names & other_hash.keys
-          @paths.find { |path| 
+          @paths.find { |path|
             var_count = significant_keys ? params.size + significant_keys.size : params.size
             path.variables.size == var_count
           }
@@ -262,7 +274,7 @@ class HttpRouter
         end
       end
     end
-    
+
     def extract_partial_match(path)
       path[-1] == ?* && path.slice!(-1)
     end

data/lib/http_router/variable.rb

@@ -8,14 +8,13 @@ class HttpRouter
       @matches_with = matches_with
     end
 
-    def matches?(parts, whole_path)
-      @matches_with.nil? or (@matches_with and match = @matches_with.match(whole_path) and match.begin(0) == 0)
+    def matches?(parts)
+      @matches_with.nil? or (@matches_with and match = @matches_with.match(parts.whole_path) and match.begin(0) == 0) ? match : nil
     end
 
-    def consume(parts, whole_path)
+    def consume(match, parts)
       if @matches_with
-        match = @matches_with.match(whole_path)
-        parts.replace(router.split(whole_path[match.end(0), whole_path.size]))
+        parts.replace(router.split(parts.whole_path[match.end(0), parts.whole_path.size]))
         match[0]
       else
         parts.shift

data/lib/http_router.rb

@@ -1,5 +1,7 @@
-$LOAD_PATH << File.dirname(__FILE__)
+$LOAD_PATH << File.expand_path(File.dirname(__FILE__))
+
 require 'rack'
+require 'url_mount'
 require 'ext/rack/uri_escape'
 require 'http_router/node'
 require 'http_router/root'
@@ -9,6 +11,7 @@ require 'http_router/route'
 require 'http_router/response'
 require 'http_router/path'
 require 'http_router/optional_compiler'
+require 'http_router/parts'
 
 class HttpRouter
   # Raised when a Route is not able to be generated.
@@ -29,6 +32,7 @@ class HttpRouter
   AmbiguousVariableException       = Class.new(RuntimeError)
 
   attr_reader :named_routes, :routes, :root
+  attr_accessor :url_mount
 
   # Monkey-patches Rack::Builder to use HttpRouter.
   # See examples/rack_mapper.rb
@@ -83,7 +87,7 @@ class HttpRouter
   def default(app)
     @default_app = app
   end
-  
+
   # Adds a path to be recognized.
   #
   # To assign a part of the path to a specific variable, use :variable_name within the route.
@@ -93,7 +97,7 @@ class HttpRouter
   # For example, <tt>add('/path/*id')</tt> would match <tt>/path/123/456/789</tt>, with the variable <tt>:id</tt> having the value <tt>["123", "456", "789"]</tt>.
   #
   # As well, paths can end with two optional parts, <tt>*</tt> and <tt>/?</tt>. If it ends with a <tt>*</tt>, it will match partially, returning the part of the path unmatched in the PATH_INFO value of the env. The part matched to will be returned in the SCRIPT_NAME. If it ends with <tt>/?</tt>, then a trailing / on the path will be optionally matched for that specific route. As trailing /'s are ignored by default, you probably don't actually want to use this option that frequently.
-  # 
+  #
   # Routes can also contain optional parts. There are surrounded with <tt>( )</tt>'s. If you need to match on a bracket in the route itself, you can escape the parentheses with a backslash.
   #
   # The second argument, options, is an optional hash that can modify the route in further ways. See HttpRouter::Route#with_options for details. Typically, you want to add further options to the route by calling additional methods on it. See HttpRouter::Route for further details.
@@ -144,7 +148,7 @@ class HttpRouter
 
   # Generate a URL for a specified route. This will accept a list of variable values plus any other variable names named as a hash.
   # This first value must be either the Route object or the name of the route.
-  # 
+  #
   # Example:
   #   router = HttpRouter.new
   #   router.add('/:foo.:format).name(:test).compile
@@ -167,7 +171,7 @@ class HttpRouter
     end
   end
 
-  # Rack compatible #call. If matching route is found, and +dest+ value responds to #call, processing will pass to the matched route. Otherwise, 
+  # Rack compatible #call. If matching route is found, and +dest+ value responds to #call, processing will pass to the matched route. Otherwise,
   # 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>. The HttpRouter::Response object will be available under the key <tt>router.response</tt> if
   # a response is available.
@@ -192,7 +196,7 @@ class HttpRouter
       @default_app.call(env)
     end
   end
-  
+
   # Returns a new node
   def node(*args)
     Node.new(self, *args)
@@ -211,7 +215,7 @@ class HttpRouter
   def variable(*args)
     Variable.new(self, *args)
   end
-  
+
   # Returns a new glob
   def glob(*args)
     Glob.new(self, *args)
@@ -219,16 +223,25 @@ class HttpRouter
 
   # Creates a deep-copy of the router.
   def clone
-    cloned_router = HttpRouter.new(@default_app, @options, &@init_block)
+    cloned_router = HttpRouter.new(@default_app, @options)
     @routes.each do |route|
-      new_route = route.clone
-      new_route.instance_variable_set(:@router, cloned_router)
+      new_route = route.clone(cloned_router)
+      cloned_router.add_route(new_route).compile
+      new_route.name(route.named) if route.named
+
+      if route.dest
+        begin
+          new_route.to route.dest.clone
+        rescue
+          new_route.to route.dest
+        end
+      end
     end
     cloned_router
   end
 
   def split(path)
-    (path[0] == ?/ ? path[1, path.size] : path).split('/')
+    Parts.new(path)
   end
 
   private

data/spec/generate_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 describe "HttpRouter#generate" do
   before(:each) do
     @router = HttpRouter.new
@@ -32,7 +33,7 @@ describe "HttpRouter#generate" do
       @router.add("/:var").name(:test).compile
       @router.url(:test, 'test', :query => 'string').should == '/test?query=string'
     end
-    
+
     it "should generate with multiple dynamics" do
       @router.add("/:var/:baz").name(:test).compile
       @router.url(:test, 'one', 'two').should == '/one/two'
@@ -49,7 +50,7 @@ describe "HttpRouter#generate" do
         @router.add("/test.:format").name(:test).compile
         @router.url(:test, :format => 'html').should == '/test.html'
       end
-      
+
       it "should generate with format as a symbol" do
         @router.add("/test.:format").name(:test).compile
         @router.url(:test, :format => :html).should == '/test.html'
@@ -60,24 +61,24 @@ describe "HttpRouter#generate" do
         @router.url(:test, 'html').should == '/test.html'
         @router.url(:test).should == '/test'
       end
-      
+
       it "should generate a dynamic path and a format" do
         @router.add("/:var1.:format").name(:test).compile
         @router.url(:test, 'var', :format => 'html').should == '/var.html'
       end
-      
+
       it "should generate a dynamic path and an optional format" do
         @router.add("/:var1(.:format)").name(:test).compile
         @router.url(:test, 'var').should == '/var'
         @router.url(:test, 'var', :format => 'html').should == '/var.html'
       end
-      
+
       it "should generate multiple dynamics and a format" do
         @router.add("/:foo/:bar.:format").name(:test).compile
         @router.url(:test, 'var', 'baz', 'html').should == '/var/baz.html'
         @router.url(:test, :foo => 'var', :bar => 'baz', :format => 'html').should == '/var/baz.html'
       end
-      
+
       it "should generate multiple dynamics and an optional format" do
         @router.add("/:foo/:bar(.:format)").name(:test).compile
         @router.url(:test, 'var', 'baz').should == '/var/baz'
@@ -137,5 +138,90 @@ describe "HttpRouter#generate" do
       end
     end
 
+    context "url mounting" do
+      context "nested routes" do
+        before(:each) do
+          @r1 = HttpRouter.new
+          @r2 = HttpRouter.new
+          @r2.add("/bar").name(:test).compile
+        end
+
+        it "should set the url mount on a child route" do
+          route = @r1.add("/foo").to(@r2)
+          @r2.url_mount.url.should == "/foo"
+          @r2.url(:test).should == "/foo/bar"
+        end
+
+        it "should set any default values on the url mount" do
+          route = @r1.add("/foo/:bar").default(:bar => "baz").to(@r2)
+          @r2.url(:test).should == "/foo/baz/bar"
+          @r2.url(:test, :bar => "haha").should == "/foo/haha/bar"
+        end
+
+        it "should use multiple variables" do
+          @r1.add("/foo/:bar/:baz").default(:bar => "bar").to(@r2)
+          @r2.url(:test, :baz => "baz").should == "/foo/bar/baz/bar"
+        end
+
+        it "should not steal parameters from the defaults it doesn't need" do
+          route = @r1.add("/foo/:bar").default(:bar => "baz").to(@r2)
+          @r2.url(:test, :bang => "ers").should == "/foo/baz/bar?bang=ers"
+          @r2.url(:test, :bar => "haha", :bang => "ers").should == "/foo/haha/bar?bang=ers"
+        end
+
+        it "should generate on a path with an optional variable" do
+          @r1.add("/foo(/:bar)").to(@r2)
+          @r2.add("/hey(/:there)").name(:test).compile
+          @r2.url(:test).should == "/foo/hey"
+          @r2.url(:test, :bar => "bar").should == "/foo/bar/hey"
+          @r2.url(:test, :bar => "bar", :there => "there").should == "/foo/bar/hey/there"
+        end
+
+        it "should nest 3 times deeply" do
+          @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
+
+          @r2.url(:hi).should == "/foo/barry/hi"
+          @r3.url(:endpoint).should == "/foo/barry/mounted/endpoint"
+          @r3.url(:endpoint, :bar => "flower").should == "/foo/flower/mounted/endpoint"
+        end
+
+        it "should allow me to set the host via a default" do
+          @r1.add("/mounted").default(:host => "example.com").to(@r2)
+          @r2.url(:test).should == "http://example.com/mounted/bar"
+        end
+
+        it "should allow me to set the host via an option" do
+          @r1.add("/mounted").to(@r2)
+          @r2.url(:test).should == "/mounted/bar"
+          @r2.url(:test, :host => "example.com").should == "http://example.com/mounted/bar"
+        end
+
+        it "should allow me to set the scheme via an option" do
+          @r1.add("/mounted").to(@r2)
+          @r2.url(:test).should == "/mounted/bar"
+          @r2.url(:test, :scheme => "https", :host => "example.com").should == "https://example.com/mounted/bar"
+        end
+
+        it "should clone my nested structure" do
+          @r3 = HttpRouter.new
+          @r1.add("/first").to(@r2)
+          @r2.add("/second").to(@r3)
+          r1 = @r1.clone
+          @r1.routes.first.should_not be_nil
+          r2 = r1.routes.first.dest
+          r2.should_not be_nil
+          @r1.routes.first.dest.object_id.should == @r2.object_id
+          r2.object_id.should_not == @r2.object_id
+          r2.routes.should have(2).route
+          r3 = r2.routes.last.dest
+          r3.should be_an_instance_of(HttpRouter)
+          r3.object_id.should_not == @r3.object_id
+        end
+      end
+    end
   end
 end

data/spec/misc_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 describe "HttpRouter" do
   before(:each) do
     @router = HttpRouter.new
@@ -43,17 +44,17 @@ describe "HttpRouter" do
         add('/test').name(:test_route).to :test
       }
       r2 = r1.clone
-      
+
       r2.add('/test2').name(:test).to(:test2)
       r2.routes.size.should == 2
-      
+
       r1.recognize(Rack::MockRequest.env_for('/test2')).should be_nil
       r2.recognize(Rack::MockRequest.env_for('/test2')).should_not be_nil
       r1.named_routes[:test_route].should == r1.routes.first
       r2.named_routes[:test_route].should == r2.routes.first
 
       r1.add('/another').name(:test).to(:test2)
-      
+
       r1.routes.size.should == r2.routes.size
       r1.url(:test).should == '/another'
       r2.url(:test).should == '/test2'
@@ -61,4 +62,4 @@ describe "HttpRouter" do
       r2.routes.first.dest.should == :test
     end
   end
-end
+end

data/spec/mounting_spec.rb

@@ -0,0 +1,5 @@
+describe "mounting" do
+  before(:each) do
+    @router = HttpRouter.new
+  end
+end

data/spec/rack/dispatch_spec.rb

@@ -1,6 +1,3 @@
-route_set = HttpRouter.new
-route_set.extend(CallWithMockRequestMixin)
-
 describe "HttpRouter route dispatching with redirect_on_trailing_delimiters" do
   before(:each) do
     @route_set = HttpRouter.new(:redirect_trailing_slash => true)
@@ -18,78 +15,79 @@ end
 
 describe "HttpRouter route dispatching" do
   before(:each) do
-    route_set.reset!
+    @route_set = HttpRouter.new(:redirect_trailing_slash => true)
+    @route_set.extend(CallWithMockRequestMixin)
     @app = MockApp.new("Hello World!")
   end
 
   describe "HTTP GET" do
     before(:each) do
-      route_set.reset!
-      route_set.add('/sample').request_method('GET').to(@app)
+      @route_set.reset!
+      @route_set.add('/sample').request_method('GET').to(@app)
     end
 
     it "should dispatch a request" do
-      response = route_set.call_with_mock_request
+      response = @route_set.call_with_mock_request
       response.body.should eql("Hello World!")
     end
 
     it "should write router.params" do
-      response = route_set.call_with_mock_request
+      response = @route_set.call_with_mock_request
       @app.env["router.params"].should == {}
     end
   end
 
   describe "HTTP POST" do
     before(:each) do
-      route_set.reset!
-      route_set.add('/sample').post.to(@app)
-      route_set.add('/sample').to(MockApp.new("You shouldn't get here if you are using POST"))
+      @route_set.reset!
+      @route_set.add('/sample').post.to(@app)
+      @route_set.add('/sample').to(MockApp.new("You shouldn't get here if you are using POST"))
     end
 
     it "should dispatch a POST request" do
-      response = route_set.call_with_mock_request('/sample', 'POST')
+      response = @route_set.call_with_mock_request('/sample', 'POST')
       response.body.should eql("Hello World!")
     end
 
     it "shouldn't dispatch a GET request" do
-      response = route_set.call_with_mock_request('/sample', 'GET')
+      response = @route_set.call_with_mock_request('/sample', 'GET')
       response.body.should eql("You shouldn't get here if you are using POST")
     end
 
     it "should write router.params" do
-      response = route_set.call_with_mock_request("/sample", 'POST')
+      response = @route_set.call_with_mock_request("/sample", 'POST')
       @app.env["router.params"].should == {}
     end
   end
 
   it "should returns HTTP 405 if the method mis-matches" do
-    route_set.reset!
-    route_set.post('/sample').to(@app)
-    route_set.put('/sample').to(@app)
-    response = route_set.call_with_mock_request('/sample', 'GET')
+    @route_set.reset!
+    @route_set.post('/sample').to(@app)
+    @route_set.put('/sample').to(@app)
+    response = @route_set.call_with_mock_request('/sample', 'GET')
     response.status.should eql(405)
     response['Allow'].should == 'POST, PUT'
   end
 
   it "should returns HTTP 404 if route doesn't exist" do
-    response = route_set.call_with_mock_request("/not-existing-url")
+    response = @route_set.call_with_mock_request("/not-existing-url")
     response.status.should eql(404)
   end
 
   describe "shortcuts" do
     describe "get" do
       before(:each) do
-        route_set.reset!
-        route_set.get('/sample').head.to(@app)
+        @route_set.reset!
+        @route_set.get('/sample').head.to(@app)
       end
 
       it "should dispatch a GET request" do
-        response = route_set.call_with_mock_request("/sample", "GET")
+        response = @route_set.call_with_mock_request("/sample", "GET")
         response.body.should eql("Hello World!")
       end
 
       it "should dispatch a HEAD request" do
-        response = route_set.call_with_mock_request("/sample", "HEAD")
+        response = @route_set.call_with_mock_request("/sample", "HEAD")
         response.body.should eql("Hello World!")
       end
     end

data/spec/rack/generate_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 route_set = HttpRouter.new
 route_set.extend(CallWithMockRequestMixin)
 
@@ -9,12 +11,12 @@ describe "HttpRouter route generation" do
     route_set.add("/named/simple/:named_simple_var").name(:simple).compile
     route_set.add("/named/optional(/:named_optional_var)").name(:optional).compile
   end
-  
+
   describe "named routes" do
     it "should generate a fixed path" do
       route_set.url(:fixed).should == "/fixed"
     end
-    
+
     it "should generate a named path route" do
       route_set.url(:simple, :named_simple_var => "the_var").should == "/named/simple/the_var"
     end

data/spec/rack/middleware_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe "HttpRouter as middleware" do
   before(:each) do
     @builder = Rack::Builder.new do
@@ -17,4 +19,4 @@ describe "HttpRouter as middleware" do
     @builder.call(Rack::MockRequest.env_for('/test')).last.join.should == 'test'
   end
 end
-  
+

data/spec/rack/route_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe "Rack interface extensions for Usher::Route" do
   before(:each) do
     @route_set = HttpRouter.new

data/spec/recognize_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 describe "HttpRouter#recognize" do
   before(:each) do
     @router = HttpRouter.new
@@ -10,7 +11,7 @@ describe "HttpRouter#recognize" do
         @router.recognize(Rack::MockRequest.env_for(path)).route.should == route
       end
     end
-    
+
     context("with optional parts") do
       it "work either way" do
         route = @router.add("/test(/optional)").to(:test)
@@ -199,7 +200,7 @@ describe "HttpRouter#recognize" do
       response.params_as_hash[:format].should be_nil
       response.params_as_hash[:test].should == 'hey'
     end
-    
+
     context "with globs" do
       it "should recognize" do
         route = @router.add('/test/*variable').to(:test)
@@ -216,9 +217,9 @@ describe "HttpRouter#recognize" do
         response.should be_nil
       end
     end
-    
+
   end
-  
+
   context("with interstitial variables") do
     it "should recognize" do
       route = @router.add('/one-:variable-time').to(:test)
@@ -234,14 +235,14 @@ describe "HttpRouter#recognize" do
       response.route.should == route
       response.params_as_hash[:variable].should == '123'
     end
-    
+
     it "should recognize when there is an extension" do
       route = @router.add('/hey.:greed.html').to(:test)
       response = @router.recognize(Rack::MockRequest.env_for('/hey.greedyboy.html'))
       response.route.should == route
       response.params_as_hash[:greed].should == 'greedyboy'
     end
-    
+
   end
 
   context("with dynamic greedy paths") do

data/spec/sinatra/recognize_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 require "sinatra"
 require "http_router/interface/sinatra"
 
@@ -79,28 +80,28 @@ describe "HttpRouter (for Sinatra) route recognition" do
   describe "mapping functionality" do
 
     it "should map a basic route" do
-      @app.get('/hi', :name => :hi) { generate(:hi) } 
+      @app.get('/hi', :name => :hi) { generate(:hi) }
       response = @app.call_with_mock_request('/hi')
       response.status.should == 200
       response.body.should == "/hi"
     end
 
     it "should map a basic route ignoring trailing delimiters" do
-      @app.get('/hi', :name => :hi) { generate(:hi) } 
+      @app.get('/hi', :name => :hi) { generate(:hi) }
       response = @app.call_with_mock_request('/hi/')
       response.status.should == 200
       response.body.should == "/hi"
     end
 
     it "should map a basic route with params" do
-      @app.get('/hi/:id', :name => :hi) { generate(:hi, :id => 18) } 
+      @app.get('/hi/:id', :name => :hi) { generate(:hi, :id => 18) }
       response = @app.call_with_mock_request('/hi/1')
       response.status.should == 200
       response.body.should == "/hi/18"
     end
 
     it "should map route with params" do
-      @app.get('/hi-:id', :name => :hi) { generate(:hi, :id => 18) } 
+      @app.get('/hi-:id', :name => :hi) { generate(:hi, :id => 18) }
       response = @app.call_with_mock_request('/hi-1')
       response.status.should == 200
       response.body.should == "/hi-18"
@@ -137,4 +138,4 @@ describe "HttpRouter (for Sinatra) route recognition" do
       response.body.should_not match(/__sinatra__/)
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -1,4 +1,8 @@
-require 'rack'
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'rubygems'
+require 'http_router'
+require 'spec'
+require 'spec/autorun'
 
 module CallWithMockRequestMixin
   def call_with_mock_request(url = "/sample", method = "GET", params = Hash.new)
@@ -21,4 +25,4 @@ class MockApp
     @headers.merge("Content-Length" => @body.length.to_s)
     [@status, @headers, [@body]]
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: http_router
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Joshua Hull
@@ -34,6 +34,21 @@ dependencies:
         version: 1.0.0
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: url_mount
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 2
+        version: "0.2"
+  type: :runtime
+  version_requirements: *id002
 description: A kick-ass HTTP router for use in Rack & Sinatra
 email: joshbuddy@gmail.com
 executables: []
@@ -44,6 +59,8 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .gitignore
+- Gemfile
+- Gemfile.lock
 - README.rdoc
 - Rakefile
 - VERSION
@@ -67,6 +84,7 @@ files:
 - lib/http_router/interface/sinatra.rb
 - lib/http_router/node.rb
 - lib/http_router/optional_compiler.rb
+- lib/http_router/parts.rb
 - lib/http_router/path.rb
 - lib/http_router/response.rb
 - lib/http_router/root.rb
@@ -74,6 +92,7 @@ files:
 - lib/http_router/variable.rb
 - spec/generate_spec.rb
 - spec/misc_spec.rb
+- spec/mounting_spec.rb
 - spec/rack/dispatch_spec.rb
 - spec/rack/generate_spec.rb
 - spec/rack/middleware_spec.rb
@@ -119,6 +138,7 @@ summary: A kick-ass HTTP router for use in Rack & Sinatra
 test_files: 
 - spec/generate_spec.rb
 - spec/misc_spec.rb
+- spec/mounting_spec.rb
 - spec/rack/dispatch_spec.rb
 - spec/rack/generate_spec.rb
 - spec/rack/middleware_spec.rb