Added both format and default_format.

Author: dblock

README.markdown

@@ -268,12 +268,14 @@ end
 You can also set the default format. The order for choosing the format is the following.
 
 * Use the file extension, if specified. If the file is .json, choose the JSON format.
-* Use the default format, if specified by the `default_format` option.
+* 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.
 
 ```ruby
 class Twitter::API < Grape::API
+  format :json
   defalt_format :json
 end
 ```

lib/grape/api.rb

@@ -115,6 +115,12 @@ def default_format(new_format = nil)
         new_format ? set(:default_format, new_format.to_sym) : settings[:default_format]
       end
 
+      # Specify the format for the API's serializers.
+      # May be `:json` or `:txt`.
+      def format(new_format = nil)
+        new_format ? set(:format, new_format.to_sym) : settings[:format]
+      end
+      
       # Specify the format for error messages.
       # May be `:json` or `:txt` (default).
       def error_format(new_format = nil)

lib/grape/endpoint.rb

@@ -275,7 +275,8 @@ def build_middleware
       end
 
       b.use Grape::Middleware::Formatter,
-        :format => settings[:default_format],
+        :format => settings[:format],
+        :default_format => settings[:default_format] || :txt,
         :content_types => settings[:content_types]
 
       aggregate_setting(:middleware).each do |m|

lib/grape/middleware/formatter.rb

@@ -7,6 +7,7 @@ class Formatter < Base
 
       def default_options
         {
+          :default_format => :txt,
           :formatters => {},
           :content_types => {},
           :parsers => {}
@@ -18,7 +19,7 @@ def headers
       end
 
       def before
-        fmt = format_from_extension || options[:format] || format_from_header || :txt
+        fmt = format_from_extension || options[:format] || 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

spec/grape/api_spec.rb

@@ -1058,7 +1058,7 @@ class CommunicationError < RuntimeError; end
   context "format" do
     context ":txt" do
       before(:each) do
-        subject.default_format :txt
+        subject.format :txt
         subject.get '/meaning_of_life' do
           { :meaning_of_life => 42 }
         end
@@ -1078,7 +1078,7 @@ class CommunicationError < RuntimeError; end
     end
     context ":json" do
       before(:each) do
-        subject.default_format :json
+        subject.format :json
         subject.get '/meaning_of_life' do
           { :meaning_of_life => 42 }
         end