Merge pull request ruby-grape#163 from jch/default_format_json

Default format json

Author: jch

Gemfile

@@ -10,4 +10,5 @@ group :development, :test do
   gem 'rb-fsevent'
   gem 'growl'
   gem 'json'
+  gem 'debugger'
 end

README.markdown

@@ -310,7 +310,7 @@ You can also set the default format. The order for choosing the format is the fo
 * Use the format, if specified by the `format` option.
 * Attempt to find an acceptable format from the `Accept` header.
 * Use the default format, if specified by the `default_format` option.
-* Default to `:txt` otherwise.
+* Default to `:json` otherwise.
 
 ``` ruby
 class Twitter::API < Grape::API
@@ -319,6 +319,16 @@ class Twitter::API < Grape::API
 end
 ```
 
+By default, Grape understands the following content types:
+
+```ruby
+:xml  => 'application/xml',
+:json => 'application/json',
+:atom => 'application/atom+xml',
+:rss  => 'application/rss+xml',
+:txt  => 'text/plain'
+```
+
 ## Writing Tests
 
 You can test a Grape API with RSpec by making HTTP requests and examining the response. 

lib/grape/middleware/formatter.rb

@@ -7,7 +7,7 @@ class Formatter < Base
 
       def default_options
         {
-          :default_format => :txt,
+          :default_format => :json,
           :formatters => {},
           :content_types => {},
           :parsers => {}

spec/grape/middleware/formatter_spec.rb

@@ -70,16 +70,16 @@ def to_xml
 
     it 'should use the default format if none is provided' do
       subject.call({'PATH_INFO' => '/info'})
-      subject.env['api.format'].should == :txt
+      subject.env['api.format'].should == :json
     end
 
     it 'should use the requested format if provided in headers' do
-      subject.call({'PATH_INFO' => '/info', 'HTTP_ACCEPT' => 'application/json'})
-      subject.env['api.format'].should == :json
+      subject.call({'PATH_INFO' => '/info', 'HTTP_ACCEPT' => 'text/plain'})
+      subject.env['api.format'].should == :txt
     end
 
     it 'should use the file extension format if provided before headers' do
-      subject.call({'PATH_INFO' => '/info.txt', 'HTTP_ACCEPT' => 'application/json'})
+      subject.call({'PATH_INFO' => '/info.txt', 'HTTP_ACCEPT' => 'text/plain'})
       subject.env['api.format'].should == :txt
     end