Merge pull request #2145 from ericproulx/try_ruby_3_0

dblock · web-flow · commit 6b31f6198243 · 2020-12-30T12:49:31.000-05:00
Ruby 3.0.0 compatibility
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -28,6 +28,7 @@ jobs:
           - 2.5
           - 2.6
           - 2.7
+          - 3.0
         gemfile:
           - Gemfile
           - gemfiles/rack1.gemfile
@@ -36,8 +37,15 @@ jobs:
           - gemfiles/rails_edge.gemfile
           - gemfiles/rails_5.gemfile
           - gemfiles/rails_6.gemfile
+          - gemfiles/rails_6_1.gemfile
         experimental: [false]
         include:
+          - ruby: 3.0
+            gemfile: 'gemfiles/multi_json.gemfile'
+            experimental: false
+          - ruby: 3.0
+            gemfile: 'gemfiles/multi_xml.gemfile'
+            experimental: false
           - ruby: 2.7
             gemfile: 'gemfiles/multi_json.gemfile'
             experimental: false
diff --git a/Appraisals b/Appraisals
@@ -8,6 +8,10 @@ appraise 'rails-6' do
   gem 'rails', '~> 6.0'
 end
 
+appraise 'rails-6-1' do
+  gem 'rails', '~> 6.1'
+end
+
 appraise 'rails-edge' do
   gem 'rails', github: 'rails/rails'
 end
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,9 +3,9 @@
 #### Features
 
 * Your contribution here.
+* [#2145](https://github.com/ruby-grape/grape/pull/2145): Ruby 3.0 compatibility - [@ericproulx](https://github.com/ericproulx).
 * [#2143](https://github.com/ruby-grape/grape/pull/2143): Enable GitHub Actions with updated RuboCop and Danger - [@anakinj](https://github.com/anakinj).
 
-
 #### Fixes
 
 * Your contribution here.
diff --git a/gemfiles/multi_json.gemfile b/gemfiles/multi_json.gemfile
@@ -10,14 +10,15 @@ group :development, :test do
   gem 'bundler'
   gem 'hashie'
   gem 'rake'
-  gem 'rubocop', '0.84.0'
-  gem 'rubocop-ast', '< 0.7'
-  gem 'rubocop-performance', require: false
+  gem 'rubocop', '1.7.0'
+  gem 'rubocop-ast', '1.3.0'
+  gem 'rubocop-performance', '1.9.1', require: false
 end
 
 group :development do
   gem 'appraisal'
   gem 'benchmark-ips'
+  gem 'benchmark-memory'
   gem 'guard'
   gem 'guard-rspec'
   gem 'guard-rubocop'
@@ -26,14 +27,13 @@ end
 group :test do
   gem 'cookiejar'
   gem 'coveralls_reborn'
-  gem 'danger-toc', '~> 0.1.2'
   gem 'grape-entity', '~> 0.6'
   gem 'maruku'
   gem 'mime-types'
   gem 'rack-jsonp', require: 'rack/jsonp'
   gem 'rack-test', '~> 1.1.0'
   gem 'rspec', '~> 3.0'
-  gem 'ruby-grape-danger', '~> 0.1.0', require: false
+  gem 'ruby-grape-danger', '~> 0.2.0', require: false
 end
 
 gemspec path: '../'
diff --git a/gemfiles/multi_xml.gemfile b/gemfiles/multi_xml.gemfile
@@ -10,14 +10,15 @@ group :development, :test do
   gem 'bundler'
   gem 'hashie'
   gem 'rake'
-  gem 'rubocop', '0.84.0'
-  gem 'rubocop-ast', '< 0.7'
-  gem 'rubocop-performance', require: false
+  gem 'rubocop', '1.7.0'
+  gem 'rubocop-ast', '1.3.0'
+  gem 'rubocop-performance', '1.9.1', require: false
 end
 
 group :development do
   gem 'appraisal'
   gem 'benchmark-ips'
+  gem 'benchmark-memory'
   gem 'guard'
   gem 'guard-rspec'
   gem 'guard-rubocop'
@@ -26,14 +27,13 @@ end
 group :test do
   gem 'cookiejar'
   gem 'coveralls_reborn'
-  gem 'danger-toc', '~> 0.1.2'
   gem 'grape-entity', '~> 0.6'
   gem 'maruku'
   gem 'mime-types'
   gem 'rack-jsonp', require: 'rack/jsonp'
   gem 'rack-test', '~> 1.1.0'
   gem 'rspec', '~> 3.0'
-  gem 'ruby-grape-danger', '~> 0.1.0', require: false
+  gem 'ruby-grape-danger', '~> 0.2.0', require: false
 end
 
 gemspec path: '../'
diff --git a/gemfiles/rack1.gemfile b/gemfiles/rack1.gemfile
@@ -10,14 +10,15 @@ group :development, :test do
   gem 'bundler'
   gem 'hashie'
   gem 'rake'
-  gem 'rubocop', '0.84.0'
-  gem 'rubocop-ast', '< 0.7'
-  gem 'rubocop-performance', require: false
+  gem 'rubocop', '1.7.0'
+  gem 'rubocop-ast', '1.3.0'
+  gem 'rubocop-performance', '1.9.1', require: false
 end
 
 group :development do
   gem 'appraisal'
   gem 'benchmark-ips'
+  gem 'benchmark-memory'
   gem 'guard'
   gem 'guard-rspec'
   gem 'guard-rubocop'
@@ -26,14 +27,13 @@ end
 group :test do
   gem 'cookiejar'
   gem 'coveralls_reborn'
-  gem 'danger-toc', '~> 0.1.2'
   gem 'grape-entity', '~> 0.6'
   gem 'maruku'
   gem 'mime-types'
   gem 'rack-jsonp', require: 'rack/jsonp'
   gem 'rack-test', '~> 1.1.0'
   gem 'rspec', '~> 3.0'
-  gem 'ruby-grape-danger', '~> 0.1.0', require: false
+  gem 'ruby-grape-danger', '~> 0.2.0', require: false
 end
 
 gemspec path: '../'
diff --git a/gemfiles/rack2.gemfile b/gemfiles/rack2.gemfile
@@ -10,14 +10,15 @@ group :development, :test do
   gem 'bundler'
   gem 'hashie'
   gem 'rake'
-  gem 'rubocop', '0.84.0'
-  gem 'rubocop-ast', '< 0.7'
-  gem 'rubocop-performance', require: false
+  gem 'rubocop', '1.7.0'
+  gem 'rubocop-ast', '1.3.0'
+  gem 'rubocop-performance', '1.9.1', require: false
 end
 
 group :development do
   gem 'appraisal'
   gem 'benchmark-ips'
+  gem 'benchmark-memory'
   gem 'guard'
   gem 'guard-rspec'
   gem 'guard-rubocop'
@@ -26,14 +27,13 @@ end
 group :test do
   gem 'cookiejar'
   gem 'coveralls_reborn'
-  gem 'danger-toc', '~> 0.1.2'
   gem 'grape-entity', '~> 0.6'
   gem 'maruku'
   gem 'mime-types'
   gem 'rack-jsonp', require: 'rack/jsonp'
   gem 'rack-test', '~> 1.1.0'
   gem 'rspec', '~> 3.0'
-  gem 'ruby-grape-danger', '~> 0.1.0', require: false
+  gem 'ruby-grape-danger', '~> 0.2.0', require: false
 end
 
 gemspec path: '../'
diff --git a/gemfiles/rack_edge.gemfile b/gemfiles/rack_edge.gemfile
@@ -10,14 +10,15 @@ group :development, :test do
   gem 'bundler'
   gem 'hashie'
   gem 'rake'
-  gem 'rubocop', '0.84.0'
-  gem 'rubocop-ast', '< 0.7'
-  gem 'rubocop-performance', require: false
+  gem 'rubocop', '1.7.0'
+  gem 'rubocop-ast', '1.3.0'
+  gem 'rubocop-performance', '1.9.1', require: false
 end
 
 group :development do
   gem 'appraisal'
   gem 'benchmark-ips'
+  gem 'benchmark-memory'
   gem 'guard'
   gem 'guard-rspec'
   gem 'guard-rubocop'
@@ -26,14 +27,13 @@ end
 group :test do
   gem 'cookiejar'
   gem 'coveralls_reborn'
-  gem 'danger-toc', '~> 0.1.2'
   gem 'grape-entity', '~> 0.6'
   gem 'maruku'
   gem 'mime-types'
   gem 'rack-jsonp', require: 'rack/jsonp'
   gem 'rack-test', '~> 1.1.0'
   gem 'rspec', '~> 3.0'
-  gem 'ruby-grape-danger', '~> 0.1.0', require: false
+  gem 'ruby-grape-danger', '~> 0.2.0', require: false
 end
 
 gemspec path: '../'
diff --git a/gemfiles/rails_5.gemfile b/gemfiles/rails_5.gemfile
@@ -10,14 +10,15 @@ group :development, :test do
   gem 'bundler'
   gem 'hashie'
   gem 'rake'
-  gem 'rubocop', '0.84.0'
-  gem 'rubocop-ast', '< 0.7'
-  gem 'rubocop-performance', require: false
+  gem 'rubocop', '1.7.0'
+  gem 'rubocop-ast', '1.3.0'
+  gem 'rubocop-performance', '1.9.1', require: false
 end
 
 group :development do
   gem 'appraisal'
   gem 'benchmark-ips'
+  gem 'benchmark-memory'
   gem 'guard'
   gem 'guard-rspec'
   gem 'guard-rubocop'
@@ -26,14 +27,13 @@ end
 group :test do
   gem 'cookiejar'
   gem 'coveralls_reborn'
-  gem 'danger-toc', '~> 0.1.2'
   gem 'grape-entity', '~> 0.6'
   gem 'maruku'
   gem 'mime-types'
   gem 'rack-jsonp', require: 'rack/jsonp'
   gem 'rack-test', '~> 1.1.0'
   gem 'rspec', '~> 3.0'
-  gem 'ruby-grape-danger', '~> 0.1.0', require: false
+  gem 'ruby-grape-danger', '~> 0.2.0', require: false
 end
 
 gemspec path: '../'
diff --git a/gemfiles/rails_6.gemfile b/gemfiles/rails_6.gemfile
@@ -10,14 +10,15 @@ group :development, :test do
   gem 'bundler'
   gem 'hashie'
   gem 'rake'
-  gem 'rubocop', '0.84.0'
-  gem 'rubocop-ast', '< 0.7'
-  gem 'rubocop-performance', require: false
+  gem 'rubocop', '1.7.0'
+  gem 'rubocop-ast', '1.3.0'
+  gem 'rubocop-performance', '1.9.1', require: false
 end
 
 group :development do
   gem 'appraisal'
   gem 'benchmark-ips'
+  gem 'benchmark-memory'
   gem 'guard'
   gem 'guard-rspec'
   gem 'guard-rubocop'
@@ -26,14 +27,13 @@ end
 group :test do
   gem 'cookiejar'
   gem 'coveralls_reborn'
-  gem 'danger-toc', '~> 0.1.2'
   gem 'grape-entity', '~> 0.6'
   gem 'maruku'
   gem 'mime-types'
   gem 'rack-jsonp', require: 'rack/jsonp'
   gem 'rack-test', '~> 1.1.0'
   gem 'rspec', '~> 3.0'
-  gem 'ruby-grape-danger', '~> 0.1.0', require: false
+  gem 'ruby-grape-danger', '~> 0.2.0', require: false
 end
 
 gemspec path: '../'
diff --git a/gemfiles/rails_6_1.gemfile b/gemfiles/rails_6_1.gemfile
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+# This file was generated by Appraisal
+
+source 'https://rubygems.org'
+
+gem 'rails', '~> 6.1'
+
+group :development, :test do
+  gem 'bundler'
+  gem 'hashie'
+  gem 'rake'
+  gem 'rubocop', '1.7.0'
+  gem 'rubocop-ast', '1.3.0'
+  gem 'rubocop-performance', '1.9.1', require: false
+end
+
+group :development do
+  gem 'appraisal'
+  gem 'benchmark-ips'
+  gem 'benchmark-memory'
+  gem 'guard'
+  gem 'guard-rspec'
+  gem 'guard-rubocop'
+end
+
+group :test do
+  gem 'cookiejar'
+  gem 'coveralls_reborn'
+  gem 'grape-entity', '~> 0.6'
+  gem 'maruku'
+  gem 'mime-types'
+  gem 'rack-jsonp', require: 'rack/jsonp'
+  gem 'rack-test', '~> 1.1.0'
+  gem 'rspec', '~> 3.0'
+  gem 'ruby-grape-danger', '~> 0.2.0', require: false
+end
+
+gemspec path: '../'
diff --git a/gemfiles/rails_edge.gemfile b/gemfiles/rails_edge.gemfile
@@ -10,14 +10,15 @@ group :development, :test do
   gem 'bundler'
   gem 'hashie'
   gem 'rake'
-  gem 'rubocop', '0.84.0'
-  gem 'rubocop-ast', '< 0.7'
-  gem 'rubocop-performance', require: false
+  gem 'rubocop', '1.7.0'
+  gem 'rubocop-ast', '1.3.0'
+  gem 'rubocop-performance', '1.9.1', require: false
 end
 
 group :development do
   gem 'appraisal'
   gem 'benchmark-ips'
+  gem 'benchmark-memory'
   gem 'guard'
   gem 'guard-rspec'
   gem 'guard-rubocop'
@@ -26,14 +27,13 @@ end
 group :test do
   gem 'cookiejar'
   gem 'coveralls_reborn'
-  gem 'danger-toc', '~> 0.1.2'
   gem 'grape-entity', '~> 0.6'
   gem 'maruku'
   gem 'mime-types'
   gem 'rack-jsonp', require: 'rack/jsonp'
   gem 'rack-test', '~> 1.1.0'
   gem 'rspec', '~> 3.0'
-  gem 'ruby-grape-danger', '~> 0.1.0', require: false
+  gem 'ruby-grape-danger', '~> 0.2.0', require: false
 end
 
 gemspec path: '../'
diff --git a/lib/grape/dsl/routing.rb b/lib/grape/dsl/routing.rb
@@ -79,11 +79,12 @@ def do_not_route_options!
           namespace_inheritable(:do_not_route_options, true)
         end
 
-        def mount(mounts, **opts)
+        def mount(mounts, *opts)
           mounts = { mounts => '/' } unless mounts.respond_to?(:each_pair)
           mounts.each_pair do |app, path|
             if app.respond_to?(:mount_instance)
-              mount(app.mount_instance(configuration: opts[:with] || {}) => path)
+              opts_with = opts.any? ? opts.shift[:with] : {}
+              mount({ app.mount_instance(configuration: opts_with) => path })
               next
             end
             in_setting = inheritable_setting
diff --git a/lib/grape/exceptions/validation_errors.rb b/lib/grape/exceptions/validation_errors.rb
@@ -39,7 +39,7 @@ def as_json(**_opts)
         end
       end
 
-      def to_json(**_opts)
+      def to_json(*_opts)
         as_json.to_json
       end
 
diff --git a/lib/grape/middleware/auth/base.rb b/lib/grape/middleware/auth/base.rb
diff --git a/lib/grape/middleware/base.rb b/lib/grape/middleware/base.rb
diff --git a/lib/grape/middleware/error.rb b/lib/grape/middleware/error.rb
diff --git a/lib/grape/validations/validators/base.rb b/lib/grape/validations/validators/base.rb
diff --git a/spec/grape/request_spec.rb b/spec/grape/request_spec.rb
diff --git a/spec/shared/versioning_examples.rb b/spec/shared/versioning_examples.rb
diff --git a/spec/support/versioned_helpers.rb b/spec/support/versioned_helpers.rb
