mongoid-multitenancy 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 046b1e5327369856dee33f99a53977a2193dfc78
-  data.tar.gz: 696c53ac82dc8c0580c365379055dcd02bfa64ae
+  metadata.gz: 5fbe595c3d525a08bfe506d7c116dde5c8928885
+  data.tar.gz: 27764ffe6c0c8096b5c7b17eace5c318c0a8037e
 SHA512:
-  metadata.gz: bf99d6fd58f15a2f12caf85c37a9b621cace5146958c39c34a6df286285dcdbb302664970781f494d6a0761d638a7662cf9a40ccb6413813ccf48002e9238f41
-  data.tar.gz: a8ba34aa544fb199f7f45335224d29e4c3bb90967f0f8240fd0069d0be820c6ae24bb075a5c71aa25a2ba95ab8978386f089b8538076a10435ab0bf5ebe33722
+  metadata.gz: 125f068d3618a1184254e2464719e8ac98b5bff432df29bdfebbc931fb5fb969317a93f2f3348d761e92ceef3f2d6735ef1234c69cfe780a91dd7e19fe02d3c1
+  data.tar.gz: 7d134e70413887e1f362e0727327f92ad8d2a713823512ee77d9be1af44c9fda8274a78b83268a053804f41a9ad4593ced7744d1204258e446a300ee43d05834

data/lib/mongoid/multitenancy/validators/tenant_uniqueness.rb

@@ -56,9 +56,10 @@ module Mongoid
       def with_tenant_criterion(criteria, base, document)
         item = base.tenant_field.to_sym
         name = document.database_field_name(item)
+        tenant_value = document.attributes[name]
 
         if document.class.tenant_options[:optional]
-          if tenant_value = document.attributes[name]
+          if document.attributes[name]
             criteria = criteria.where(:"#{item}".in => [tenant_value, nil])
           end
         else

data/lib/mongoid/multitenancy/version.rb

@@ -1,6 +1,6 @@
 module Mongoid
   module Multitenancy
     # Version
-    VERSION = '1.1.1'
+    VERSION = '1.1.2'
   end
 end

data/spec/mandatory_spec.rb

@@ -68,7 +68,7 @@ describe Mandatory do
   describe '#valid?' do
     context 'with a tenant' do
       before do
-        item.client = client
+        Mongoid::Multitenancy.current_tenant = client
       end
 
       it 'is valid' do
@@ -97,10 +97,6 @@ describe Mandatory do
     end
 
     context 'without a tenant' do
-      before do
-        item.client = nil
-      end
-
       it 'is not valid' do
         expect(item).not_to be_valid
       end

data/spec/optional_spec.rb

@@ -184,10 +184,6 @@ describe Optional do
     end
 
     context 'without a tenant' do
-      before do
-        item.client = nil
-      end
-
       it 'is valid' do
         expect(item).to be_valid
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-multitenancy
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Aymeric Brisse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-19 00:00:00.000000000 Z
+date: 2015-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid