Respect primitve mapping on type and format attributs of 1.2 swagger spec: https://github.com/swagger-api/swagger-spec/blob/master/versions/1.2.md#431-primitives

Author: frodrigo

CHANGELOG.md

@@ -17,6 +17,7 @@
 * [#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).
 * [#235](https://github.com/tim-vandecasteele/grape-swagger/pull/235): Fixed nested entity names in parameters and as `$ref` in models - [@frodrigo](https://github.com/frodrigo).
 * [#206](https://github.com/tim-vandecasteele/grape-swagger/pull/206): Fixed 'is_array' in the return entity being ignored - [@igormoochnick](https://github.com/igormoochnick).
+* [#266](https://github.com/tim-vandecasteele/grape-swagger/pull/266): Respect primitve mapping on type and format attributs of 1.2 swagger spec - [@frodrigo](https://github.com/frodrigo).
 
 ### 0.10.1 (March 11, 2015)
 

lib/grape-swagger/doc_methods.rb

@@ -1,5 +1,15 @@
 module GrapeSwagger
   module DocMethods
+    PRIMITIVE_MAPPINGS = {
+      'integer' => %w(integer int32),
+      'long' => %w(integer int64),
+      'float' => %w(number float),
+      'double' => %w(number double),
+      'byte' => %w(string byte),
+      'date' => %w(string date),
+      'dateTime' => %w(string date-time)
+    }
+
     def name
       @@class_name
     end
@@ -86,8 +96,10 @@ def parse_params(params, path, method)
           allowMultiple: is_array
         }
 
-        parsed_params[:format] = 'int32' if data_type == 'integer'
-        parsed_params[:format] = 'int64' if data_type == 'long'
+        if PRIMITIVE_MAPPINGS.key?(data_type)
+          parsed_params[:type], parsed_params[:format] = PRIMITIVE_MAPPINGS[data_type]
+        end
+
         parsed_params[:items]  = items   if items.present?
 
         parsed_params[:defaultValue] = example if example
@@ -208,6 +220,10 @@ def parse_entity_models(models)
             p[:enum] = select_values
           end
 
+          if PRIMITIVE_MAPPINGS.key?(p['type'])
+            p['type'], p['format'] = PRIMITIVE_MAPPINGS[p['type']]
+          end
+
           properties[property_name] = p
         end
 

spec/api_global_models_spec.rb

@@ -70,7 +70,7 @@ def app
         'id' => 'Some::CombinedThing',
         'properties' => {
           'text' => { 'type' => 'string', 'description' => 'Content of something.' },
-          'created_at' => { 'type' => 'dateTime', 'description' => 'Creation of something.' }
+          'created_at' => { 'type' => 'string', 'format' => 'date-time', 'description' => 'Creation of something.' }
         }
       })
   end

spec/api_models_spec.rb

@@ -258,7 +258,7 @@ def app
       'id' => 'EnumValues',
       'properties' => {
         'gender' => { 'type' => 'string', 'description' => 'Content of something.', 'enum' => %w(Male Female) },
-        'number' => { 'type' => 'integer', 'description' => 'Content of something.', 'enum' => [1, 2] }
+        'number' => { 'type' => 'integer', 'format' => 'int32', 'description' => 'Content of something.', 'enum' => [1, 2] }
       }
     )
 

spec/float_api_spec.rb

@@ -24,7 +24,7 @@ def app
 
   it 'converts float types' do
     expect(subject).to eq [
-      { 'paramType' => 'form', 'name' => 'a_float', 'description' => nil, 'type' => 'float', 'required' => true, 'allowMultiple' => false }
+      { 'paramType' => 'form', 'name' => 'a_float', 'description' => nil, 'type' => 'number', 'format' => 'float', 'required' => true, 'allowMultiple' => false }
     ]
   end
 end

spec/param_values_spec.rb

@@ -123,7 +123,7 @@ def first_parameter_info(request)
 
     it 'has float range values as string' do
       expect(range_float).to eq [
-        { 'paramType' => 'form', 'name' => 'float', 'description' => nil, 'type' => 'float', 'required' => true, 'allowMultiple' => false }
+        { 'paramType' => 'form', 'name' => 'float', 'description' => nil, 'type' => 'number', 'format' => 'float', 'required' => true, 'allowMultiple' => false }
       ]
     end
   end