acts_as_tenant 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b818ac81194035979865164439e777511f68c06c
-  data.tar.gz: f395680cfb279dd618df7e88ca6373adb2f6596a
+SHA256:
+  metadata.gz: fda1a0075313a96256ff1815cf9fd08422e2cfd18934703e8325273b2b941a3e
+  data.tar.gz: e89bef1337f0210769a0ffaca7c081a111944bdbdb5b4d282118df39f4a1d53f
 SHA512:
-  metadata.gz: 61cffd95ae9374d1f09a6353785468d8b13db7a3fbb2e9936585d9b0f8092a34a6d683bb20032715465e7cb4e72afacd67fc80dd5cf6c6b1b01178658b67bc36
-  data.tar.gz: 9f2f90d90b7ec7a25b443da85dc89cb75912bf348e600175e5a83af9ed14699ab1a2313e463eda90bfbd3db87674e148bacdc11e0d275a5aa5c2928590fc4387
+  metadata.gz: b80f8de28ae30db10fdca8e9a2a290e014c87ab195b250661c4c81a7d33d761b67929b2b43f77380c3c5fbe128611ede07e135c7adc3708f9fbe406d1f7e8516
+  data.tar.gz: ec85db56efcd7441559ef33adbc0ec25bd366108aa3bd2da9f1bd3279776e45181e9153796d2071116991c63a76e849b1411d8d852c4ba25fb0497958a59192a

data/README.md

@@ -1,9 +1,7 @@
 Acts As Tenant
 ==============
 
-[![Build Status](https://travis-ci.org/ErwinM/acts_as_tenant.png)](https://travis-ci.org/ErwinM/acts_as_tenant)
-
-**Note**: acts_as_tenant was introduced in this [blog post](http://www.rollcallapp.com/blog/2011/10/03/adding-multi-tenancy-to-your-rails-app-acts-as-tenant).
+[![Build Status](https://github.com/ErwinM/acts_as_tenant/workflows/Tests/badge.svg)](https://github.com/ErwinM/acts_as_tenant/actions)
 
 This gem was born out of our own need for a fail-safe and out-of-the-way manner to add multi-tenancy to our Rails app through a shared database strategy, that integrates (near) seamless with Rails.
 
@@ -16,6 +14,8 @@ In addition, acts_as_tenant:
 * adds a method to validate uniqueness to a tenant, `validates_uniqueness_to_tenant`
 * sets up a helper method containing the current tenant
 
+**Note**: acts_as_tenant was introduced in this [blog post](https://github.com/ErwinM/acts_as_tenant/blob/master/docs/blog_post.md).
+
 Installation
 ------------
 acts_as_tenant will only work on Rails 3.1 and up. This is due to changes made to the handling of `default_scope`, an essential pillar of the gem.
@@ -41,7 +41,8 @@ There are three ways to set the current tenant:
 2. by setting  the current tenant in the controller, and
 3. by setting the current tenant for a block.
 
-### Use the subdomain to lookup the current tenant ###
+### Looking Up Tenants
+#### By Subdomain to lookup the current tenant
 
 ```ruby
 class ApplicationController < ActionController::Base
@@ -49,16 +50,28 @@ class ApplicationController < ActionController::Base
 end
 ```
 
-This tells acts_as_tenant to use the current subdomain to identify the current tenant. In addition, it tells acts_as_tenant that tenants are represented by the Account model and this model has a column named 'subdomain' which can be used to lookup the Account using the actual subdomain. If ommitted, the parameters will default to the values used above.
+This tells acts_as_tenant to use the last subdomain to identify the current tenant. In addition, it tells acts_as_tenant that tenants are represented by the Account model and this model has a column named 'subdomain' which can be used to lookup the Account using the actual subdomain. If ommitted, the parameters will default to the values used above.
+
+By default, the *last* subdomain will be used for lookup. Pass in `subdomain_lookup: :first` to use the first subdomain instead.
+
+#### By Domain to lookup the current tenant
+
+```ruby
+class ApplicationController < ActionController::Base
+  set_current_tenant_by_subdomain_or_domain(:account, :subdomain, :domain)
+end
+```
+
+You can locate the tenant using `set_current_tenant_by_subdomain_or_domain( :account, :subdomain,  :domain )` which will check for a subdomain and fallback to domain.
 
-Alternatively, you could locate the tenant using the method `set_current_tenant_by_subdomain_or_domain( :account, :subdomain,  :domain )` which will try to match a record first by subdomain. in case it fails, by domain.
+By default, the *last* subdomain will be used for lookup. Pass in `subdomain_lookup: :first` to use the first subdomain instead.
 
-### Setting the current tenant in a controller, manually ###
+#### Manually using before_action
 
 ```ruby
 class ApplicationController < ActionController::Base
   set_current_tenant_through_filter
-  before_filter :your_method_that_finds_the_current_tenant
+  before_action :your_method_that_finds_the_current_tenant
 
   def your_method_that_finds_the_current_tenant
     current_account = Account.find_it
@@ -67,8 +80,23 @@ class ApplicationController < ActionController::Base
 end
 ```
 
-Setting the `current_tenant` yourself, requires you to declare `set_current_tenant_through_filter` at the top of your application_controller to tell acts_as_tenant that you are going to use a before_filter to setup the current tenant. Next you should actually setup that before_filter to fetch the current tenant and pass it to `acts_as_tenant` by using `set_current_tenant(current_tenant)` in the before_filter.
+Setting the `current_tenant` yourself, requires you to declare `set_current_tenant_through_filter` at the top of your application_controller to tell acts_as_tenant that you are going to use a before_action to setup the current tenant. Next you should actually setup that before_action to fetch the current tenant and pass it to `acts_as_tenant` by using `set_current_tenant(current_tenant)` in the before_action.
+
+If you are setting the tenant in a specific controller (except `application_controller`), it should to be included **AT THE TOP** of the file.
+
+```
+class MembersController < ActionController::Base
+  set_current_tenant_through_filter
+  before_action :set_tenant
+  before_action :set_member, only: [:show, :edit, :update, :destroy]
+
+  def set_tenant
+    set_current_tenant(current_user.account)
+  end
+end
+```
 
+This allows the tenant to be set before any other code runs so everything is within the current tenant.
 
 ### Setting the current tenant for a block ###
 
@@ -94,7 +122,7 @@ This is useful in shared routes such as admin panels or internal dashboards when
 
 ### Require tenant to be set always ###
 
-If you want to require the tenant to be set at all times, you can configure acts_as_tenant to raise an error when a query is made without a tenant available. See below under configuarion options.
+If you want to require the tenant to be set at all times, you can configure acts_as_tenant to raise an error when a query is made without a tenant available. See below under configuration options.
 
 Scoping your models
 -------------------
@@ -151,10 +179,18 @@ All options available to Rails' own `validates_uniqueness_of` are also available
 
 ### Custom foreign_key ###
 
-You can explicitely specifiy a foreign_key for AaT to use should the key differ from the default:
+You can explicitly specifiy a foreign_key for AaT to use should the key differ from the default:
 
 ```ruby
-acts_as_tenant(:account, :foreign_key => 'accountID) # by default AaT expects account_id
+acts_as_tenant(:account, :foreign_key => 'accountID') # by default AaT expects account_id
+```
+
+### Custom primary_key ###
+
+You can also explicitly specifiy a primary_key for AaT to use should the key differ from the default:
+
+```ruby
+acts_as_tenant(:account, :primary_key => 'primaryID') # by default AaT expects id
 ```
 
 Configuration options
@@ -183,24 +219,42 @@ require 'acts_as_tenant/sidekiq'
 Testing
 ---------------
 
-If you set the `current_tenant` in your tests, make sure to clean up the tenant after each test by calling `ActsAsTenant.current_tenant = nil`. If you are manually setting the `current_tenant` in integration tests, please be aware that the value will not survive across multiple requests, even if they take place within the same test.
+If you set the `current_tenant` in your tests, make sure to clean up the tenant after each test by calling `ActsAsTenant.current_tenant = nil`. Integration tests are more difficult: manually setting the `current_tenant` value will not survive across multiple requests, even if they take place within the same test. This can result in undesired boilerplate to set the desired tenant. Moreover, the efficacy of the test can be compromised because the set `current_tenant` value will carry over into the request-response cycle.
 
-If you'd like to set a default tenant that will survive across multiple requests, assign a value to `default_tenant`. You might use a before hook like this:
+To address this issue, ActsAsTenant provides for a `test_tenant` value that can be set to allow for setup and post-request expectation testing. It should be used in conjunction with middleware that clears out this value while an integration test is processing. A typical Rails and RSpec setup might look like:
 
 ```ruby
-# Make the default tenant globally available to the tests
-$default_account = Account.create!
-# Specify this account as the current tenant unless overridden
-ActsAsTenant.default_tenant = $default_account
-# Stub out the method setting a tenant in a controller hook
-allow_any_instance_of(ApplicationController).to receive(:set_current_tenant)
+# test.rb
+require_dependency 'acts_as_tenant/test_tenant_middleware'
+
+Rails.application.configure do
+  config.middleware.use ActsAsTenant::TestTenantMiddleware
+end
 ```
 
-This can later be overridden by using any of the standard methods for specifying a different tenant. If you don't want this setting to apply to all of your tests, remember to clear it when you're finished by setting `ActsAsTenant.default_tenant = nil`.
+```ruby
+# spec_helper.rb
+config.before(:suite) do |example|
+  # Make the default tenant globally available to the tests
+  $default_account = Account.create!
+end
 
-To Do
------
-* ...
+config.before(:each) do |example|
+  if example.metadata[:type] == :request
+    # Set the `test_tenant` value for integration tests
+    ActsAsTenant.test_tenant = $default_account
+  else
+    # Otherwise just use current_tenant
+    ActsAsTenant.current_tenant = $default_account
+  end
+end
+
+config.after(:each) do |example|
+  # Clear any tenancy that might have been set
+  ActsAsTenant.current_tenant = nil
+  ActsAsTenant.test_tenant = nil
+end
+```
 
 Bug reports & suggested improvements
 ------------------------------------
@@ -210,10 +264,20 @@ If you have found a bug or want to suggest an improvement, please use our issue
 
 If you want to contribute, fork the project, code your improvements and make a pull request on [Github](http://github.com/ErwinM/acts_as_tenant/). When doing so, please don't forget to add tests. If your contribution is fixing a bug it would be perfect if you could also submit a failing test, illustrating the issue.
 
+Contributing to this gem
+------------------------
+
+We use the Appraisal gem to run tests against supported versions of Rails to test for compatibility against them all. StandardRb also helps keep code formatted cleanly.
+
+1. Fork the repo
+2. Make changes
+3. Run test suite with `bundle exec appraisal`
+4. Run `bundle exec standardrb` to standardize code formatting
+5. Submit a PR
+
 Author & Credits
 ----------------
-acts_as_tenant is written by Erwin Matthijssen.
-Erwin is currently busy developing [Roll Call](http://www.rollcallapp.com/ "Roll Call App").
+acts_as_tenant is written by Erwin Matthijssen & Chris Oliver.
 
 This gem was inspired by Ryan Sonnek's [Multitenant](https://github.com/wireframe/multitenant) gem and its use of default_scope.
 

data/Rakefile

@@ -1,16 +1,7 @@
-require 'bundler/gem_tasks'
+require "bundler/gem_tasks"
 
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec)
-task :default => :spec
+APP_RAKEFILE = File.expand_path("spec/dummy/Rakefile", __dir__)
 
-desc 'Run the test suite for all supported ORMs.'
-namespace :spec do
-  task :all do
-    %w[active_record mongoid].each do |orm|
-      ENV["ORM"] = orm
-      Rake::Task["spec"].reenable
-      Rake::Task["spec"].invoke
-    end
-  end
-end
+require "rspec/core/rake_task"
+RSpec::Core::RakeTask.new(:spec)
+task default: :spec

data/lib/acts_as_tenant.rb

@@ -1,23 +1,125 @@
 require "request_store"
 
-#$LOAD_PATH.unshift(File.dirname(__FILE__))
-
 require "acts_as_tenant/version"
 require "acts_as_tenant/errors"
-require "acts_as_tenant/configuration"
-require "acts_as_tenant/controller_extensions"
-require "acts_as_tenant/model_extensions"
 
-#$LOAD_PATH.shift
+module ActsAsTenant
+  autoload :Configuration, "acts_as_tenant/configuration"
+  autoload :ControllerExtensions, "acts_as_tenant/controller_extensions"
+  autoload :ModelExtensions, "acts_as_tenant/model_extensions"
+  autoload :TenantHelper, "acts_as_tenant/tenant_helper"
+
+  @@configuration = nil
+  @@tenant_klass = nil
+  @@models_with_global_records = []
+
+  class << self
+    attr_accessor :test_tenant
+    attr_writer :default_tenant
+  end
+
+  def self.configure
+    @@configuration = Configuration.new
+    yield configuration if block_given?
+    configuration
+  end
+
+  def self.configuration
+    @@configuration || configure
+  end
+
+  def self.set_tenant_klass(klass)
+    @@tenant_klass = klass
+  end
+
+  def self.tenant_klass
+    @@tenant_klass
+  end
+
+  def self.models_with_global_records
+    @@models_with_global_records
+  end
+
+  def self.add_global_record_model model
+    @@models_with_global_records.push(model)
+  end
+
+  def self.fkey
+    "#{@@tenant_klass}_id"
+  end
+
+  def self.pkey
+    ActsAsTenant.configuration.pkey
+  end
+
+  def self.polymorphic_type
+    "#{@@tenant_klass}_type"
+  end
 
-if defined?(ActiveRecord::Base)
-  ActiveRecord::Base.send(:include, ActsAsTenant::ModelExtensions)
+  def self.current_tenant=(tenant)
+    RequestStore.store[:current_tenant] = tenant
+  end
+
+  def self.current_tenant
+    RequestStore.store[:current_tenant] || test_tenant || default_tenant
+  end
+
+  def self.unscoped=(unscoped)
+    RequestStore.store[:acts_as_tenant_unscoped] = unscoped
+  end
+
+  def self.unscoped
+    RequestStore.store[:acts_as_tenant_unscoped]
+  end
+
+  def self.unscoped?
+    !!unscoped
+  end
+
+  def self.default_tenant
+    @default_tenant unless unscoped
+  end
+
+  def self.with_tenant(tenant, &block)
+    if block.nil?
+      raise ArgumentError, "block required"
+    end
+
+    old_tenant = current_tenant
+    self.current_tenant = tenant
+    value = block.call
+    value
+  ensure
+    self.current_tenant = old_tenant
+  end
+
+  def self.without_tenant(&block)
+    if block.nil?
+      raise ArgumentError, "block required"
+    end
+
+    old_tenant = current_tenant
+    old_unscoped = unscoped
+
+    self.current_tenant = nil
+    self.unscoped = true
+    value = block.call
+    value
+  ensure
+    self.current_tenant = old_tenant
+    self.unscoped = old_unscoped
+  end
 end
 
-if defined?(ActionController::Base)
-  ActionController::Base.extend ActsAsTenant::ControllerExtensions
+ActiveSupport.on_load(:active_record) do |base|
+  base.include ActsAsTenant::ModelExtensions
 end
 
-module ActsAsTenant
+ActiveSupport.on_load(:action_controller) do |base|
+  base.extend ActsAsTenant::ControllerExtensions
+  base.include ActsAsTenant::TenantHelper
+end
+
+ActiveSupport.on_load(:action_view) do |base|
+  base.include ActsAsTenant::TenantHelper
 end
-  

data/lib/acts_as_tenant/configuration.rb

@@ -1,26 +1,13 @@
 module ActsAsTenant
-  @@configuration = nil
-
-  def self.configure
-    @@configuration = Configuration.new
-
-    if block_given?
-      yield configuration
-    end
-
-    configuration
-  end
-
-  def self.configuration
-    @@configuration || configure
-  end
-
   class Configuration
-    attr_writer :require_tenant
-  
+    attr_writer :require_tenant, :pkey
+
     def require_tenant
       @require_tenant ||= false
     end
-  
+
+    def pkey
+      @pkey ||= :id
+    end
   end
 end

data/lib/acts_as_tenant/controller_extensions.rb

@@ -1,81 +1,36 @@
 module ActsAsTenant
   module ControllerExtensions
+    autoload :Filter, "acts_as_tenant/controller_extensions/filter"
+    autoload :Subdomain, "acts_as_tenant/controller_extensions/subdomain"
+    autoload :SubdomainOrDomain, "acts_as_tenant/controller_extensions/subdomain_or_domain"
 
     # this method allows setting the current_tenant by reading the subdomain and looking
     # it up in the tenant-model passed to the method. The method will look for the subdomain
     # in a column referenced by the second argument.
-    def set_current_tenant_by_subdomain(tenant = :account, column = :subdomain )
-      self.class_eval do
-        cattr_accessor :tenant_class, :tenant_column
-      end
+    def set_current_tenant_by_subdomain(tenant = :account, column = :subdomain, subdomain_lookup: :last)
+      include Subdomain
 
       self.tenant_class = tenant.to_s.camelcase.constantize
       self.tenant_column = column.to_sym
-
-      self.class_eval do
-        before_filter :find_tenant_by_subdomain
-        helper_method :current_tenant
-
-        private
-          def find_tenant_by_subdomain
-            if request.subdomains.last
-              ActsAsTenant.current_tenant = tenant_class.where(tenant_column => request.subdomains.last.downcase).first
-            end
-          end
-
-          def current_tenant
-            ActsAsTenant.current_tenant
-          end
-      end
+      self.subdomain_lookup = subdomain_lookup
     end
 
     # 01/27/2014 Christian Yerena / @preth00nker
     # this method adds the possibility of use the domain as a possible second argument to find
     # the current_tenant.
-    def set_current_tenant_by_subdomain_or_domain(tenant = :account, primary_column = :subdomain, second_column = :domain )
-      self.class_eval do
-        cattr_accessor :tenant_class, :tenant_primary_column, :tenant_second_column
-      end
+    def set_current_tenant_by_subdomain_or_domain(tenant = :account, primary_column = :subdomain, second_column = :domain, subdomain_lookup: :last)
+      include SubdomainOrDomain
 
       self.tenant_class = tenant.to_s.camelcase.constantize
       self.tenant_primary_column = primary_column.to_sym
       self.tenant_second_column = second_column.to_sym
-
-      self.class_eval do
-        before_filter :find_tenant_by_subdomain_or_domain
-        helper_method :current_tenant
-
-        private
-          def find_tenant_by_subdomain_or_domain
-            if request.subdomains.last
-              ActsAsTenant.current_tenant = tenant_class.where(tenant_primary_column => request.subdomains.last.downcase).first
-            else
-              ActsAsTenant.current_tenant = tenant_class.where(tenant_second_column => request.domain.downcase).first
-            end
-          end
-
-          def current_tenant
-            ActsAsTenant.current_tenant
-          end
-      end
+      self.subdomain_lookup = subdomain_lookup
     end
 
-
     # This method sets up a method that allows manual setting of the current_tenant. This method should
-    # be used in a before_filter. In addition, a helper is setup that returns the current_tenant
+    # be used in a before_action. In addition, a helper is setup that returns the current_tenant
     def set_current_tenant_through_filter
-      self.class_eval do
-        helper_method :current_tenant
-
-        private
-          def set_current_tenant(current_tenant_object)
-            ActsAsTenant.current_tenant = current_tenant_object
-          end
-
-          def current_tenant
-            ActsAsTenant.current_tenant
-          end
-      end
+      include Filter
     end
   end
 end