activerecord-reactor 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5af5bf8ba7a0f8015fc807306996064bb5aae71e
-  data.tar.gz: 079bd7c5e25c9aec35736ef010e3a281108723f2
+SHA256:
+  metadata.gz: 4fb857e4ea5416ec633effb7cc11376981c68f0acb2b49257975c7ea3bcfa2dd
+  data.tar.gz: 50906b950e0ce055085ba19a9ced733b56484740fb0ebece508d3dba76c1ee02
 SHA512:
-  metadata.gz: 8f155aefc6aa6f0ccfe029604237d97d558759fe9aad71522bcd87181329a8c8a2d0d8dc98b666af81ff93de9ea4dc1ae673a0a63c4fc8fca8e944edda87f3e5
-  data.tar.gz: 92b05135c408e08a6a10bf19a95bb549d1f3b04be618d35222b5ca6e8870a275239470db0a4b15a4407d5b2db7b5140946da2d731b1e7ba670099d796bcbfb87
+  metadata.gz: 68c64d41ab78c4f3e09baf704916e5ebecb6a7deb98f2bbd1d44cc78809883e55e59c5067deff6abc168c90a818c9f016fe987478cfd1f5fd2dd33800aef755f
+  data.tar.gz: 7a6812c14dc95f0c9b6734e633a1f78e77e4118c118be2963ddef7a33a98965ef30c02e4a3f5429364ba91c17eb9f44f3a862cdc9a246c636d0cf81ede456803

data/CHANGELOG

@@ -1,3 +1,8 @@
+1.5.0
+
+Support Rails 6
+Make threadsafe
+
 1.0.1
 
 Remove incorrect class definitions

data/lib/active_record/reactor.rb

@@ -45,6 +45,7 @@ module ActiveRecord
     include Singleton
 
     class << self
+      
       def callbacks # :nodoc:
         (self.public_instance_methods - ActiveRecord::Reactor.public_instance_methods).grep(/\A(before|around|after)_.+/)
       end
@@ -55,12 +56,22 @@ module ActiveRecord
 
       # Stops all reactions while inside the (required) block.
       def scram(&block)
-        previously_scrammed = @scrammed
-        @scrammed = true
+        previously_scrammed = nil
+        mutex.synchronize do
+          previously_scrammed = @scrammed
+          @scrammed = true
+        end
         yield
       ensure
-        @scrammed = previously_scrammed
+        mutex.synchronize { @scrammed = previously_scrammed }
       end
+      
+      private
+      
+      def mutex
+        @mutex ||= Mutex.new
+      end
+      
     end
   end
 

data/lib/active_record/reactor/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   class Reactor
-    VERSION = '1.4.0'
+    VERSION = '1.5.0'
   end
 end

data/test/cases/reactor_test.rb

@@ -26,10 +26,32 @@ class ReactorTest < ActiveSupport::TestCase
 
   test 'Scrammed reactors do not react' do
     FruitReactor.scram do
-      b = Banana.create(color: 'blue')
-      c = Cherry.create(color: 'red')
+      Banana.create(color: 'blue')
+      Cherry.create(color: 'red')
     end
     assert_empty FruitReactor.calls
     assert_equal false, FruitReactor.scrammed?
   end
+  
+  test 'Subclasses have their own mutex' do
+    fruit_mutex = FruitReactor.send(:mutex)
+    peel_mutex = PeelReactor.send(:mutex)
+    assert_kind_of Mutex, fruit_mutex
+    assert_kind_of Mutex, peel_mutex
+    assert_not_equal fruit_mutex.object_id, peel_mutex.object_id
+  end
+  
+  test 'Threading' do
+    threads = 5.times.collect do
+      Thread.new do
+        100_000.times do
+          FruitReactor.scram do
+            #
+          end
+        end
+      end
+    end
+    threads.each(&:join)
+    assert_equal false, FruitReactor.scrammed?
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-reactor
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Matthias Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-16 00:00:00.000000000 Z
+date: 2019-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -108,8 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Controlled reactions on ActiveRecord callbacks