Adapt to PaperTrail v9

lib/paper_trail-globalid.rb

@@ -1,6 +1,5 @@
 require "paper_trail_globalid/paper_trail"
 require "paper_trail_globalid/version"
-require "paper_trail_globalid/version_concern"
 
 module PaperTrailGlobalid
   module ::PaperTrail
@@ -9,9 +8,17 @@ class << self
     end
   end
 
+  module ::PaperTrail
+    module Request
+      class << self
+        prepend ::PaperTrailGlobalid::PaperTrail
+      end
+    end
+  end
+
   module ::PaperTrail
     module VersionConcern
-      include ::PaperTrailGlobalid::VersionConcern
+      include ::PaperTrailGlobalid::PaperTrail
     end
   end
 end

lib/paper_trail_globalid/paper_trail.rb

@@ -2,14 +2,14 @@ module PaperTrailGlobalid
   module PaperTrail
     def whodunnit=(value)
       if value.is_a? ActiveRecord::Base
-        paper_trail_store[:whodunnit] = value.to_gid
+        super(value.to_gid)
       else
-        paper_trail_store[:whodunnit] = value
+        super
       end
     end
 
     def actor
-      ::GlobalID::Locator.locate(paper_trail_store[:whodunnit]) || whodunnit
+      ::GlobalID::Locator.locate(whodunnit) || whodunnit
     end
   end
 end

paper_trail_globalid.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'paper_trail', '>= 3.0.0'
+  spec.add_dependency 'paper_trail', '>= 4.0.0'
   spec.add_dependency 'globalid'
 
   spec.add_development_dependency 'appraisal', '~> 2.1'

spec/paper_trail_globalid_spec.rb

@@ -2,7 +2,6 @@
 require_relative '../spec/support/order.rb'
 require_relative '../spec/support/admin.rb'
 
-
 describe PaperTrailGlobalid do
   before(:all) do
     ActiveRecord::Migration.verbose = false
@@ -65,14 +64,50 @@
           context 'when value for whodunnit is object of ActiveRecord' do
             it 'returns global id' do
               PaperTrail.whodunnit=@admin
-              expect(PaperTrail.paper_trail_store[:whodunnit]).to eq(@admin.to_gid)
+              expect(PaperTrail.whodunnit).to eq(@admin.to_gid)
             end
           end
 
           context 'when value for whodunnit is not an object of ActiveRecord' do
             it 'returns value itself' do
               PaperTrail.whodunnit="test"
-              expect(PaperTrail.paper_trail_store[:whodunnit]).to eq("test")
+              expect(PaperTrail.whodunnit).to eq("test")
+            end
+          end
+        end
+      end
+
+      if PaperTrail.respond_to? :request
+        describe 'request methods' do
+          describe 'PaperTrail.request.actor' do
+            context 'when value for whodunnit is object of ActiveRecord' do
+              it 'returns object' do
+                PaperTrail.request.whodunnit=@admin
+                expect(PaperTrail.request.actor).to eq(@admin)
+              end
+            end
+
+            context 'when value for whodunnit is not an object of ActiveRecord' do
+              it 'returns value itself' do
+                PaperTrail.request.whodunnit="test"
+                expect(PaperTrail.request.actor).to eq("test")
+              end
+            end
+          end
+
+          describe '.whodunnit' do
+            context 'when value for whodunnit is object of ActiveRecord' do
+              it 'returns global id' do
+                PaperTrail.request.whodunnit=@admin
+                expect(PaperTrail.request.whodunnit).to eq(@admin.to_gid)
+              end
+            end
+
+            context 'when value for whodunnit is not an object of ActiveRecord' do
+              it 'returns value itself' do
+                PaperTrail.request.whodunnit="test"
+                expect(PaperTrail.request.whodunnit).to eq("test")
+              end
             end
           end
         end