mongoid-multitenancy 2.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 431219928a15faa3df3004d3b81b840bc8650691
-  data.tar.gz: 41c7101a950c1ae7539912038befff3c9e4cac63
+  metadata.gz: c38ddec7cbb763f8fe21c663051a825ac342e325
+  data.tar.gz: 6566d061de75d4b9cf092ef1864b35c0e061ffc8
 SHA512:
-  metadata.gz: 6c7e4c5902e9da5050c1bf14797a93d06a1303fa61fed4ad9cb6b32ea57309f6abbe8ecef530f37457e9474fc18bd2eeb99812229c67abbaf9e8a7b3cceec1fe
-  data.tar.gz: 14df29dad2f6946275bbc152823003a04c701b44f3bac4774fdbbf11faabe7d4d5aad0b1f49b7f544d298c7ef6d0ed056874fe8a26c047b09de7986ddc1c13b6
+  metadata.gz: a7844d83386cdea3bfdcb7eddf5a91cdb85e346530d91de291eacc07d767fda5a04ec0baec47a44171459a69c0ebf91d516b4cff751b4bc026c36baa54f49e26
+  data.tar.gz: 1fa4b30f02ac4ae4c51a93f8cf0af9f6bf209059cc9b05b179c011da3fd507b463d416255660d09891e3c141d92fa1a7434261e164c6f0d311c159eec163610a

data/Gemfile

@@ -2,13 +2,13 @@ source 'https://rubygems.org'
 
 gem 'mongoid', '~> 6.0'
 
-gem 'rake', '~> 11.0'
+gem 'rake'
 
 group :test do
   gem 'database_cleaner'
   gem 'coveralls', require: false
   gem 'rspec', '~> 3.1'
-  gem 'yard', '~> 0.8'
+  gem 'yard'
   gem 'mongoid-rspec', git: 'https://github.com/mongoid-rspec/mongoid-rspec.git'
   gem 'rubocop', require: false
 end

data/lib/mongoid/multitenancy.rb

@@ -21,11 +21,13 @@ module Mongoid
       def with_tenant(tenant, &block)
         raise ArgumentError, 'block required' if block.nil?
 
-        old_tenant = current_tenant
-        self.current_tenant = tenant
-        result = yield
-        self.current_tenant = old_tenant
-        result
+        begin
+          old_tenant = current_tenant
+          self.current_tenant = tenant
+          yield
+        ensure
+          self.current_tenant = old_tenant
+        end
       end
     end
   end

data/lib/mongoid/multitenancy/version.rb

@@ -1,6 +1,6 @@
 module Mongoid
   module Multitenancy
     # Version
-    VERSION = '2.0'.freeze
+    VERSION = '2.0.1'.freeze
   end
 end

data/spec/mongoid-multitenancy_spec.rb

@@ -24,5 +24,14 @@ describe Mongoid::Multitenancy do
       Mongoid::Multitenancy.with_tenant(another_client) { ; }
       expect(Mongoid::Multitenancy.current_tenant).to eq client
     end
+
+    context 'when the block fails' do
+      it 'restores the current tenant' do
+        begin
+          Mongoid::Multitenancy.with_tenant(another_client) { raise StandardError }
+        rescue StandardError; end
+        expect(Mongoid::Multitenancy.current_tenant).to eq client
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-multitenancy
 version: !ruby/object:Gem::Version
-  version: '2.0'
+  version: 2.0.1
 platform: ruby
 authors:
 - Aymeric Brisse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-21 00:00:00.000000000 Z
+date: 2017-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Support of a multi-tenant database with Mongoid