From 175367a189e69a1b664f01ac96b5170a9a762c23 Mon Sep 17 00:00:00 2001
From: Jez Caudle <jez@hiddenagenda.ltd.uk>
Date: Tue, 9 May 2023 17:40:19 +0100
Subject: [PATCH] Ruby 3.2.2 and Rails 7.0.4.3

---
 .ruby-version                 |  2 +-
 Gemfile                       |  6 ++-
 Gemfile.lock                  |  3 +-
 Gemfile.old                   | 75 +++++++++++++++++++++++++++++++++++
 app/javascript/application.js | 11 ++---
 config/importmap.rb           |  4 +-
 6 files changed, 91 insertions(+), 10 deletions(-)
 create mode 100644 Gemfile.old

diff --git a/.ruby-version b/.ruby-version
index e76033b..9e79f6c 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-ruby-3.0.3
+ruby-3.2.2
diff --git a/Gemfile b/Gemfile
index 9cc4957..c40ab41 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,10 +4,12 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 gem 'devise'
 gem 'cancancan'
 
-ruby "3.1.3"
+ruby "3.2.2"
+
+gem "nokogiri", force_ruby_platform: true
 
 # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
-gem "rails", "~> 7.0.4.2"
+gem "rails", "~> 7.0.4.3"
 
 # The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
 gem "sprockets-rails"
diff --git a/Gemfile.lock b/Gemfile.lock
index d6c44e6..3cc0c60 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -248,6 +248,7 @@ DEPENDENCIES
   importmap-rails
   jbuilder
   mysql2 (~> 0.5)
+  nokogiri
   puma!
   rails (~> 7.0.4.3)
   selenium-webdriver
@@ -260,7 +261,7 @@ DEPENDENCIES
   webdrivers
 
 RUBY VERSION
-   ruby 3.1.4p223
+   ruby 3.2.2
 
 BUNDLED WITH
    2.3.26
diff --git a/Gemfile.old b/Gemfile.old
new file mode 100644
index 0000000..55f6daa
--- /dev/null
+++ b/Gemfile.old
@@ -0,0 +1,75 @@
+source "https://rubygems.org"
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
+gem 'devise'
+gem 'cancancan'
+
+ruby "3.2.2"
+
+# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
+gem "rails", "~> 7.0.4.3"
+
+# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
+gem "sprockets-rails"
+
+# Use mysql as the database for Active Record
+gem "mysql2", "~> 0.5"
+
+# Use the Puma web server [https://github.com/puma/puma]
+gem "puma", git: 'https://github.com/puma/puma', branch: 'master'
+
+# Use JavaScript with ESM import maps [https://github.com/rails/importmap-rails]
+gem "importmap-rails"
+
+# Hotwire's SPA-like page accelerator [https://turbo.hotwired.dev]
+gem "turbo-rails"
+
+# Hotwire's modest JavaScript framework [https://stimulus.hotwired.dev]
+gem "stimulus-rails"
+
+# Build JSON APIs with ease [https://github.com/rails/jbuilder]
+gem "jbuilder"
+
+# Use Redis adapter to run Action Cable in production
+# gem "redis", "~> 4.0"
+
+# Use Kredis to get higher-level data types in Redis [https://github.com/rails/kredis]
+# gem "kredis"
+
+# Use Active Model has_secure_password [https://guides.rubyonrails.org/active_model_basics.html#securepassword]
+# gem "bcrypt", "~> 3.1.7"
+
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+gem "tzinfo-data", platforms: %i[ mingw mswin x64_mingw jruby ]
+
+# Reduces boot times through caching; required in config/boot.rb
+gem "bootsnap", require: false
+
+# Use Sass to process CSS
+# gem "sassc-rails"
+
+# Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images]
+gem "image_processing", "~> 1.2"
+
+group :development, :test do
+  # See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem
+  gem "debug", platforms: %i[ mri mingw x64_mingw ]
+end
+
+group :development do
+  # Use console on exceptions pages [https://github.com/rails/web-console]
+  gem "web-console"
+
+  # Add speed badges [https://github.com/MiniProfiler/rack-mini-profiler]
+  # gem "rack-mini-profiler"
+
+  # Speed up commands on slow machines / big apps [https://github.com/rails/spring]
+  gem "spring"
+end
+
+group :test do
+  # Use system testing [https://guides.rubyonrails.org/testing.html#system-testing]
+  gem "capybara"
+  gem "selenium-webdriver"
+  gem "webdrivers"
+end
diff --git a/app/javascript/application.js b/app/javascript/application.js
index a1dad47..511708d 100644
--- a/app/javascript/application.js
+++ b/app/javascript/application.js
@@ -1,8 +1,9 @@
 // Configure your import map in config/importmap.rb. Read more: https://github.com/rails/importmap-rails
-import "jquery"
-import "@hotwired/turbo-rails"
-import "controllers"
-import "trix"
-import "@rails/actiontext"
+import "jquery";
+import "@hotwired/turbo-rails";
+//import "controllers";
+import Trix from "trix";
+import "@rails/actiontext";
 
 window.importmapScriptsLoaded = true;
+
diff --git a/config/importmap.rb b/config/importmap.rb
index fdd6fc1..adbdbb2 100644
--- a/config/importmap.rb
+++ b/config/importmap.rb
@@ -4,5 +4,7 @@ pin "application", preload: true
 pin "@hotwired/turbo-rails", to: "turbo.min.js", preload: true
 pin "@hotwired/stimulus", to: "stimulus.min.js", preload: true
 pin "@hotwired/stimulus-loading", to: "stimulus-loading.js", preload: true
+pin "trix"
+pin "@rails/actiontext", to: "actiontext.js"
+pin_all_from "app/javascript/controllers", under: "controllers"
 pin "script"
-# pin_all_from "app/javascript/controllers", under: "controllers"