Replace RequestStore with ActiveSupport::CurrentAttributes

.github/workflows/ci.yml

@@ -12,8 +12,6 @@ jobs:
       matrix:
         ruby: [2.3, 2.4, 2.5, 2.6, 2.7, 3.0, 3.1, 3.2]
         appraisal:
-          - rails50
-          - rails51
           - rails52
           - rails60
           - rails61
@@ -31,32 +29,6 @@ jobs:
           - ruby: 2.3
             db: POSTGRES
 
-          # Rails 5.0 supports Ruby 2.2-2.4
-          - appraisal: rails50
-            ruby: 2.5
-          - appraisal: rails50
-            ruby: 2.6
-          - appraisal: rails50
-            ruby: 2.7
-          - appraisal: rails50
-            ruby: 3.0
-          - appraisal: rails50
-            ruby: 3.1
-          - appraisal: rails50
-            ruby: 3.2
-
-          # Rails 5.1 supports Ruby 2.2-2.5
-          - appraisal: rails51
-            ruby: 2.6
-          - appraisal: rails51
-            ruby: 2.7
-          - appraisal: rails51
-            ruby: 3.0
-          - appraisal: rails51
-            ruby: 3.1
-          - appraisal: rails51
-            ruby: 3.2
-
           # Rails 5.2 supports Ruby 2.2-2.5
           - appraisal: rails52
             ruby: 2.6

audited.gemspec

@@ -16,11 +16,11 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = ">= 2.3.0"
 
-  gem.add_dependency "activerecord", ">= 5.0", "< 7.2"
-  gem.add_dependency "request_store", "~> 1.2"
+  gem.add_dependency "activerecord", ">= 5.2", "< 7.2"
+  gem.add_dependency "activesupport", ">= 5.2", "< 7.2"
 
   gem.add_development_dependency "appraisal"
-  gem.add_development_dependency "rails", ">= 5.0", "< 7.2"
+  gem.add_development_dependency "rails", ">= 5.2", "< 7.2"
   gem.add_development_dependency "rspec-rails"
   gem.add_development_dependency "standard"
   gem.add_development_dependency "single_cov"

lib/audited.rb

@@ -1,9 +1,13 @@
 # frozen_string_literal: true
 
 require "active_record"
-require "request_store"
 
 module Audited
+  # Wrapper around ActiveSupport::CurrentAttributes
+  class RequestStore < ActiveSupport::CurrentAttributes
+    attribute :audited_store
+  end
+
   class << self
     attr_accessor \
       :auditing_enabled,
@@ -27,7 +31,7 @@ def audit_class
               deprecator: ActiveSupport::Deprecation.new('6.0.0', 'Audited')
 
     def store
-      RequestStore.store[:audited_store] ||= {}
+      RequestStore.audited_store ||= {}
     end
 
     def config

spec/audited_spec.rb

@@ -3,12 +3,19 @@
 describe Audited do
   describe "#store" do
     describe "maintains state of store" do
-      let(:current_user) { RequestStore.store[:audited_store] }
-      before { Audited.store[:current_user] = current_user }
+      let(:current_user) { Models::ActiveRecord::User.new(name: 'Some User', username: 'some_username') }
+
+      it "can store and retrieve current_user" do
+        expect(Audited.store[:current_user]).to be_nil
+
+        Audited.store[:current_user] = current_user
 
-      it "checks store is not nil" do
         expect(Audited.store[:current_user]).to eq(current_user)
       end
+
+      it "checks store is not nil" do
+        expect(Audited.store).not_to be_nil
+      end
     end
   end
 end

spec/spec_helper.rb

@@ -22,3 +22,4 @@
   config.use_transactional_fixtures = false if Rails.version.start_with?("4.")
   config.use_transactional_tests = false if config.respond_to?(:use_transactional_tests=)
 end
+