mongoid-multitenancy 0.4.4 → 1.0.0

data/spec/models/indexable.rb

@@ -2,9 +2,9 @@ class Indexable
   include Mongoid::Document
   include Mongoid::Multitenancy::Document
 
-  field :title, :type => String
+  field :title, type: String
 
   tenant :client, class_name: 'Account', index: true, full_indexes: false
 
-  index({ :title => 1 })
+  index({ title: 1 })
 end

data/spec/models/mandatory.rb

@@ -2,14 +2,14 @@ class Mandatory
   include Mongoid::Document
   include Mongoid::Multitenancy::Document
 
-  tenant(:client, :class_name => 'Account')
+  tenant(:client, class_name: 'Account')
 
-  field :slug, :type => String
-  field :title, :type => String
+  field :slug, type: String
+  field :title, type:String
 
-  validates_uniqueness_of :slug
+  validates_tenant_uniqueness_of :slug
   validates_presence_of :slug
   validates_presence_of :title
 
-  index({ :title => 1 })
+  index({ title: 1 })
 end

data/spec/models/mutable.rb

@@ -2,14 +2,14 @@ class Mutable
   include Mongoid::Document
   include Mongoid::Multitenancy::Document
 
-  tenant :client, :class_name => 'Account', :immutable => false, :optional => false
+  tenant :client, class_name: 'Account', immutable: false, optional: false
 
   field :slug, :type => String
   field :title, :type => String
 
-  validates_uniqueness_of :slug
+  validates_tenant_uniqueness_of :slug
   validates_presence_of :slug
   validates_presence_of :title
 
-  index({ :title => 1 })
+  index({ title: 1 })
 end

data/spec/models/optional.rb

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

data/spec/mongoid-multitenancy_spec.rb

@@ -1,22 +1,28 @@
-require "spec_helper"
+require 'spec_helper'
 
 describe Mongoid::Multitenancy do
-  let(:client) { Account.create!(:name => "client") }
-  let(:another_client) { Account.create!(:name => "another client") }
+  let(:client) do
+    Account.create!(name: 'client')
+  end
+
+  let(:another_client) do
+    Account.create!(name: 'another client')
+  end
 
-  before { Mongoid::Multitenancy.current_tenant = client }
-  after { Mongoid::Multitenancy.current_tenant = nil }
+  before do
+    Mongoid::Multitenancy.current_tenant = client
+  end
 
-  describe ".with_tenant" do
-    it "should change temporary the current tenant within the block" do
+  describe '.with_tenant' do
+    it 'changes temporary the current tenant within the block' do
       Mongoid::Multitenancy.with_tenant(another_client) do
-        Mongoid::Multitenancy.current_tenant.should == another_client
+        expect(Mongoid::Multitenancy.current_tenant).to eq another_client
       end
     end
 
-    it "should have restored the current tenant after the block" do
+    it 'restores the current tenant after the block' do
       Mongoid::Multitenancy.with_tenant(another_client) do ; end
-      Mongoid::Multitenancy.current_tenant.should == client
+      expect(Mongoid::Multitenancy.current_tenant).to eq client
     end
   end
-end
+end

data/spec/mutable_child_spec.rb

@@ -1,33 +1,47 @@
 require 'spec_helper'
 
 describe MutableChild do
+  let(:client) do
+    Account.create!(name: 'client')
+  end
+
+  let(:another_client) do
+    Account.create!(name: 'another client')
+  end
 
-  let(:client) { Account.create!(:name => "client") }
-  let(:another_client) { Account.create!(:name => "another client") }
+  let(:item) do
+    MutableChild.new(title: 'title X', slug: 'page-x')
+  end
 
-  describe "#valid?" do
-    before { Mongoid::Multitenancy.current_tenant = client; }
-    after { Mongoid::Multitenancy.current_tenant = nil }
+  it_behaves_like 'a tenantable model'
 
-    let(:item) { MutableChild.new(:title => "title X", :slug => "page-x") }
+  describe '#valid?' do
+    before do
+      Mongoid::Multitenancy.current_tenant = client
+    end
 
-    it_behaves_like "a tenant validator"
+    context 'when the tenant has not changed' do
+      before do
+        item.save!
+      end
 
-    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
+      it 'is valid' do
+        item.title = 'title X (2)'
+        expect(item).to 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
+    context 'when the tenant has changed' do
+      before do
+        item.save!
+        Mongoid::Multitenancy.current_tenant = another_client
+      end
+
+      it 'is valid' do
         item.client = another_client
-        item.should be_valid
+        expect(item).to be_valid
       end
     end
   end
 
-end
+end

data/spec/mutable_spec.rb

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

data/spec/optional_spec.rb

@@ -2,83 +2,125 @@ require 'spec_helper'
 
 describe Optional do
 
-  it_behaves_like "a tenantable model"
-  it { should validate_uniqueness_of(:slug) }
+  let(:client) do
+    Account.create!(name: 'client')
+  end
+
+  let(:another_client) do
+    Account.create!(name: 'another client')
+  end
+
+  let(:item) do
+    Optional.new(title: 'title X', slug: 'page-x')
+  end
 
-  let(:client) { Account.create!(:name => "client") }
-  let(:another_client) { Account.create!(:name => "another client") }
+  it_behaves_like 'a tenantable model'
+  it { is_expected.to validate_tenant_uniqueness_of(:slug) }
 
-  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) }
-    }
+  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) }
+    end
 
-    context "with a current tenant" do
-      before { Mongoid::Multitenancy.current_tenant = another_client }
-      after { Mongoid::Multitenancy.current_tenant = nil }
+    context 'with a current tenant' do
+      before do
+        Mongoid::Multitenancy.current_tenant = another_client
+      end
 
-      it "should filter on the current tenant / free-tenant items" do
-        Optional.all.to_a.should =~ [@itemY, @itemC]
+      it 'filters on the current tenant / free-tenant items' do
+        expect(Optional.all.to_a).to match_array [@itemY, @itemC]
       end
     end
 
-    context "without a current tenant" do
-      before { Mongoid::Multitenancy.current_tenant = nil }
+    context 'without a current tenant' do
+      before do
+        Mongoid::Multitenancy.current_tenant = nil
+      end
 
-      it "should not filter on any tenant" do
-        Optional.all.to_a.should =~ [@itemC, @itemX, @itemY]
+      it 'does not filter on any tenant' do
+        expect(Optional.all.to_a).to match_array [@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) }
-    }
+  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) }
+    end
 
-    context "with a current tenant" do
-      it "should only delete the current tenant / free-tenant items" do
+    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 }
-        Optional.all.to_a.should =~ [@itemX]
+        expect(Optional.all.to_a).to match_array [@itemX]
       end
     end
 
-    context "without a current tenant" do
-      it "should delete all the pages" do
+    context 'without a current tenant' do
+      it 'deletes all the pages' do
         Optional.delete_all
-        Optional.all.to_a.should be_empty
+        expect(Optional.all.to_a).to be_empty
       end
     end
   end
 
-  describe "#valid?" do
-    after { Mongoid::Multitenancy.current_tenant = nil }
+  describe '#valid?' do
+    context 'with a tenant' do
+      before do
+        item.client = client
+      end
+
+      it 'is valid' do
+        expect(item).to be_valid
+      end
 
-    let(:item) { Optional.new(:title => "title X", :slug => "page-x") }
+      context 'with a uniqueness constraint' do
+        let(:duplicate) do
+          Optional.new(title: 'title Y', slug: 'page-x')
+        end
 
-    it_behaves_like "a tenant validator"
+        before do
+          item.save!
+        end
 
-    context "with a current tenant" do
-      before { Mongoid::Multitenancy.current_tenant = client }
+        it 'does not allow duplicates on the same tenant' do
+          expect(duplicate).not_to be_valid
+        end
 
-      it "should not set the client field" do
-        item.valid?
-        item.client.should be_nil
+        it 'allow duplicates on a different same tenant' do
+          Mongoid::Multitenancy.with_tenant(another_client) do
+            expect(duplicate).to be_valid
+          end
+        end
       end
     end
 
-    context "without a current tenant" do
-      it "should not set the client field" do
-        item.valid?
-        item.client.should be_nil
+    context 'without a tenant' do
+      before do
+        item.client = nil
       end
 
-      it "should be valid" do
-        item.should be_valid
+      it 'is valid' do
+        expect(item).to be_valid
+      end
+
+      context 'with a uniqueness constraint' do
+        let(:duplicate) do
+          Optional.new(title: 'title Y', slug: 'page-x')
+        end
+
+        before do
+          item.save!
+        end
+
+        it 'does not allow duplicates on any client' do
+          Mongoid::Multitenancy.with_tenant(client) do
+            expect(duplicate).not_to be_valid
+          end
+        end
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-MODELS = File.join(File.dirname(__FILE__), "models")
+MODELS = File.join(File.dirname(__FILE__), 'models')
 
 require 'simplecov'
 require 'coveralls'
@@ -12,82 +12,38 @@ SimpleCov.start
 require 'rspec'
 require 'mongoid'
 require 'mongoid-multitenancy'
-require 'database_cleaner'
 require 'mongoid-rspec'
 
-require_relative 'support/mongoid'
+if Mongoid::VERSION.start_with? '5'
+  Mongo::Logger.logger.level = ::Logger::FATAL
+elsif Mongoid::VERSION.start_with? '4'
+  Moped.logger = nil
+end
+
+require_relative 'support/shared_examples'
+require_relative 'support/database_cleaner'
+require_relative 'support/mongoid_matchers'
 
 Dir["#{MODELS}/*.rb"].each { |f| require f }
 
 Mongoid.configure do |config|
-  config.connect_to "mongoid_multitenancy"
+  config.connect_to 'mongoid_multitenancy'
 end
 
-Mongoid.logger = Logger.new($stdout)
-
-DatabaseCleaner.orm = "mongoid"
+Mongoid.logger = nil
 
 RSpec.configure do |config|
   config.include Mongoid::Matchers
 
-  config.before(:all) do
-    DatabaseCleaner.strategy = :truncation
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
   end
 
   config.before(:each) do
-    DatabaseCleaner.start
-  end
-
-  config.after(:each) do
     DatabaseCleaner.clean
   end
-end
-
-shared_examples_for "a tenantable model" do
-
-  it { should belong_to(:client) }
-  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
+  config.after(:each) do
+    Mongoid::Multitenancy.current_tenant = nil
   end
 end