Merge pull request #696 from railsbridge/dependabot/bundler/sinatra-and-sinatra-contrib-3.0.3

Author: dependabot[bot]

Gemfile

@@ -4,8 +4,8 @@ ruby '2.7.6'
 
 gem 'activesupport'
 gem "erector", "~> 0.10.0"
-gem "sinatra", "~> 1.4.0"
-gem "sinatra-contrib", "~> 1.4.0"
+gem "sinatra", "~> 3.0.3"
+gem "sinatra-contrib", "~> 3.0.3"
 gem "nokogiri"
 gem "thin", "1.8.1"
 gem 'rack-codehighlighter'

Gemfile.lock

@@ -44,17 +44,19 @@ GEM
       ruby_dep (~> 1.2)
     mini_portile2 (2.8.0)
     minitest (5.15.0)
-    multi_json (1.12.1)
-    nokogiri (1.13.2)
+    multi_json (1.15.0)
+    mustermann (3.0.0)
+      ruby2_keywords (~> 0.0.1)
+    nokogiri (1.13.9)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     polyglot (0.3.5)
     racc (1.6.0)
-    rack (1.6.13)
-    rack-codehighlighter (0.5.1)
+    rack (2.2.4)
+    rack-codehighlighter (0.6.0)
       nokogiri (>= 1.4.1)
-      rack (>= 1.0.0)
-    rack-protection (1.5.5)
+      rack (>= 2.0.0)
+    rack-protection (3.0.3)
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -78,22 +80,23 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
+    ruby2_keywords (0.0.5)
     ruby_dep (1.5.0)
     rubyzip (1.3.0)
     sass (3.4.23)
     sassc (2.4.0)
       ffi (~> 1.9)
-    sinatra (1.4.8)
-      rack (~> 1.5)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
-    sinatra-contrib (1.4.7)
-      backports (>= 2.0)
+    sinatra (3.0.3)
+      mustermann (~> 3.0)
+      rack (~> 2.2, >= 2.2.4)
+      rack-protection (= 3.0.3)
+      tilt (~> 2.0)
+    sinatra-contrib (3.0.3)
       multi_json
-      rack-protection
-      rack-test
-      sinatra (~> 1.4.0)
-      tilt (>= 1.3, < 3)
+      mustermann (~> 3.0)
+      rack-protection (= 3.0.3)
+      sinatra (= 3.0.3)
+      tilt (~> 2.0)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -102,7 +105,7 @@ GEM
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
     thread_safe (0.3.6)
-    tilt (2.0.6)
+    tilt (2.0.11)
     treetop (1.6.8)
       polyglot (~> 0.3)
     trollop (2.1.2)
@@ -134,8 +137,8 @@ DEPENDENCIES
   rspec
   rubyzip
   sass
-  sinatra (~> 1.4.0)
-  sinatra-contrib (~> 1.4.0)
+  sinatra (~> 3.0.3)
+  sinatra-contrib (~> 3.0.3)
   sprockets
   thin (= 1.8.1)
 

app.rb

@@ -148,7 +148,7 @@ def doc_path
   end
 
   def back_path
-    path_parts = cookies[:docs_back_path].try(:split, '/')
+    path_parts = cookies[:docs_back_path]&.split('/')
     return unless path_parts && path_parts.length > 2
 
     current_path_parts = request.fullpath.split('/')