2 files changed, 33 insertions, 2 deletions
diff --git a/lib/zero/router.rb b/lib/zero/router.rb
index 659d9b6..482f25a 100644
--- a/lib/zero/router.rb
+++ b/lib/zero/router.rb
@@ -20,7 +20,7 @@ module Zero
     # match for variables in routes
     VARIABLE_MATCH = %r{:(\w+)[^/]?}
     # the replacement string to make it an regex
-    VARIABLE_REGEX = '(?<\1>.+?)'
+    VARIABLE_REGEX = '(?<\1>[\w]+?)'
     # regex part of the beginning of the line
     REGEX_BEGINNING = '\A'
     # regex part of the end of the line
@@ -41,7 +41,7 @@ module Zero
     # @param routes [Hash] a map of URLs to rack compatible applications
     def initialize(routes)
       @routes = {}
-      routes.each do |route, target|
+      routes.to_a.sort_by(&:first).reverse.each do |route, target|
         @routes[
           Regexp.new(REGEX_BEGINNING +
                      route.gsub(VARIABLE_MATCH, VARIABLE_REGEX) +
diff --git a/spec/unit/zero/router/call_spec.rb b/spec/unit/zero/router/call_spec.rb
index 683eca8..923b747 100644
--- a/spec/unit/zero/router/call_spec.rb
+++ b/spec/unit/zero/router/call_spec.rb
@@ -44,6 +44,22 @@ describe Zero::Router, '#call' do
     it_behaves_like "a sample app"
   end
 
+  context 'with nested variable routes' do
+    let(:routes) do
+      { '/' => wrong_app, '/foo/:id' => app, '/foo/:id/bar' => wrong_app }
+    end
+    let(:env) { EnvGenerator.get('/foo/23') }
+    it_behaves_like "a sample app"
+  end
+
+  context 'with nested routes and variable in the middle' do
+    let(:routes) do
+      { '/' => wrong_app, '/foo/:id' => wrong_app, '/foo/:id/bar' => app }
+    end
+    let(:env) { EnvGenerator.get('/foo/23/bar') }
+    it_behaves_like "a sample app"
+  end
+
   context 'with a route not found' do
     let(:routes) {{ '/foo' => wrong_app, '/foo/bar/baz' => app }}
     let(:env) { EnvGenerator.get('/foo/bar') }
@@ -72,4 +88,19 @@ describe Zero::Router, '#call' do
 
     it_behaves_like 'a sample app'
   end
+
+  context 'with parameters and nested routes' do
+    let(:routes) do
+      { '/' => wrong_app, '/foo/:id' => app, '/foo/:id/bar' => wrong_app }
+    end
+    let(:env) { EnvGenerator.get('/foo/bar') }
+    let(:app) do
+      lambda do |env|
+        [200, content_type, [Zero::Request.new(env).params['id']]]
+      end
+    end
+    let(:result) { ['bar'] }
+
+    it_behaves_like "a sample app"
+  end
 end