Prepare release 1.3.0 (#808)

- updates and satisfy rubocop 0.90
- fixes ruby warnings
- adds truffelruby-head to travis

.rubocop.yml

@@ -4,6 +4,7 @@ AllCops:
   Exclude:
     - vendor/**/*
     - example/**/*
+  NewCops: enable
   TargetRubyVersion: 2.7
 
 #  Layout stuff
@@ -80,8 +81,12 @@ Style/CaseLikeIf:
 Style/ExponentialNotation:
   Enabled: true
 
+Style/ExplicitBlockArgument:
+  Enabled: false
+
 Style/HashAsLastArrayItem:
   Enabled: true
+
 Style/HashEachMethods:
   Enabled: true
 
@@ -114,5 +119,3 @@ Style/RedundantRegexpEscape:
 
 Style/SlicingWithRange:
   Enabled: false
-
-

.travis.yml

@@ -29,8 +29,12 @@ jobs:
       env:
     - rvm: jruby-head
       env:
+    - rvm: truffleruby-head
+      env:
+      script: bundle exec rake spec
 
   allow_failures:
     - rvm: 2.4.10
     - rvm: ruby-head
     - rvm: jruby-head
+    - rvm: truffleruby-head

CHANGELOG.md

@@ -7,7 +7,14 @@
 #### Fixes
 
 * Your contribution here.
-* [#804](https://github.com/ruby-grape/grape-swagger/pull/804): Don't overwrite model description with the route description. - [@Bhacaz](https://github.com/Bhacaz)
+
+
+### 1.3.0 (September 3, 2020)
+
+#### Features
+
+* [#804](https://github.com/ruby-grape/grape-swagger/pull/804): Don't overwrite model description with the route description - [@Bhacaz](https://github.com/Bhacaz).
+
 
 ### 1.2.1 (July 15, 2020)
 

Gemfile

@@ -27,7 +27,7 @@ group :development, :test do
   gem 'rake'
   gem 'rdoc'
   gem 'rspec', '~> 3.9'
-  gem 'rubocop', '~> 0.88', require: false
+  gem 'rubocop', '~> 0.90', require: false
 end
 
 group :test do

lib/grape-swagger/doc_methods/format_data.rb

@@ -7,7 +7,7 @@ class << self
         def to_format(parameters)
           parameters.reject { |parameter| parameter[:in] == 'body' }.each do |b|
             related_parameters = parameters.select do |p|
-              p[:name] != b[:name] && p[:name].to_s.include?(b[:name].to_s.gsub(/\[\]\z/, '') + '[')
+              p[:name] != b[:name] && p[:name].to_s.include?("#{b[:name].to_s.gsub(/\[\]\z/, '')}[")
             end
             parameters.reject! { |p| p[:name] == b[:name] } if move_down(b, related_parameters)
           end
@@ -30,7 +30,7 @@ def move_down(parameter, related_parameters)
 
         def add_braces(parameter, related_parameters)
           param_name = parameter[:name].gsub(/\A(.*)\[\]\z/, '\1')
-          related_parameters.each { |p| p[:name] = p[:name].gsub(param_name, param_name + '[]') }
+          related_parameters.each { |p| p[:name] = p[:name].gsub(param_name, "#{param_name}[]") }
         end
 
         def add_array(parameter, related_parameters)

lib/grape-swagger/endpoint.rb

@@ -11,7 +11,7 @@ def content_types_for(target_class)
 
       if content_types.empty?
         formats       = [target_class.format, target_class.default_format].compact.uniq
-        formats       = Grape::Formatter.formatters({}).keys if formats.empty?
+        formats       = Grape::Formatter.formatters(**{}).keys if formats.empty?
         content_types = Grape::ContentTypes::CONTENT_TYPES.select do |content_type, _mime_type|
           formats.include? content_type
         end.values
@@ -365,7 +365,7 @@ def hidden?(route, options)
     end
 
     def hidden_parameter?(value)
-      return false if value.dig(:required)
+      return false if value[:required]
 
       if value.dig(:documentation, :hidden).is_a?(Proc)
         value.dig(:documentation, :hidden).call

lib/grape-swagger/rake/oapi_tasks.rb

@@ -74,6 +74,7 @@ def validate
 
       # helper methods
       #
+      # rubocop:disable Style/StringConcatenation
       def make_request
         get url_for
 
@@ -83,6 +84,7 @@ def make_request
           )
         ) + "\n"
       end
+      # rubocop:enable Style/StringConcatenation
 
       def url_for
         oapi_route = api_class.routes[-2]

lib/grape-swagger/version.rb

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

spec/lib/move_params_spec.rb

@@ -97,7 +97,7 @@
     let(:route_options) { { requirements: {} } }
     describe 'POST' do
       let(:params) { paths[path][:post][:parameters] }
-      let(:route) { Grape::Router::Route.new('POST', path.dup, route_options) }
+      let(:route) { Grape::Router::Route.new('POST', path.dup, **route_options) }
 
       specify do
         subject.to_definition(path, params, route, definitions)
@@ -113,7 +113,7 @@
 
     describe 'POST' do
       let(:params) { paths['/in_body/{key}'][:put][:parameters] }
-      let(:route) { Grape::Router::Route.new('PUT', path.dup, route_options) }
+      let(:route) { Grape::Router::Route.new('PUT', path.dup, **route_options) }
 
       specify do
         subject.to_definition(path, params, route, definitions)