Merge pull request #41 from dblock/ruby-3.1.1

Upgraded to Ruby 3.1.1.

Author: dblock

.github/workflows/rubocop.yml

@@ -8,6 +8,6 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.6.5
+          ruby-version: 3.1.1
           bundler-cache: true
       - run: bundle exec rubocop

.github/workflows/test.yml

@@ -8,7 +8,7 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.6.5
+          ruby-version: 3.1.1
           bundler-cache: true
       - uses: browser-actions/setup-geckodriver@latest
         with:

.gitignore

@@ -4,3 +4,4 @@
 .irbrc
 .bundle
 log
+vendor

.rubocop_todo.yml

@@ -1,17 +1,11 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2022-06-18 00:01:02 UTC using RuboCop version 1.30.1.
+# on 2022-06-18 16:28:15 UTC using RuboCop version 1.30.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Lint/NonDeterministicRequireOrder:
-  Exclude:
-    - 'config/application.rb'
-
 # Offense count: 1
 Lint/UriEscapeUnescape:
   Exclude:

Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-ruby '2.6.5'
+ruby '3.1.1'
 
 gem 'grape'
 gem 'grape-entity'
@@ -11,6 +11,7 @@ gem 'mime-types'
 gem 'newrelic_rpm'
 gem 'nokogiri'
 gem 'rack-cors'
+gem 'webrick'
 
 group :development do
   gem 'guard'

Gemfile.lock

@@ -1,17 +1,16 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (6.1.6)
+    activesupport (7.0.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
     builder (3.2.4)
-    capybara (3.36.0)
+    capybara (3.37.1)
       addressable
       matrix
       mini_mime (>= 0.1.3)
@@ -24,7 +23,7 @@ GEM
     coderay (1.1.3)
     concurrent-ruby (1.1.10)
     diff-lcs (1.5.0)
-    dry-configurable (0.13.0)
+    dry-configurable (0.15.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.6)
     dry-container (0.9.0)
@@ -68,8 +67,8 @@ GEM
       pry (>= 0.13.0)
       shellany (~> 0.0)
       thor (>= 0.18.1)
-    guard-bundler (2.2.1)
-      bundler (>= 1.3.0, < 3)
+    guard-bundler (3.0.0)
+      bundler (>= 2.1, < 3)
       guard (~> 2.2)
       guard-compat (~> 1.1)
     guard-compat (1.2.1)
@@ -153,25 +152,27 @@ GEM
       parser (>= 3.1.1.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.9.0)
+    rubocop-rspec (2.11.1)
       rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
-    selenium-webdriver (4.1.0)
+    selenium-webdriver (4.2.1)
       childprocess (>= 0.5, < 5.0)
       rexml (~> 3.2, >= 3.2.5)
-      rubyzip (>= 1.2.2)
+      rubyzip (>= 1.2.2, < 3.0)
+      websocket (~> 1.0)
     shellany (0.0.1)
     spoon (0.0.6)
       ffi
     thor (1.2.1)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)
+    webrick (1.7.0)
+    websocket (1.2.9)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.0)
 
 PLATFORMS
   ruby
@@ -197,9 +198,10 @@ DEPENDENCIES
   rubocop-rake
   rubocop-rspec
   selenium-webdriver
+  webrick
 
 RUBY VERSION
-   ruby 2.6.5p114
+   ruby 3.1.1p18
 
 BUNDLED WITH
-   1.17.3
+   2.3.15

api/upload_file.rb

@@ -15,7 +15,7 @@ class UploadFile < Grape::API
       filename = params[:file][:filename]
       content_type MIME::Types.type_for(filename)[0].to_s
       env['api.format'] = :binary
-      header 'Content-Disposition', "attachment; filename*=UTF-8''#{URI.escape(filename)}"
+      header 'Content-Disposition', "attachment; filename*=UTF-8''#{CGI.escape(filename)}"
       params[:file][:tempfile].read
     end
   end

api/wrap_response_decorator.rb

@@ -7,7 +7,7 @@ def initialize(app)
     def call(env)
       status, headers, body_proxy = @app.call(env)
       bodies = body_proxy.map do |body|
-        { body: JSON.parse(body), status: status }.to_json
+        { body: JSON.parse(body), status: }.to_json
       end
       [200, headers, bodies]
     end