mongoid-multitenancy 1.1.3 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30fa52034535ce4524481877d5b9e048e1eeeaa5
-  data.tar.gz: 533f4f95ecb750443629027cac6d0dd9edc6bb73
+  metadata.gz: 57b6a36dd90e26ab59298efdd32bfeb5b92a1bfd
+  data.tar.gz: da726e93d69c677784b0bb5213d21bda3a77af3b
 SHA512:
-  metadata.gz: efb3239aa595fe974954364f1b8b7cf2b0bb061d87dac50166294f54a219ed97b68504deead534086576016e840d38b125612a64d12a429d3b37c19ef90deb6a
-  data.tar.gz: f3a64574e2ef09ade685ab061806bd37885286ead3efe20d884887d14e42ab748e712a1635b9fc2724aa6bb520d614684e70b973bf4952b2866bad396e2125fd
+  metadata.gz: b11cda4238d5ef849b59ce910c70136692e04680c764159c128cf38eea5fd89851e8d9d728a3773edbf27ed0013d9fbc2e2777babe2b977c4bcab160198ecca2
+  data.tar.gz: bf624d27f91d4ac108f811445eaa9fbbb4837e88427cc4a5eb7d810c9adbb19f6310f7a94ac84592560f371ad9ed666999498a7395cc562f495d845be724880e

data/.travis.yml

@@ -1,13 +1,11 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1.0
-  - 2.2.0
+  - 2.2.2
   - 2.3.0
-  - jruby
+  - 2.4.1
 gemfile:
-  - gemfiles/Gemfile.mongoid-4.0
-  - gemfiles/Gemfile.mongoid-5.0
+  - gemfiles/Gemfile.mongoid-6
+  - gemfiles/Gemfile.mongoid-7
   - Gemfile
 services:
   - mongodb

data/CHANGELOG.md

@@ -1,3 +1,36 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+
+## [2.0.3] - 2020-06-25
+### Fixed
+
+* Full Support of mongoid 7
+
+## [2.0.2] - 2018-08-23
+### Added
+
+* Support of mongoid 7
+
+## [2.0.1] - 2017-12-14
+### Changed
+
+* Add ensure block in method with_tenant
+
+## [2.0] - 2017-07-21
+### New Features
+
+* Add support for mongoid 6
+* Remove support for mongoid 4 & 5
+
+## 1.2
+
+### New Features
+
+* Add *exclude_shared* option for the TenantUniquenessValidator
+
 ## 1.1
 
 ### New Features
@@ -12,7 +45,7 @@
 
 ### New Features
 
-* Adds support for mongoid 5
+* Add support for mongoid 5
 
 ### Major Changes (Backwards Incompatible)
 

data/Gemfile

@@ -1,15 +1,13 @@
 source 'https://rubygems.org'
 
-gem 'mongoid', '~> 5.0'
-
-gem 'rake', '~> 10.0'
+gem 'rake'
 
 group :test do
-  gem 'database_cleaner', github: 'DatabaseCleaner/database_cleaner', ref: '1cab518'
+  gem 'database_cleaner'
   gem 'coveralls', require: false
   gem 'rspec', '~> 3.1'
-  gem 'yard', '~> 0.8'
-  gem 'mongoid-rspec', '~> 3.0'
+  gem 'yard'
+  gem 'mongoid-rspec', git: 'https://github.com/mongoid-rspec/mongoid-rspec.git'
   gem 'rubocop', require: false
 end
 

data/README.md

@@ -1,4 +1,4 @@
-# mongoid-multitenancy [![Build Status](https://travis-ci.org/PerfectMemory/mongoid-multitenancy.png?branch=master)](https://travis-ci.org/PerfectMemory/mongoid-multitenancy) [![Coverage Status](https://coveralls.io/repos/PerfectMemory/mongoid-multitenancy/badge.svg?branch=master&service=github)](https://coveralls.io/github/PerfectMemory/mongoid-multitenancy?branch=master) [![Code Climate](https://codeclimate.com/github/PerfectMemory/mongoid-multitenancy.png)](https://codeclimate.com/github/PerfectMemory/mongoid-multitenancy) [![Dependency Status](https://gemnasium.com/PerfectMemory/mongoid-multitenancy.png)](https://gemnasium.com/PerfectMemory/mongoid-multitenancy)
+# mongoid-multitenancy [![Build Status](https://api.travis-ci.org/PerfectMemory/mongoid-multitenancy.png?branch=master)](https://travis-ci.org/PerfectMemory/mongoid-multitenancy) [![Coverage Status](https://coveralls.io/repos/github/PerfectMemory/mongoid-multitenancy/badge.svg?branch=master)](https://coveralls.io/github/PerfectMemory/mongoid-multitenancy?branch=master) [![Code Climate](https://codeclimate.com/github/PerfectMemory/mongoid-multitenancy.png)](https://codeclimate.com/github/PerfectMemory/mongoid-multitenancy)
 
 mongoid-multitenancy adds the ability to scope [Mongoid](https://github.com/mongoid/mongoid) models to a tenant in a **shared database strategy**. Tenants are represented by a tenant model, such as `Client`. mongoid-multitenancy will help you set the current tenant on each request and ensures that all 'tenant models' are always properly scoped to the current tenant: when viewing, searching and creating.
 
@@ -12,12 +12,17 @@ In addition, mongoid-multitenancy:
 * is thread safe
 * redefines some mongoid functions like `index`, `validates_with` and `delete_all` to take in account the multitenancy.
 
+Compatibility
+===============
+
+mongoid-multitenancy 2.0 is compatible with mongoid 6/7. For mongoid 4/5 compatiblity, use mongoid-multitenancy 1.2.
+
 Installation
 ===============
 
 Add this line to your application's Gemfile:
 
-    gem 'mongoid-multitenancy'
+    gem 'mongoid-multitenancy', '~> 2.0'
 
 And then execute:
 
@@ -74,7 +79,7 @@ class Article
   include Mongoid::Document
   include Mongoid::Multitenancy::Document
 
-  tenant(:client)
+  tenant(:tenant)
 
   field :title, :type => String
 end
@@ -85,10 +90,14 @@ The association passed to the `tenant` function must be valid.
 
 `tenant` accepts several options:
 
- * :optional : set to true when the tenant is optional (default value is `false`)
- * :immutable : set to true when the tenant field is immutable (default value is `true`)
- * :full_indexes : set to true to add the tenant field automatically to all the indexes (default value is `true`)
- * :class_name, etc. : all the other options will be passed to the mongoid relation (belongs_to)
+| Option  | Default | Description |
+| ------------- | ------------- | ------------- |
+| :optional  | false  | set to true when the tenant is optional |
+| :immutable  | true  | set to true when the tenant field is immutable |
+| :full_indexes  | true  | set to true to add the tenant field automatically to all the indexes |
+| :index  | false  | set to true to define an index for the tenant field |
+| :scopes  | true  | set to true to define scopes :shared and :unshared |
+| :class_name, etc. |   | all the other options will be passed to the mongoid relation (belongs_to) |
 
 Some examples to illustrate this behavior:
 
@@ -97,15 +106,15 @@ Some examples to illustrate this behavior:
 Mongoid::Multitenancy.current_tenant = Client.find_by(:name => 'Perfect Memory') # => <#Client _id:50ca04b86c82bfc125000025, :name: "Perfect Memory">
 
  # All searches are scoped by the tenant, the following searches will only return objects belonging to the current client.
-Article.all # => all articles where client_id => 50ca04b86c82bfc125000025
+Article.all # => all articles where tenant_id => 50ca04b86c82bfc125000025
 
  # New objects are scoped to the current tenant
 article = Article.new(:title => 'New blog')
-article.save # => <#Article _id: 50ca04b86c82bfc125000044, title: 'New blog', client_id: 50ca04b86c82bfc125000025>
+article.save # => <#Article _id: 50ca04b86c82bfc125000044, title: 'New blog', tenant_id: 50ca04b86c82bfc125000025>
 
  # It can make the tenant field immutable once it is persisted to avoid inconsistency
 article.persisted? # => true
-article.client = another_client
+article.tenant = another_client
 article.valid? # => false
 ```
 
@@ -120,21 +129,21 @@ class Article
   include Mongoid::Document
   include Mongoid::Multitenancy::Document
 
-  tenant(:client, optional: true)
+  tenant(:tenant, optional: true)
 
   field :title, :type => String
 end
 
 Mongoid::Multitenancy.with_tenant(client_instance) do
-  Article.all # => all articles where client_id.in [50ca04b86c82bfc125000025, nil]
+  Article.all # => all articles where tenant_id.in [50ca04b86c82bfc125000025, nil]
   article = Article.new(:title => 'New article')
-  article.save # => <#Article _id: 50ca04b86c82bfc125000044, title: 'New blog', client_id: 50ca04b86c82bfc125000025>
+  article.save # => <#Article _id: 50ca04b86c82bfc125000044, title: 'New blog', tenant_id: 50ca04b86c82bfc125000025>
 
   # tenant needs to be set manually to nil
-  article = Article.new(:title => 'New article', :client => nil)
-  article.save # => <#Article _id: 50ca04b86c82bfc125000044, title: 'New blog', client_id: 50ca04b86c82bfc125000025>
+  article = Article.new(:title => 'New article', :tenant => nil)
+  article.save # => <#Article _id: 50ca04b86c82bfc125000044, title: 'New blog', tenant_id: 50ca04b86c82bfc125000025>
   article.tenant = nil
-  article.save => <#Article _id: 50ca04b86c82bfc125000044, title: 'New blog', client_id: nil>
+  article.save => <#Article _id: 50ca04b86c82bfc125000044, title: 'New blog', tenant_id: nil>
 end
 ```
 
@@ -173,7 +182,7 @@ class Article
   include Mongoid::Document
   include Mongoid::Multitenancy::Document
 
-  tenant :client
+  tenant :tenant
 
   field :slug
 
@@ -181,19 +190,19 @@ class Article
 end
 ```
 
-* When used with an *optional* tenant, the uniqueness constraint is not scoped if the item is shared, but is
-  scoped to the client new item otherwise. Note that a private item cannot have the the value if a shared item
-  already uses it.
+* When used with an *optional* tenant, the uniqueness constraint by default is not scoped if the item is shared, but is
+  scoped to the client new item otherwise. Note that by default in that case a private item cannot have a value if a shared item
+  already uses it. You can change that behaviour by setting the option `exclude_shared` to `true`.
 
 In the following case, 2 private articles can have the same slug if they belongs to 2 different clients. But if a shared
-article has the slug "slugA", no client will be able to use that slug again, like a standard validates_uniqueness_of does.
+article has the slug "slugA", no client will be able to use that slug again, like a standard `validates_uniqueness_of` does.
 
 ```ruby
 class Article
   include Mongoid::Document
   include Mongoid::Multitenancy::Document
 
-  tenant :client, optional: true
+  tenant :tenant, optional: true
 
   field :slug
 
@@ -201,6 +210,22 @@ class Article
 end
 ```
 
+In the following case, 2 private articles can have the same slug if they belongs to 2 different clients even if a shared
+article already uses that same slug, like a `validates_uniqueness_of scope: :tenant` does.
+
+```ruby
+class Article
+  include Mongoid::Document
+  include Mongoid::Multitenancy::Document
+
+  tenant :tenant, optional: true
+
+  field :slug
+
+  validates_tenant_uniqueness_of :slug, exclude_shared: true
+end
+```
+
 Mongoid indexes
 -------------------
 
@@ -210,14 +235,14 @@ To create a single index on the tenant field, you can use the option `index: tru
 
 On the example below, only one indexe will be created:
 
-* { 'title_id' => 1, 'client_id' => 1 }
+* { 'title_id' => 1, 'tenant_id' => 1 }
 
 ```ruby
 class Article
   include Mongoid::Document
   include Mongoid::Multitenancy::Document
 
-  tenant :client, full_indexes: true
+  tenant :tenant, full_indexes: true
 
   field :title
 
@@ -227,7 +252,7 @@ end
 
 On the example below, 2 indexes will be created:
 
-* { 'client_id' => 1 }
+* { 'tenant_id' => 1 }
 * { 'title_id' => 1 }
 
 ```ruby
@@ -235,7 +260,7 @@ class Article
   include Mongoid::Document
   include Mongoid::Multitenancy::Document
 
-  tenant :client, index: true
+  tenant :tenant, index: true
 
   field :title
 

data/gemfiles/Gemfile.mongoid-6

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

data/gemfiles/Gemfile.mongoid-7

@@ -0,0 +1,14 @@
+source 'https://rubygems.org'
+
+gem 'mongoid', '~> 7.0'
+
+gem 'rake'
+
+group :test do
+  gem 'database_cleaner'
+  gem 'coveralls', require: false
+  gem 'rspec', '~> 3.1'
+  gem 'yard'
+  gem 'mongoid-rspec', git: 'https://github.com/mongoid-rspec/mongoid-rspec.git'
+  gem 'rubocop', require: false
+end

data/lib/mongoid/multitenancy.rb

@@ -7,7 +7,6 @@ require 'mongoid/multitenancy/validators/tenant_uniqueness'
 module Mongoid
   module Multitenancy
     class << self
-
       # Set the current tenant. Make it Thread aware
       def current_tenant=(tenant)
         Thread.current[:current_tenant] = tenant
@@ -22,11 +21,13 @@ module Mongoid
       def with_tenant(tenant, &block)
         raise ArgumentError, 'block required' if block.nil?
 
-        old_tenant = self.current_tenant
-        self.current_tenant = tenant
-        result = block.call
-        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/document.rb

@@ -7,7 +7,7 @@ module Mongoid
         attr_accessor :tenant_field, :tenant_options
 
         # List of authorized options
-        MULTITENANCY_OPTIONS = [:optional, :immutable, :full_indexes, :index]
+        MULTITENANCY_OPTIONS = [:optional, :immutable, :full_indexes, :index, :scopes].freeze
 
         # Defines the tenant field for the document.
         #
@@ -24,10 +24,13 @@ module Mongoid
         #   wil raise an Exception.
         # @option options [ Boolean ] :optional If true allow the document
         #   to be shared among all the tenants.
-        #
+        # @option options [ Boolean ] :index If true build an index for
+        #   the tenant field itself.
+        # @option options [ Boolean ] :scopes If true create scopes :shared
+        #   and :unshared.
         # @return [ Field ] The generated field
         def tenant(association = :account, options = {})
-          options = { full_indexes: true, immutable: true }.merge!(options)
+          options = { full_indexes: true, immutable: true, scopes: true }.merge!(options)
           assoc_options, multitenant_options = build_options(options)
 
           # Setup the association between the class and the tenant class
@@ -40,7 +43,7 @@ module Mongoid
           # Validates the tenant field
           validates_tenancy_of tenant_field, multitenant_options
 
-          define_scopes
+          define_scopes if multitenant_options[:scopes]
           define_initializer association
           define_inherited association, options
           define_index if multitenant_options[:index]
@@ -92,7 +95,7 @@ module Mongoid
         end
 
         # Redefine 'delete_all' to take in account the default scope
-        def delete_all(conditions = nil)
+        def delete_all(conditions = {})
           scoped.where(conditions).delete
         end
 
@@ -106,6 +109,7 @@ module Mongoid
           options.each do |k, v|
             if MULTITENANCY_OPTIONS.include?(k)
               multitenant_options[k] = v
+              assoc_options[k] = v if k == :optional
             else
               assoc_options[k] = v
             end
@@ -131,7 +135,7 @@ module Mongoid
         # Define the inherited method
         def define_inherited(association, options)
           define_singleton_method(:inherited) do |child|
-            child.tenant association, options
+            child.tenant association, options.merge(scopes: false)
             super(child)
           end
         end
@@ -150,7 +154,7 @@ module Mongoid
                 where(tenant_field => tenant_id)
               end
             else
-              where(nil)
+              all
             end
           }
 

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

@@ -16,18 +16,18 @@ module Mongoid
       def validate_each(object, attribute, value)
         # Immutable Check
         if options[:immutable]
-          if object.send(:attribute_changed?, attribute) and object.send(:attribute_was, attribute)
+          if object.send(:attribute_changed?, attribute) && object.send(:attribute_was, attribute)
             object.errors.add(attribute, 'is immutable and cannot be updated')
           end
         end
 
         # Ownership check
-        if value and Mongoid::Multitenancy.current_tenant and value != Mongoid::Multitenancy.current_tenant.id
-          object.errors.add(attribute, "not authorized")
+        if value && Mongoid::Multitenancy.current_tenant && value != Mongoid::Multitenancy.current_tenant.id
+          object.errors.add(attribute, 'not authorized')
         end
 
         # Optional Check
-        if !options[:optional] and value.nil?
+        if !options[:optional] && value.nil?
           object.errors.add(attribute, 'is mandatory')
         end
       end

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

@@ -39,14 +39,8 @@ module Mongoid
         criteria = with_tenant_criterion(criteria, klass, document)
         criteria = criteria.merge(options[:conditions].call) if options[:conditions]
 
-        if Mongoid::VERSION.start_with?('4')
-          if criteria.with(persistence_options(criteria)).exists?
-            add_error(document, attribute, value)
-          end
-        else
-          if criteria.with(criteria.persistence_options).read(mode: :primary).exists?
-            add_error(document, attribute, value)
-          end
+        if criteria.read(mode: :primary).exists?
+          add_error(document, attribute, value)
         end
       end
 
@@ -58,8 +52,8 @@ module Mongoid
         name = document.database_field_name(item)
         tenant_value = document.attributes[name]
 
-        if document.class.tenant_options[:optional]
-          if document.attributes[name]
+        if document.class.tenant_options[:optional] && !options[:exclude_shared]
+          if tenant_value
             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.3'
+    VERSION = '2.0.3'.freeze
   end
 end

data/mongoid-multitenancy.gemspec

@@ -8,12 +8,12 @@ Gem::Specification.new do |gem|
   gem.summary       = 'Support of a multi-tenant database with Mongoid'
   gem.homepage      = 'https://github.com/PerfectMemory/mongoid-multitenancy'
   gem.license       = 'MIT'
-  gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.files         = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR)
+  gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = 'mongoid-multitenancy'
   gem.require_paths = ['lib']
   gem.version       = Mongoid::Multitenancy::VERSION
 
-  gem.add_dependency('mongoid', '>= 4.0')
+  gem.add_dependency('mongoid', '>= 6', '< 8')
 end

data/spec/immutable_spec.rb

@@ -38,7 +38,7 @@ describe Immutable do
       end
 
       it 'is not valid' do
-        item.client = another_client
+        item.tenant = another_client
         expect(item).not_to be_valid
       end
     end

data/spec/indexable_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe 'tenant' do
-
   let(:client) do
     Account.create!(name: 'client')
   end
@@ -12,26 +11,25 @@ describe 'tenant' do
 
   context 'without index: true' do
     it 'does not create an index' do
-      expect(Immutable).not_to have_index_for(:client_id => 1)
+      expect(Immutable).not_to have_index_for(tenant_id: 1)
     end
   end
 
   context 'with index: true' do
     it 'creates an index' do
-      expect(Indexable).to have_index_for(:client_id => 1)
+      expect(Indexable).to have_index_for(tenant_id: 1)
     end
   end
 
   context 'with full_indexes: true' do
     it 'add the tenant field on each index' do
-      expect(Immutable).to have_index_for(:client_id => 1, title: 1)
+      expect(Immutable).to have_index_for(tenant_id: 1, title: 1)
     end
   end
 
   context 'with full_indexes: false' do
     it 'does not add the tenant field on each index' do
-      expect(Indexable).not_to have_index_for(:client_id => 1, title: 1)
+      expect(Indexable).not_to have_index_for(tenant_id: 1, title: 1)
     end
   end
-
 end

data/spec/mandatory_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Mandatory do
-
   let(:client) do
     Account.create!(name: 'client')
   end
@@ -17,6 +16,18 @@ describe Mandatory do
   it_behaves_like 'a tenantable model'
   it { is_expected.to validate_tenant_uniqueness_of(:slug) }
 
+  describe '.shared' do
+    it 'is defined' do
+      expect(Mandatory).to respond_to(:shared)
+    end
+  end
+
+  describe '.unshared' do
+    it 'is defined' do
+      expect(Mandatory).to respond_to(:unshared)
+    end
+  end
+
   describe '.default_scope' do
     before do
       Mongoid::Multitenancy.with_tenant(client) { @itemX = Mandatory.create!(title: 'title X', slug: 'article-x') }

data/spec/models/account.rb

@@ -1,5 +1,5 @@
 class Account
   include Mongoid::Document
 
-  field :name, :type => String
+  field :name, type: String
 end

data/spec/models/immutable.rb

@@ -2,14 +2,14 @@ class Immutable
   include Mongoid::Document
   include Mongoid::Multitenancy::Document
 
-  tenant(:client, class_name: 'Account', immutable: true)
+  tenant(:tenant, class_name: 'Account', immutable: true)
 
-  field :slug, :type => String
-  field :title, :type => String
+  field :slug, type: String
+  field :title, type: String
 
   validates_tenant_uniqueness_of :slug
   validates_presence_of :slug
   validates_presence_of :title
 
-  index({ title: 1 })
+  index(title: 1)
 end

data/spec/models/indexable.rb

@@ -4,7 +4,7 @@ class Indexable
 
   field :title, type: String
 
-  tenant :client, class_name: 'Account', index: true, full_indexes: false
+  tenant :tenant, class_name: 'Account', index: true, full_indexes: false
 
-  index({ title: 1 })
+  index(title: 1)
 end

data/spec/models/mandatory.rb

@@ -2,14 +2,14 @@ class Mandatory
   include Mongoid::Document
   include Mongoid::Multitenancy::Document
 
-  tenant(:client, class_name: 'Account')
+  tenant(:tenant, class_name: 'Account')
 
   field :slug, type: String
-  field :title, type:String
+  field :title, type: String
 
   validates_tenant_uniqueness_of :slug
   validates_presence_of :slug
   validates_presence_of :title
 
-  index({ title: 1 })
+  index(title: 1)
 end

data/spec/models/mutable.rb

@@ -2,14 +2,14 @@ class Mutable
   include Mongoid::Document
   include Mongoid::Multitenancy::Document
 
-  tenant :client, class_name: 'Account', immutable: false, optional: false
+  tenant :tenant, class_name: 'Account', immutable: false, optional: false
 
-  field :slug, :type => String
-  field :title, :type => String
+  field :slug, type: String
+  field :title, type: String
 
   validates_tenant_uniqueness_of :slug
   validates_presence_of :slug
   validates_presence_of :title
 
-  index({ title: 1 })
+  index(title: 1)
 end

data/spec/models/mutable_child.rb

@@ -1,9 +1,9 @@
 require 'models/mutable'
 
 class MutableChild < Mutable
-	field :random, type: String
+  field :random, type: String
 end
 
 class AnotherMutableChild < Mutable
-	field :random, type: String
-end
+  field :random, type: String
+end

data/spec/models/no_scopable.rb

@@ -0,0 +1,11 @@
+class NoScopable
+  include Mongoid::Document
+  include Mongoid::Multitenancy::Document
+
+  tenant :tenant, class_name: 'Account', scopes: false
+
+  field :slug, type: String
+  field :title, type: String
+
+  index(title: 1)
+end

data/spec/models/optional.rb

@@ -2,7 +2,7 @@ class Optional
   include Mongoid::Document
   include Mongoid::Multitenancy::Document
 
-  tenant(:client, class_name: 'Account', optional: true)
+  tenant(:tenant, class_name: 'Account', optional: true)
 
   field :slug, type: String
   field :title, type: String
@@ -11,5 +11,5 @@ class Optional
   validates_presence_of :slug
   validates_presence_of :title
 
-  index({ title: 1 })
+  index(title: 1)
 end

data/spec/models/optional_exclude.rb

@@ -0,0 +1,15 @@
+class OptionalExclude
+  include Mongoid::Document
+  include Mongoid::Multitenancy::Document
+
+  tenant(:tenant, class_name: 'Account', optional: true)
+
+  field :slug, type: String
+  field :title, type: String
+
+  validates_tenant_uniqueness_of :slug, exclude_shared: true
+  validates_presence_of :slug
+  validates_presence_of :title
+
+  index(title: 1)
+end

data/spec/mongoid-multitenancy_spec.rb

@@ -21,8 +21,17 @@ describe Mongoid::Multitenancy do
     end
 
     it 'restores the current tenant after the block' do
-      Mongoid::Multitenancy.with_tenant(another_client) do ; end
+      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

data/spec/mutable_child_spec.rb

@@ -38,10 +38,9 @@ describe MutableChild do
       end
 
       it 'is valid' do
-        item.client = another_client
+        item.tenant = another_client
         expect(item).to be_valid
       end
     end
   end
-
 end

data/spec/mutable_spec.rb

@@ -42,7 +42,7 @@ describe Mutable do
       end
 
       it 'is valid' do
-        item.client = another_client
+        item.tenant = another_client
         expect(item).to be_valid
       end
     end

data/spec/optional_exclude_spec.rb

@@ -0,0 +1,71 @@
+require 'spec_helper'
+
+describe OptionalExclude do
+  let(:client) do
+    Account.create!(name: 'client')
+  end
+
+  let(:another_client) do
+    Account.create!(name: 'another client')
+  end
+
+  let(:item) do
+    OptionalExclude.new(title: 'title X', slug: 'page-x')
+  end
+
+  it_behaves_like 'a tenantable model'
+
+  describe '#valid?' do
+    context 'with a tenant' do
+      before do
+        Mongoid::Multitenancy.current_tenant = client
+      end
+
+      it 'is valid' do
+        expect(item).to be_valid
+      end
+
+      context 'with a uniqueness constraint' do
+        let(:duplicate) do
+          OptionalExclude.new(title: 'title Y', slug: 'page-x')
+        end
+
+        before do
+          item.save!
+        end
+
+        it 'does not allow duplicates on the same tenant' do
+          expect(duplicate).not_to be_valid
+        end
+
+        it 'allow duplicates on a different same tenant' do
+          Mongoid::Multitenancy.with_tenant(another_client) do
+            expect(duplicate).to be_valid
+          end
+        end
+      end
+    end
+
+    context 'without a tenant' do
+      it 'is valid' do
+        expect(item).to be_valid
+      end
+
+      context 'with a uniqueness constraint' do
+        let(:duplicate) do
+          OptionalExclude.new(title: 'title Y', slug: 'page-x')
+        end
+
+        before do
+          item.save!
+        end
+
+        it 'allow duplicates on any client' do
+          Mongoid::Multitenancy.with_tenant(client) do
+            expect(duplicate).to be_valid
+          end
+        end
+      end
+    end
+  end
+end

data/spec/optional_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Optional do
-
   let(:client) do
     Account.create!(name: 'client')
   end
@@ -25,13 +24,13 @@ describe Optional do
 
       context 'when persisted' do
         before do
-          item.client = nil
+          item.tenant = nil
           item.save!
         end
 
         it 'does not override the client' do
           item.reload
-          expect(Optional.last.client).to be_nil
+          expect(Optional.last.tenant).to be_nil
         end
       end
     end

data/spec/scopable_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe NoScopable do
+  it_behaves_like 'a tenantable model' do
+    let(:client) do
+      Account.create!(name: 'client')
+    end
+
+    let(:another_client) do
+      Account.create!(name: 'another client')
+    end
+
+    let(:item) do
+      NoScopable.new(title: 'title X', slug: 'page-x')
+    end
+  end
+
+  describe '.shared' do
+    it 'is not defined' do
+      expect(NoScopable).not_to respond_to(:shared)
+    end
+  end
+
+  describe '.unshared' do
+    it 'is not defined' do
+      expect(NoScopable).not_to respond_to(:unshared)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -15,12 +15,6 @@ require 'mongoid'
 require 'mongoid-multitenancy'
 require 'mongoid-rspec'
 
-if Mongoid::VERSION.start_with? '5'
-  Mongo::Logger.logger.level = ::Logger::FATAL
-elsif Mongoid::VERSION.start_with? '4'
-  Moped.logger = nil
-end
-
 require_relative 'support/shared_examples'
 require_relative 'support/mongoid_matchers'
 
@@ -30,7 +24,8 @@ Mongoid.configure do |config|
   config.connect_to 'mongoid_multitenancy'
 end
 
-Mongoid.logger = nil
+Mongoid.logger.level = Logger::INFO
+Mongo::Logger.logger.level = Logger::INFO
 
 RSpec.configure do |config|
   config.include Mongoid::Matchers

data/spec/support/shared_examples.rb

@@ -1,7 +1,6 @@
 shared_examples_for 'a tenantable model' do
-
-  it { is_expected.to belong_to(:client) }
-  it { is_expected.to have_index_for(client_id: 1, title: 1) }
+  it { is_expected.to belong_to(:tenant) }
+  it { is_expected.to have_index_for(tenant_id: 1, title: 1) }
 
   describe '#initialize' do
     context 'within a client context' do
@@ -10,7 +9,7 @@ shared_examples_for 'a tenantable model' do
       end
 
       it 'set the client' do
-        expect(item.client).to eq client
+        expect(item.tenant).to eq client
       end
     end
 
@@ -20,7 +19,7 @@ shared_examples_for 'a tenantable model' do
       end
 
       it 'does not set any client' do
-        expect(item.client).to be_nil
+        expect(item.tenant).to be_nil
       end
     end
   end
@@ -33,7 +32,7 @@ shared_examples_for 'a tenantable model' do
 
       context 'with the client id' do
         before do
-          item.client = client
+          item.tenant = client
         end
 
         it 'is valid' do
@@ -43,7 +42,7 @@ shared_examples_for 'a tenantable model' do
 
       context 'with another client id' do
         before do
-          item.client = another_client
+          item.tenant = another_client
         end
 
         it 'is not valid' do
@@ -59,7 +58,7 @@ shared_examples_for 'a tenantable model' do
 
       context 'with the client id' do
         before do
-          item.client = client
+          item.tenant = client
         end
 
         it 'is valid' do
@@ -69,7 +68,7 @@ shared_examples_for 'a tenantable model' do
 
       context 'with another client id' do
         before do
-          item.client = another_client
+          item.tenant = another_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.3
+  version: 2.0.3
 platform: ruby
 authors:
 - Aymeric Brisse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2020-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
 description: MultiTenancy with Mongoid
 email:
 - aymeric.brisse@mperfect-memory.com
@@ -39,8 +45,8 @@ files:
 - LICENSE.TXT
 - README.md
 - Rakefile
-- gemfiles/Gemfile.mongoid-4.0
-- gemfiles/Gemfile.mongoid-5.0
+- gemfiles/Gemfile.mongoid-6
+- gemfiles/Gemfile.mongoid-7
 - lib/mongoid-multitenancy.rb
 - lib/mongoid/multitenancy.rb
 - lib/mongoid/multitenancy/document.rb
@@ -58,11 +64,15 @@ files:
 - spec/models/mandatory.rb
 - spec/models/mutable.rb
 - spec/models/mutable_child.rb
+- spec/models/no_scopable.rb
 - spec/models/optional.rb
+- spec/models/optional_exclude.rb
 - spec/mongoid-multitenancy_spec.rb
 - spec/mutable_child_spec.rb
 - spec/mutable_spec.rb
+- spec/optional_exclude_spec.rb
 - spec/optional_spec.rb
+- spec/scopable_spec.rb
 - spec/spec_helper.rb
 - spec/support/mongoid_matchers.rb
 - spec/support/shared_examples.rb
@@ -86,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.6.14.4
 signing_key: 
 specification_version: 4
 summary: Support of a multi-tenant database with Mongoid
@@ -101,12 +111,15 @@ test_files:
 - spec/models/mandatory.rb
 - spec/models/mutable.rb
 - spec/models/mutable_child.rb
+- spec/models/no_scopable.rb
 - spec/models/optional.rb
+- spec/models/optional_exclude.rb
 - spec/mongoid-multitenancy_spec.rb
 - spec/mutable_child_spec.rb
 - spec/mutable_spec.rb
+- spec/optional_exclude_spec.rb
 - spec/optional_spec.rb
+- spec/scopable_spec.rb
 - spec/spec_helper.rb
 - spec/support/mongoid_matchers.rb
 - spec/support/shared_examples.rb
-has_rdoc: 

data/gemfiles/Gemfile.mongoid-4.0

@@ -1,16 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'mongoid', '~> 4.0'
-
-gem 'rake', '~> 10.0'
-
-group :test do
-  gem 'database_cleaner', github: 'DatabaseCleaner/database_cleaner', ref: '1cab518'
-  gem 'coveralls', :require => false
-  gem 'rspec', '~> 3.1'
-  gem 'yard', '~> 0.8'
-  gem 'mongoid-rspec', '~> 2.1'
-end
-
-# Specify your gem's dependencies in mongoid-multitenancy.gemspec
-gemspec :path => '..'

data/gemfiles/Gemfile.mongoid-5.0

@@ -1,16 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'mongoid', '~> 5.0'
-
-gem 'rake', '~> 10.0'
-
-group :test do
-  gem 'database_cleaner', github: 'DatabaseCleaner/database_cleaner', ref: '1cab518'
-  gem 'coveralls', :require => false
-  gem 'rspec', '~> 3.1'
-  gem 'yard', '~> 0.8'
-  gem 'mongoid-rspec', '~> 3.0'
-end
-
-# Specify your gem's dependencies in mongoid-multitenancy.gemspec
-gemspec :path => '..'