mongoid-multitenancy 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e24dad42cdd8d6692c7c37ae3d370c11615423ed
-  data.tar.gz: 0a6b110bab9bd521fe3be96a76cc7f10e9ef4957
+  metadata.gz: 046b1e5327369856dee33f99a53977a2193dfc78
+  data.tar.gz: 696c53ac82dc8c0580c365379055dcd02bfa64ae
 SHA512:
-  metadata.gz: 5ffaa31b8280e405b4b0e7acd7b5ad84e8c15ae3815be55a962526ef6cf9d918ea76d144041856d0f281153e31dbea025bdf5cee6ab0d1546436751022fa777c
-  data.tar.gz: 68fa75bceb0e1103a0307edafb1e0b2d4110bb1f76473b13a823d560dd35e5ca00a8bbc2c94413fcb358d77eb24e608cc9bdf8efe36139b8347051188cca5ecf
+  metadata.gz: bf99d6fd58f15a2f12caf85c37a9b621cace5146958c39c34a6df286285dcdbb302664970781f494d6a0761d638a7662cf9a40ccb6413813ccf48002e9238f41
+  data.tar.gz: a8ba34aa544fb199f7f45335224d29e4c3bb90967f0f8240fd0069d0be820c6ae24bb075a5c71aa25a2ba95ab8978386f089b8538076a10435ab0bf5ebe33722

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

@@ -36,8 +36,7 @@ module Mongoid
         criteria = create_criteria(klass, document, attribute, value)
 
         # <<Add the tenant Criteria>>
-        add_tenant_criterion(criteria, klass, document)
-
+        criteria = with_tenant_criterion(criteria, klass, document)
         criteria = criteria.merge(options[:conditions].call) if options[:conditions]
 
         if Mongoid::VERSION.start_with?('4')
@@ -51,18 +50,19 @@ module Mongoid
         end
       end
 
-      # Create the validation criteria for a tenant model.
+      # Add the scope criteria for a tenant model criteria.
       #
       # @api private
-      def add_tenant_criterion(criteria, base, document)
-        tenant_value = document.send(base.tenant_field.to_sym)
+      def with_tenant_criterion(criteria, base, document)
+        item = base.tenant_field.to_sym
+        name = document.database_field_name(item)
 
         if document.class.tenant_options[:optional]
-          if tenant_value
-            criteria.selector.update(criterion(document, base.tenant_field, {'$in' => [tenant_value, nil].mongoize}))
+          if tenant_value = document.attributes[name]
+            criteria = criteria.where(:"#{item}".in => [tenant_value, nil])
           end
         else
-          criteria.selector.update(criterion(document, base.tenant_field, tenant_value.mongoize))
+          criteria = criteria.where(item => tenant_value)
         end
 
         criteria

data/lib/mongoid/multitenancy/version.rb

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

data/spec/optional_spec.rb

@@ -155,7 +155,7 @@ describe Optional do
   describe '#valid?' do
     context 'with a tenant' do
       before do
-        item.client = client
+        Mongoid::Multitenancy.current_tenant = client
       end
 
       it 'is valid' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-multitenancy
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Aymeric Brisse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2015-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -87,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: Support of a multi-tenant database with Mongoid