sequel_test_after_commit 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b52b3e69a382c92ab94f784c4e0dfe705ead2b7e
-  data.tar.gz: 00300d77b2e6e9935c69ae828565fc6b99438819
+  metadata.gz: 2741b2083df5a6cac22b15c28527e553507b99dd
+  data.tar.gz: 91019c6b88abe93e4388f1993bbad9cbddb2a99f
 SHA512:
-  metadata.gz: 7b4cfc7426fd3efe263f207432627ae72cb386e770b1616adfb16407b867f4b9af8a473356269c75cf4611741c7bbd60355d4f483111fbc660c8e1a0380ecabf
-  data.tar.gz: 117d66a0cc1008d6c9adee7bcb5eedf47c3d7a0cf1d5ffb10d5ee4889fc3132d6b4474bf833af15a3dbeea72f6eb3e734760aede273a59a144c8404502d7542b
+  metadata.gz: 07419e2a57fb6a371a59ec470c0b99f6e7c5e90ba16073d9e6e12342a67ade2ae35f685a976ff4f1d19b3f597fc1600c54933c1e715fc9edd5b668299ed412e2
+  data.tar.gz: 96eb18d1589b988c5c789ca86004fa8340f6c9503977aac6e9c11617805839d984d2a0a02b7a6cf340f6a4e826d2a46613aaf131ab9d75e539572e95bb456d5d

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+#### 0.0.4 (2014-08-12)
+
+*   When declaring an after_commit callback within another after_commit callback, it is now processed immediately rather than being added to the queue. This may not be expected behavior for some cases, but is consistent with the notion of treating the period immediately after a subtransaction ends as being outside of any transaction for testing purposes.
+
+#### 0.0.3 (2014-06-28)
+
+*   Fix bug where transactions wouldn't be cleared if an error was raised while processing an after_commit hook.
+
+#### 0.0.2 (2014-06-25)
+
+*   Initial release. Very simple, just runs after_commit hooks that were declared in a subtransaction when that subtransaction ends.

data/lib/sequel/extensions/test_after_commit.rb

@@ -4,16 +4,22 @@ module Sequel
       level = savepoint_level(conn)
 
       if h = _trans(conn)
-        if after_commit = h[:after_commit]
-          if hooks = after_commit.delete(level)
-            hooks.each(&:call) if committed
+        begin
+          h[:in_after_commit] = true
+
+          if after_commit = h[:after_commit]
+            if hooks = after_commit.delete(level)
+              hooks.each(&:call) if committed
+            end
           end
-        end
 
-        if after_rollback = h[:after_rollback]
-          if hooks = after_rollback.delete(level)
-            hooks.each(&:call) unless committed
+          if after_rollback = h[:after_rollback]
+            if hooks = after_rollback.delete(level)
+              hooks.each(&:call) unless committed
+            end
           end
+        ensure
+          h.delete(:in_after_commit)
         end
       end
     ensure
@@ -23,7 +29,7 @@ module Sequel
     def after_commit(opts=OPTS, &block)
       raise Error, "must provide block to after_commit" unless block
       synchronize(opts[:server]) do |conn|
-        if h = _trans(conn)
+        if (h = _trans(conn)) && h[:in_after_commit].nil?
           raise Error, "cannot call after_commit in a prepared transaction" if h[:prepare]
           level = savepoint_level(conn)
           hooks = h[:after_commit] ||= {}

data/lib/sequel_test_after_commit/version.rb

@@ -1,5 +1,5 @@
 module Sequel
   module TestAfterCommit
-    VERSION = '0.0.3'
+    VERSION = '0.0.4'
   end
 end

data/spec/test_after_commit_spec.rb

@@ -86,6 +86,41 @@ describe Sequel::TestAfterCommit do
     @callbacks.should == [:second_after_commit, :third_after_commit, :first_after_commit]
   end
 
+  it "should run new after_commit callbacks immediately when in the after_commit stage" do
+    @db.transaction do
+      @db.after_commit do
+        @db.after_commit { @callbacks << :after_commit_1_1 }
+        @callbacks << :after_commit_1
+        @db.after_commit { @callbacks << :after_commit_1_2 }
+      end
+      @callbacks.should == []
+
+      @db.transaction :savepoint => true do
+        @db.after_commit do
+          @db.after_commit { @callbacks << :after_commit_2_1 }
+          @callbacks << :after_commit_2
+          @db.after_commit { @callbacks << :after_commit_2_2 }
+        end
+        @callbacks.should == []
+      end
+
+      @callbacks.should == [:after_commit_2_1, :after_commit_2, :after_commit_2_2]
+
+      @db.transaction :savepoint => true do
+        @db.after_commit do
+          @db.after_commit { @callbacks << :after_commit_3_1 }
+          @callbacks << :after_commit_3
+          @db.after_commit { @callbacks << :after_commit_3_2 }
+        end
+        @callbacks.should == [:after_commit_2_1, :after_commit_2, :after_commit_2_2]
+      end
+
+      @callbacks.should == [:after_commit_2_1, :after_commit_2, :after_commit_2_2, :after_commit_3_1, :after_commit_3, :after_commit_3_2]
+    end
+
+    @callbacks.should == [:after_commit_2_1, :after_commit_2, :after_commit_2_2, :after_commit_3_1, :after_commit_3, :after_commit_3_2, :after_commit_1_1, :after_commit_1, :after_commit_1_2]
+  end
+
   it "should run after_rollback callbacks after the subtransaction in which they are declared rolls back" do
     @db.transaction do
       @db.after_commit   { @callbacks << :first_after_commit }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel_test_after_commit
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Chris Hanks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-28 00:00:00.000000000 Z
+date: 2014-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -61,6 +61,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md