Drop Rails 5.2 support

ErwinM · Dec 7, 2023 · 44a5b7c · 44a5b7c
1 parent 6fd5edb
commit 44a5b7c
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 269 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,7 +16,6 @@ jobs:
       matrix:
         ruby: ['2.7', '3.0', '3.1', '3.2']
         gemfile:
-          - rails_5
           - rails_6
           - rails_6_1
           - rails_7
@@ -25,12 +24,6 @@ jobs:
           - sidekiq_6
           - sidekiq_7
         exclude:
-          - ruby: '3.0'
-            gemfile: rails_5
-          - ruby: '3.1'
-            gemfile: rails_5
-          - ruby: '3.2'
-            gemfile: rails_5
           - ruby: '3.2'
             gemfile: rails_6
 

diff --git a/Appraisals b/Appraisals
@@ -1,7 +1,3 @@
-appraise "rails-5" do
-  gem "rails", "~> 5.2.0"
-end
-
 appraise "rails-6" do
   gem "rails", "~> 6.0.0"
 end

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 Unreleased
 ----------
 
+* [Breaking] Drop Rails 5.2 support
 * Replace RequestStore dependency with CurrentAttributes. #313 - @excid3
 * Easy integration with Sidekiq, not requiring to add any configuration to the initializer #314 - @nunommc
 * Add `scope` support to `acts_as_tenant :account, ->{ with_deleted }` #282 - @adrian-gomez

diff --git a/README.md b/README.md
@@ -36,8 +36,6 @@ Want to see how it works? Check out [the ActsAsTenant walkthrough video](https:/
 Installation
 ------------
 
-acts_as_tenant will only work on Rails 5.2 and up. This is due to changes made to the handling of `default_scope`, an essential pillar of the gem.
-
 To use it, add it to your Gemfile:
 
 ```ruby
@@ -325,7 +323,15 @@ Background Processing libraries
 
 ActsAsTenant supports
 
-- [Sidekiq](//sidekiq.org/) - make sure to place acts_as_tenant gem after sidekiq in your gemfiles;
+- ActiveJob - ActsAsTenant will automatically save the current tenant in ActiveJob arguments and set it when the job runs.
+
+- [Sidekiq](//sidekiq.org/)
+Add the following code to `config/initializers/acts_as_tenant.rb`:
+
+```ruby
+require 'acts_as_tenant/sidekiq'
+```
+
 - DelayedJob - [acts_as_tenant-delayed_job](https://github.com/nunommc/acts_as_tenant-delayed_job)
 
 Testing

diff --git a/acts_as_tenant.gemspec b/acts_as_tenant.gemspec
@@ -14,5 +14,5 @@ Gem::Specification.new do |spec|
 
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rails", ">= 5.2"
+  spec.add_dependency "rails", ">= 6.0"
 end
diff --git a/gemfiles/rails_5.gemfile b/gemfiles/rails_5.gemfile
diff --git a/gemfiles/rails_5.gemfile.lock b/gemfiles/rails_5.gemfile.lock
diff --git a/lib/acts_as_tenant.rb b/lib/acts_as_tenant.rb
@@ -151,7 +151,6 @@ def self.should_require_tenant?
 
 ActiveSupport.on_load(:active_record) do |base|
   base.include ActsAsTenant::ModelExtensions
-  require "acts_as_tenant/sidekiq" if defined?(::Sidekiq)
 end
 
 ActiveSupport.on_load(:action_controller) do |base|

diff --git a/spec/acts_as_tenant/sidekiq_spec.rb b/spec/acts_as_tenant/sidekiq_spec.rb
@@ -1,4 +1,5 @@
 require "spec_helper"
+require "acts_as_tenant/sidekiq"
 
 describe "ActsAsTenant::Sidekiq" do
   let(:account) { Account.new(id: 1234) }