active-record-transactioner 0.0.4 → 0.0.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6ff5f7c2e010ea51c857be4b595aff6a11fc6a29
+  data.tar.gz: c1b7216f9189778553b7455faf98d33760658683
+SHA512:
+  metadata.gz: 8a4511fa3b9124dd3173097b6601c23af067afc4ac1964a251e3e80045aa282b0bd8431159d4385211dd979c12b5b2691166e36a169f4e4208fb68cb66a2015d
+  data.tar.gz: a2e7df57feb26de445f1bb4a416d67265ce16aac5cbb23a2ca9528d768fc10251f67d8dd261e90dfad5cd7be21653ff9af2a225ada422209277f93db0b02fa22

data/Gemfile

@@ -9,5 +9,6 @@ group :development do
   gem "rspec", "~> 2.8.0"
   gem "rdoc", "~> 3.12"
   gem "bundler", ">= 1.0.0"
-  gem "jeweler", "~> 1.8.4"
+  gem "jeweler", ">= 1.8.4"
+  gem "builder"
 end

data/Gemfile.lock

@@ -1,15 +1,50 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    addressable (2.3.6)
+    builder (3.2.2)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.1.3)
-    git (1.2.5)
-    jeweler (1.8.4)
-      bundler (~> 1.0)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    git (1.2.6)
+    github_api (0.11.3)
+      addressable (~> 2.3)
+      descendants_tracker (~> 0.0.1)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 1.2)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.0)
+      oauth2
+    hashie (2.1.1)
+    highline (1.6.21)
+    jeweler (2.0.1)
+      builder
+      bundler (>= 1.0)
       git (>= 1.2.5)
+      github_api
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
       rake
       rdoc
-    json (1.7.7)
-    rake (10.0.4)
+    json (1.8.1)
+    jwt (0.1.13)
+      multi_json (>= 1.5)
+    mini_portile (0.6.0)
+    multi_json (1.10.0)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
+    nokogiri (1.6.2.1)
+      mini_portile (= 0.6.0)
+    oauth2 (0.9.3)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 0.1.8)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    rack (1.5.2)
+    rake (10.3.2)
     rdoc (3.12.2)
       json (~> 1.4)
     rspec (2.8.0)
@@ -20,12 +55,14 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
+    thread_safe (0.3.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  builder
   bundler (>= 1.0.0)
-  jeweler (~> 1.8.4)
+  jeweler (>= 1.8.4)
   rdoc (~> 3.12)
   rspec (~> 2.8.0)

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/active-record-transactioner.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "active-record-transactioner"
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = "2013-04-09"
+  s.date = "2014-05-18"
   s.description = "Queue up calls to specific models and execute them in transactions, after a certain number of models have been added."
   s.email = "kj@gfish.com"
   s.extra_rdoc_files = [
@@ -34,28 +34,31 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/kaspernj/active-record-transactioner"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.25"
+  s.rubygems_version = "2.0.7"
   s.summary = "Queue up calls to specific models and execute them in transactions, after a certain number of models have been added."
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_development_dependency(%q<jeweler>, [">= 1.8.4"])
+      s.add_development_dependency(%q<builder>, [">= 0"])
     else
       s.add_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_dependency(%q<jeweler>, [">= 1.8.4"])
+      s.add_dependency(%q<builder>, [">= 0"])
     end
   else
     s.add_dependency(%q<rspec>, ["~> 2.8.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+    s.add_dependency(%q<jeweler>, [">= 1.8.4"])
+    s.add_dependency(%q<builder>, [">= 0"])
   end
 end
 

data/lib/active-record-transactioner.rb

@@ -5,7 +5,9 @@ class ActiveRecordTransactioner
     :call_args => [],
     :call_method => :save!,
     :transaction_method => :transaction,
-    :transaction_size => 1000
+    :transaction_size => 1000,
+    :max_running_threads => 2,
+    :debug => false
   }
   
   ALLOWED_ARGS = DEFAULT_ARGS.keys
@@ -22,6 +24,7 @@ class ActiveRecordTransactioner
     @lock = Monitor.new
     @lock_threads = Monitor.new
     @lock_models = {}
+    @debug = @args[:debug]
     
     if block_given?
       begin
@@ -42,13 +45,15 @@ class ActiveRecordTransactioner
       @models[klass] = [] if !@models.key?(klass)
       @models[klass] << model
       @count += 1
-      flush if @count >= @args[:transaction_size]
     end
+    
+    flush if @count >= @args[:transaction_size]
   end
   
   #Flushes the specified method on all the queued models in a thread for each type of model.
   def flush
     threads = []
+    wait_for_threads
     
     @lock.synchronize do
       @models.each do |klass, val|
@@ -63,8 +68,10 @@ class ActiveRecordTransactioner
           thread = Thread.new do
             begin
               @lock_models[klass].synchronize do
+                debug "Opening new transaction by using '#{@args[:transaction_method]}'."
                 klass.__send__(@args[:transaction_method]) do
                   models.each do |model|
+                    # debug "Saving #{model.class.name}(#{model.id}) with method #{@args[:call_method]}"
                     model.__send__(@args[:call_method], *@args[:call_args])
                   end
                 end
@@ -74,15 +81,21 @@ class ActiveRecordTransactioner
               puts e.backtrace
               
               if e.is_a?(NoMethodError) and e.message.to_s.include?("`reverse' for nil:NilClass")
-                puts
                 puts "Warning: Known Rails reverse error when using transaction - retrying in 2 sec."
                 sleep 2
                 puts "Retrying"
                 puts
                 retry
               end
+              
+              raise e
             ensure
+              debug "Removing thread #{Thread.current.__id__}"
               @threads.delete(Thread.current)
+              
+              @lock.synchronize do
+                ActiveRecord::Base.connection.close if ActiveRecord::Base.connection
+              end
             end
           end
         end
@@ -107,4 +120,29 @@ class ActiveRecordTransactioner
       end
     end
   end
+  
+private
+  
+  def debug(str)
+    puts "{ActiveRecordTransactioner}: #{str}" if @debug
+  end
+  
+  def wait_for_threads
+    break_loop = false
+    while !break_loop
+      debug "Trying to lock..." if @debug
+      @lock.synchronize do
+        debug "Running threads: #{@threads.length} / #{@args[:max_running_threads]}"
+        if @threads.length < @args[:max_running_threads]
+          break_loop = true
+        else
+          debug "Waiting for threads #{@threads.length} / #{@args[:max_running_threads]}" if @debug
+        end
+      end
+      
+      sleep 0.2
+    end
+    
+    debug "Done waiting." if @debug
+  end
 end

data/spec/active-record-transactioner_spec.rb

@@ -27,4 +27,14 @@ describe "ActiveRecordTransactioner" do
     
     called.should eql(true)
   end
+  
+  it "should not fail under the Rails reverse bug" do
+    ActiveRecordTransactionerTestClass::ARGS[:nilraise] = true
+    trans = ActiveRecordTransactioner.new(:transaction_size => 1)
+    model1 = ActiveRecordTransactionerTestClass.new
+    trans.queue(model1)
+    trans.join
+    
+    ActiveRecordTransactionerTestClass::ARGS[:nilraise].should eql(false)
+  end
 end

data/spec/test_classes/active-record-transactioner-test-class.rb

@@ -1,11 +1,19 @@
 class ActiveRecordTransactionerTestClass
-  attr_reader :save_called
+  attr_reader :save_called, :args
+  
+  ARGS = {:nilraise => false}
   
   def initialize
     @save_called = false
   end
   
   def self.transaction
+    if ActiveRecordTransactionerTestClass::ARGS[:nilraise]
+      nilobj = nil
+      ActiveRecordTransactionerTestClass::ARGS[:nilraise] = false
+      nilobj.reverse
+    end
+    
     Thread.current[:trans] = self.name
     
     begin

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: active-record-transactioner
 version: !ruby/object:Gem::Version
-  version: 0.0.4
-  prerelease: 
+  version: 0.0.5
 platform: ruby
 authors:
 - Kasper Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-09 00:00:00.000000000 Z
+date: 2014-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,35 +41,45 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.8.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.8.4
+- !ruby/object:Gem::Dependency
+  name: builder
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Queue up calls to specific models and execute them in transactions, after
   a certain number of models have been added.
 email: kj@gfish.com
@@ -100,30 +105,26 @@ files:
 homepage: http://github.com/kaspernj/active-record-transactioner
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1215318973199029384
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.7
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Queue up calls to specific models and execute them in transactions, after
   a certain number of models have been added.
 test_files: []