mongoid-multitenancy 0.3.1 → 0.3.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2Y1ODVlM2ZlMzZlMDRlZmEzM2MwOTRiNWI3NzRjZmRkNTNlNDI5MQ==
+    ZWQ3NzVkNzFkZGVlMDc3Y2Y5NTc1ZjI0MDhkNjA0YWRhNDIxMzMzNA==
   data.tar.gz: !binary |-
-    Yjc4MjEyYTlkZWUxNDAwYjNlZTU5ZGQ3NmVkYWUzYWRlNDU1ZDE0NA==
+    ZDMzNmQyMmFmZmEyYTYwYWM5ZjA3NGI0NzkxOGI1MGIxYTU0NGM2OA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MDYyZjllZGM4ZDFjNmU2ZWYxNGZlMTE1ZTUwZTQ0YmU2MjU4MTg4YmY2OWYx
-    ZWI2MGU0ZTdmNjY2YTEwMmYxZTBmOWRlMDQ5OWIwN2QxYjM4NjRiZTEyMjll
-    MGYzOTUwOGUyMjNmMmY4M2NkNWMyYzc3ZmU3NjBhNGM4Y2RlYTY=
+    YjJkOGZlZDVkODlhODE3ZWUwYzM2NjliZmRhNjRhMDYxYWI3NWJiZDE5YWU3
+    YWQ3ODg1OWUwNzRmYTg2OWMyMDA2OTY2MmNlZGE1Y2JkNWExNTM1NjI4YTc0
+    NWYwZGE3MmE2OGYxMzNhZWNkMjI2YzE0ZmE2NGMyNzAzMmZiYTg=
   data.tar.gz: !binary |-
-    N2VjZDQ1N2MzZTE4MjVhOTI2NDhkN2YzMGEwNTQwYzQyYjIwMzk2N2IyMTNh
-    NjM3MDQ4MWVlMThjZjVjNDc1OTkyNGJmZWE0OGNhZGQxZGYzNTg3Mzc1MTAy
-    NzEzZTI3ZThjYzA0ODdlMDE2YTMzMmZhYTIwNmU1N2Y4MDk5MDI=
+    YTBlZjk0OGFmM2Q4YjZhYjYyNjc3MTY0MmNiYTBjZjgxODNjM2Y3ZDA1NzMx
+    YmQ4MDkxOGU4MTgyMWM5ZWRiYThkMTUxMGJkYmQxOTY0OTYwMGM2ZWE3YTAy
+    ZDFmYzg3Y2FjOTAxMDZkZWMwNTg1NjExOWY5NjFlZjc2NzJmNDg=

data/Gemfile.lock

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

data/lib/mongoid/multitenancy.rb

@@ -1,7 +1,7 @@
 require "mongoid"
 require "mongoid/multitenancy/document"
 require "mongoid/multitenancy/version"
-require "mongoid/validators/immutable_validator"
+require "mongoid/validators/tenant_validator"
 
 module Mongoid
   module Multitenancy

data/lib/mongoid/multitenancy/document.rb

@@ -16,13 +16,12 @@ module Mongoid
           tenant_field = reflect_on_association(association).foreign_key
           self.tenant_field = tenant_field
 
-          # Validates the presence of the association key
-          validates_presence_of tenant_field unless tenant_options[:optional]
-          validates tenant_field, immutable: { field: tenant_field } if tenant_options[:immutable]
+          # Validates the tenant field
+          validates tenant_field, tenant: tenant_options
 
           # Set the current_tenant on newly created objects
-          after_initialize lambda { |m|
-            if Multitenancy.current_tenant #and !self.class.tenant_options[:optional]
+          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

data/lib/mongoid/multitenancy/version.rb

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

data/lib/mongoid/validators/tenant_validator.rb

@@ -0,0 +1,20 @@
+class TenantValidator < ActiveModel::EachValidator
+  def validate_each(object, attribute, value)
+    # Immutable Check
+    if options[:immutable]
+      if object.send(:attribute_changed?, attribute) and object.send(:attribute_was, attribute)
+        object.errors.add(attribute, 'is immutable and cannot be updated')
+      end
+    end
+
+    # Ownership check
+    if value and Mongoid::Multitenancy.current_tenant and value != Mongoid::Multitenancy.current_tenant.id
+      object.errors.add(attribute, "not authorized")
+    end
+
+    # Optional Check
+    if !options[:optional] and value.nil?
+      object.errors.add(attribute, 'is mandatory')
+    end
+  end
+end

data/spec/immutable_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe Immutable do
+
+  it_behaves_like "a tenantable model"
+
+  let(:client) { Account.create!(:name => "client") }
+  let(:another_client) { Account.create!(:name => "another client") }
+
+  describe "#valid?" do
+    before { Mongoid::Multitenancy.current_tenant = client; }
+    after { Mongoid::Multitenancy.current_tenant = nil }
+
+    let(:item) { Immutable.new(:title => "title X", :slug => "page-x") }
+
+    it_behaves_like "a tenant validator"
+
+    context "when the tenant has not changed" do
+      before { item.save! }
+      it 'should be valid' do
+        item.title = "title X (2)"
+        item.should be_valid
+      end
+    end
+
+    context "when the tenant has changed" do
+      before { item.save!; Mongoid::Multitenancy.current_tenant = another_client }
+      it 'should not be valid' do
+        item.client = another_client
+        item.should_not be_valid
+      end
+    end
+  end
+end

data/spec/mandatory_spec.rb

@@ -0,0 +1,82 @@
+require 'spec_helper'
+
+describe Mandatory do
+
+  it_behaves_like "a tenantable model"
+
+  let(:client) { Account.create!(:name => "client") }
+  let(:another_client) { Account.create!(:name => "another client") }
+
+  describe ".default_scope" do
+    before {
+      Mongoid::Multitenancy.with_tenant(client) { @itemX = Mandatory.create!(:title => "title X", :slug => "article-x") }
+      Mongoid::Multitenancy.with_tenant(another_client) { @itemY = Mandatory.create!(:title => "title Y", :slug => "article-y") }
+    }
+
+    context "with a current tenant" do
+      before { Mongoid::Multitenancy.current_tenant = another_client }
+      after { Mongoid::Multitenancy.current_tenant = nil }
+
+      it "should filter on the current tenant" do
+        Mandatory.all.to_a.should =~ [@itemY]
+      end
+    end
+
+    context "without a current tenant" do
+      before { Mongoid::Multitenancy.current_tenant = nil }
+
+      it "should not filter on any tenant" do
+        Mandatory.all.to_a.should =~ [@itemX, @itemY]
+      end
+    end
+  end
+
+  describe "#delete_all" do
+    before {
+      Mongoid::Multitenancy.with_tenant(client) { @itemX = Mandatory.create!(:title => "title X", :slug => "article-x") }
+      Mongoid::Multitenancy.with_tenant(another_client) { @itemY = Mandatory.create!(:title => "title Y", :slug => "article-y") }
+    }
+
+    context "with a current tenant" do
+      it "should only delete the current tenant" do
+        Mongoid::Multitenancy.with_tenant(another_client) { Mandatory.delete_all }
+        Mandatory.all.to_a.should =~ [@itemX]
+      end
+    end
+
+    context "without a current tenant" do
+      it "should delete all the items" do
+        Mandatory.delete_all
+        Mandatory.all.to_a.should be_empty
+      end
+    end
+  end
+
+  describe "#valid?" do
+    after { Mongoid::Multitenancy.current_tenant = nil }
+
+    let(:item) { Mandatory.new(:title => "title X", :slug => "page-x") }
+
+    it_behaves_like "a tenant validator"
+
+    context "with a current tenant" do
+      before { Mongoid::Multitenancy.current_tenant = client }
+
+      it "should set the client field" do
+        item.valid?
+        item.client.should eq client
+      end
+    end
+
+    context "without a current tenant" do
+      it "should not set the client field" do
+        item.valid?
+        item.client.should be_nil
+      end
+
+      it "should be invalid" do
+        item.should_not be_valid
+      end
+    end
+  end
+end

data/spec/models/immutable.rb

@@ -0,0 +1,15 @@
+class Immutable
+  include Mongoid::Document
+  include Mongoid::Multitenancy::Document
+
+  tenant(:client, :class_name => 'Account', :immutable => true)
+
+  field :slug, :type => String
+  field :title, :type => String
+
+  validates_uniqueness_of :slug
+  validates_presence_of :slug
+  validates_presence_of :title
+
+  index({ :title => 1 })
+end

data/spec/models/{page.rb → mandatory.rb}

@@ -1,8 +1,8 @@
-class Page
+class Mandatory
   include Mongoid::Document
   include Mongoid::Multitenancy::Document
 
-  tenant(:client, :class_name => 'Account', :optional => true )
+  tenant(:client, :class_name => 'Account')
 
   field :slug, :type => String
   field :title, :type => String
@@ -12,4 +12,4 @@ class Page
   validates_presence_of :title
 
   index({ :title => 1 })
-end
+end

data/spec/models/{article.rb → mutable.rb}

@@ -1,4 +1,4 @@
-class Article
+class Mutable
   include Mongoid::Document
   include Mongoid::Multitenancy::Document
 

data/spec/models/optional.rb

@@ -0,0 +1,15 @@
+class Optional
+  include Mongoid::Document
+  include Mongoid::Multitenancy::Document
+
+  tenant(:client, :class_name => 'Account', :optional => true)
+
+  field :slug, :type => String
+  field :title, :type => String
+
+  validates_uniqueness_of :slug
+  validates_presence_of :slug
+  validates_presence_of :title
+
+  index({ :title => 1 })
+end

data/spec/mongoid-multitenancy_spec.rb

@@ -19,182 +19,4 @@ describe Mongoid::Multitenancy do
       Mongoid::Multitenancy.current_tenant.should == client
     end
   end
-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) }
-
-  let(:client) { Account.create!(:name => "client") }
-  let(:another_client) { Account.create!(:name => "another client") }
-
-  describe ".initialize" do
-    before { Mongoid::Multitenancy.current_tenant = client }
-    after { Mongoid::Multitenancy.current_tenant = nil }
-
-    it "should set the client field" do
-      described_class.new.client.should eq client
-    end
-  end
-
-end
-
-describe Page do
-
-  it_behaves_like "a tenantable model"
-
-  it { should_not validate_presence_of(:client_id) }
-
-  let(:client) { Account.create!(:name => "client") }
-  let(:another_client) { Account.create!(:name => "another client") }
-
-  describe ".default_scope" do
-    before {
-      @itemC = described_class.create!(:title => "title C", :slug => "article-c")
-      Mongoid::Multitenancy.with_tenant(client) { @itemX = described_class.create!(:title => "title X", :slug => "article-x") }
-      Mongoid::Multitenancy.with_tenant(another_client) { @itemY = described_class.create!(:title => "title Y", :slug => "article-y") }
-    }
-
-    context "with a current tenant" do
-      before { Mongoid::Multitenancy.current_tenant = another_client }
-      after { Mongoid::Multitenancy.current_tenant = nil }
-
-      it "should filter on the current tenant / free-tenant items" do
-        described_class.all.to_a.should =~ [@itemY, @itemC]
-      end
-    end
-
-    context "without a current tenant" do
-      before { Mongoid::Multitenancy.current_tenant = nil }
-
-      it "should not filter on any tenant" do
-        described_class.all.to_a.should =~ [@itemC, @itemX, @itemY]
-      end
-    end
-  end
-
-  describe "#delete_all" do
-    before {
-      @itemC = described_class.create!(:title => "title C", :slug => "article-c")
-      Mongoid::Multitenancy.with_tenant(client) { @itemX = described_class.create!(:title => "title X", :slug => "article-x") }
-      Mongoid::Multitenancy.with_tenant(another_client) { @itemY = described_class.create!(:title => "title Y", :slug => "article-y") }
-    }
-
-    context "with a current tenant" do
-      it "should only delete the current tenant / free-tenant items" do
-        Mongoid::Multitenancy.with_tenant(another_client) { described_class.delete_all }
-        described_class.all.to_a.should =~ [@itemX]
-      end
-    end
-
-    context "without a current tenant" do
-      it "should delete all the pages" do
-        described_class.delete_all
-        described_class.all.to_a.should be_empty
-      end
-    end
-  end
-
-end
-
-describe Article do
-
-  it_behaves_like "a tenantable model"
-
-  it { should validate_presence_of(:client_id) }
-
-  let(:client) { Account.create!(:name => "client") }
-  let(:another_client) { Account.create!(:name => "another client") }
-
-  describe ".default_scope" do
-    before {
-      Mongoid::Multitenancy.with_tenant(client) { @itemX = described_class.create!(:title => "title X", :slug => "article-x") }
-      Mongoid::Multitenancy.with_tenant(another_client) { @itemY = described_class.create!(:title => "title Y", :slug => "article-y") }
-    }
-
-    context "with a current tenant" do
-      before { Mongoid::Multitenancy.current_tenant = another_client }
-      after { Mongoid::Multitenancy.current_tenant = nil }
-
-      it "should filter on the current tenant" do
-        described_class.all.to_a.should =~ [@itemY]
-      end
-    end
-
-    context "without a current tenant" do
-      before { Mongoid::Multitenancy.current_tenant = nil }
-
-      it "should not filter on any tenant" do
-        described_class.all.to_a.should =~ [@itemX, @itemY]
-      end
-    end
-  end
-
-  describe "#valid?" do
-    before { Mongoid::Multitenancy.current_tenant = client }
-    after { Mongoid::Multitenancy.current_tenant = nil }
-
-    context "with :immutable" do
-      let(:item) { Page.create!(:title => "title X", :slug => "article-x") }
-
-      context "when the tenant has not changed" do
-        it 'should be valid' do
-          item.title = "title X (2)"
-          item.should be_valid
-        end
-      end
-
-      context "when the tenant has changed" do
-        it 'should be invalid' do
-          item.title = "title X (2)"
-          item.client = another_client
-          item.should_not be_valid
-        end
-      end
-    end
-
-    context "without :immutable" do
-      let(:item) { Article.create!(:title => "title X", :slug => "article-x") }
-
-      context "when the tenant has not changed" do
-        it 'should be valid' do
-          item.title = "title X (2)"
-          item.should be_valid
-        end
-      end
-
-      context "when the tenant has changed" do
-        it 'should be valid' do
-          item.title = "title X (2)"
-          item.client = another_client
-          item.should be_valid
-        end
-      end
-    end
-
-  end
-
-  describe "#delete_all" do
-    before {
-      Mongoid::Multitenancy.with_tenant(client) { @itemX = described_class.create!(:title => "title X", :slug => "article-x") }
-      Mongoid::Multitenancy.with_tenant(another_client) { @itemY = described_class.create!(:title => "title Y", :slug => "article-y") }
-    }
-
-    context "with a current tenant" do
-      it "should only delete the current tenant articles" do
-        Mongoid::Multitenancy.with_tenant(another_client) { described_class.delete_all }
-        described_class.all.to_a.should =~ [@itemX]
-      end
-    end
-
-    context "without a current tenant" do
-      it "should delete all the articles" do
-        described_class.delete_all
-        described_class.all.to_a.should be_empty
-      end
-    end
-  end
-
-end
+end

data/spec/mutable_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe Mutable do
+
+  it_behaves_like "a tenantable model"
+
+  let(:client) { Account.create!(:name => "client") }
+  let(:another_client) { Account.create!(:name => "another client") }
+
+  describe "#valid?" do
+    before { Mongoid::Multitenancy.current_tenant = client; }
+    after { Mongoid::Multitenancy.current_tenant = nil }
+
+    let(:item) { Mutable.new(:title => "title X", :slug => "page-x") }
+
+    it_behaves_like "a tenant validator"
+
+    context "when the tenant has not changed" do
+      before { item.save! }
+      it 'should be valid' do
+        item.title = "title X (2)"
+        item.should be_valid
+      end
+    end
+
+    context "when the tenant has changed" do
+      before { item.save!; Mongoid::Multitenancy.current_tenant = another_client }
+      it 'should be valid' do
+        item.client = another_client
+        item.should be_valid
+      end
+    end
+  end
+end

data/spec/optional_spec.rb

@@ -0,0 +1,84 @@
+require 'spec_helper'
+
+describe Optional do
+
+  it_behaves_like "a tenantable model"
+
+  let(:client) { Account.create!(:name => "client") }
+  let(:another_client) { Account.create!(:name => "another client") }
+
+  describe ".default_scope" do
+    before {
+      @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) }
+    }
+
+    context "with a current tenant" do
+      before { Mongoid::Multitenancy.current_tenant = another_client }
+      after { Mongoid::Multitenancy.current_tenant = nil }
+
+      it "should filter on the current tenant / free-tenant items" do
+        Optional.all.to_a.should =~ [@itemY, @itemC]
+      end
+    end
+
+    context "without a current tenant" do
+      before { Mongoid::Multitenancy.current_tenant = nil }
+
+      it "should not filter on any tenant" do
+        Optional.all.to_a.should =~ [@itemC, @itemX, @itemY]
+      end
+    end
+  end
+
+  describe "#delete_all" do
+    before {
+      @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) }
+    }
+
+    context "with a current tenant" do
+      it "should only delete the current tenant / free-tenant items" do
+        Mongoid::Multitenancy.with_tenant(another_client) { Optional.delete_all }
+        Optional.all.to_a.should =~ [@itemX]
+      end
+    end
+
+    context "without a current tenant" do
+      it "should delete all the pages" do
+        Optional.delete_all
+        Optional.all.to_a.should be_empty
+      end
+    end
+  end
+
+  describe "#valid?" do
+    after { Mongoid::Multitenancy.current_tenant = nil }
+
+    let(:item) { Optional.new(:title => "title X", :slug => "page-x") }
+
+    it_behaves_like "a tenant validator"
+
+    context "with a current tenant" do
+      before { Mongoid::Multitenancy.current_tenant = client }
+
+      it "should not set the client field" do
+        item.valid?
+        item.client.should be_nil
+      end
+    end
+
+    context "without a current tenant" do
+      it "should not set the client field" do
+        item.valid?
+        item.client.should be_nil
+      end
+
+      it "should be valid" do
+        item.should be_valid
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -36,3 +36,53 @@ RSpec.configure do |config|
     DatabaseCleaner.clean
   end
 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
+
+shared_examples_for "a tenant validator" do
+  context "within a client context" do
+    before { Mongoid::Multitenancy.current_tenant = client }
+
+    context "with the client id" do
+      before { item.client = client }
+
+      it "should be valid" do
+        item.should be_valid
+      end
+    end
+
+    context "with another client id" do
+      before { item.client = another_client }
+
+      it "should be invalid" do
+        item.should_not be_valid
+      end
+    end
+  end
+
+  context "without a client context" do
+    before { Mongoid::Multitenancy.current_tenant = nil }
+
+    context "with the client id" do
+      before { item.client = client }
+
+      it "should be valid" do
+        item.should be_valid
+      end
+    end
+
+    context "with another client id" do
+      before { item.client = another_client }
+
+      it "should be valid" do
+        item.should be_valid
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-multitenancy
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Aymeric Brisse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-30 00:00:00.000000000 Z
+date: 2013-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -126,12 +126,18 @@ files:
 - lib/mongoid/multitenancy.rb
 - lib/mongoid/multitenancy/document.rb
 - lib/mongoid/multitenancy/version.rb
-- lib/mongoid/validators/immutable_validator.rb
+- lib/mongoid/validators/tenant_validator.rb
 - mongoid-multitenancy.gemspec
+- spec/immutable_spec.rb
+- spec/mandatory_spec.rb
 - spec/models/account.rb
-- spec/models/article.rb
-- spec/models/page.rb
+- spec/models/immutable.rb
+- spec/models/mandatory.rb
+- spec/models/mutable.rb
+- spec/models/optional.rb
 - spec/mongoid-multitenancy_spec.rb
+- spec/mutable_spec.rb
+- spec/optional_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/PerfectMemory/mongoid-multitenancy
 licenses: []
@@ -157,9 +163,15 @@ signing_key:
 specification_version: 4
 summary: Support of a multi-tenant database with Mongoid
 test_files:
+- spec/immutable_spec.rb
+- spec/mandatory_spec.rb
 - spec/models/account.rb
-- spec/models/article.rb
-- spec/models/page.rb
+- spec/models/immutable.rb
+- spec/models/mandatory.rb
+- spec/models/mutable.rb
+- spec/models/optional.rb
 - spec/mongoid-multitenancy_spec.rb
+- spec/mutable_spec.rb
+- spec/optional_spec.rb
 - spec/spec_helper.rb
 has_rdoc: 

data/lib/mongoid/validators/immutable_validator.rb

@@ -1,7 +0,0 @@
-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