Fix bug that would overwrite the content of the response body when using multiple presenters

CHANGELOG.md

@@ -7,6 +7,7 @@
 * [#745](https://github.com/intridea/grape/pull/745): Added `:binary, application/octet-stream` content-type - [@akabraham](https://github.com/akabraham).
 * [#757](https://github.com/intridea/grape/pull/757): Changed `desc` can now be used with a block syntax - [@dspaeth-faber](https://github.com/dspaeth-faber).
 * [#779](https://github.com/intridea/grape/pull/779): Fixed using `values` with a `default` proc - [@ShPakvel](https://github.com/ShPakvel).
+* [#784](https://github.com/intridea/grape/pull/784): Fix issue in inside_route#present that would overwrite the previously added contents of the response body when calling `present` with Grape Entities more than once in an endpoint.  - [@mfunaro](https://github.com/mfunaro).
 * Your contribution here.
 
 0.9.0 (8/27/2014)

lib/grape/dsl/inside_route.rb

@@ -187,7 +187,12 @@ def present(*args)
                          end
 
         representation = { root => representation } if root
-        representation = (@body || {}).merge(key => representation) if key
+        if key
+          representation = (@body || {}).merge(key => representation)
+        elsif entity_class.present? && representation.respond_to?('merge')
+          representation = (@body || {}).merge(representation)
+        end
+
         body representation
       end
 

spec/grape/dsl/inside_route_spec.rb

@@ -208,6 +208,35 @@ def initialize
             end
           end
         end
+
+        describe 'with' do
+          describe 'multiple entities' do
+            let(:entity_mock1) do
+              entity_mock1 = Object.new
+              allow(entity_mock1).to receive(:represent).and_return(dummy1: 'dummy1')
+              entity_mock1
+            end
+
+            let(:entity_mock2) do
+              entity_mock2 = Object.new
+              allow(entity_mock2).to receive(:represent).and_return(dummy2: 'dummy2')
+              entity_mock2
+            end
+
+            describe 'instance' do
+              before do
+                subject.present 'dummy1', with: entity_mock1
+                subject.present 'dummy2', with: entity_mock2
+              end
+
+              it 'presents both dummy objects' do
+                expect(subject.body[:dummy1]).to eq 'dummy1'
+                expect(subject.body[:dummy2]).to eq 'dummy2'
+              end
+            end
+
+          end
+        end
       end
 
       describe '#declared' do