mongoid-multitenancy 0.3 → 0.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Njk4YWRlMTZhYzljNjc2ZjBiNjQwYWY1YmQ4NjAzMWM2OTIzZGExYw==
+    Y2Y1ODVlM2ZlMzZlMDRlZmEzM2MwOTRiNWI3NzRjZmRkNTNlNDI5MQ==
   data.tar.gz: !binary |-
-    NjcwYzEwZDNiYTlhODBiMWExNjY5MGVjOWI3ZTQ5MmQwM2Q2OWNiMQ==
+    Yjc4MjEyYTlkZWUxNDAwYjNlZTU5ZGQ3NmVkYWUzYWRlNDU1ZDE0NA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NzFmNjU1ODg0MzE0YzE4ODE0YTViODVhMGEzZWMyOGViZjBkNTg5MDg4ZWU4
-    M2ViY2MxMzE0YmU1MDY5NTAxNGQxN2NiOTJkNjg2NzM2ODA0ODMyYjJjYWM4
-    NmMyY2NjMzljMGJlY2VkNzMyYzA3OTJmYzk2NTY1ODhjOTllZWM=
+    MDYyZjllZGM4ZDFjNmU2ZWYxNGZlMTE1ZTUwZTQ0YmU2MjU4MTg4YmY2OWYx
+    ZWI2MGU0ZTdmNjY2YTEwMmYxZTBmOWRlMDQ5OWIwN2QxYjM4NjRiZTEyMjll
+    MGYzOTUwOGUyMjNmMmY4M2NkNWMyYzc3ZmU3NjBhNGM4Y2RlYTY=
   data.tar.gz: !binary |-
-    M2RiMmYxZGU5NWE5MGZjNzkxZTljNjU1ZjVjM2U1ZGM2Yzg3ZmRkYjhkYTBh
-    YzZkZTYyMjJjYjRmZWUwOTdmNGU2M2U2NTVmMjY5MTJjODE4Mzg1NmIzMDA4
-    YTQzZWZjMTAyYzAwYWExZWQ1NGNhODFlOGQ1NTExOTBiYzQzZmE=
+    N2VjZDQ1N2MzZTE4MjVhOTI2NDhkN2YzMGEwNTQwYzQyYjIwMzk2N2IyMTNh
+    NjM3MDQ4MWVlMThjZjVjNDc1OTkyNGJmZWE0OGNhZGQxZGYzNTg3Mzc1MTAy
+    NzEzZTI3ZThjYzA0ODdlMDE2YTMzMmZhYTIwNmU1N2Y4MDk5MDI=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mongoid-multitenancy (0.3)
+    mongoid-multitenancy (0.3.1)
       mongoid (~> 3)
 
 GEM

data/lib/mongoid/multitenancy/document.rb

@@ -3,35 +3,22 @@ module Mongoid
     module Document
       extend ActiveSupport::Concern
 
-      included do
-        private
-
-        # Check that the tenant foreign key field has not been changed once the object has been persisted
-        def check_tenant_immutability
-          # We check that the tenant has changed and that the old was not nil to avoid after_create callbacks issues.
-          # Indeed in this case, even if the flag is set to persisted, changes have not yet been reset.
-          if attribute_changed?(self.class.tenant_field) and attribute_was(self.class.tenant_field)
-            self.errors.add(self.class.tenant_field, 'is immutable and cannot be updated' )
-          end
-        end
-      end
-
       module ClassMethods
-        # Access to the tenant field
-        attr_reader :tenant_field, :tenant_options
+        attr_accessor :tenant_field
 
         def tenant(association = :account, options={})
-          @tenant_options = { optional: options.delete(:optional), immutable: options.delete(:immutable) { true } }
+          tenant_options = { optional: options.delete(:optional), immutable: options.delete(:immutable) { true } }
           # Setup the association between the class and the tenant class
           # TODO: should index this association if no other indexes are defined => , index: true
           belongs_to association, options
 
           # Get the tenant model and its foreign key
-          fkey = reflect_on_association(association).foreign_key
-          @tenant_field = fkey
+          tenant_field = reflect_on_association(association).foreign_key
+          self.tenant_field = tenant_field
 
           # Validates the presence of the association key
-          validates_presence_of fkey unless @tenant_options[:optional]
+          validates_presence_of tenant_field unless tenant_options[:optional]
+          validates tenant_field, immutable: { field: tenant_field } if tenant_options[:immutable]
 
           # Set the current_tenant on newly created objects
           after_initialize lambda { |m|
@@ -41,17 +28,14 @@ module Mongoid
             true
           }
 
-          # Rewrite accessors to make tenant foreign_key/association immutable
-          validate :check_tenant_immutability, :on => :update if @tenant_options[:immutable]
-
           # Set the default_scope to scope to current tenant
           default_scope lambda {
             criteria = if Multitenancy.current_tenant
-              if self.tenant_options[:optional]
+              if tenant_options[:optional]
                 #any_of({ self.tenant_field => Multitenancy.current_tenant.id }, { self.tenant_field => nil })
-                where({ self.tenant_field.to_sym.in => [Multitenancy.current_tenant.id, nil] })
+                where({ tenant_field.to_sym.in => [Multitenancy.current_tenant.id, nil] })
               else
-                where({ self.tenant_field => Multitenancy.current_tenant.id })
+                where({ tenant_field => Multitenancy.current_tenant.id })
               end
             else
               where(nil)

data/lib/mongoid/multitenancy/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Multitenancy
-    VERSION = "0.3"
+    VERSION = "0.3.1"
   end
 end

data/lib/mongoid/multitenancy.rb

@@ -1,10 +1,10 @@
+require "mongoid"
+require "mongoid/multitenancy/document"
+require "mongoid/multitenancy/version"
+require "mongoid/validators/immutable_validator"
+
 module Mongoid
   module Multitenancy
-    require "mongoid"
-
-    require "mongoid/multitenancy/document"
-    require "mongoid/multitenancy/version"
-
     class << self
 
       # Set the current tenant. Make it Thread aware

data/lib/mongoid/validators/immutable_validator.rb

@@ -0,0 +1,7 @@
+class ImmutableValidator < ActiveModel::EachValidator
+  def validate_each(object, attribute, value)
+    if object.send(:attribute_changed?, options[:field])  and object.send(:attribute_was, options[:field])
+      object.errors.add(options[:field], 'is immutable and cannot be updated') and false
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-multitenancy
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: 0.3.1
 platform: ruby
 authors:
 - Aymeric Brisse
@@ -126,6 +126,7 @@ files:
 - lib/mongoid/multitenancy.rb
 - lib/mongoid/multitenancy/document.rb
 - lib/mongoid/multitenancy/version.rb
+- lib/mongoid/validators/immutable_validator.rb
 - mongoid-multitenancy.gemspec
 - spec/models/account.rb
 - spec/models/article.rb