grape-swagger 0.32.0 → 0.32.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea7cb947847696a10190ade08cfbe8bf19364a4b5855d932abda009c672122c4
-  data.tar.gz: 8a9c2f4a2bff62b247b795b6082d825d9403382ef56626f93ed697b4b654dc54
+  metadata.gz: 1c5f4e8337c6872fe55038b194145b68b2f590d5b0c1a69e21968ce3c2cd15ab
+  data.tar.gz: 37af5bafa392cd66f53636e5e586b6763ecab6596d31250977644482183b5506
 SHA512:
-  metadata.gz: 45dfe914ee2225ab36174fd182563a56aaf8cfb78f9aaccdc8a4070e47acb41e0010f31c283d6bef76819a296539457da5095191e17e181d0acf4271f743bcf0
-  data.tar.gz: 0ab65509589c8537b7f77810dd76be2fb50e092796570a333704a9b06893e8a5756988465214752df3b0a2093a731e33e10b229b7c879568e28d2f247a79dd68
+  metadata.gz: f994d0712a3cdb78c37536ca4a636b986ed48178daeed7b0dcb86fe02b75ffb0b2844cacddac3f767213d461efc6f1ba15adea681622ee5add22c0a5ec31c74e
+  data.tar.gz: 3ccae0f447dfd4e4517e3d5f02e33678b3733a999d2bd1c81a9a9f54d29d201cd0c378b64f20932dcbbe41b660ffad742d1940bab0094b64586802655cb44b49

data/.travis.yml

@@ -7,19 +7,19 @@ before_install:
   - gem install bundler
 
 after_success:
-  - coveralls
+  # - coveralls
   - bundle exec danger
 
 rvm:
   - 2.4.5
   - 2.5.3
-  - 2.6.0-preview2
+  - 2.6.0-rc1
 env:
   - MODEL_PARSER=grape-swagger-entity
   - MODEL_PARSER=grape-swagger-representable
   - GRAPE_VERSION=0.19.2
   - GRAPE_VERSION=1.0.3
-  - GRAPE_VERSION=1.2.0
+  - GRAPE_VERSION=1.2.2
   - GRAPE_VERSION=HEAD
 
 matrix:

data/CHANGELOG.md

@@ -8,6 +8,13 @@
 
 * Your contribution here.
 
+### 0.32.1 (December 7, 2018)
+
+#### Fixes
+
+* [#731](https://github.com/ruby-grape/grape-swagger/pull/731): Skip empty parameters and tags arrays - [@fotos](https://github.com/fotos).
+* [#729](https://github.com/ruby-grape/grape-swagger/pull/729): Allow empty security array for endpoints - [@fotos](https://github.com/fotos).
+
 ### 0.32.0 (November 26, 2018)
 
 #### Features

data/Gemfile

@@ -30,7 +30,7 @@ group :development, :test do
   if RUBY_VERSION == '2.6.0'
     gem 'rubocop', git: 'https://github.com/rubocop-hq/rubocop.git', require: false
   else
-    gem 'rubocop', '~> 0.60', require: false
+    gem 'rubocop', '~> 0.61', require: false
   end
 end
 

data/lib/grape-swagger/endpoint.rb

@@ -125,7 +125,7 @@ module Grape
       method[:tags]        = route.options.fetch(:tags, tag_object(route, path))
       method[:operationId] = GrapeSwagger::DocMethods::OperationId.build(route, path)
       method[:deprecated] = deprecated_object(route)
-      method.delete_if { |_, value| value.blank? }
+      method.delete_if { |_, value| value.nil? }
 
       [route.request_method.downcase.to_sym, method]
     end
@@ -149,7 +149,6 @@ module Grape
     def description_object(route)
       description = route.description if route.description.present?
       description = route.options[:detail] if route.options.key?(:detail)
-      description ||= ''
 
       description
     end
@@ -192,7 +191,7 @@ module Grape
         parameters = GrapeSwagger::DocMethods::MoveParams.to_definition(path, parameters, route, @definitions)
       end
 
-      parameters
+      parameters.presence
     end
 
     def response_object(route)
@@ -258,11 +257,12 @@ module Grape
     def tag_object(route, path)
       version = GrapeSwagger::DocMethods::Version.get(route)
       version = [version] unless version.is_a?(Array)
+
       Array(
         path.split('{')[0].split('/').reject(&:empty?).delete_if do |i|
           i == route.prefix.to_s || version.map(&:to_s).include?(i)
         end.first
-      )
+      ).presence
     end
 
     private

data/lib/grape-swagger/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GrapeSwagger
-  VERSION = '0.32.0'
+  VERSION = '0.32.1'
 end

data/spec/spec_helper.rb

@@ -2,14 +2,14 @@
 
 if RUBY_ENGINE == 'ruby'
   require 'simplecov'
-  require 'coveralls'
+  # require 'coveralls'
 
-  SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+  # SimpleCov.formatter = Coveralls::SimpleCov::Formatter
   SimpleCov.start do
     add_filter 'spec/'
-    add_filter 'example/'
+    # add_filter 'example/'
   end
-  Coveralls.wear!
+  # Coveralls.wear!
 end
 
 $LOAD_PATH.unshift File.expand_path('../lib', __dir__)

data/spec/swagger_v2/security_requirement_spec.rb

@@ -10,7 +10,24 @@ describe 'security requirement on endpoint method' do
         { foo: 'bar' }
       end
 
-      add_swagger_documentation
+      desc 'Endpoint without security requirement', security: []
+      get '/without_security' do
+        { foo: 'bar' }
+      end
+
+      add_swagger_documentation(
+        security_definitions: {
+          petstore_auth: {
+            type: 'oauth2',
+            flow: 'implicit',
+            authorizationUrl: 'https://petstore.swagger.io/oauth/dialog',
+            scopes: {
+              'read:pets': 'read your pets',
+              'write:pets': 'modify pets in your account'
+            }
+          }
+        }
+      )
     end
   end
 
@@ -22,4 +39,8 @@ describe 'security requirement on endpoint method' do
   it 'defines the security requirement on the endpoint method' do
     expect(subject['paths']['/with_security']['get']['security']).to eql ['oauth_pets' => ['read:pets', 'write:pets']]
   end
+
+  it 'defines an empty security requirement on the endpoint method' do
+    expect(subject['paths']['/without_security']['get']['security']).to eql []
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-swagger
 version: !ruby/object:Gem::Version
-  version: 0.32.0
+  version: 0.32.1
 platform: ruby
 authors:
 - Tim Vandecasteele
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-26 00:00:00.000000000 Z
+date: 2018-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape