mongoid-multitenancy 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e151c5f6685219fa3632b566d9f6b5da8af7d5eb
-  data.tar.gz: dff2b8a2e7751b2a46441d0f9fb1a3664e3056d9
+  metadata.gz: facc15f874a27e6541f1d7963370a4c372c863e6
+  data.tar.gz: 686e5f4eca2e9c6e9b6245406aa0904bf33c7ee2
 SHA512:
-  metadata.gz: 9d82f6b364671ed9e87c3c5b301d10d34c0fdb2bf169e4c80a532fb001b6a0e75df91be8bb585452370eef9f8c3093902764799ca1a3dc02086b49ab14cc1a36
-  data.tar.gz: b8e2737fb53ad53d0a77b145b04e1f4bfec1310e47e7b20ca85ee23c93aab50cffd0b8892b6de5e1e0d1a8554fc44da62f93ca985cb5a4b50adaf713a3011db6
+  metadata.gz: e7ff42bb09808638b9b10ca05d302d3f3c7b5974ef6aedd0a7debecdccbbb557889ac916b5b50727bd556930bb5299a317d52ba7742f4d7ebc24fe558c7329d3
+  data.tar.gz: d6df90fd199a0420952c244148e7ab7f10c60ab157d675adb76c577d5170395a29225d3fe9ee8dab6833d0b51a2d3b0c37253b59d2bec7705375f107d1ba19f8

data/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'mongoid', '~> 4.0.alpha'
+gem 'mongoid', '~> 4.0'
 
 gem 'rake', '~> 10.0'
 

data/README.md

@@ -99,7 +99,8 @@ Mongoid::Multitenancy.current_tenant = Client.find_by(:name => 'Perfect Memory')
 Article.all # => all articles where client_id => 50ca04b86c82bfc125000025
 
  # New objects are scoped to the current tenant
-Article.new(:title => 'New blog') # => <#Article _id: nil, title: 'New blog', :client_id: 50ca04b86c82bfc125000025>
+article = Article.new(:title => 'New blog')
+article.save # => <#Article _id: 50ca04b86c82bfc125000044, title: 'New blog', client_id: 50ca04b86c82bfc125000025>
 
  # It can make the tenant field immutable once it is persisted to avoid inconsistency
 article.persisted? # => true
@@ -109,10 +110,27 @@ article.valid? # => false
 
 **Optional tenant**
 
-When setting an optional tenant, for example to allow shared instances between all the tenants, the default scope will return both the tenant and the free-tenant items. That means that using `Article.delete_all` or `Article.destroy_all` will remove the shared items too.
+When setting an optional tenant, for example to allow shared instances between all the tenants, the default scope will return both the tenant and the free-tenant items. That means that using `Article.delete_all` or `Article.destroy_all` will **remove the shared items too**. And that means too that **the tenant must be set manually**.
 
 ```ruby
-Article.all # => all articles where client_id.in [50ca04b86c82bfc125000025, nil]
+class Article
+  include Mongoid::Document
+  include Mongoid::Multitenancy::Document
+
+  tenant(:client, 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 = Article.new(:title => 'New article')
+  article.save # => <#Article _id: 50ca04b86c82bfc125000044, title: 'New blog', client_id: nil>
+
+  # tenant needs to be set manually
+  article.tenant = client_instance
+  article.save => <#Article _id: 50ca04b86c82bfc125000044, title: 'New blog', client_id: 50ca04b86c82bfc125000025>
+end
 ```
 
 Rails

data/lib/mongoid/multitenancy/document.rb

@@ -6,39 +6,28 @@ module Mongoid
       module ClassMethods
         attr_accessor :tenant_field, :full_indexes
 
+        MULTITENANCY_OPTIONS = [:optional, :immutable, :full_indexes, :index]
+
         def tenant(association = :account, options = {})
-          options = { full_indexes: true }.merge(options)
-          active_model_options = options.clone
-          to_index = active_model_options.delete(:index)
-          tenant_options = { optional: active_model_options.delete(:optional), immutable: active_model_options.delete(:immutable) { true } }
-          self.full_indexes = active_model_options.delete(:full_indexes)
+          options = { full_indexes: true, immutable: true }.merge(options)
 
           # Setup the association between the class and the tenant class
-          belongs_to association, active_model_options
+          belongs_to association, extract_association_options(options)
 
           # Get the tenant model and its foreign key
-          tenant_field = reflect_on_association(association).foreign_key
-          self.tenant_field = tenant_field
+          self.tenant_field = reflect_on_association(association).foreign_key
+          self.full_indexes = options[:full_indexes]
 
           # Validates the tenant field
-          validates tenant_field, tenant: tenant_options
-
-          # Set the current_tenant on newly created objects
-          before_validation lambda { |m|
-            if Multitenancy.current_tenant and !tenant_options[:optional] and m.send(association.to_sym).nil?
-              m.send "#{association}=".to_sym, Multitenancy.current_tenant
-            end
-            true
-          }
+          validates tenant_field, tenant: options
 
           # Set the default_scope to scope to current tenant
           default_scope lambda {
-            criteria = if Multitenancy.current_tenant
-              if tenant_options[:optional]
-                #any_of({ self.tenant_field => Multitenancy.current_tenant.id }, { self.tenant_field => nil })
-                where({ tenant_field.to_sym.in => [Multitenancy.current_tenant.id, nil] })
+            if Multitenancy.current_tenant
+              if options[:optional]
+                where(self.tenant_field.to_sym.in => [Multitenancy.current_tenant.id, nil])
               else
-                where({ tenant_field => Multitenancy.current_tenant.id })
+                where(self.tenant_field => Multitenancy.current_tenant.id)
               end
             else
               where(nil)
@@ -50,7 +39,7 @@ module Mongoid
             super(child)
           end
 
-          if to_index
+          if options[:index]
             index({self.tenant_field => 1}, { background: true })
           end
         end
@@ -79,6 +68,18 @@ module Mongoid
         def delete_all(conditions = nil)
           scoped.where(conditions).delete
         end
+
+        private
+
+        def extract_association_options(options)
+          new_options = {}
+
+          options.each do |k, v|
+            new_options[k] = v unless MULTITENANCY_OPTIONS.include?(k)
+          end
+
+          new_options
+        end
       end
     end
   end

data/lib/mongoid/multitenancy/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Multitenancy
-    VERSION = "0.4.2"
+    VERSION = "0.4.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-multitenancy
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Aymeric Brisse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-04 00:00:00.000000000 Z
+date: 2015-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -83,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Support of a multi-tenant database with Mongoid