From f7c367b939b8bb5afb73673c54efb05603a6398c Mon Sep 17 00:00:00 2001
From: Kyle Drake <kyle@kyledrake.net>
Date: Fri, 31 Jan 2025 16:15:14 -0600
Subject: [PATCH] migrate to sinatra 4 / rack 3 (breaks current session
 cookies)

---
 Gemfile        |  2 +-
 Gemfile.lock   | 27 +++++++++++++++++----------
 environment.rb |  2 +-
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/Gemfile b/Gemfile
index e0a68d96..af68c02d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,7 +12,7 @@ gem 'sidekiq', '~> 7'
 gem 'mail'
 gem 'net-smtp'
 gem 'tilt'
-gem 'erubis'
+gem 'erubi'
 gem 'stripe' #, source: 'https://code.stripe.com/'
 gem 'terrapin'
 gem 'sass', require: nil
diff --git a/Gemfile.lock b/Gemfile.lock
index 3c8b2048..36f34fca 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -70,7 +70,7 @@ GEM
     domain_name (0.6.20231109)
     drb (2.2.0)
       ruby2_keywords
-    erubis (2.7.0)
+    erubi (1.13.1)
     exifr (1.4.0)
     fabrication (2.31.0)
     facter (4.5.1)
@@ -156,6 +156,7 @@ GEM
     llhttp-ffi (0.4.0)
       ffi-compiler (~> 1.0)
       rake (~> 13.0)
+    logger (1.6.5)
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -201,7 +202,7 @@ GEM
     msgpack (1.7.2)
     multi_json (1.15.0)
     multipart-post (2.3.0)
-    mustermann (3.0.0)
+    mustermann (3.0.3)
       ruby2_keywords (~> 0.0.1)
     mutex_m (0.2.0)
     net-imap (0.4.9)
@@ -229,12 +230,16 @@ GEM
     puma (6.4.3)
       nio4r (~> 2.0)
     racc (1.7.3)
-    rack (2.2.9)
+    rack (3.1.9)
     rack-cache (1.15.0)
       rack (>= 0.4)
-    rack-protection (3.2.0)
+    rack-protection (4.1.1)
       base64 (>= 0.1.0)
-      rack (~> 2.2, >= 2.2.4)
+      logger (>= 1.6.0)
+      rack (>= 3.0.0, < 4)
+    rack-session (2.1.0)
+      base64 (>= 0.1.0)
+      rack (>= 3.0.0)
     rack-test (2.1.0)
       rack (>= 1.3)
     rack_session_access (0.2.0)
@@ -296,10 +301,12 @@ GEM
     simplecov_json_formatter (0.1.4)
     simpleidn (0.2.1)
       unf (~> 0.1.4)
-    sinatra (3.2.0)
+    sinatra (4.1.1)
+      logger (>= 1.6.0)
       mustermann (~> 3.0)
-      rack (~> 2.2, >= 2.2.4)
-      rack-protection (= 3.2.0)
+      rack (>= 3.0.0, < 4)
+      rack-protection (= 4.1.1)
+      rack-session (>= 2.0.0, < 3)
       tilt (~> 2.0)
     sinatra-flash (0.3.0)
       sinatra (>= 1.0.0)
@@ -317,7 +324,7 @@ GEM
       climate_control
     thor (1.3.0)
     thread (0.2.2)
-    tilt (2.3.0)
+    tilt (2.6.0)
     timecop (0.9.8)
     timeout (0.4.1)
     tins (1.32.1)
@@ -363,7 +370,7 @@ DEPENDENCIES
   coveralls_reborn
   dav4rack!
   dnsbl-client
-  erubis
+  erubi
   fabrication
   facter
   faker
diff --git a/environment.rb b/environment.rb
index ffc30cdf..e7732554 100644
--- a/environment.rb
+++ b/environment.rb
@@ -13,7 +13,7 @@ require 'logger'
 Bundler.require
 Bundler.require :development if ENV['RACK_ENV'] == 'development'
 
-require 'tilt/erubis'
+require 'tilt/erubi'
 require 'active_support'
 require 'active_support/time'