acts_as_tenant 0.4.0 → 0.5.0

data/.gitignore

@@ -1,7 +0,0 @@
-.rvmrc
-*.gem
-.bundle
-Gemfile.lock
-pkg/*
-spec/*.sqlite3
-spec/*.log

data/.travis.yml

@@ -1,6 +0,0 @@
-language: ruby
-services:
-  - mongodb
-before_install:
-  - gem update bundler
-script: bundle exec rake spec:all

data/CHANGELOG.md

@@ -1,101 +0,0 @@
-0.4.0
-------
-* (Sub)domain lookup is no longer case insensitive
-* Added ability to use inverse_of (thx lowjoel)
-* Added ability to disable tenant checking for a block (thx duboff)
-* Allow for validation that associations belong to the tenant to reflect on associations which return an Array from `where` (thx ludamillion)
-
-0.3.9
------
-* Added ability to configure a default tenant for testing purposes. (thx iangreenleaf)
-* AaT will now accept a string for a tenant_id (thx calebthompson)
-* Improvements to readme (thx stgeneral)
-
-0.3.8
------
-* Added Mongoid compatibility [thx iangreenleaf]
-
-0.3.7
------
-* Fix for proper handling of polymorphic associations (thx sol1dus)
-* Fix fefault scope to generate correct sql when using database prefix (thx IgorDobryn)
-* Added ability to specify a custom Primary Key (thx matiasdim)
-* Sidekiq 3.2.2+ no longer supports Ruby 1.9. Locking Sidekiq in gemspec at 3.2.1.
-* Update RSPEC to 3.0. Convert all specs (thx petergoldstein)
-* support sidekiq 3 interface (thx davekaro)
-
-0.3.6
------
-* Added method `set_current_tenant_by_subdomain_or_domain` (thx preth00nker)
-
-0.3.5
------
-* Fix to degredation introduced after 3.1 that prevented tenant_id from being set during initialization (thx jorgevaldivia)
-
-0.3.4
------
-* Fix to a bug introduced in 0.3.2
-
-0.3.3
------
-* Support user defined foreign keys on scoped models
-
-0.3.2
------
-* correctly support nested models with has_many :through (thx dexion)
-* Support 'www.subdomain.example.com' (thx wtfiwtz)
-* Support setting `tenant_id` on scoped models if the `tenant_id` is nil (thx Matt Wilson)
-
-0.3.1
------
-* Added support for Rails 4
-
-0.3.0
------
-* You can now raise an exception if a query on a scope model is made without a tenant set. Adding an initializer that sets config.require_tenant to true will accomplish this. See readme for more details.
-* `ActsAsTenant.with_tenant` will now return the value of the block it evaluates instead of the original tenant. The original tenant is restored automatically.
-* acts_as_tenant now raises standard errors which can be caught individually.
-* `set_current_tenant_to`, which was deprecated some versions ago and could lead to weird errors, has been removed.
-
-
-0.2.9
------
-* Added support for many-to-many associations (thx Nucleoid)
-
-0.2.8
------
-* Added dependencies to gemspec (thx aaronrenner)
-* Added the `ActsAsTenant.with_tenant` block method (see readme) (thx aaronrenner)
-* Acts_as_Tenant is now thread safe (thx davide)
-
-0.2.7
------
-* Changed the interface for passing in the current_tenant manually in the controller. `set_current_tenant_to` has been deprecated and replaced by `set_current_tenant_through_filter` declaration and the `set_current_tenant` method. See readme for details.
-
-0.2.6
------
-* Fixed a bug with resolving the tenant model name (thx devton!)
-* Added support for using relations: User.create(:account => Account.first) now works, while it wouldn't before (thx bnmrrs)
-
-0.2.5
------
-* Added Rails 3.2 compatibility (thx nickveys!)
-
-0.2.4
------
-* Added correct handling of child models that do not have their parent set (foreign key == nil)
-
-
-0.2.3
------
-* Added support for models that declare a has_one relationships, these would error out in the previous versions.
-
-
-0.2.2
------
-* Enhancements
-  * Added support for aliased associations ( belongs_to :something, :class_name => 'SomethingElse'). In previous version these would raise an 'uninitialized constant' error.
-
-0.2.1
------
-* Initial release

data/Gemfile

@@ -1,4 +0,0 @@
-source "http://rubygems.org"
-
-# Specify your gem's dependencies in acts_as_tenant.gemspec
-gemspec

data/acts_as_tenant.gemspec

@@ -1,33 +0,0 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "acts_as_tenant/version"
-
-Gem::Specification.new do |s|
-  s.name        = "acts_as_tenant"
-  s.version     = ActsAsTenant::VERSION
-  s.authors     = ["Erwin Matthijssen"]
-  s.email       = ["erwin.matthijssen@gmail.com"]
-  s.homepage    = "http://www.rollcallapp.com/blog"
-  s.summary     = %q{Add multi-tenancy to Rails applications using a shared db strategy}
-  s.description = %q{Integrates multi-tenancy into a Rails application in a convenient and out-of-your way manner}
-
-  s.rubyforge_project = "acts_as_tenant"
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-
-  #add_runtime_dependency("rails")
-  s.add_runtime_dependency('request_store', '>= 1.0.5')
-  s.add_dependency('rails','>= 3.1')
-  #s.add_dependency('request_store', '>= 1.0.5')
-
-  s.add_development_dependency('rspec', '>=3.0')
-  s.add_development_dependency('rspec-rails')
-  s.add_development_dependency('database_cleaner', '~> 1.3.0')
-  s.add_development_dependency('sqlite3')
-  s.add_development_dependency('mongoid', '~> 4.0')
-
-  s.add_development_dependency('sidekiq', '3.2.1')
-end

data/rails/init.rb

@@ -1,2 +0,0 @@
-ActiveRecord::Base.send(:include, ActsAsTenant::ModelExtensions)
-ActionController::Base.extend ActsAsTenant::ControllerExtensions

data/spec/active_record_helper.rb

@@ -1,22 +0,0 @@
-require 'rails/all'
-require 'database_cleaner'
-require 'yaml'
-
-dbconfig = YAML::load(IO.read(File.join(File.dirname(__FILE__), 'database.yml')))
-ActiveRecord::Base.logger = Logger.new(File.join(File.dirname(__FILE__), "debug.log"))
-ActiveRecord::Base.establish_connection(dbconfig[ENV['DB'] || 'sqlite'])
-
-RSpec.configure do |config|
-  config.before(:suite) do
-    DatabaseCleaner[:active_record].strategy = :transaction
-    DatabaseCleaner[:active_record].clean_with(:truncation)
-  end
-
-  config.before(:each) do
-    DatabaseCleaner[:active_record].start
-  end
-
-  config.after(:each) do
-    DatabaseCleaner[:active_record].clean
-  end
-end

data/spec/active_record_models.rb

@@ -1,109 +0,0 @@
-ActiveRecord::Schema.define(:version => 1) do
-  create_table :accounts, :force => true do |t|
-    t.column :name, :string
-    t.column :subdomain, :string
-    t.column :domain, :string
-  end
-
-  create_table :projects, :force => true do |t|
-    t.column :name, :string
-    t.column :account_id, :integer
-  end
-
-  create_table :managers, :force => true do |t|
-    t.column :name, :string
-    t.column :project_id, :integer
-    t.column :account_id, :integer
-  end
-
-  create_table :tasks, :force => true do |t|
-    t.column :name, :string
-    t.column :account_id, :integer
-    t.column :project_id, :integer
-    t.column :completed, :boolean
-  end
-
-  create_table :countries, :force => true do |t|
-    t.column :name, :string
-  end
-
-  create_table :unscoped_models, :force => true do |t|
-    t.column :name, :string
-  end
-
-  create_table :aliased_tasks, :force => true do |t|
-    t.column :name, :string
-    t.column :project_alias_id, :integer
-    t.column :account_id, :integer
-  end
-
-  create_table :unique_tasks, :force => true do |t|
-    t.column :name, :string
-    t.column :user_defined_scope, :string
-    t.column :project_id, :integer
-    t.column :account_id, :integer
-  end
-
-  create_table :custom_foreign_key_tasks, :force => true do |t|
-    t.column :name, :string
-    t.column :accountID, :integer
-  end
-
-  create_table :comments, :force => true do |t|
-    t.column :commentable_id, :integer
-    t.column :commentable_type, :string
-    t.column :account_id, :integer
-  end
-
-end
-
-class Account < ActiveRecord::Base
-  has_many :projects
-end
-
-class Project < ActiveRecord::Base
-  has_one :manager
-  has_many :tasks
-  acts_as_tenant :account
-
-  validates_uniqueness_to_tenant :name
-end
-
-class Manager < ActiveRecord::Base
-  belongs_to :project
-  acts_as_tenant :account
-end
-
-class Task < ActiveRecord::Base
-  belongs_to :project
-  default_scope -> { where(:completed => nil).order("name") }
-
-  acts_as_tenant :account
-  validates_uniqueness_of :name
-end
-
-class UnscopedModel < ActiveRecord::Base
-  validates_uniqueness_of :name
-end
-
-class AliasedTask < ActiveRecord::Base
-  acts_as_tenant(:account)
-  belongs_to :project_alias, :class_name => "Project"
-end
-
-class UniqueTask < ActiveRecord::Base
-  acts_as_tenant(:account)
-  belongs_to :project
-  validates_uniqueness_to_tenant :name, scope: :user_defined_scope
-end
-
-class CustomForeignKeyTask < ActiveRecord::Base
-  acts_as_tenant(:account, :foreign_key => "accountID")
-  validates_uniqueness_to_tenant :name
-end
-
-class Comment < ActiveRecord::Base
-  belongs_to :commentable, polymorphic: true
-  belongs_to :task, -> { where(comments: { commentable_type: 'Task'  })  }, foreign_key: 'commentable_id'
-  acts_as_tenant :account
-end

data/spec/acts_as_tenant/model_extensions_spec.rb

@@ -1,394 +0,0 @@
-require 'spec_helper'
-require "#{$orm}_models"
-
-describe ActsAsTenant do
-  after { ActsAsTenant.current_tenant = nil }
-
-  # Setting and getting
-  describe 'Setting the current tenant' do
-    before { ActsAsTenant.current_tenant = :foo }
-    it { ActsAsTenant.current_tenant == :foo }
-  end
-
-  describe 'is_scoped_as_tenant should return the correct value when true' do
-    it {expect(Project.respond_to?(:scoped_by_tenant?)).to eq(true)}
-  end
-
-  describe 'is_scoped_as_tenant should return the correct value when false' do
-    it {expect(UnscopedModel.respond_to?(:scoped_by_tenant?)).to eq(false)}
-  end
-
-  describe 'tenant_id should be immutable, if already set' do
-    before do
-      @account = Account.create!(:name => 'foo')
-      @project = @account.projects.create!(:name => 'bar')
-    end
-
-    it { expect {@project.account_id = @account.id + 1}.to raise_error }
-  end
-
-  describe 'setting tenant_id to the same value should not error' do
-    before do
-      @account = Account.create!(:name => 'foo')
-      @project = @account.projects.create!(:name => 'bar')
-    end
-
-    it { expect {@project.account_id = @account.id}.not_to raise_error }
-  end
-
-  describe 'setting tenant_id to a string with same to_i value should not error' do
-    before do
-      @account = Account.create!(:name => 'foo')
-      @project = @account.projects.create!(:name => 'bar')
-    end
-
-    it { expect {@project.account_id = @account.id.to_s}.not_to raise_error }
-  end
-
-  describe 'tenant_id should be mutable, if not already set' do
-    before do
-      @account = Account.create!(:name => 'foo')
-      @project = Project.create!(:name => 'bar')
-    end
-
-    it { expect(@project.account_id).to be_nil }
-    it { expect { @project.account = @account }.not_to raise_error }
-  end
-
-  describe 'tenant_id should auto populate after initialization' do
-    before do
-      @account = Account.create!(:name => 'foo')
-      ActsAsTenant.current_tenant = @account
-    end
-    it {expect(Project.new.account_id).to eq(@account.id)}
-  end
-
-  describe 'Handles custom foreign_key on tenant model' do
-    before do
-      @account  = Account.create!(:name => 'foo')
-      ActsAsTenant.current_tenant = @account
-      @custom_foreign_key_task = CustomForeignKeyTask.create!(:name => 'foo')
-    end
-
-    it { expect(@custom_foreign_key_task.account).to eq(@account) }
-  end
-
-  # Scoping models
-  describe 'Project.all should be scoped to the current tenant if set' do
-    before do
-      @account1 = Account.create!(:name => 'foo')
-      @account2 = Account.create!(:name => 'bar')
-
-      @project1 = @account1.projects.create!(:name => 'foobar')
-      @project2 = @account2.projects.create!(:name => 'baz')
-
-      ActsAsTenant.current_tenant= @account1
-      @projects = Project.all
-    end
-
-    it { expect(@projects.length).to eq(1) }
-    it { expect(@projects).to eq([@project1]) }
-  end
-
-  describe 'Project.unscoped.all should return the unscoped value' do
-    before do
-      @account1 = Account.create!(:name => 'foo')
-      @account2 = Account.create!(:name => 'bar')
-
-      @project1 = @account1.projects.create!(:name => 'foobar')
-      @project2 = @account2.projects.create!(:name => 'baz')
-
-      ActsAsTenant.current_tenant= @account1
-      @projects = Project.unscoped
-    end
-
-    it { expect(@projects.count).to eq(2) }
-  end
-
-  describe 'Querying the tenant from a scoped model without a tenant set' do
-    before do
-      @project = Project.create!(:name => 'bar')
-    end
-
-    it { @project.account }
-  end
-
-  describe 'Querying the tenant from a scoped model with a tenant set' do
-    before do
-      @account = Account.create!(:name => 'foo')
-      @project = @account.projects.create!(:name => 'foobar')
-      ActsAsTenant.current_tenant= @account1
-    end
-
-    it { @project.account }
-  end
-
-  # Associations
-  describe 'Associations should be correctly scoped by current tenant' do
-    before do
-      @account = Account.create!(:name => 'foo')
-      @project = Project.create!(:name => 'foobar', :account => @account )
-      # the next line should normally be (nearly) impossible: a task assigned to a tenant project,
-      # but the task has no tenant assigned
-      @task1 = Task.create!(:name => 'no_tenant', :project => @project)
-
-      ActsAsTenant.current_tenant = @account
-      @task2 = @project.tasks.create!(:name => 'baz')
-
-      @project.reload
-    end
-
-    it 'should correctly set the tenant on the task created with current_tenant set' do
-      expect(@task2.account).to eq(@account)
-    end
-
-    it 'should filter out the non-tenant task from the project' do
-      expect(@project.tasks.length).to eq(1)
-    end
-  end
-
-  describe 'Associations can only be made with in-scope objects' do
-    before do
-      @account = Account.create!(:name => 'foo')
-      @project1 = Project.create!(:name => 'inaccessible_project', :account => Account.create!)
-      ActsAsTenant.current_tenant = @account
-
-      @project2 = Project.create!(:name => 'accessible_project')
-      @task = @project2.tasks.create!(:name => 'bar')
-    end
-
-    it { expect(@task.update_attributes(:project_id => @project1.id)).to eq(false) }
-  end
-
-  describe "Create and save an AaT-enabled child without it having a parent" do
-    before do
-      @account = Account.create!(:name => 'baz')
-      ActsAsTenant.current_tenant = @account
-    end
-    it { expect(Task.create(:name => 'bar').valid?).to eq(true) }
-  end
-
-  describe "It should be possible to use aliased associations" do
-    it { expect(AliasedTask.create(:name => 'foo', :project_alias => @project2).valid?).to eq(true) }
-  end
-
-  describe "It should be possible to use associations with foreign_key from polymorphic" do
-    before do
-      @account = Account.create!(name: 'foo')
-      ActsAsTenant.current_tenant = @account
-      @project = Project.create!(name: 'project', account: @account)
-      @comment = Comment.new commentable: @project, account: @account
-    end
-
-    it { expect(@comment.save!).to eq(true) }
-  end
-
-  # Additional default_scopes
-  describe 'When dealing with a user defined default_scope' do
-    before do
-      @account = Account.create!(:name => 'foo')
-      @project1 = Project.create!(:name => 'inaccessible')
-      @task1 = Task.create!(:name => 'no_tenant', :project => @project1)
-
-      ActsAsTenant.current_tenant = @account
-      @project2 = Project.create!(:name => 'accessible')
-      @task2 = @project2.tasks.create!(:name => 'bar')
-      @task3 = @project2.tasks.create!(:name => 'baz')
-      @task4 = @project2.tasks.create!(:name => 'foo')
-      @task5 = @project2.tasks.create!(:name => 'foobar', :completed => true )
-
-      @tasks= Task.all
-    end
-
-    it 'should apply both the tenant scope and the user defined default_scope, including :order' do
-      expect(@tasks.length).to eq(3)
-      expect(@tasks).to eq([@task2, @task3, @task4])
-    end
-  end
-
-  # Validates_uniqueness
-  describe 'When using validates_uniqueness_to_tenant in a aat model' do
-    before do
-      account = Account.create!(:name => 'foo')
-      ActsAsTenant.current_tenant = account
-      Project.create!(:name => 'existing_name')
-    end
-
-    it 'should not be possible to create a duplicate within the same tenant' do
-      expect(Project.create(:name => 'existing_name').valid?).to eq(false)
-    end
-
-    it 'should be possible to create a duplicate outside the tenant scope' do
-      account = Account.create!(:name => 'baz')
-      ActsAsTenant.current_tenant = account
-      expect(Project.create(:name => 'bar').valid?).to eq(true)
-    end
-  end
-
-  describe 'Handles user defined scopes' do
-    before do
-      UniqueTask.create!(:name => 'foo', :user_defined_scope => 'unique_scope')
-    end
-
-    it { expect(UniqueTask.create(:name => 'foo', :user_defined_scope => 'another_scope')).to be_valid }
-    it { expect(UniqueTask.create(:name => 'foo', :user_defined_scope => 'unique_scope')).not_to be_valid }
-  end
-
-  describe 'When using validates_uniqueness_of in a NON-aat model' do
-    before do
-      UnscopedModel.create!(:name => 'foo')
-    end
-    it 'should not be possible to create duplicates' do
-      expect(UnscopedModel.create(:name => 'foo').valid?).to eq(false)
-    end
-  end
-
-  # ::with_tenant
-  describe "::with_tenant" do
-    it "should set current_tenant to the specified tenant inside the block" do
-      @account = Account.create!(:name => 'baz')
-
-      ActsAsTenant.with_tenant(@account) do
-        expect(ActsAsTenant.current_tenant).to eq(@account)
-      end
-    end
-
-    it "should reset current_tenant to the previous tenant once exiting the block" do
-      @account1 = Account.create!(:name => 'foo')
-      @account2 = Account.create!(:name => 'bar')
-
-      ActsAsTenant.current_tenant = @account1
-      ActsAsTenant.with_tenant @account2 do
-
-      end
-
-      expect(ActsAsTenant.current_tenant).to eq(@account1)
-    end
-
-    it "should return the value of the block" do
-      @account1 = Account.create!(:name => 'foo')
-      @account2 = Account.create!(:name => 'bar')
-
-      ActsAsTenant.current_tenant = @account1
-      value = ActsAsTenant.with_tenant @account2 do
-        "something"
-      end
-
-      expect(value).to eq "something"
-    end
-
-    it "should raise an error when no block is provided" do
-      expect { ActsAsTenant.with_tenant(nil) }.to raise_error(ArgumentError, /block required/)
-    end
-  end
-
-  describe "::without_tenant" do
-    it "should set current_tenant to nil inside the block" do
-      ActsAsTenant.without_tenant do
-        expect(ActsAsTenant.current_tenant).to be_nil
-      end
-    end
-
-    it "should reset current_tenant to the previous tenant once exiting the block" do
-      @account1 = Account.create!(:name => 'foo')
-
-      ActsAsTenant.current_tenant = @account1
-      ActsAsTenant.without_tenant do
-      end
-
-      expect(ActsAsTenant.current_tenant).to eq(@account1)
-    end
-
-    it "should return the value of the block" do
-      value = ActsAsTenant.without_tenant do
-        "something"
-      end
-
-      expect(value).to eq "something"
-    end
-
-    it "should raise an error when no block is provided" do
-      expect { ActsAsTenant.without_tenant }.to raise_error(ArgumentError, /block required/)
-    end
-  end
-
-  # Tenant required
-  context "tenant required" do
-    before do
-      @account1 = Account.create!(:name => 'foo')
-      @project1 = @account1.projects.create!(:name => 'foobar')
-      allow(ActsAsTenant.configuration).to receive_messages(require_tenant: true)
-    end
-
-    describe "raises exception if no tenant specified" do
-      it "should raise an error when no tenant is provided" do
-        expect { Project.all }.to raise_error(ActsAsTenant::Errors::NoTenantSet)
-      end
-    end
-
-    describe "does not raise exception when run in unscoped mode" do
-      it "should not raise an error when no tenant is provided" do
-        expect do
-          ActsAsTenant.without_tenant { Project.all }
-        end.to_not raise_error
-      end
-    end
-  end
-
-  context "no tenant required" do
-    describe "does not raise exception if no tenant specified" do
-      before do
-        @account1 = Account.create!(:name => 'foo')
-        @project1 = @account1.projects.create!(:name => 'foobar')
-      end
-
-      it "should not raise an error when no tenant is provided" do
-        expect { Project.all }.to_not raise_error
-      end
-    end
-  end
-
-  describe "ActsAsTenant.default_tenant=" do
-    before(:each) do
-      @account = Account.create!
-    end
-
-    after(:each) do
-      ActsAsTenant.default_tenant = nil
-    end
-
-    it "provides current_tenant" do
-      ActsAsTenant.default_tenant = @account
-      expect(ActsAsTenant.current_tenant).to eq(@account)
-    end
-
-    it "can be overridden by assignment" do
-      ActsAsTenant.default_tenant = @account
-      @account2 = Account.create!
-      ActsAsTenant.current_tenant = @account2
-      expect(ActsAsTenant.current_tenant).not_to eq(@account)
-    end
-
-    it "can be overridden by with_tenant" do
-      ActsAsTenant.default_tenant = @account
-      @account2 = Account.create!
-      ActsAsTenant.with_tenant @account2 do
-        expect(ActsAsTenant.current_tenant).to eq(@account2)
-      end
-      expect(ActsAsTenant.current_tenant).to eq(@account)
-    end
-
-    it "doesn't override existing current_tenant" do
-      @account2 = Account.create!
-      ActsAsTenant.current_tenant = @account2
-      ActsAsTenant.default_tenant = @account
-      expect(ActsAsTenant.current_tenant).to eq(@account2)
-    end
-
-    it "survives request resets" do
-      ActsAsTenant.default_tenant = @account
-      RequestStore.clear!
-      expect(ActsAsTenant.current_tenant).to eq(@account)
-    end
-  end
-end