mongoid-multitenancy 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95438e3e7adc7dc21d06a0deec16979183b37738
-  data.tar.gz: 61ce79abafb106d53af8dbf35c74523a04b43a31
+  metadata.gz: e24dad42cdd8d6692c7c37ae3d370c11615423ed
+  data.tar.gz: 0a6b110bab9bd521fe3be96a76cc7f10e9ef4957
 SHA512:
-  metadata.gz: 58cf2892dd86cd822f1fc436e745e53ffd128680164226323e5e32ac328bd14db877cd990ea29e01db130e4155b205a1de1a9b6cd040c7bc0381d1dfd89dc72a
-  data.tar.gz: 3ac676cd7c0df46eb10a703967f9375d51674f6a61f3a8ae637ea8cd7562b6361905def86aa52269af8dfcdfc1cbd29a9e4ea2eee8665ff35a1341207247d7fa
+  metadata.gz: 5ffaa31b8280e405b4b0e7acd7b5ad84e8c15ae3815be55a962526ef6cf9d918ea76d144041856d0f281153e31dbea025bdf5cee6ab0d1546436751022fa777c
+  data.tar.gz: 68fa75bceb0e1103a0307edafb1e0b2d4110bb1f76473b13a823d560dd35e5ca00a8bbc2c94413fcb358d77eb24e608cc9bdf8efe36139b8347051188cca5ecf

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 1.1
+
+### New Features
+
+* Add scopes *shared* and *unshared* (1b5c420)
+
+### Fixes
+
+* When a tenant is optional, do not override the tenant during persisted document initialization (81a9b45)
+
 ## 1.0.0
 
 ### New Features

data/lib/mongoid/multitenancy/document.rb

@@ -34,13 +34,13 @@ module Mongoid
           belongs_to association, assoc_options
 
           # Get the tenant model and its foreign key
-          self.tenant_field = reflect_on_association(association).foreign_key
+          self.tenant_field = reflect_on_association(association).foreign_key.to_sym
           self.tenant_options = multitenant_options
 
           # Validates the tenant field
           validates_tenancy_of tenant_field, multitenant_options
 
-          define_default_scope
+          define_scopes
           define_initializer association
           define_inherited association, options
           define_index if multitenant_options[:index]
@@ -120,7 +120,7 @@ module Mongoid
         def define_initializer(association)
           # Apply the default value when the default scope is complex (optional tenant)
           after_initialize lambda {
-            if Multitenancy.current_tenant && send(association.to_sym).nil?
+            if Multitenancy.current_tenant && send(association.to_sym).nil? && new_record?
               send "#{association}=".to_sym, Multitenancy.current_tenant
             end
           }
@@ -138,14 +138,14 @@ module Mongoid
 
         # @private
         #
-        # Set the default scope
-        def define_default_scope
+        # Define the scopes
+        def define_scopes
           # Set the default_scope to scope to current tenant
           default_scope lambda {
             if Multitenancy.current_tenant
               tenant_id = Multitenancy.current_tenant.id
               if tenant_options[:optional]
-                where(tenant_field.to_sym.in => [tenant_id, nil])
+                where(tenant_field.in => [tenant_id, nil])
               else
                 where(tenant_field => tenant_id)
               end
@@ -153,6 +153,9 @@ module Mongoid
               where(nil)
             end
           }
+
+          scope :shared, -> { where(tenant_field => nil) }
+          scope :unshared, -> { where(tenant_field => Multitenancy.current_tenant.id) }
         end
 
         # @private

data/lib/mongoid/multitenancy/version.rb

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

data/lib/mongoid/multitenancy.rb

@@ -20,16 +20,13 @@ module Mongoid
 
       # Affects a tenant temporary for a block execution
       def with_tenant(tenant, &block)
-        if block.nil?
-          raise ArgumentError, 'block required'
-        end
+        raise ArgumentError, 'block required' if block.nil?
 
         old_tenant = self.current_tenant
         self.current_tenant = tenant
-
-        block.call
-
+        result = block.call
         self.current_tenant = old_tenant
+        result
       end
     end
   end

data/spec/optional_spec.rb

@@ -17,45 +17,130 @@ describe Optional do
   it_behaves_like 'a tenantable model'
   it { is_expected.to validate_tenant_uniqueness_of(:slug) }
 
+  describe '#initialize' do
+    context 'within a client context' do
+      before do
+        Mongoid::Multitenancy.current_tenant = client
+      end
+
+      context 'when persisted' do
+        before do
+          item.client = nil
+          item.save!
+        end
+
+        it 'does not override the client' do
+          item.reload
+          expect(Optional.last.client).to be_nil
+        end
+      end
+    end
+  end
+
   describe '.default_scope' do
-    before do
-      @itemC = Optional.create!(title: 'title C', slug: 'article-c')
-      Mongoid::Multitenancy.with_tenant(client) { @itemX = Optional.create!(title: 'title X', slug: 'article-x', :client => client) }
-      Mongoid::Multitenancy.with_tenant(another_client) { @itemY = Optional.create!(title: 'title Y', slug: 'article-y', :client => another_client) }
+    let!(:item_a) do
+      Mongoid::Multitenancy.with_tenant(client) do
+        Optional.create!(title: 'title A', slug: 'article-a')
+      end
     end
 
-    context 'with a current tenant' do
-      before do
-        Mongoid::Multitenancy.current_tenant = another_client
+    let!(:item_b) do
+      Mongoid::Multitenancy.with_tenant(another_client) do
+        Optional.create!(title: 'title B', slug: 'article-b')
       end
+    end
+
+    let!(:shared_item) do
+      Optional.create!(title: 'title C', slug: 'article-c')
+    end
 
+    context 'with a current tenant' do
       it 'filters on the current tenant / free-tenant items' do
-        expect(Optional.all.to_a).to match_array [@itemY, @itemC]
+        Mongoid::Multitenancy.with_tenant(another_client) do
+          expect(Optional.all.to_a).to match_array [shared_item, item_b]
+        end
       end
     end
 
     context 'without a current tenant' do
-      before do
-        Mongoid::Multitenancy.current_tenant = nil
+      it 'does not filter on any tenant' do
+        expect(Optional.all.to_a).to match_array [item_a, item_b, shared_item]
       end
+    end
+  end
 
-      it 'does not filter on any tenant' do
-        expect(Optional.all.to_a).to match_array [@itemC, @itemX, @itemY]
+  describe '.shared' do
+    let!(:item_a) do
+      Mongoid::Multitenancy.with_tenant(client) do
+        Optional.create!(title: 'title A', slug: 'article-a')
+      end
+    end
+
+    let!(:item_b) do
+      Mongoid::Multitenancy.with_tenant(another_client) do
+        Optional.create!(title: 'title B', slug: 'article-b')
+      end
+    end
+
+    let!(:shared_item) do
+      Optional.create!(title: 'title C', slug: 'article-c')
+    end
+
+    it 'returns only the shared items' do
+      Mongoid::Multitenancy.with_tenant(another_client) do
+        expect(Optional.shared.to_a).to match_array [shared_item]
+      end
+    end
+  end
+
+  describe '.unshared' do
+    let!(:item_a) do
+      Mongoid::Multitenancy.with_tenant(client) do
+        Optional.create!(title: 'title A', slug: 'article-a')
+      end
+    end
+
+    let!(:item_b) do
+      Mongoid::Multitenancy.with_tenant(another_client) do
+        Optional.create!(title: 'title B', slug: 'article-b')
+      end
+    end
+
+    let!(:shared_item) do
+      Optional.create!(title: 'title C', slug: 'article-c')
+    end
+
+    it 'returns only the shared items' do
+      Mongoid::Multitenancy.with_tenant(another_client) do
+        expect(Optional.unshared.to_a).to match_array [item_b]
       end
     end
   end
 
   describe '#delete_all' do
-    before do
-      @itemC = Optional.create!(title: 'title C', slug: 'article-c')
-      Mongoid::Multitenancy.with_tenant(client) { @itemX = Optional.create!(title: 'title X', slug: 'article-x', :client => client) }
-      Mongoid::Multitenancy.with_tenant(another_client) { @itemY = Optional.create!(title: 'title Y', slug: 'article-y', :client => another_client) }
+    let!(:item_a) do
+      Mongoid::Multitenancy.with_tenant(client) do
+        Optional.create!(title: 'title A', slug: 'article-a')
+      end
+    end
+
+    let!(:item_b) do
+      Mongoid::Multitenancy.with_tenant(another_client) do
+        Optional.create!(title: 'title B', slug: 'article-b')
+      end
+    end
+
+    let!(:shared_item) do
+      Optional.create!(title: 'title C', slug: 'article-c')
     end
 
     context 'with a current tenant' do
       it 'only deletes the current tenant / free-tenant items' do
-        Mongoid::Multitenancy.with_tenant(another_client) { Optional.delete_all }
-        expect(Optional.all.to_a).to match_array [@itemX]
+        Mongoid::Multitenancy.with_tenant(another_client) do
+          Optional.delete_all
+        end
+
+        expect(Optional.all.to_a).to match_array [item_a]
       end
     end
 

data/spec/spec_helper.rb

@@ -43,7 +43,7 @@ RSpec.configure do |config|
     DatabaseCleaner.clean
   end
 
-  config.after(:each) do
+  config.before(:each) do
     Mongoid::Multitenancy.current_tenant = nil
   end
 end

data/spec/support/database_cleaner.rb

@@ -1,5 +1,3 @@
-require 'pp'
-
 class DatabaseCleaner
   class << self
     def clean

metadata

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