mongoid-multitenancy 2.0.2 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 620341a8f6aca85ff9aa07f1d1ef64350c83761b
-  data.tar.gz: 9084759b68045627f30ebda29c78bbfbc1bde545
+SHA256:
+  metadata.gz: 6b73b7aa6b228218cdc8f7984b1e1b6ba340f06f23ad4730e533c7eda4fe9023
+  data.tar.gz: bf9b89578b7afef058724f6e3170b5158590894d6267d419df9675c1fa786e08
 SHA512:
-  metadata.gz: 219017bd332374bb672778f8c100a237c3e97d065bd4fe4d0ca8299f382260f222bab417ed9610d4ab6afc9ea37bf73562680b61ad94a3bca00cadcda1ca5861
-  data.tar.gz: 5fb5ec2e0f34dd22a9b2b4c06a158e035370f38baad826da42fd0d7e4365043eb2ad4870a25ad62696afa87f1c548cf1a07771dbcdccbd47f5c09816a9f8a7b5
+  metadata.gz: 59a416b22144c02a3617356317421b27b6bb73947556c96c34ce36e67525d2b6a84a15bc5cd9f66d0acd9efd93e88cccaa1273c1dd4d3e6a08651acd294f5777
+  data.tar.gz: 3eefea63c163088fd87870cbe58d04aa8f17df612da993c552f666d01ebb4d9bf520715735f1afc04a234fba7a25573ba3e06b37bbc2c6c95951e8f4370da579

data/.travis.yml

@@ -6,6 +6,8 @@ rvm:
 gemfile:
   - gemfiles/Gemfile.mongoid-6
   - gemfiles/Gemfile.mongoid-7
+  - gemfiles/Gemfile.mongoid-8
+  - gemfiles/Gemfile.mongoid-9
   - Gemfile
 services:
   - mongodb

data/CHANGELOG.md

@@ -4,6 +4,16 @@ 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.4] - 2024-06-17
+### Fixed
+
+* Full Support of mongoid 8 & 9
+
+## [2.0.3] - 2020-06-25
+### Fixed
+
+* Full Support of mongoid 7
+
 ## [2.0.2] - 2018-08-23
 ### Added
 

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gem 'rake'
 
 group :test do
-  gem 'database_cleaner'
+  gem 'database_cleaner-mongoid'
   gem 'coveralls', require: false
   gem 'rspec', '~> 3.1'
   gem 'yard'

data/README.md

@@ -1,4 +1,4 @@
-# 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/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.
 
@@ -15,7 +15,7 @@ In addition, mongoid-multitenancy:
 Compatibility
 ===============
 
-mongoid-multitenancy 2.0 is only compatible with mongoid 6. For mongoid 4 & 5 compatiblity, use mongoid-multitenancy 1.2.
+mongoid-multitenancy 2 is compatible with mongoid 6/7/8/9. For mongoid 4/5 compatiblity, use mongoid-multitenancy 1.2.
 
 Installation
 ===============
@@ -229,13 +229,13 @@ end
 Mongoid indexes
 -------------------
 
-mongoid-multitenancy automatically adds the tenant foreign key in all your mongoid indexes to avoid to redefine all your validators. If you prefer to define manually the indexes, you can use the option `full_indexes: false`.
+mongoid-multitenancy automatically adds the tenant foreign key in all your mongoid indexes to avoid to redefine all your validators. If you prefer to define the indexes manually, you can use the option `full_indexes: false` on the tenant or `full_index: true/false` on the indexes.
 
 To create a single index on the tenant field, you can use the option `index: true` like any `belongs_to` declaration (false by default)
 
-On the example below, only one indexe will be created:
+On the example below, only one index will be created:
 
-* { 'title_id' => 1, 'tenant_id' => 1 }
+* { 'tenant_id' => 1, 'title' => 1 }
 
 ```ruby
 class Article
@@ -250,10 +250,11 @@ class Article
 end
 ```
 
-On the example below, 2 indexes will be created:
+On the example below, 3 indexes will be created:
 
 * { 'tenant_id' => 1 }
-* { 'title_id' => 1 }
+* { 'tenant_id' => 1, 'title' => 1 }
+* { 'name' => 1 }
 
 ```ruby
 class Article
@@ -263,8 +264,10 @@ class Article
   tenant :tenant, index: true
 
   field :title
+  field :name
 
   index({ :title => 1 })
+  index({ :name => 1 }, { full_index: false })
 end
 ```
 

data/gemfiles/Gemfile.mongoid-6

@@ -5,7 +5,7 @@ gem 'mongoid', '~> 6.0'
 gem 'rake'
 
 group :test do
-  gem 'database_cleaner'
+  gem 'database_cleaner-mongoid'
   gem 'coveralls', require: false
   gem 'rspec', '~> 3.1'
   gem 'yard'

data/gemfiles/Gemfile.mongoid-7

@@ -5,7 +5,7 @@ gem 'mongoid', '~> 7.0'
 gem 'rake'
 
 group :test do
-  gem 'database_cleaner'
+  gem 'database_cleaner-mongoid'
   gem 'coveralls', require: false
   gem 'rspec', '~> 3.1'
   gem 'yard'

data/gemfiles/Gemfile.mongoid-8

@@ -0,0 +1,14 @@
+source 'https://rubygems.org'
+
+gem 'mongoid', '~> 8.0'
+
+gem 'rake'
+
+group :test do
+  gem 'database_cleaner-mongoid'
+  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-9

@@ -0,0 +1,14 @@
+source 'https://rubygems.org'
+
+gem 'mongoid', '~> 9.0'
+
+gem 'rake'
+
+group :test do
+  gem 'database_cleaner-mongoid'
+  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/document.rb

@@ -87,15 +87,17 @@ module Mongoid
 
         # Redefine 'index' to include the tenant field in first position
         def index(spec, options = nil)
-          if tenant_options[:full_indexes]
+          super_options = (options || {}).dup
+          full_index = super_options.delete(:full_index)
+          if full_index.nil? ? tenant_options[:full_indexes] : full_index
             spec = { tenant_field => 1 }.merge(spec)
           end
 
-          super(spec, options)
+          super(spec, super_options)
         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
 
@@ -154,7 +156,7 @@ module Mongoid
                 where(tenant_field => tenant_id)
               end
             else
-              where(nil)
+              all
             end
           }
 

data/lib/mongoid/multitenancy/version.rb

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

data/mongoid-multitenancy.gemspec

@@ -15,5 +15,5 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.version       = Mongoid::Multitenancy::VERSION
 
-  gem.add_dependency('mongoid', '~> 6', '< 8')
+  gem.add_dependency('mongoid', '>= 6', '< 10')
 end

data/spec/indexable_spec.rb

@@ -9,27 +9,62 @@ describe 'tenant' do
     Mongoid::Multitenancy.current_tenant = client
   end
 
-  context 'without index: true' do
-    it 'does not create an index' do
-      expect(Immutable).not_to have_index_for(tenant_id: 1)
+  describe 'tenant full_indexes option' do
+    context 'without index option' do
+      it 'does not create an index' do
+        expect(IndexableWithoutIndex).not_to have_index_for(tenant_id: 1)
+      end
     end
-  end
 
-  context 'with index: true' do
-    it 'creates an index' do
-      expect(Indexable).to have_index_for(tenant_id: 1)
+    context 'with index: false' do
+      it 'does not create an index' do
+        expect(IndexableWithIndexFalse).not_to have_index_for(tenant_id: 1)
+      end
     end
-  end
 
-  context 'with full_indexes: true' do
-    it 'add the tenant field on each index' do
-      expect(Immutable).to have_index_for(tenant_id: 1, title: 1)
+    context 'with index: true' do
+      it 'creates an index' do
+        expect(IndexableWithIndexTrue).to have_index_for(tenant_id: 1)
+      end
     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(tenant_id: 1, title: 1)
+  describe 'index full_index option' do
+    context 'without tenant full_indexes option specified' do
+      it 'adds the tenant field on each index' do
+        expect(IndexableWithoutFullIndexes).to have_index_for(tenant_id: 1, title: 1)
+      end
+
+      it 'adds the tenant field on the index with full_index: true' do
+        expect(IndexableWithoutFullIndexes).to have_index_for(tenant_id: 1, name: 1)
+      end
+
+      it 'does not add the tenant field on the index with full_index: false' do
+        expect(IndexableWithoutFullIndexes).not_to have_index_for(tenant_id: 1, slug: 1)
+        expect(IndexableWithoutFullIndexes).to have_index_for(slug: 1)
+      end
+    end
+
+    context 'with full_indexes: true' do
+      it 'adds the tenant field on each index' do
+        expect(IndexableWithFullIndexesTrue).to have_index_for(tenant_id: 1, title: 1)
+      end
+
+      it 'does not add the tenant field on the index with full_index: false' do
+        expect(IndexableWithFullIndexesTrue).not_to have_index_for(tenant_id: 1, name: 1)
+        expect(IndexableWithFullIndexesTrue).to have_index_for(name: 1)
+      end
+    end
+
+    context 'with full_indexes: false' do
+      it 'does not add the tenant field on each index' do
+        expect(IndexableWithFullIndexesFalse).not_to have_index_for(tenant_id: 1, title: 1)
+        expect(IndexableWithFullIndexesFalse).to have_index_for(title: 1)
+      end
+
+      it 'does add the tenant field on the index with full_index: true' do
+        expect(IndexableWithFullIndexesFalse).to have_index_for(tenant_id: 1, name: 1)
+      end
     end
   end
 end

data/spec/models/indexable.rb

@@ -1,10 +1,61 @@
-class Indexable
+class IndexableWithoutIndex
+  include Mongoid::Document
+  include Mongoid::Multitenancy::Document
+
+  tenant :tenant, class_name: 'Account'
+end
+
+class IndexableWithIndexTrue
+  include Mongoid::Document
+  include Mongoid::Multitenancy::Document
+
+  tenant :tenant, class_name: 'Account', index: true
+end
+
+class IndexableWithIndexFalse
+  include Mongoid::Document
+  include Mongoid::Multitenancy::Document
+
+  tenant :tenant, class_name: 'Account', index: false
+end
+
+class IndexableWithoutFullIndexes
+  include Mongoid::Document
+  include Mongoid::Multitenancy::Document
+
+  field :title, type: String
+  field :name, type: String
+  field :slug, type: String
+
+  tenant :tenant, class_name: 'Account'
+
+  index(title: 1)
+  index({ name: 1 }, { full_index: true })
+  index({ slug: 1 }, { full_index: false })
+end
+
+class IndexableWithFullIndexesFalse
+  include Mongoid::Document
+  include Mongoid::Multitenancy::Document
+
+  field :title, type: String
+  field :name, type: String
+
+  tenant :tenant, class_name: 'Account', full_indexes: false
+
+  index(title: 1)
+  index({ name: 1 }, { full_index: true })
+end
+
+class IndexableWithFullIndexesTrue
   include Mongoid::Document
   include Mongoid::Multitenancy::Document
 
   field :title, type: String
+  field :name, type: String
 
-  tenant :tenant, class_name: 'Account', index: true, full_indexes: false
+  tenant :tenant, class_name: 'Account', full_indexes: true
 
   index(title: 1)
+  index({ name: 1 }, { full_index: false })
 end

data/spec/spec_helper.rb

@@ -2,7 +2,7 @@ MODELS = File.join(File.dirname(__FILE__), 'models')
 
 require 'simplecov'
 require 'coveralls'
-require 'database_cleaner'
+require 'database_cleaner-mongoid'
 
 SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
   SimpleCov::Formatter::HTMLFormatter,

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-multitenancy
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.4
 platform: ruby
 authors:
 - Aymeric Brisse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-23 00:00:00.000000000 Z
+date: 2024-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '10'
 description: MultiTenancy with Mongoid
 email:
 - aymeric.brisse@mperfect-memory.com
@@ -47,6 +47,8 @@ files:
 - Rakefile
 - gemfiles/Gemfile.mongoid-6
 - gemfiles/Gemfile.mongoid-7
+- gemfiles/Gemfile.mongoid-8
+- gemfiles/Gemfile.mongoid-9
 - lib/mongoid-multitenancy.rb
 - lib/mongoid/multitenancy.rb
 - lib/mongoid/multitenancy/document.rb
@@ -95,8 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 3.3.27
 signing_key: 
 specification_version: 4
 summary: Support of a multi-tenant database with Mongoid