Replace RequestStore with ActiveSupport::CurrentAttributes

audited.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = ">= 2.3.0"
 
   gem.add_dependency "activerecord", ">= 5.0", "< 7.1"
-  gem.add_dependency "request_store", "~> 1.2"
+  gem.add_dependency "activesupport", ">= 5.0", "< 7.1"
 
   gem.add_development_dependency "appraisal"
   gem.add_development_dependency "rails", ">= 5.0", "< 7.1"

lib/audited.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "active_record"
-require "request_store"
 
 module Audited
   class << self
@@ -25,7 +24,7 @@ def audit_class
     deprecate audit_model: "use Audited.audit_class instead of Audited.audit_model. This method will be removed."
 
     def store
-      RequestStore.store[:audited_store] ||= {}
+      Audited::RequestStore.audited_store ||= {}
     end
 
     def config
@@ -41,6 +40,7 @@ def config
 end
 
 require "audited/auditor"
+require "audited/request_store"
 
 ActiveSupport.on_load :active_record do
   require "audited/audit"

lib/audited/request_store.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require "active_support"
+
+module Audited
+  class RequestStore < ActiveSupport::CurrentAttributes
+    attribute :audited_store
+  end
+end

spec/audited_spec.rb

@@ -3,12 +3,16 @@
 describe Audited do
   describe "#store" do
     describe "maintains state of store" do
-      let(:current_user) { RequestStore.store[:audited_store] }
+      let(:current_user) { Audited::RequestStore.audited_store }
       before { Audited.store[:current_user] = current_user }
 
       it "checks store is not nil" do
         expect(Audited.store[:current_user]).to eq(current_user)
       end
+
+      it "when executed with Fibers" do
+        Fiber.new { expect(Audited.store[:current_user]).to eq(current_user) }.resume
+      end
     end
   end
 end