abstractivator 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6544ed986ae721bbafe6a7ca12bd302808b64497
-  data.tar.gz: 826dbb6f5c26ef72f77c9117d6bc26c10492ad31
+  metadata.gz: a3ef0c368cb253c8c08111f0a204a41efd75e771
+  data.tar.gz: 35e867d02a3f1ab5f98597eed4f33b8f608cf1ef
 SHA512:
-  metadata.gz: 69486ac9eb226283b82b1bbdfcd1dc296a73d50079a3da84fc7a601220dc688eabe12b23980ef702aa644da18bc3b8ebb3cd9feae8c8263decdc557514641271
-  data.tar.gz: 7e921ab9be7d6cc07effa8e5b9311494f4d266ee10f8d02f658026a66762b80caec81db52256b8ce496bcdc0e019941aeaa52821080c5da6b452321d6731c3d5
+  metadata.gz: c3c36e1d70be6effe19a3cc00ed630f24a53f7e3f3d2052a29c6ab3b285bfbf7d25301ad6d052c4626af50389f1555ebcd5bf5ae783bd34f7666727c2743760d
+  data.tar.gz: 553330854e53ce6027e804119bb21b6f31b21837da7898cd3502a40bf43f0605c0d23c60342b2971bf7b91e92be0c366994d174d79dbc063e6b8670fcc4c0886

data/abstractivator.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'eventmachine'
+  spec.add_development_dependency 'mongoid'
 
   spec.add_runtime_dependency 'activesupport', '~> 4.0'
   spec.add_runtime_dependency 'sourcify', '> 0'

data/lib/abstractivator/fiber_defer.rb

@@ -33,5 +33,15 @@ module Abstractivator
       raise error if error
       result
     end
+
+    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
+      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.2.0'
+  VERSION = '0.3.0'
 end

data/spec/lib/abstractivator/fiber_defer_spec.rb

@@ -1,6 +1,7 @@
 require 'rspec'
 require 'abstractivator/fiber_defer'
 require 'eventmachine'
+require 'mongoid'
 
 describe Abstractivator::FiberDefer do
   include Abstractivator::FiberDefer
@@ -71,4 +72,30 @@ describe Abstractivator::FiberDefer do
       end
     end
   end
+
+  describe '#mongoid_fiber_defer' do
+    it 'restores the mongoid database override within and after the deferred action' do
+      the_log = []
+      log = proc { the_log << Mongoid::Threaded.database_override }
+      EM.run do
+        with_fiber_defer do
+          Mongoid.override_database('good')
+          mongoid_fiber_defer do
+            sleep(0.1) # let the main thread proceed to set 'bad'
+            log.call # regardless, we should get 'good' here
+            EM.next_tick do
+              Mongoid.override_database('bad') # something else sets 'bad' again on the main thread
+              log.call
+            end
+            sleep(0.1) # allow main thread to run
+          end
+          log.call # back on the main thread now, we should see 'good'
+          EM.stop
+        end
+        Mongoid.override_database('bad') # this runs right after the background thread is started
+        log.call
+      end
+      expect(the_log).to eql %w(bad good bad good)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abstractivator
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Peter Winton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2015-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mongoid
+  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: activesupport
   requirement: !ruby/object:Gem::Requirement