after_commit_action 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7098526c08593ab256447fbe799f786c877e4831
-  data.tar.gz: c090670e06e2edc562ffea54df197ffd9f947abb
+  metadata.gz: 9222b7ce5f9538d3823646319cdfd4a0a005d918
+  data.tar.gz: f6eca3b15daccf6681d58cc9dbcaf5e8bc8a53f8
 SHA512:
-  metadata.gz: a89dfaec4db205f167749d6d8b49c9a419352c9ef70f7f2fb4c89c118e55c50a7539dd391ea25147ff2c3982b067860160ac6e7de97f1503336a01f0a41f8688
-  data.tar.gz: 2505e04c3e9dc9e18263180925be6d8617d1b936adc8066e698a05e9eb6113e814fc93c62bb84ebfceca3294390a99d9dc42f749b3f9a0280da5ec4b9b0d242c
+  metadata.gz: 180205c0f74beb5fa377322dee5f68a2b748fb9301c35f1038c802ba6b74a82519427befb2477cd87b38b7269d07396c7e36ee5080fe189aa59fc4cd7b936c37
+  data.tar.gz: 40a229846a306df184fa56a573592500a43f6058dad311b0bdb6a208821634a4b7d7a30b75acc7d781f914b86770d401f993fbeac24d386dbfacc53b9e82f998

data/Gemfile

@@ -3,13 +3,19 @@ source "http://rubygems.org"
 gem "activerecord", ">= 3.0.0"
 gem "activesupport", ">= 3.0.0"
 
+# Add dependencies to develop your gem here.
+# Include everything needed to run rake, tests, features, etc.
+group :development, :test do
+  gem "rails"
+end
+
 group :development do
   gem "rdoc", "~> 3.12"
   gem "bundler", ">= 1.1.3"
   gem "jeweler", "~> 2.0.1"
 end
 
-group :test do
+group :development, :test do
   gem "rspec", "~> 2.8.0"
   gem "sqlite3"
   gem "rspec-extra-formatters"

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/after_commit_action.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: after_commit_action 1.0.0 ruby lib
+# stub: after_commit_action 1.0.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "after_commit_action"
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["BestVendor"]
-  s.date = "2015-03-07"
+  s.date = "2016-01-13"
   s.description = "Use this module to defer actions to the after-commit hook. This is useful if you want to trigger actions in after_create, after_destroy and after_update callbacks but want to execute them outside of the transaction (for example, to avoid deadlocks)."
   s.email = "magnus@bestvendor.com"
   s.extra_rdoc_files = [
@@ -23,7 +23,6 @@ Gem::Specification.new do |s|
     ".rspec",
     ".rvmrc",
     "Gemfile",
-    "Gemfile.lock",
     "LICENSE.txt",
     "README.md",
     "Rakefile",
@@ -33,6 +32,7 @@ Gem::Specification.new do |s|
     "lib/after_commit_action.rb",
     "spec/after_commit_action_spec.rb",
     "spec/config/database.yml",
+    "spec/models/another_model.rb",
     "spec/models/tester.rb",
     "spec/rails_app/.gitignore",
     "spec/rails_app/Gemfile",
@@ -87,7 +87,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/magnusvk/after_commit_action"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.4.3"
+  s.rubygems_version = "2.2.2"
   s.summary = "Easily defer blocks of code to the after-commit action of an ActiveRecord model."
 
   if s.respond_to? :specification_version then
@@ -96,22 +96,34 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activerecord>, [">= 3.0.0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0"])
+      s.add_development_dependency(%q<rails>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, [">= 1.1.3"])
       s.add_development_dependency(%q<jeweler>, ["~> 2.0.1"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_development_dependency(%q<sqlite3>, [">= 0"])
+      s.add_development_dependency(%q<rspec-extra-formatters>, [">= 0"])
     else
       s.add_dependency(%q<activerecord>, [">= 3.0.0"])
       s.add_dependency(%q<activesupport>, [">= 3.0.0"])
+      s.add_dependency(%q<rails>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, [">= 1.1.3"])
       s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
+      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_dependency(%q<sqlite3>, [">= 0"])
+      s.add_dependency(%q<rspec-extra-formatters>, [">= 0"])
     end
   else
     s.add_dependency(%q<activerecord>, [">= 3.0.0"])
     s.add_dependency(%q<activesupport>, [">= 3.0.0"])
+    s.add_dependency(%q<rails>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, [">= 1.1.3"])
     s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
+    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+    s.add_dependency(%q<sqlite3>, [">= 0"])
+    s.add_dependency(%q<rspec-extra-formatters>, [">= 0"])
   end
 end
 

data/lib/after_commit_action.rb

@@ -17,6 +17,12 @@ module AfterCommitAction
   end
 
   def execute_after_commit(&block)
+    if ActiveRecord::Base.connection.open_transactions == 0
+      return block.call
+    else
+      ActiveRecord::Base.connection.add_transaction_record(self)
+    end
+
     @_execute_after_commit ||= []
     @_execute_after_commit<< block
   end

data/spec/after_commit_action_spec.rb

@@ -1,6 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 require 'models/tester'
+require 'models/another_model'
 
 describe "AfterCommitAction" do
   it "should correctly execute tasks after commit" do
@@ -18,4 +19,23 @@ describe "AfterCommitAction" do
     t.array.should include('before_update')
     t.array.should include('after_update')
   end
+
+  context 'when block is executed in another model transaction' do
+    let(:tester)        { Tester.create count: 0 }
+    let(:another_model) { AnotherModel.new tester: tester }
+
+    subject {}
+
+    it "increments the counter" do
+      expect { another_model.save! }.to change { tester.reload.count }.from(0).to 1
+    end
+  end
+
+  context 'when there is no transaction' do
+    let(:tester) { Tester.create count: 0 }
+
+    it "increments the counter" do
+      expect { tester.increment_counter }.to change { tester.reload.count }.from(0).to 1
+    end
+  end
 end

data/spec/models/another_model.rb

@@ -0,0 +1,11 @@
+class AnotherModel < ActiveRecord::Base
+  include AfterCommitAction
+
+  belongs_to :tester
+
+  after_save :increment_tester_counter
+
+  def increment_tester_counter
+    tester.increment_counter
+  end
+end

data/spec/models/tester.rb

@@ -29,4 +29,8 @@ class Tester < ActiveRecord::Base
   def after_update
     execute_after_commit { @array<< 'after_update' }
   end
+
+  def increment_counter
+    execute_after_commit { increment! :count }
+  end
 end

data/spec/schema.rb

@@ -15,6 +15,11 @@ ActiveRecord::Schema.define(:version => 20120522160158) do
 
   create_table "testers", :force => true do |t|
     t.string   "name"
+    t.integer  "count", :default => 0
+  end
+
+  create_table "another_models", :force => true do |t|
+    t.string   "tester_id"
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: after_commit_action
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - BestVendor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-07 00:00:00.000000000 Z
+date: 2016-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: rails
+  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'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +94,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.1
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  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'
+- !ruby/object:Gem::Dependency
+  name: rspec-extra-formatters
+  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: Use this module to defer actions to the after-commit hook. This is useful
   if you want to trigger actions in after_create, after_destroy and after_update callbacks
   but want to execute them outside of the transaction (for example, to avoid deadlocks).
@@ -94,7 +150,6 @@ files:
 - ".rspec"
 - ".rvmrc"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -104,6 +159,7 @@ files:
 - lib/after_commit_action.rb
 - spec/after_commit_action_spec.rb
 - spec/config/database.yml
+- spec/models/another_model.rb
 - spec/models/tester.rb
 - spec/rails_app/.gitignore
 - spec/rails_app/Gemfile
@@ -175,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Easily defer blocks of code to the after-commit action of an ActiveRecord

data/Gemfile.lock

@@ -1,90 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (4.2.0)
-      activesupport (= 4.2.0)
-      builder (~> 3.1)
-    activerecord (4.2.0)
-      activemodel (= 4.2.0)
-      activesupport (= 4.2.0)
-      arel (~> 6.0)
-    activesupport (4.2.0)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    addressable (2.3.6)
-    arel (6.0.0)
-    builder (3.2.2)
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.1.3)
-    faraday (0.9.0)
-      multipart-post (>= 1.2, < 3)
-    git (1.2.8)
-    github_api (0.12.2)
-      addressable (~> 2.3)
-      descendants_tracker (~> 0.0.4)
-      faraday (~> 0.8, < 0.10)
-      hashie (>= 3.3)
-      multi_json (>= 1.7.5, < 2.0)
-      nokogiri (~> 1.6.3)
-      oauth2
-    hashie (3.3.2)
-    highline (1.6.21)
-    i18n (0.7.0)
-    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.8.1)
-    jwt (1.2.0)
-    mini_portile (0.6.1)
-    minitest (5.5.0)
-    multi_json (1.10.1)
-    multi_xml (0.5.5)
-    multipart-post (2.0.0)
-    nokogiri (1.6.5)
-      mini_portile (~> 0.6.0)
-    oauth2 (1.0.0)
-      faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (~> 1.2)
-    rack (1.6.0)
-    rake (10.4.2)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-extra-formatters (1.0.0)
-    rspec-mocks (2.8.0)
-    sqlite3 (1.3.10)
-    thread_safe (0.3.4)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (>= 3.0.0)
-  activesupport (>= 3.0.0)
-  bundler (>= 1.1.3)
-  jeweler (~> 2.0.1)
-  rdoc (~> 3.12)
-  rspec (~> 2.8.0)
-  rspec-extra-formatters
-  sqlite3