Backported to Ruby 1.8.7.

Author: dblock

lib/grape/api.rb

@@ -206,8 +206,9 @@ def route(methods, paths = ['/'], route_options = {}, &block)
 
             compiled_path = compile_path(path)
             path = Rack::Mount::Strexp.compile(compiled_path, endpoint_options, %w( / . ? ), true)
-            path_params = path.named_captures.map { |nc| nc[0] } - [ 'version', 'format' ]
-            path_params |= (route_options[:params] || [])            
+            regex = Rack::Mount::RegexpWithNamedGroups.new(path)
+            path_params = regex.named_captures.map { |nc| nc[0] } - [ 'version', 'format' ]
+            path_params |= (route_options[:params] || [])
             request_method = (method.to_s.upcase unless method == :any)
 
             routes << Route.new(route_options.merge({

lib/grape/middleware/error.rb

@@ -70,7 +70,7 @@ def rack_response(message, status = options[:default_status], headers = { 'Conte
 
       def format_message(message, backtrace, status)
         formatter = formatter_for(options[:format])
-        throw :error, :status => 406, :message => "The requested format #{options[:format]} is not supported." unless formatter        
+        throw :error, :status => 406, :message => "The requested format #{options[:format]} is not supported." unless formatter
         formatter.call(message, backtrace)
       end
 

lib/grape/middleware/formatter.rb

@@ -20,7 +20,6 @@ def headers
 
       def before
         fmt = format_from_extension || format_from_header || options[:default_format]
-                
         if content_types.key?(fmt)
           if !env['rack.input'].nil? and (body = env['rack.input'].read).strip.length != 0
             parser = parser_for fmt

lib/grape/route.rb

@@ -8,8 +8,8 @@ def initialize(options = {})
     end
 
     def method_missing(method_id, *arguments)
-      if match = /route_(?<name>[_a-zA-Z]\w*)/.match(method_id.to_s)
-        @options[match['name'].to_sym]
+      if match = /route_([_a-zA-Z]\w*)/.match(method_id.to_s)
+        @options[match.captures.last.to_sym]
       else
         super
       end

spec/grape/api_spec.rb

@@ -657,7 +657,7 @@ class TwitterAPI < Grape::API
         TwitterAPI::versions.should == [ 'v1', 'v2' ]
       end
       it "should set route paths" do
-        TwitterAPI::routes.size.should == 2
+        TwitterAPI::routes.size.should >= 2
         TwitterAPI::routes[0].route_path.should == "/:version/version(.:format)"
         TwitterAPI::routes[1].route_path.should == "/p/:version/n1/n2/version(.:format)"
       end
@@ -679,12 +679,12 @@ class TwitterAPI < Grape::API
         end
       end
       it "should split a string" do
-        get "/split/a,b,c", :token => ','
-        last_response.body.should == '["a", "b", "c"]'
+        get "/split/a,b,c.json", :token => ','
+        last_response.body.should == '["a","b","c"]'
       end
       it "should split a string with limit" do
-        get "/split/a,b,c", :token => ',', :limit => '2'
-        last_response.body.should == '["a", "b,c"]'
+        get "/split/a,b,c.json", :token => ',', :limit => '2'
+        last_response.body.should == '["a","b,c"]'
       end
       it "should set route_params" do
         subject.routes.size.should == 1
@@ -697,43 +697,43 @@ class TwitterAPI < Grape::API
   describe ".rescue_from klass, block" do
     it 'should rescue Exception' do
       subject.rescue_from RuntimeError do |e|
-        rack_response({ :message => "rescued from #{e.message}" }, 202)
+        rack_response("rescued from #{e.message}", 202)
       end
       subject.get '/exception' do
         raise "rain!"
       end
       get '/exception'
       last_response.status.should eql 202
-      last_response.body.should == '{:message=>"rescued from rain!"}'
+      last_response.body.should == 'rescued from rain!'
     end
     it 'should rescue an error via rescue_from :all' do
       class ConnectionError < RuntimeError; end
       subject.rescue_from :all do |e|
-        rack_response({ :message => "rescued from #{e.class.name}" }, 500)
+        rack_response("rescued from #{e.class.name}", 500)
       end
       subject.get '/exception' do
         raise ConnectionError
       end
       get '/exception'
       last_response.status.should eql 500
-      last_response.body.should == '{:message=>"rescued from ConnectionError"}'
+      last_response.body.should == 'rescued from ConnectionError'
     end
     it 'should rescue a specific error' do
       class ConnectionError < RuntimeError; end
       subject.rescue_from ConnectionError do |e|
-        rack_response({ :message => "rescued from #{e.class.name}" }, 500)
+        rack_response("rescued from #{e.class.name}", 500)
       end
       subject.get '/exception' do
         raise ConnectionError
       end
       get '/exception'
       last_response.status.should eql 500
-      last_response.body.should == '{:message=>"rescued from ConnectionError"}'
+      last_response.body.should == 'rescued from ConnectionError'
     end
     it 'should not rescue a different error' do
       class CommunicationError < RuntimeError; end
       subject.rescue_from RuntimeError do |e|
-        rack_response({ :message => "rescued from #{e.class.name}" }, 500)
+        rack_response("rescued from #{e.class.name}", 500)
       end
       subject.get '/uncaught' do
         raise CommunicationError