lib/grape-swagger/entity/parser.rb in grape-swagger-entity-0.1.4 vs lib/grape-swagger/entity/parser.rb in grape-swagger-entity-0.1.5

@@ -11,11 +11,11 @@
 
       def call
         # TODO: this should only be a temporary hack ;)
         if ::GrapeEntity::VERSION =~ /0\.4\.\d/
           parameters = model.exposures ? model.exposures : model.documentation
-        elsif ::GrapeEntity::VERSION =~ /0\.5\.\d/
+        else
           parameters = model.root_exposures.each_with_object({}) do |value, memo|
             memo[value.attribute] = value.send(:options)
           end
         end
 
@@ -36,11 +36,11 @@
           if entity_options[:documentation] && could_it_be_a_model?(entity_options[:documentation])
             model ||= entity_options[:documentation][:type]
           end
 
           if model
-            name = endpoint.send(:expose_params_from_model, model)
+            name = endpoint.nil? ? model.to_s.demodulize : endpoint.send(:expose_params_from_model, model)
             memo[entity_name] = entity_model_type(name, entity_options)
           else
             documented_type = entity_options[:type]
 
             if entity_options[:documentation]
@@ -60,11 +60,12 @@
               memo[entity_name] = {
                 type: data_type
               }
             end
 
-            if entity_options[:values] && entity_options[:values].is_a?(Array)
-              memo[entity_name][:enum] = entity_options[:values]
+            if entity_options[:documentation] && entity_options[:documentation][:values]
+              values = entity_options[:documentation][:values]
+              memo[entity_name][:enum] = values if values.is_a?(Array)
             end
 
             if entity_options[:documentation] && entity_options[:documentation][:is_array]
               memo[entity_name] = {
                 type: :array,