active-record-transactioner 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/active-record-transactioner.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "active-record-transactioner"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]

data/lib/active-record-transactioner.rb

@@ -21,6 +21,7 @@ class ActiveRecordTransactioner
     @count = 0
     @lock = Monitor.new
     @lock_threads = Monitor.new
+    @lock_models = {}
     
     if block_given?
       begin
@@ -35,6 +36,8 @@ class ActiveRecordTransactioner
   def queue(model)
     @lock.synchronize do
       klass = model.class
+      
+      @lock_models[klass] = Mutex.new if !@lock_models.key?(klass)
       @models[klass] = [] if !@models.key?(klass)
       @models[klass] << model
       @count += 1
@@ -53,19 +56,24 @@ class ActiveRecordTransactioner
         models = val
         @models[klass] = []
         @count -= models.length
+        thread = nil
         
-        thread = Thread.new do
-          begin
-            klass.__send__(@args[:transaction_method]) do
-              models.each do |model|
-                model.__send__(@args[:call_method], *@args[:call_args])
+        @lock_models[klass].synchronize do
+          thread = Thread.new do
+            begin
+              @lock_models[klass].synchronize do
+                klass.__send__(@args[:transaction_method]) do
+                  models.each do |model|
+                    model.__send__(@args[:call_method], *@args[:call_args])
+                  end
+                end
               end
+            rescue => e
+              puts e.inspect
+              puts e.backtrace
+            ensure
+              @threads.delete(Thread.current)
             end
-          rescue => e
-            puts e.inspect
-            puts e.backtrace
-          ensure
-            @threads.delete(Thread.current)
           end
         end
         

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-record-transactioner
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -112,7 +112,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2428606338728267940
+      hash: 1711089571951927244
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: