Merging from pull request.

Author: Michael Bleigh

lib/grape/api.rb

@@ -145,7 +145,7 @@ def route(methods, paths, &block)
 
         methods.each do |method|
           paths.each do |path|
-            path = Rack::Mount::Strexp.compile(compile_path(path), options)
+            path = Rack::Mount::Strexp.compile(compile_path(path), options, ['/'], true)
             route_set.add_route(endpoint, 
               :path_info => path, 
               :request_method => (method.to_s.upcase unless method == :any)

spec/grape/api_spec.rb

@@ -14,10 +14,10 @@ def app; subject end
       end
 
       get 'awesome/sauce/hello'
-      last_response.body.should == "Hello there."
+      last_response.body.should eql "Hello there."
 
       get '/hello'
-      last_response.status.should == 404
+      last_response.status.should eql 404
     end
   end
 
@@ -29,7 +29,7 @@ def app; subject end
       end
 
       get '/v1/hello'
-      last_response.body.should == "Version: v1"
+      last_response.body.should eql "Version: v1"
     end
 
     it 'should add the prefix before the API version' do
@@ -40,7 +40,7 @@ def app; subject end
       end
 
       get '/api/v1/hello'
-      last_response.body.should == "Version: v1"
+      last_response.body.should eql "Version: v1"
     end
 
     it 'should be able to specify version as a nesting' do
@@ -56,13 +56,13 @@ def app; subject end
       end
 
       get '/v1/awesome'
-      last_response.status.should == 404
+      last_response.status.should eql 404
       get '/v2/awesome'
-      last_response.status.should == 200
+      last_response.status.should eql 200
       get '/v1/legacy'
-      last_response.status.should == 200
+      last_response.status.should eql 200
       get '/v2/legacy'
-      last_response.status.should == 404
+      last_response.status.should eql 404
     end
 
     it 'should be able to specify multiple versions' do
@@ -72,11 +72,11 @@ def app; subject end
       end
 
       get '/v1/awesome'
-      last_response.status.should == 200
+      last_response.status.should eql 200
       get '/v2/awesome'
-      last_response.status.should == 200
+      last_response.status.should eql 200
       get '/v3/awesome'
-      last_response.status.should == 404
+      last_response.status.should eql 404
     end
 
     it 'should allow the same endpoint to be implemented for different versions' do
@@ -146,7 +146,7 @@ def app; subject end
     %w(group resource resources).each do |als|
       it "`.#{als}` should be an alias" do
         subject.send(als, :awesome) do
-          namespace.should == "/awesome"
+          namespace.should ==  "/awesome"
         end
       end
     end
@@ -165,9 +165,9 @@ def app; subject end
       end
 
       get '/votes'
-      last_response.body.should == 'Votes'
+      last_response.body.should eql 'Votes'
       post '/votes'
-      last_response.body.should == 'Created a Vote'
+      last_response.body.should eql 'Created a Vote'
     end
 
     it 'should allow for multiple paths' do
@@ -176,9 +176,9 @@ def app; subject end
       end
 
       get '/abc'
-      last_response.body.should == 'foo'
+      last_response.body.should eql 'foo'
       get '/def'
-      last_response.body.should == 'foo'
+      last_response.body.should eql 'foo'
     end
 
     it 'should allow for format' do
@@ -187,7 +187,7 @@ def app; subject end
       end
 
       get '/abc.json'
-      last_response.body.should == '"json"'
+      last_response.body.should eql '"json"'
     end
 
     it 'should allow for format in namespace with no path' do
@@ -198,7 +198,7 @@ def app; subject end
       end
 
       get '/abc.json'
-      last_response.body.should == '"json"'
+      last_response.body.should eql '"json"'
     end
 
     it 'should allow for multiple verbs' do
@@ -207,9 +207,38 @@ def app; subject end
       end
 
       get '/abc'
-      last_response.body.should == 'hiya'
+      last_response.body.should eql 'hiya'
       post '/abc'
-      last_response.body.should == 'hiya'
+      last_response.body.should eql 'hiya'
+    end
+
+    it 'should allow for multipart paths' do
+
+
+      subject.route([:get, :post], '/:id/first') do
+        "first"
+      end
+
+      
+      subject.route([:get, :post], '/:id') do
+        "ola"
+      end
+      subject.route([:get, :post], '/:id/first/second') do
+        "second"
+      end
+      
+
+      get '/1'
+      last_response.body.should eql 'ola'
+      post '/1'
+      last_response.body.should eql 'ola'
+      get '/1/first'
+      last_response.body.should eql 'first'
+      post '/1/first'
+      last_response.body.should eql 'first'
+      get '/1/first/second'
+      last_response.body.should eql 'second'
+
     end
 
     it 'should allow for :any as a verb' do
@@ -219,7 +248,7 @@ def app; subject end
 
       %w(get post put delete).each do |m|
         send(m, '/abc')
-        last_response.body.should == 'lol'
+        last_response.body.should eql 'lol'
       end
     end
 
@@ -230,10 +259,10 @@ def app; subject end
           verb
         end
         send(verb, '/example')
-        last_response.body.should == verb
+        last_response.body.should eql verb
         # Call it with a method other than the properly constrained one.
         send(verbs[(verbs.index(verb) + 1) % verbs.size], '/example')
-        last_response.status.should == 404
+        last_response.status.should eql 404
       end
     end
 
@@ -243,8 +272,8 @@ def app; subject end
       end
 
       post '/example'
-      last_response.status.should == 201
-      last_response.body.should == 'Created'
+      last_response.status.should eql 201
+      last_response.body.should eql 'Created'
     end
   end
 
@@ -265,7 +294,7 @@ def call(env)
     describe '.middleware' do
       it 'should include middleware arguments from settings' do
         subject.stub!(:settings_stack).and_return [{:middleware => [[PhonyMiddleware, 'abc', 123]]}]
-        subject.middleware.should == [[PhonyMiddleware, 'abc', 123]]
+        subject.middleware.should eql [[PhonyMiddleware, 'abc', 123]]
       end
 
       it 'should include all middleware from stacked settings' do
@@ -274,7 +303,7 @@ def call(env)
           {:middleware => [[PhonyMiddleware, 'foo']]}
         ]
 
-        subject.middleware.should == [
+        subject.middleware.should eql [
           [PhonyMiddleware, 123],
           [PhonyMiddleware, 'abc'],
           [PhonyMiddleware, 'foo']
@@ -285,7 +314,7 @@ def call(env)
     describe '.use' do
       it 'should add middleware' do
         subject.use PhonyMiddleware, 123
-        subject.middleware.should == [[PhonyMiddleware, 123]]
+        subject.middleware.should eql [[PhonyMiddleware, 123]]
       end
 
       it 'should not show up outside the namespace' do
@@ -295,7 +324,7 @@ def call(env)
           middleware.should == [[PhonyMiddleware, 123],[PhonyMiddleware, 'abc']]
         end
 
-        subject.middleware.should == [[PhonyMiddleware, 123]]        
+        subject.middleware.should eql [[PhonyMiddleware, 123]]        
       end
 
       it 'should actually call the middleware' do
@@ -305,7 +334,7 @@ def call(env)
         end
 
         get '/'
-        last_response.body.should == 'hello'
+        last_response.body.should eql 'hello'
       end
     end
   end
@@ -316,9 +345,9 @@ def call(env)
       end
       subject.get(:hello){ "Hello, world."}
       get '/hello'
-      last_response.status.should == 401
+      last_response.status.should eql 401
       get '/hello', {}, 'HTTP_AUTHORIZATION' => encode_basic('allow','whatever')
-      last_response.status.should == 200
+      last_response.status.should eql 200
     end
 
     it 'should be scopable' do
@@ -332,9 +361,9 @@ def call(env)
       end
 
       get '/hello'
-      last_response.status.should == 200
+      last_response.status.should eql 200
       get '/admin/hello'
-      last_response.status.should == 401
+      last_response.status.should eql 401
     end
 
     it 'should be callable via .auth as well' do
@@ -344,9 +373,9 @@ def call(env)
 
       subject.get(:hello){ "Hello, world."}
       get '/hello'
-      last_response.status.should == 401
+      last_response.status.should eql 401
       get '/hello', {}, 'HTTP_AUTHORIZATION' => encode_basic('allow','whatever')
-      last_response.status.should == 200
+      last_response.status.should eql 200
     end
   end
 
@@ -363,7 +392,7 @@ def hello
       end
 
       get '/howdy'
-      last_response.body.should == 'Hello, world.'
+      last_response.body.should eql 'Hello, world.'
     end
 
     it 'should be scopable' do
@@ -390,9 +419,9 @@ def secret
       end
 
       get '/generic'
-      last_response.body.should == 'always there:false'
+      last_response.body.should eql 'always there:false'
       get '/admin/secret'
-      last_response.body.should == 'always there:only in admin'
+      last_response.body.should eql 'always there:only in admin'
     end
 
     it 'should be reopenable' do
@@ -433,13 +462,13 @@ def two
       end
 
       get '/v2/abc'
-      last_response.status.should == 404
+      last_response.status.should eql 404
       get '/v1/abc'
-      last_response.status.should == 200
+      last_response.status.should eql 200
       get '/v1/def'
-      last_response.status.should == 404
+      last_response.status.should eql 404
       get '/v2/def'
-      last_response.status.should == 200
+      last_response.status.should eql 200
     end
   end
 end