From 9eb08067771a4cd3f9206c941b6860810aa20a1d Mon Sep 17 00:00:00 2001
From: Anton Sokolov <profox.rus@gmail.com>
Date: Tue, 13 Jan 2026 23:00:35 +0700
Subject: [PATCH 1/2] Switch Appraisals and gemfiles to `rails` dependency

- Replace `activesupport` with `rails` across all Appraisals and gemfiles for consistency.
- Update `stroma.gemspec` to remove `activesupport` dependency.
- Clean up redundant comments and lines in Appraisals and gemfiles.
- Adjust Gemfile.lock accordingly to reflect dependency changes.
---
 Appraisals                 | 18 +++++++++---------
 Gemfile.lock               |  1 -
 gemfiles/rails_5.1.gemfile |  4 +---
 gemfiles/rails_5.2.gemfile |  4 +---
 gemfiles/rails_6.0.gemfile |  6 ++----
 gemfiles/rails_6.1.gemfile |  6 ++----
 gemfiles/rails_7.0.gemfile |  4 +---
 gemfiles/rails_7.1.gemfile |  4 +---
 gemfiles/rails_7.2.gemfile |  4 +---
 gemfiles/rails_8.0.gemfile |  4 +---
 gemfiles/rails_8.1.gemfile |  4 +---
 spec/spec_helper.rb        |  2 --
 stroma.gemspec             |  3 ---
 13 files changed, 20 insertions(+), 44 deletions(-)

diff --git a/Appraisals b/Appraisals
index 8d88bc5..0b941e2 100644
--- a/Appraisals
+++ b/Appraisals
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 appraise "rails-5.1" do
-  gem "activesupport", "~> 5.1.0"
+  gem "rails", "~> 5.1.0"
 
   # These gems were loaded from the standard library, but are not part of the default gems starting from Ruby 3.4.0.
   gem "base64", ">= 0.2"
@@ -10,7 +10,7 @@ appraise "rails-5.1" do
 end
 
 appraise "rails-5.2" do
-  gem "activesupport", "~> 5.2.0"
+  gem "rails", "~> 5.2.0"
 
   # These gems were loaded from the standard library, but are not part of the default gems starting from Ruby 3.4.0.
   gem "base64", ">= 0.2"
@@ -19,7 +19,7 @@ appraise "rails-5.2" do
 end
 
 appraise "rails-6.0" do
-  gem "activesupport", "~> 6.0.0"
+  gem "rails", "~> 6.0.0"
   gem "concurrent-ruby", "1.3.4"
 
   # These gems were loaded from the standard library, but are not part of the default gems starting from Ruby 3.4.0.
@@ -29,7 +29,7 @@ appraise "rails-6.0" do
 end
 
 appraise "rails-6.1" do
-  gem "activesupport", "~> 6.1.0"
+  gem "rails", "~> 6.1.0"
   gem "concurrent-ruby", "1.3.4"
 
   # These gems were loaded from the standard library, but are not part of the default gems starting from Ruby 3.4.0.
@@ -39,22 +39,22 @@ appraise "rails-6.1" do
 end
 
 appraise "rails-7.0" do
-  gem "activesupport", "~> 7.0.0"
+  gem "rails", "~> 7.0.0"
   gem "concurrent-ruby", "1.3.4"
 end
 
 appraise "rails-7.1" do
-  gem "activesupport", "~> 7.1.0"
+  gem "rails", "~> 7.1.0"
 end
 
 appraise "rails-7.2" do
-  gem "activesupport", "~> 7.2.0"
+  gem "rails", "~> 7.2.0"
 end
 
 appraise "rails-8.0" do
-  gem "activesupport", "~> 8.0.0"
+  gem "rails", "~> 8.0.0"
 end
 
 appraise "rails-8.1" do
-  gem "activesupport", "~> 8.1.0"
+  gem "rails", "~> 8.1.0"
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 21f30bb..83a8625 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,7 +2,6 @@ PATH
   remote: .
   specs:
     stroma (0.4.0)
-      activesupport (>= 5.1)
       zeitwerk (>= 2.6)
 
 GEM
diff --git a/gemfiles/rails_5.1.gemfile b/gemfiles/rails_5.1.gemfile
index 8d22f79..f2fc1ae 100644
--- a/gemfiles/rails_5.1.gemfile
+++ b/gemfiles/rails_5.1.gemfile
@@ -1,10 +1,8 @@
-# frozen_string_literal: true
-
 # This file was generated by Appraisal
 
 source "https://rubygems.org"
 
-gem "activesupport", "~> 5.1.0"
+gem "rails", "~> 5.1.0"
 gem "base64", ">= 0.2"
 gem "bigdecimal", ">= 3.1"
 gem "mutex_m", ">= 0.3"
diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile
index 19d3e9c..767259d 100644
--- a/gemfiles/rails_5.2.gemfile
+++ b/gemfiles/rails_5.2.gemfile
@@ -1,10 +1,8 @@
-# frozen_string_literal: true
-
 # This file was generated by Appraisal
 
 source "https://rubygems.org"
 
-gem "activesupport", "~> 5.2.0"
+gem "rails", "~> 5.2.0"
 gem "base64", ">= 0.2"
 gem "bigdecimal", ">= 3.1"
 gem "mutex_m", ">= 0.3"
diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile
index 8ae6391..6f9efbf 100644
--- a/gemfiles/rails_6.0.gemfile
+++ b/gemfiles/rails_6.0.gemfile
@@ -1,13 +1,11 @@
-# frozen_string_literal: true
-
 # This file was generated by Appraisal
 
 source "https://rubygems.org"
 
-gem "activesupport", "~> 6.0.0"
+gem "rails", "~> 6.0.0"
+gem "concurrent-ruby", "1.3.4"
 gem "base64", ">= 0.2"
 gem "bigdecimal", ">= 3.1"
-gem "concurrent-ruby", "1.3.4"
 gem "mutex_m", ">= 0.3"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile
index f6dc0b2..7672e3a 100644
--- a/gemfiles/rails_6.1.gemfile
+++ b/gemfiles/rails_6.1.gemfile
@@ -1,13 +1,11 @@
-# frozen_string_literal: true
-
 # This file was generated by Appraisal
 
 source "https://rubygems.org"
 
-gem "activesupport", "~> 6.1.0"
+gem "rails", "~> 6.1.0"
+gem "concurrent-ruby", "1.3.4"
 gem "base64", ">= 0.2"
 gem "bigdecimal", ">= 3.1"
-gem "concurrent-ruby", "1.3.4"
 gem "mutex_m", ">= 0.3"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile
index f9b8580..04654c1 100644
--- a/gemfiles/rails_7.0.gemfile
+++ b/gemfiles/rails_7.0.gemfile
@@ -1,10 +1,8 @@
-# frozen_string_literal: true
-
 # This file was generated by Appraisal
 
 source "https://rubygems.org"
 
-gem "activesupport", "~> 7.0.0"
+gem "rails", "~> 7.0.0"
 gem "concurrent-ruby", "1.3.4"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile
index 8a5b469..35a0ba3 100644
--- a/gemfiles/rails_7.1.gemfile
+++ b/gemfiles/rails_7.1.gemfile
@@ -1,9 +1,7 @@
-# frozen_string_literal: true
-
 # This file was generated by Appraisal
 
 source "https://rubygems.org"
 
-gem "activesupport", "~> 7.1.0"
+gem "rails", "~> 7.1.0"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_7.2.gemfile b/gemfiles/rails_7.2.gemfile
index 7c2a78e..92cc2b2 100644
--- a/gemfiles/rails_7.2.gemfile
+++ b/gemfiles/rails_7.2.gemfile
@@ -1,9 +1,7 @@
-# frozen_string_literal: true
-
 # This file was generated by Appraisal
 
 source "https://rubygems.org"
 
-gem "activesupport", "~> 7.2.0"
+gem "rails", "~> 7.2.0"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_8.0.gemfile b/gemfiles/rails_8.0.gemfile
index f949a19..3b3765b 100644
--- a/gemfiles/rails_8.0.gemfile
+++ b/gemfiles/rails_8.0.gemfile
@@ -1,9 +1,7 @@
-# frozen_string_literal: true
-
 # This file was generated by Appraisal
 
 source "https://rubygems.org"
 
-gem "activesupport", "~> 8.0.0"
+gem "rails", "~> 8.0.0"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_8.1.gemfile b/gemfiles/rails_8.1.gemfile
index 890e279..cedb65f 100644
--- a/gemfiles/rails_8.1.gemfile
+++ b/gemfiles/rails_8.1.gemfile
@@ -1,9 +1,7 @@
-# frozen_string_literal: true
-
 # This file was generated by Appraisal
 
 source "https://rubygems.org"
 
-gem "activesupport", "~> 8.1.0"
+gem "rails", "~> 8.1.0"
 
 gemspec path: "../"
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 716e4fe..3a81ee2 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -10,8 +10,6 @@
 
 Dir[File.join(__dir__, "support", "**", "*.rb")].each { |file| require file }
 
-# I18n.load_path += Dir["#{File.expand_path('config/locales')}/*.yml"]
-
 RSpec.configure do |config|
   # Enable flags like --only-failures and --next-failure
   config.example_status_persistence_file_path = ".rspec_status"
diff --git a/stroma.gemspec b/stroma.gemspec
index 4b1dc02..bd6c78a 100644
--- a/stroma.gemspec
+++ b/stroma.gemspec
@@ -29,12 +29,9 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = Gem::Requirement.new(">= 3.2")
 
-  spec.add_dependency "activesupport", ">= 5.1"
-  # spec.add_dependency "i18n", ">= 1.14"
   spec.add_dependency "zeitwerk", ">= 2.6"
 
   spec.add_development_dependency "appraisal", ">= 2.5"
-  # spec.add_development_dependency "async", ">= 2.23"
   spec.add_development_dependency "rake", ">= 13.2"
   spec.add_development_dependency "rbs", ">= 3.8"
   spec.add_development_dependency "rspec", ">= 3.13"

From 9f1f89663e431b18e24d370d87c837fe85b3d10f Mon Sep 17 00:00:00 2001
From: Anton Sokolov <profox.rus@gmail.com>
Date: Tue, 13 Jan 2026 23:02:06 +0700
Subject: [PATCH 2/2] Add frozen string literal comments to all gemfiles

- Add `# frozen_string_literal: true` to the top of all Rails gemfiles for improved memory efficiency.
- Adjust the order of gem declarations for consistency across gemfiles.
- No functional changes made.
---
 gemfiles/rails_5.1.gemfile | 4 +++-
 gemfiles/rails_5.2.gemfile | 4 +++-
 gemfiles/rails_6.0.gemfile | 6 ++++--
 gemfiles/rails_6.1.gemfile | 6 ++++--
 gemfiles/rails_7.0.gemfile | 4 +++-
 gemfiles/rails_7.1.gemfile | 2 ++
 gemfiles/rails_7.2.gemfile | 2 ++
 gemfiles/rails_8.0.gemfile | 2 ++
 gemfiles/rails_8.1.gemfile | 2 ++
 9 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/gemfiles/rails_5.1.gemfile b/gemfiles/rails_5.1.gemfile
index f2fc1ae..b330ab4 100644
--- a/gemfiles/rails_5.1.gemfile
+++ b/gemfiles/rails_5.1.gemfile
@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 # This file was generated by Appraisal
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.1.0"
 gem "base64", ">= 0.2"
 gem "bigdecimal", ">= 3.1"
 gem "mutex_m", ">= 0.3"
+gem "rails", "~> 5.1.0"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile
index 767259d..f42d2d0 100644
--- a/gemfiles/rails_5.2.gemfile
+++ b/gemfiles/rails_5.2.gemfile
@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 # This file was generated by Appraisal
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.2.0"
 gem "base64", ">= 0.2"
 gem "bigdecimal", ">= 3.1"
 gem "mutex_m", ">= 0.3"
+gem "rails", "~> 5.2.0"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile
index 6f9efbf..38b6d32 100644
--- a/gemfiles/rails_6.0.gemfile
+++ b/gemfiles/rails_6.0.gemfile
@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 # This file was generated by Appraisal
 
 source "https://rubygems.org"
 
-gem "rails", "~> 6.0.0"
-gem "concurrent-ruby", "1.3.4"
 gem "base64", ">= 0.2"
 gem "bigdecimal", ">= 3.1"
+gem "concurrent-ruby", "1.3.4"
 gem "mutex_m", ">= 0.3"
+gem "rails", "~> 6.0.0"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile
index 7672e3a..ce85a8c 100644
--- a/gemfiles/rails_6.1.gemfile
+++ b/gemfiles/rails_6.1.gemfile
@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 # This file was generated by Appraisal
 
 source "https://rubygems.org"
 
-gem "rails", "~> 6.1.0"
-gem "concurrent-ruby", "1.3.4"
 gem "base64", ">= 0.2"
 gem "bigdecimal", ">= 3.1"
+gem "concurrent-ruby", "1.3.4"
 gem "mutex_m", ">= 0.3"
+gem "rails", "~> 6.1.0"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile
index 04654c1..b4ed075 100644
--- a/gemfiles/rails_7.0.gemfile
+++ b/gemfiles/rails_7.0.gemfile
@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 # This file was generated by Appraisal
 
 source "https://rubygems.org"
 
-gem "rails", "~> 7.0.0"
 gem "concurrent-ruby", "1.3.4"
+gem "rails", "~> 7.0.0"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile
index 35a0ba3..2470682 100644
--- a/gemfiles/rails_7.1.gemfile
+++ b/gemfiles/rails_7.1.gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This file was generated by Appraisal
 
 source "https://rubygems.org"
diff --git a/gemfiles/rails_7.2.gemfile b/gemfiles/rails_7.2.gemfile
index 92cc2b2..259409c 100644
--- a/gemfiles/rails_7.2.gemfile
+++ b/gemfiles/rails_7.2.gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This file was generated by Appraisal
 
 source "https://rubygems.org"
diff --git a/gemfiles/rails_8.0.gemfile b/gemfiles/rails_8.0.gemfile
index 3b3765b..bfbb780 100644
--- a/gemfiles/rails_8.0.gemfile
+++ b/gemfiles/rails_8.0.gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This file was generated by Appraisal
 
 source "https://rubygems.org"
diff --git a/gemfiles/rails_8.1.gemfile b/gemfiles/rails_8.1.gemfile
index cedb65f..623e5a3 100644
--- a/gemfiles/rails_8.1.gemfile
+++ b/gemfiles/rails_8.1.gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This file was generated by Appraisal
 
 source "https://rubygems.org"