Merged from master.

Author: dblock

lib/grape/endpoint.rb

@@ -48,7 +48,7 @@ def prepare_routes
       options[:method].each do |method|
         options[:path].each do |path|
           prepared_path = prepare_path(path)
-          path = compile_path(path, !options[:app])
+          path = compile_path(prepared_path, !options[:app])
           regex = Rack::Mount::RegexpWithNamedGroups.new(path)
           path_params = regex.named_captures.map { |nc| nc[0] } - [ 'version', 'format' ]
           path_params |= (options[:route_options][:params] || [])
@@ -82,11 +82,10 @@ def namespace
       Rack::Mount::Utils.normalize_path(settings.stack.map{|s| s[:namespace]}.join('/'))
     end
 
-    def compile_path(path, anchor = true)
+    def compile_path(prepared_path, anchor = true)
       endpoint_options = {}
       endpoint_options[:version] = /#{settings[:version].join('|')}/ if settings[:version]
-
-      Rack::Mount::Strexp.compile(prepare_path(path), endpoint_options, %w( / . ? ), anchor)
+      Rack::Mount::Strexp.compile(prepared_path, endpoint_options, %w( / . ? ), anchor)
     end
 
     def call(env)

lib/grape/middleware/base.rb

@@ -111,6 +111,8 @@ def decode_json(object)
         end
 
         def encode_json(object)
+          return object if object.is_a?(String)
+
           if object.respond_to? :serializable_hash
             MultiJson.encode(object.serializable_hash)
           elsif object.respond_to? :to_json

spec/grape/api_spec.rb

@@ -175,33 +175,44 @@ def app; subject end
       last_response.body.should eql 'foo'
     end
 
-    it 'should allow for format' do
-      subject.get("/abc") do
-        "json"
+    context "format" do
+      before(:each) do
+        subject.get("/abc") do
+          RSpec::Mocks::Mock.new(:to_json => 'abc', :to_txt => 'def')
+        end
+      end
+    
+      it "should allow .json" do
+        get '/abc.json'
+        last_response.status.should == 200
+        last_response.body.should eql 'abc' # json-encoded symbol
       end
 
-      get '/abc.json'
-      last_response.body.should eql '"json"'
+      it "should allow .txt" do
+        get '/abc.txt'
+        last_response.status.should == 200
+        last_response.body.should eql 'def' # raw text
+      end
     end
 
     it 'should allow for format without corrupting a param' do
       subject.get('/:id') do
-        params[:id]
+        {"id" => params[:id]}
       end
 
       get '/awesome.json'
-      last_response.body.should eql "\"awesome\""
+      last_response.body.should eql '{"id":"awesome"}'
     end
 
     it 'should allow for format in namespace with no path' do
       subject.namespace :abc do
         get do
-          "json"
+          ["json"]
         end
       end
 
       get '/abc.json'
-      last_response.body.should eql '"json"'
+      last_response.body.should eql '["json"]'
     end
 
     it 'should allow for multiple verbs' do

spec/grape/middleware/formatter_spec.rb

@@ -14,7 +14,7 @@
     end
 
     it 'should call #to_json first if it is available' do
-      @body = "string"
+      @body = ['foo']
       @body.instance_eval do
         def to_json
           "\"bar\""
@@ -124,9 +124,9 @@ def to_xml
       body.body.should == ['CUSTOM FORMAT']
     end
     it 'should use default json formatter' do
-      @body = 'blah'
+      @body = ['blah']
       _, _, body = subject.call({'PATH_INFO' => '/info.json'})
-      body.body.should == ['"blah"']
+      body.body.should == ['["blah"]']
     end
     it 'should use custom json formatter' do
       subject.options[:formatters][:json] = lambda { |obj| 'CUSTOM JSON FORMAT' }