abstractivator 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3ef0c368cb253c8c08111f0a204a41efd75e771
-  data.tar.gz: 35e867d02a3f1ab5f98597eed4f33b8f608cf1ef
+  metadata.gz: a5b90ea5c5ad7ac821065c55b0141d0c3fc150e0
+  data.tar.gz: 1143a6763ec08d757ae98ecda3d1b444e7cd1a9d
 SHA512:
-  metadata.gz: c3c36e1d70be6effe19a3cc00ed630f24a53f7e3f3d2052a29c6ab3b285bfbf7d25301ad6d052c4626af50389f1555ebcd5bf5ae783bd34f7666727c2743760d
-  data.tar.gz: 553330854e53ce6027e804119bb21b6f31b21837da7898cd3502a40bf43f0605c0d23c60342b2971bf7b91e92be0c366994d174d79dbc063e6b8670fcc4c0886
+  metadata.gz: 9e48495ea18d4ec76b1b9f9c95768995643ad77a02f36ed08dafcdc9c22e0d41cba293dbcfd3250598b5d1d0f0ecb408a097a6899fb7807757f19648ec9f292e
+  data.tar.gz: 3f410933ce0c6f4c1d2d7eb69f8fbba241607731a524bce093fd62cc00f1547e3f7c4d492f67a7df770acbe2e29b16e0a04c826b954a9ce3a0b16af1e7196b98

data/lib/abstractivator/fiber_defer.rb

@@ -36,12 +36,15 @@ module Abstractivator
 
     def mongoid_fiber_defer(&action)
       db = Mongoid::Threaded.database_override
-      fiber_defer do
-        # in the background thread
-        Mongoid.override_database(db) # set the db to what it was in the main thread
-        action.call
+      begin
+        fiber_defer do
+          # in the background thread
+          Mongoid.override_database(db) # set the db to what it was in the main thread
+          action.call
+        end
+      ensure
+        Mongoid.override_database(db) # main thread has moved on before we resume here. restore the db override.
       end
-      Mongoid.override_database(db) # main thread has moved on before we resume here. restore the db override.
     end
   end
 end

data/lib/abstractivator/version.rb

@@ -1,3 +1,3 @@
 module Abstractivator
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/spec/lib/abstractivator/fiber_defer_spec.rb

@@ -71,6 +71,30 @@ describe Abstractivator::FiberDefer do
         end
       end
     end
+    it 'works with simultaneous deferred actions' do
+      EM.run do
+        log = []
+        EM.next_tick do
+          with_fiber_defer do
+            log << 'start1'
+            fiber_defer { sleep(0.1) }
+            log << 'end1'
+          end
+        end
+        EM.next_tick do
+          with_fiber_defer do
+            log << 'start2'
+            fiber_defer { sleep(0.2) }
+            log << 'end2'
+            expect(log).to eql %w(start1 start2 end1 end2)
+            EM.stop
+          end
+        end
+        EM.next_tick do
+          sleep(0.3)
+        end
+      end
+    end
   end
 
   describe '#mongoid_fiber_defer' do
@@ -97,5 +121,13 @@ describe Abstractivator::FiberDefer do
       end
       expect(the_log).to eql %w(bad good bad good)
     end
+    it 'returns the value of its block' do
+      EM.run do
+        with_fiber_defer do
+          expect(mongoid_fiber_defer{42}).to eql 42
+          EM.stop
+        end
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abstractivator
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Peter Winton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-15 00:00:00.000000000 Z
+date: 2015-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler