grape-swagger 0.20.3 → 0.21.0

data/spec/swagger_v2/namespace_tags_spec.rb

@@ -27,7 +27,8 @@ describe 'namespace tags check' do
           { 'name' => 'colorado', 'description' => 'Operations about colorados' },
           { 'name' => 'thames', 'description' => 'Operations about thames' },
           { 'name' => 'niles', 'description' => 'Operations about niles' }
-        ])
+        ]
+      )
 
       expect(subject['paths']['/hudson']['get']['tags']).to eql(['hudson'])
       expect(subject['paths']['/colorado/simple']['get']['tags']).to eql(['colorado'])
@@ -51,7 +52,8 @@ describe 'namespace tags check' do
           { 'name' => 'colorado', 'description' => 'Operations about colorados' },
           { 'name' => 'thames', 'description' => 'Operations about thames' },
           { 'name' => 'niles', 'description' => 'Operations about niles' }
-        ])
+        ]
+      )
 
       expect(subject['paths']['/colorado/simple']['get']['tags']).to eql(['colorado'])
       expect(subject['paths']['/colorado/simple-test']['get']['tags']).to eql(['colorado'])
@@ -70,7 +72,8 @@ describe 'namespace tags check' do
             { 'name' => 'colorado', 'description' => 'Operations about colorados' },
             { 'name' => 'thames', 'description' => 'Operations about thames' },
             { 'name' => 'niles', 'description' => 'Operations about niles' }
-          ])
+          ]
+        )
 
         expect(subject['paths']['/thames/simple_with_headers']['get']['tags']).to eql(['thames'])
       end

data/spec/swagger_v2/params_array_spec.rb

@@ -42,7 +42,8 @@ describe 'Group Params as Array' do
         [
           { 'in' => 'formData', 'name' => 'required_group[][required_param_1]', 'required' => true, 'type' => 'array', 'items' => { 'type' => 'string' } },
           { 'in' => 'formData', 'name' => 'required_group[][required_param_2]', 'required' => true, 'type' => 'array', 'items' => { 'type' => 'string' } }
-        ])
+        ]
+      )
     end
   end
 
@@ -59,7 +60,8 @@ describe 'Group Params as Array' do
           { 'in' => 'formData', 'name' => 'typed_group[][name]', 'description' => 'string given', 'required' => true, 'type' => 'array', 'items' => { 'type' => 'string' } },
           { 'in' => 'formData', 'name' => 'typed_group[][email]', 'description' => 'email given', 'required' => false, 'type' => 'array', 'items' => { 'type' => 'string' } },
           { 'in' => 'formData', 'name' => 'typed_group[][others]', 'required' => false, 'type' => 'array', 'items' => { 'type' => 'integer' }, 'enum' => [1, 2, 3] }
-        ])
+        ]
+      )
     end
   end
 end

data/spec/swagger_v2/params_hash_spec.rb

@@ -43,7 +43,8 @@ describe 'Group Params as Hash' do
         [
           { 'in' => 'formData', 'name' => 'required_group[required_param_1]', 'type' => 'string', 'required' => true },
           { 'in' => 'formData', 'name' => 'required_group[required_param_2]', 'type' => 'string', 'required' => true }
-        ])
+        ]
+      )
     end
   end
 
@@ -61,7 +62,8 @@ describe 'Group Params as Hash' do
           { 'in' => 'formData', 'name' => 'typed_group[name]', 'description' => 'string given', 'type' => 'string', 'required' => true },
           { 'in' => 'formData', 'name' => 'typed_group[email]', 'description' => 'email given', 'type' => 'string', 'required' => false },
           { 'in' => 'formData', 'name' => 'typed_group[others]', 'type' => 'integer', 'required' => false, 'format' => 'int32', 'enum' => [1, 2, 3] }
-        ])
+        ]
+      )
     end
   end
 end

data/spec/swagger_v2/params_nested_spec.rb

@@ -44,7 +44,8 @@ describe 'nested group params' do
         [
           { 'in' => 'formData', 'name' => 'a_array[][param_1]', 'required' => true, 'type' => 'array', 'items' => { 'type' => 'integer' } },
           { 'in' => 'formData', 'name' => 'a_array[][b_array][][param_2]', 'required' => true, 'type' => 'array', 'items' => { 'type' => 'string' } }
-        ])
+        ]
+      )
     end
   end
 
@@ -59,7 +60,8 @@ describe 'nested group params' do
         [
           { 'in' => 'formData', 'name' => 'a_hash[param_1]', 'required' => true, 'type' => 'integer', 'format' => 'int32' },
           { 'in' => 'formData', 'name' => 'a_hash[b_hash][param_2]', 'required' => true, 'type' => 'string' }
-        ])
+        ]
+      )
     end
   end
 end

data/spec/swagger_v2/simple_mounted_api_spec.rb

@@ -95,50 +95,66 @@ describe 'a simple mounted api' do
           { 'name' => 'simple-options-test', 'description' => 'Operations about simple-options-tests' },
           { 'name' => 'simple_with_headers', 'description' => 'Operations about simple_with_headers' },
           { 'name' => 'items', 'description' => 'Operations about items' },
-          { 'name' => 'custom', 'description' => 'Operations about customs' }],
+          { 'name' => 'custom', 'description' => 'Operations about customs' }
+        ],
         'paths' => {
           '/simple' => {
             'get' => {
+              'summary' => 'This gets something.',
               'description' => 'This gets something.',
               'produces' => ['application/json'],
               'tags' => ['simple'],
               'operationId' => 'getSimple',
-              'responses' => { '200' => { 'description' => 'This gets something.' } } } },
+              'responses' => { '200' => { 'description' => 'This gets something.' } }
+            }
+          },
           '/simple-test' => {
             'get' => {
+              'summary' => 'This gets something for URL using - separator.',
               'description' => 'This gets something for URL using - separator.',
               'produces' => ['application/json'],
               'tags' => ['simple-test'],
               'operationId' => 'getSimpleTest',
-              'responses' => { '200' => { 'description' => 'This gets something for URL using - separator.' } } } },
+              'responses' => { '200' => { 'description' => 'This gets something for URL using - separator.' } }
+            }
+          },
           '/simple-head-test' => {
             'head' => {
               'produces' => ['application/json'],
               'responses' => { '200' => { 'description' => 'head SimpleHeadTest' } },
               'tags' => ['simple-head-test'],
-              'operationId' => 'headSimpleHeadTest' } },
+              'operationId' => 'headSimpleHeadTest'
+            }
+          },
           '/simple-options-test' => {
             'options' => {
               'produces' => ['application/json'],
               'responses' => { '200' => { 'description' => 'option SimpleOptionsTest' } },
               'tags' => ['simple-options-test'],
-              'operationId' => 'optionsSimpleOptionsTest' } },
+              'operationId' => 'optionsSimpleOptionsTest'
+            }
+          },
           '/simple_with_headers' => {
             'get' => {
+              'summary' => 'this gets something else',
               'description' => 'this gets something else',
               'produces' => ['application/json'],
               'parameters' => [
                 { 'in' => 'header', 'name' => 'XAuthToken', 'description' => 'A required header.', 'type' => 'string', 'required' => true },
-                { 'in' => 'header', 'name' => 'XOtherHeader', 'description' => 'An optional header.', 'type' => 'string', 'required' => false }],
+                { 'in' => 'header', 'name' => 'XOtherHeader', 'description' => 'An optional header.', 'type' => 'string', 'required' => false }
+              ],
               'tags' => ['simple_with_headers'],
               'operationId' => 'getSimpleWithHeaders',
               'responses' => {
                 '200' => { 'description' => 'this gets something else' },
                 '403' => { 'description' => 'invalid pony' },
-                '405' => { 'description' => 'no ponies left!' } }
-            } },
+                '405' => { 'description' => 'no ponies left!' }
+              }
+            }
+          },
           '/items' => {
             'post' => {
+              'summary' => 'this takes an array of parameters',
               'description' => 'this takes an array of parameters',
               'produces' => ['application/json'],
               'consumes' => ['application/json'],
@@ -146,16 +162,21 @@ describe 'a simple mounted api' do
               'tags' => ['items'],
               'operationId' => 'postItems',
               'responses' => { '201' => { 'description' => 'this takes an array of parameters' } }
-            } },
+            }
+          },
           '/custom' => {
             'get' => {
+              'summary' => 'this uses a custom parameter',
               'description' => 'this uses a custom parameter',
               'produces' => ['application/json'],
               'parameters' => [{ 'in' => 'formData', 'name' => 'custom', 'description' => 'array of items', 'required' => false, 'type' => 'array', 'items' => { 'type' => 'CustomType' } }],
               'tags' => ['custom'],
               'operationId' => 'getCustom',
-              'responses' => { '200' => { 'description' => 'this uses a custom parameter' } } }
-          } })
+              'responses' => { '200' => { 'description' => 'this uses a custom parameter' } }
+            }
+          }
+        }
+      )
     end
   end
 
@@ -178,16 +199,21 @@ describe 'a simple mounted api' do
           { 'name' => 'simple-options-test', 'description' => 'Operations about simple-options-tests' },
           { 'name' => 'simple_with_headers', 'description' => 'Operations about simple_with_headers' },
           { 'name' => 'items', 'description' => 'Operations about items' },
-          { 'name' => 'custom', 'description' => 'Operations about customs' }],
+          { 'name' => 'custom', 'description' => 'Operations about customs' }
+        ],
         'paths' => {
           '/simple' => {
             'get' => {
+              'summary' => 'This gets something.',
               'description' => 'This gets something.',
               'produces' => ['application/json'],
               'tags' => ['simple'],
               'operationId' => 'getSimple',
-              'responses' => { '200' => { 'description' => 'This gets something.' } } } }
-        })
+              'responses' => { '200' => { 'description' => 'This gets something.' } }
+            }
+          }
+        }
+      )
     end
   end
 
@@ -211,16 +237,21 @@ describe 'a simple mounted api' do
             { 'name' => 'simple-options-test', 'description' => 'Operations about simple-options-tests' },
             { 'name' => 'simple_with_headers', 'description' => 'Operations about simple_with_headers' },
             { 'name' => 'items', 'description' => 'Operations about items' },
-            { 'name' => 'custom', 'description' => 'Operations about customs' }],
+            { 'name' => 'custom', 'description' => 'Operations about customs' }
+          ],
           'paths' => {
             '/simple-test' => {
               'get' => {
+                'summary' => 'This gets something for URL using - separator.',
                 'description' => 'This gets something for URL using - separator.',
                 'produces' => ['application/json'],
                 'tags' => ['simple-test'],
                 'operationId' => 'getSimpleTest',
-                'responses' => { '200' => { 'description' => 'This gets something for URL using - separator.' } } } }
-          })
+                'responses' => { '200' => { 'description' => 'This gets something for URL using - separator.' } }
+              }
+            }
+          }
+        )
       end
     end
 
@@ -234,18 +265,23 @@ describe 'a simple mounted api' do
         expect(subject['paths']).to eq(
           '/simple_with_headers' => {
             'get' => {
+              'summary' => 'this gets something else',
               'description' => 'this gets something else',
               'produces' => ['application/json'],
               'parameters' => [
                 { 'in' => 'header', 'name' => 'XAuthToken', 'description' => 'A required header.', 'type' => 'string', 'required' => true },
-                { 'in' => 'header', 'name' => 'XOtherHeader', 'description' => 'An optional header.', 'type' => 'string', 'required' => false }],
+                { 'in' => 'header', 'name' => 'XOtherHeader', 'description' => 'An optional header.', 'type' => 'string', 'required' => false }
+              ],
               'tags' => ['simple_with_headers'],
               'operationId' => 'getSimpleWithHeaders',
               'responses' => {
                 '200' => { 'description' => 'this gets something else' },
                 '403' => { 'description' => 'invalid pony' },
-                '405' => { 'description' => 'no ponies left!' } } }
-          })
+                '405' => { 'description' => 'no ponies left!' }
+              }
+            }
+          }
+        )
       end
     end
 
@@ -259,14 +295,17 @@ describe 'a simple mounted api' do
         expect(subject['paths']).to eq(
           '/items' => {
             'post' => {
+              'summary' => 'this takes an array of parameters',
               'description' => 'this takes an array of parameters',
               'produces' => ['application/json'],
               'consumes' => ['application/json'],
               'parameters' => [{ 'in' => 'formData', 'name' => 'items[]', 'description' => 'array of items', 'required' => false, 'type' => 'array', 'items' => { 'type' => 'string' } }],
               'tags' => ['items'],
               'operationId' => 'postItems',
-              'responses' => { '201' => { 'description' => 'this takes an array of parameters' } } }
-          })
+              'responses' => { '201' => { 'description' => 'this takes an array of parameters' } }
+            }
+          }
+        )
       end
     end
 
@@ -280,13 +319,16 @@ describe 'a simple mounted api' do
         expect(subject['paths']).to eq(
           '/custom' => {
             'get' => {
+              'summary' => 'this uses a custom parameter',
               'description' => 'this uses a custom parameter',
               'produces' => ['application/json'],
               'parameters' => [{ 'in' => 'formData', 'name' => 'custom', 'description' => 'array of items', 'required' => false, 'type' => 'array', 'items' => { 'type' => 'CustomType' } }],
               'tags' => ['custom'],
               'operationId' => 'getCustom',
-              'responses' => { '200' => { 'description' => 'this uses a custom parameter' } } }
-          })
+              'responses' => { '200' => { 'description' => 'this uses a custom parameter' } }
+            }
+          }
+        )
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-swagger
 version: !ruby/object:Gem::Version
-  version: 0.20.3
+  version: 0.21.0
 platform: ruby
 authors:
 - Tim Vandecasteele
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-09 00:00:00.000000000 Z
+date: 2016-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape
@@ -24,34 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.12.0
-- !ruby/object:Gem::Dependency
-  name: grape-entity
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: awesome_print
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -154,16 +126,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.40.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.40.0
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
@@ -281,11 +253,13 @@ files:
 - lib/grape-swagger/grape/route.rb
 - lib/grape-swagger/markdown/kramdown_adapter.rb
 - lib/grape-swagger/markdown/redcarpet_adapter.rb
+- lib/grape-swagger/model_parsers.rb
 - lib/grape-swagger/version.rb
 - spec/issues/403_versions_spec.rb
 - spec/lib/data_type_spec.rb
 - spec/lib/endpoint_spec.rb
 - spec/lib/extensions_spec.rb
+- spec/lib/model_parsers_spec.rb
 - spec/lib/move_params_spec.rb
 - spec/lib/operation_id_spec.rb
 - spec/lib/optional_object_spec.rb
@@ -294,10 +268,13 @@ files:
 - spec/markdown/kramdown_adapter_spec.rb
 - spec/markdown/redcarpet_adapter_spec.rb
 - spec/spec_helper.rb
-- spec/support/api_swagger_v2_result.rb
+- spec/support/empty_model_parser.rb
 - spec/support/grape_version.rb
+- spec/support/mock_parser.rb
+- spec/support/model_parsers/entity_parser.rb
+- spec/support/model_parsers/mock_parser.rb
+- spec/support/model_parsers/representable_parser.rb
 - spec/support/namespace_tags.rb
-- spec/support/the_api_entities.rb
 - spec/support/the_paths_definitions.rb
 - spec/swagger_v2/api_swagger_v2_definitions-models_spec.rb
 - spec/swagger_v2/api_swagger_v2_detail_spec.rb
@@ -317,6 +294,8 @@ files:
 - spec/swagger_v2/boolean_params_spec.rb
 - spec/swagger_v2/default_api_spec.rb
 - spec/swagger_v2/description_not_initialized.rb
+- spec/swagger_v2/endpoint_versioned_path_spec.rb
+- spec/swagger_v2/errors_spec.rb
 - spec/swagger_v2/float_api_spec.rb
 - spec/swagger_v2/form_params_spec.rb
 - spec/swagger_v2/grape-swagger_spec.rb
@@ -332,7 +311,6 @@ files:
 - spec/swagger_v2/params_hash_spec.rb
 - spec/swagger_v2/params_nested_spec.rb
 - spec/swagger_v2/reference_entity.rb
-- spec/swagger_v2/response_model_spec.rb
 - spec/swagger_v2/simple_mounted_api_spec.rb
 - spec/version_spec.rb
 homepage: https://github.com/ruby-grape/grape-swagger
@@ -365,6 +343,7 @@ test_files:
 - spec/lib/data_type_spec.rb
 - spec/lib/endpoint_spec.rb
 - spec/lib/extensions_spec.rb
+- spec/lib/model_parsers_spec.rb
 - spec/lib/move_params_spec.rb
 - spec/lib/operation_id_spec.rb
 - spec/lib/optional_object_spec.rb
@@ -373,10 +352,13 @@ test_files:
 - spec/markdown/kramdown_adapter_spec.rb
 - spec/markdown/redcarpet_adapter_spec.rb
 - spec/spec_helper.rb
-- spec/support/api_swagger_v2_result.rb
+- spec/support/empty_model_parser.rb
 - spec/support/grape_version.rb
+- spec/support/mock_parser.rb
+- spec/support/model_parsers/entity_parser.rb
+- spec/support/model_parsers/mock_parser.rb
+- spec/support/model_parsers/representable_parser.rb
 - spec/support/namespace_tags.rb
-- spec/support/the_api_entities.rb
 - spec/support/the_paths_definitions.rb
 - spec/swagger_v2/api_swagger_v2_definitions-models_spec.rb
 - spec/swagger_v2/api_swagger_v2_detail_spec.rb
@@ -396,6 +378,8 @@ test_files:
 - spec/swagger_v2/boolean_params_spec.rb
 - spec/swagger_v2/default_api_spec.rb
 - spec/swagger_v2/description_not_initialized.rb
+- spec/swagger_v2/endpoint_versioned_path_spec.rb
+- spec/swagger_v2/errors_spec.rb
 - spec/swagger_v2/float_api_spec.rb
 - spec/swagger_v2/form_params_spec.rb
 - spec/swagger_v2/grape-swagger_spec.rb
@@ -411,6 +395,5 @@ test_files:
 - spec/swagger_v2/params_hash_spec.rb
 - spec/swagger_v2/params_nested_spec.rb
 - spec/swagger_v2/reference_entity.rb
-- spec/swagger_v2/response_model_spec.rb
 - spec/swagger_v2/simple_mounted_api_spec.rb
 - spec/version_spec.rb