mongoid-multitenancy 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b73b7aa6b228218cdc8f7984b1e1b6ba340f06f23ad4730e533c7eda4fe9023
-  data.tar.gz: bf9b89578b7afef058724f6e3170b5158590894d6267d419df9675c1fa786e08
+  metadata.gz: 485b7b5927867bd3f2e3d33aa0705a0f78422a81cba9b5f207b7c71ba56fda65
+  data.tar.gz: 07c63615e55a7a66d7776bf61b8fd741dd15105bfb14404742242dfe36cc0387
 SHA512:
-  metadata.gz: 59a416b22144c02a3617356317421b27b6bb73947556c96c34ce36e67525d2b6a84a15bc5cd9f66d0acd9efd93e88cccaa1273c1dd4d3e6a08651acd294f5777
-  data.tar.gz: 3eefea63c163088fd87870cbe58d04aa8f17df612da993c552f666d01ebb4d9bf520715735f1afc04a234fba7a25573ba3e06b37bbc2c6c95951e8f4370da579
+  metadata.gz: 406b1104c97d9faa39822f114bb4c4b0687e2aedcf0f307e5dc2d90a96ef11a89509988a585f79030aec5ec2948ead959a351d558cc933152f55344b6ee3c96f
+  data.tar.gz: e46f79ec9b5dbe8adef7f3f5da17e6eb34397f600679e5c2f8c140b1c6911a88712b919b3c3e7a4fc9938f63731354c268e97345261441384ac821f83d2e3ebd

data/CHANGELOG.md

@@ -4,6 +4,11 @@ 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.5] - 2024-09-20
+### Fixed
+
+* Fix uniqueness validator when used with conditions
+
 ## [2.0.4] - 2024-06-17
 ### Fixed
 

data/README.md

@@ -226,6 +226,22 @@ class Article
 end
 ```
 
+TenantUniqueness validator also allow to specify additional `conditions` to limit the uniqueness of the constraint.
+
+```ruby
+class Article
+  include Mongoid::Document
+  include Mongoid::Multitenancy::Document
+
+  tenant :tenant, optional: true
+
+  field :title
+  field :slug
+
+  validates_tenant_uniqueness_of :slug, exclude_shared: true, conditions: -> { ne(title: nil) }
+end
+```
+
 Mongoid indexes
 -------------------
 

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

@@ -37,7 +37,11 @@ module Mongoid
 
         # <<Add the tenant Criteria>>
         criteria = with_tenant_criterion(criteria, klass, document)
-        criteria = criteria.merge(options[:conditions].call) if options[:conditions]
+        # Add additional conditions
+        if options[:conditions]
+          conditions = klass.unscoped { options[:conditions].call }
+          criteria = criteria.merge(conditions)
+        end
 
         if criteria.read(mode: :primary).exists?
           add_error(document, attribute, value)

data/lib/mongoid/multitenancy/version.rb

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

data/spec/conditional_uniqueness_spec.rb

@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+describe ConditionalUniqueness do
+  let(:client) do
+    Account.create!(name: 'client')
+  end
+
+  let(:another_client) do
+    Account.create!(name: 'another client')
+  end
+
+  let(:item) do
+    ConditionalUniqueness.new(approved: true, 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 duplicate on the constraint' do
+        let(:duplicate) do
+          ConditionalUniqueness.new(approved: true, slug: 'page-x')
+        end
+
+        before do
+          item.save!
+        end
+
+        it 'is not valid' do
+          expect(duplicate).not_to be_valid
+        end
+
+        context 'with a duplicate outside the conditions' do
+          before do
+            item.update(approved: false)
+          end
+
+          it 'is valid' do
+            expect(duplicate).to be_valid
+          end
+        end
+
+        context 'with a different tenant' do
+          it 'is valid' do
+            Mongoid::Multitenancy.with_tenant(another_client) do
+              expect(duplicate).to be_valid
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/spec/models/conditional_uniqueness.rb

@@ -0,0 +1,14 @@
+class ConditionalUniqueness
+  include Mongoid::Document
+  include Mongoid::Multitenancy::Document
+
+  tenant(:tenant, class_name: 'Account', optional: true)
+
+  field :slug, type: String
+  field :approved, type: Boolean, default: false
+
+  validates_tenant_uniqueness_of :slug, conditions: -> { where(approved: true) }
+  validates_presence_of :slug
+
+  index(title: 1)
+end

data/spec/models/optional_exclude.rb

@@ -7,7 +7,7 @@ class OptionalExclude
   field :slug, type: String
   field :title, type: String
 
-  validates_tenant_uniqueness_of :slug, exclude_shared: true
+  validates_tenant_uniqueness_of :slug, exclude_shared: true, conditions: -> { ne(title: nil) }
   validates_presence_of :slug
   validates_presence_of :title
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-multitenancy
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Aymeric Brisse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-17 00:00:00.000000000 Z
+date: 2024-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -56,11 +56,13 @@ files:
 - lib/mongoid/multitenancy/validators/tenant_uniqueness.rb
 - lib/mongoid/multitenancy/version.rb
 - mongoid-multitenancy.gemspec
+- spec/conditional_uniqueness_spec.rb
 - spec/immutable_spec.rb
 - spec/indexable_spec.rb
 - spec/inheritance_spec.rb
 - spec/mandatory_spec.rb
 - spec/models/account.rb
+- spec/models/conditional_uniqueness.rb
 - spec/models/immutable.rb
 - spec/models/indexable.rb
 - spec/models/mandatory.rb
@@ -102,11 +104,13 @@ signing_key:
 specification_version: 4
 summary: Support of a multi-tenant database with Mongoid
 test_files:
+- spec/conditional_uniqueness_spec.rb
 - spec/immutable_spec.rb
 - spec/indexable_spec.rb
 - spec/inheritance_spec.rb
 - spec/mandatory_spec.rb
 - spec/models/account.rb
+- spec/models/conditional_uniqueness.rb
 - spec/models/immutable.rb
 - spec/models/indexable.rb
 - spec/models/mandatory.rb