Id equal to model name when root is used in Entity

CHANGELOG.md

@@ -7,6 +7,7 @@
 
 #### Fixes
 
+* [#251](https://github.com/tim-vandecasteele/grape-swagger/pull/251): Fixed model id equal to model name when root existing in entities - [@aitortomas](https://github.com/aitortomas).
 * [#232](https://github.com/tim-vandecasteele/grape-swagger/pull/232): Fixed missing raw array params - [@u2](https://github.com/u2).
 * [#234](https://github.com/tim-vandecasteele/grape-swagger/pull/234): Fixed range :values with float - [@azhi](https://github.com/azhi).
 * [#225](https://github.com/tim-vandecasteele/grape-swagger/pull/225): Fixed `param_type` to have it read from parameter's documentation hash - [@zsxking](https://github.com/zsxking).

lib/grape-swagger.rb

@@ -345,7 +345,7 @@ def parse_entity_name(model)
             def parse_entity_models(models)
               result = {}
               models.each do |model|
-                name       = parse_entity_name(model)
+                name       = (model.instance_variable_get(:@root) || parse_entity_name(model))
                 properties = {}
                 required   = []
 
@@ -383,7 +383,7 @@ def parse_entity_models(models)
                 end
 
                 result[name] = {
-                  id:         model.instance_variable_get(:@root) || name,
+                  id:         name,
                   properties: properties
                 }
                 result[name].merge!(required: required) unless required.empty?

spec/api_models_spec.rb

@@ -94,6 +94,13 @@ class QueryResult < Grape::Entity
     end
   end
 
+  module Entities
+    class ThingWithRoot < Grape::Entity
+      root 'things', 'thing'
+      expose :text, documentation: { type: 'string', desc: 'Content of something.' }
+    end
+  end
+
   def app
     Class.new(Grape::API) do
       format :json
@@ -149,6 +156,12 @@ def app
         present result, with: Entities::QueryResult
       end
 
+      desc 'This gets thing_with_root.', entity: Entities::ThingWithRoot
+      get '/thing_with_root' do
+        thing = OpenStruct.new text: 'thing'
+        present thing, with: Entities::ThingWithRoot
+      end
+
       add_swagger_documentation
     end
   end
@@ -177,6 +190,7 @@ def app
         { 'path' => '/aliasedthing.{format}', 'description' => 'Operations about aliasedthings' },
         { 'path' => '/nesting.{format}', 'description' => 'Operations about nestings' },
         { 'path' => '/multiple_entities.{format}', 'description' => 'Operations about multiple_entities' },
+        { 'path' => '/thing_with_root.{format}', 'description' => 'Operations about thing_with_roots' },
         { 'path' => '/swagger_doc.{format}', 'description' => 'Operations about swagger_docs' }
       ]
     end
@@ -290,4 +304,10 @@ def app
 
     expect(result['models']).to include('QueryInput', 'QueryInputElement', 'QueryResult')
   end
+
+  it 'includes an id equal to the model name' do
+    get '/swagger_doc/thing_with_root'
+    result = JSON.parse(last_response.body)
+    expect(result['models']['thing']['id']).to eq('thing')
+  end
 end