mongoid-multitenancy 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: facc15f874a27e6541f1d7963370a4c372c863e6
-  data.tar.gz: 686e5f4eca2e9c6e9b6245406aa0904bf33c7ee2
+  metadata.gz: 7a20d8d26c776318f1eb6407d0dc19017a721cdb
+  data.tar.gz: 1404d16b8b568ebf9a7744ce7f6fa5c5338fa91b
 SHA512:
-  metadata.gz: e7ff42bb09808638b9b10ca05d302d3f3c7b5974ef6aedd0a7debecdccbbb557889ac916b5b50727bd556930bb5299a317d52ba7742f4d7ebc24fe558c7329d3
-  data.tar.gz: d6df90fd199a0420952c244148e7ab7f10c60ab157d675adb76c577d5170395a29225d3fe9ee8dab6833d0b51a2d3b0c37253b59d2bec7705375f107d1ba19f8
+  metadata.gz: bed65acf48172bfaac61012ebdb5bc67bb73e96500835273e7ef45743cc7e77bddd5a32ed4b2ed52f11441e735f484311d1a192047a2b594c11b07e4ba4e1dce
+  data.tar.gz: 1271fa93a141b513d1d5587b6d4bd7ce4c0b294635d243292f35cc62cfe60349abe78b499ba689bc7913868746cb1ee6a91400d4a5ecf7bb0e1a691bf196db5c

data/lib/mongoid/multitenancy/document.rb

@@ -4,7 +4,7 @@ module Mongoid
       extend ActiveSupport::Concern
 
       module ClassMethods
-        attr_accessor :tenant_field, :full_indexes
+        attr_accessor :tenant_field, :tenant_options
 
         MULTITENANCY_OPTIONS = [:optional, :immutable, :full_indexes, :index]
 
@@ -16,7 +16,7 @@ module Mongoid
 
           # Get the tenant model and its foreign key
           self.tenant_field = reflect_on_association(association).foreign_key
-          self.full_indexes = options[:full_indexes]
+          self.tenant_options = extract_tenant_options(options)
 
           # Validates the tenant field
           validates tenant_field, tenant: options
@@ -46,21 +46,24 @@ module Mongoid
 
         # Redefine 'validates_with' to add the tenant scope when using a UniquenessValidator
         def validates_with(*args, &block)
-          validator = if Mongoid::Multitenancy.mongoid4?
-            Validatable::UniquenessValidator
-          else
-            Validations::UniquenessValidator
-          end
+          if !self.tenant_options[:optional]
+            validator = if Mongoid::Multitenancy.mongoid4?
+              Validatable::UniquenessValidator
+            else
+              Validations::UniquenessValidator
+            end
 
-          if args.first.ancestors.include?(validator)
-            args.last[:scope] = Array(args.last[:scope]) << self.tenant_field
+            if args.first.ancestors.include?(validator)
+              args.last[:scope] = Array(args.last[:scope]) << self.tenant_field
+            end
           end
+
           super(*args, &block)
         end
 
         # Redefine 'index' to include the tenant field in first position
         def index(spec, options = nil)
-          spec = { self.tenant_field => 1 }.merge(spec) if self.full_indexes
+          spec = { self.tenant_field => 1 }.merge(spec) if self.tenant_options[:full_indexes]
           super(spec, options)
         end
 
@@ -80,6 +83,16 @@ module Mongoid
 
           new_options
         end
+
+        def extract_tenant_options(options)
+          new_options = {}
+
+          options.each do |k, v|
+            new_options[k] = v if 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.3"
+    VERSION = "0.4.4"
   end
 end

data/spec/mandatory_spec.rb

@@ -3,6 +3,7 @@ require 'spec_helper'
 describe Mandatory do
 
   it_behaves_like "a tenantable model"
+  it { should validate_uniqueness_of(:slug).scoped_to(:client_id) }
 
   let(:client) { Account.create!(:name => "client") }
   let(:another_client) { Account.create!(:name => "another client") }
@@ -79,4 +80,4 @@ describe Mandatory do
       end
     end
   end
-end
+end

data/spec/models/mutable.rb

@@ -2,7 +2,7 @@ class Mutable
   include Mongoid::Document
   include Mongoid::Multitenancy::Document
 
-  tenant :client, :class_name => 'Account', :immutable => false, :optional => true
+  tenant :client, :class_name => 'Account', :immutable => false, :optional => false
 
   field :slug, :type => String
   field :title, :type => String

data/spec/optional_spec.rb

@@ -3,6 +3,7 @@ require 'spec_helper'
 describe Optional do
 
   it_behaves_like "a tenantable model"
+  it { should validate_uniqueness_of(:slug) }
 
   let(:client) { Account.create!(:name => "client") }
   let(:another_client) { Account.create!(:name => "another client") }
@@ -81,4 +82,4 @@ describe Optional do
       end
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -46,7 +46,6 @@ end
 shared_examples_for "a tenantable model" do
 
   it { should belong_to(:client) }
-  it { should validate_uniqueness_of(:slug).scoped_to(:client_id) }
   it { should have_index_for(:client_id => 1, :title => 1) }
 
 end
@@ -91,4 +90,4 @@ shared_examples_for "a tenant validator" do
       end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-multitenancy
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Aymeric Brisse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-29 00:00:00.000000000 Z
+date: 2015-07-17 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.4.4
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Support of a multi-tenant database with Mongoid