Merge pull request ruby-grape#103 from springyweb/root_objects2

Root keys for entity representations

Author: jch

lib/grape/endpoint.rb

@@ -42,7 +42,7 @@ def mount_in(route_set)
         end
       end
     end
-    
+
     def prepare_routes
       routes = []
       options[:method].each do |method|
@@ -82,7 +82,7 @@ def prepare_path(path)
       parts.last << '(.:format)'
       Rack::Mount::Utils.normalize_path(parts.join('/'))
     end
-    
+
     def namespace
       Rack::Mount::Utils.normalize_path(settings.stack.map{|s| s[:namespace]}.join('/'))
     end
@@ -193,13 +193,18 @@ def present(object, options = {})
         entity_class ||= (settings[:representations] || {})[potential]
       end
 
-      if entity_class
+      root = options.delete(:root)
+
+      representation = if entity_class
         embeds = {:env => env}
         embeds[:version] = env['api.version'] if env['api.version']
-        body entity_class.represent(object, embeds.merge(options))
+        entity_class.represent(object, embeds.merge(options))
       else
-        body object
+        object
       end
+
+      representation = { root => representation } if root
+      body representation
     end
 
     protected
@@ -220,11 +225,11 @@ def run(env)
     def build_middleware
       b = Rack::Builder.new
 
-      b.use Grape::Middleware::Error, 
-        :default_status => settings[:default_error_status] || 403, 
-        :rescue_all => settings[:rescue_all], 
-        :rescued_errors => settings[:rescued_errors], 
-        :format => settings[:error_format] || :txt, 
+      b.use Grape::Middleware::Error,
+        :default_status => settings[:default_error_status] || 403,
+        :rescue_all => settings[:rescue_all],
+        :rescued_errors => settings[:rescued_errors],
+        :format => settings[:error_format] || :txt,
         :rescue_options => settings[:rescue_options],
         :rescue_handlers => settings[:rescue_handlers] || {}
 

spec/grape/endpoint_spec.rb

@@ -178,6 +178,14 @@ def memoized
       get '/example'
       last_response.body.should == 'Hiya'
     end
+
+    it 'should add a root key to the output if one is given' do
+      subject.get '/example' do
+        present({:abc => 'def'}, :root => :root)
+        body.should == {:root => {:abc => 'def'}}
+      end
+      get '/example'
+    end
   end
 
   context 'filters' do