acts_as_multi_tenant 1.2.1 → 2.0.0.pre.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b1731c4e30b01347126564bdbc96889ceef49b481a4897b402d3e5fe3ddf297
-  data.tar.gz: 43698dcccb60a541c39a8261949602ee42708f5fab5cf6422a20117581e9f200
+  metadata.gz: f4138ddbff135b1b100c0ddaba90b7ac5ca35bdbce7f031790dc8bade47df719
+  data.tar.gz: d8ac485e9aadea630e26ec7dbc852f2e4593eff23bd9be069220dc0928429af9
 SHA512:
-  metadata.gz: db1b136428f03f3b98c1d439add7d393e4aa171e88a057d21a76a63fd14b53307a954925419bad560131cea6127cbdaf45726f60548c7b67f0500b81f4489580
-  data.tar.gz: 596769d5655d197e4c273fb789e4ed3fdaf26b3600ad045f5922b8f906dadd02a42f80b56c15dcc0fe3340880f1af7af6578a3aa815079e93c3969e2c1e1b799
+  metadata.gz: b71084765bca184cb05428fa5121c5b15eaa23b9d3c6262c9508a3d70f6ab0d03c44f5458f6c6e33ff23888a5815de28d2d84a48b3dae50737d8d07b1254c0ae
+  data.tar.gz: bc9e15302492d77f48437523d2e2bf6a300b921b31bf90d3d406d140fd28d01972f05413497f88ef182281cd7c2adc6f7f9caf95ff0bce3939b9ff3e7b687f89

data/README.md

@@ -1,6 +1,6 @@
 # acts_as_multi_tenant
 
-Keep multiple tenants in a single ActiveRecord database, and keep their data separate. Let's say the `Client` AR model represents your "tenants". Rack middleware will keep track of the "current" client in the request cycle which will automatically filter *all ActiveRecord queries* by that client. New records will automatically be associated to that client as well.
+Keep multiple tenants in a single ActiveRecord database and keep their data separate. Let's say the `Client` AR model represents your "tenants". Rack middleware will keep track of the current client in the request cycle which will automatically filter *all ActiveRecord queries* by that client. New records will automatically be associated to that client as well.
 
 There are 3 main components:
 
@@ -117,25 +117,33 @@ License.current == Client.current.license
 
 ## Multiple current tenants
 
-Some applications may need to allow multiple current tenants at once. For example, a single user account may have access to multiple clients. `acts_as_multi_tenant` supports this with the `current: :multiple` option. When this is set, `Client.current` will be an array of clients. Queries will be filtered to ANY of those clients.
+Some applications may need to allow multiple current tenants at once. For example, a single user may have access to multiple clients. `acts_as_multi_tenant` has an API that allows getting and setting of multiple tenants. Queries will be filtered by ANY of them. Keep in mind that when creating new records the tenant_id column cannot automatically be set, since it doesn't know which tenant to use.
 
-```ruby
-class Client < ActiveRecord::Base
-  acts_as_tenant using: :code, current: :multiple
-end
-```
-
-When you add your middleware, your `identifier` option must also return an array:
+When you add your middleware, the `identifiers` option must return an array:
 
 ```ruby
 use MultiTenant::Middleware,
   model: -> { Client.active },
 
-  identifier: ->(req) {
+  identifiers: ->(req) {
     req.params["clients"] || []
   }
 ```
 
+In application code, use the following pluralized methods instead of their singularized counterparts:
+
+```ruby
+Client.current_tenants = ["acme", "foo"]
+
+Client.with_tenants ["acme", "foo"] do
+  # do stuff
+end
+
+Client.without_tenants do
+  # do stuff
+end
+```
+
 ## Testing
 
     bundle install

data/lib/acts_as_multi_tenant.rb

@@ -7,9 +7,5 @@ require_relative 'multi_tenant/belongs_to_tenant_through'
 require_relative 'multi_tenant/middleware'
 
 module MultiTenant
-  module Impl
-    NotImplemented = Class.new(StandardError)
-    autoload :SingleCurrent, 'multi_tenant/impl/single_current'
-    autoload :MultipleCurrent, 'multi_tenant/impl/multiple_current'
-  end
+  NotImplemented = Class.new(StandardError)
 end

data/lib/multi_tenant/acts_as_tenant.rb

@@ -9,22 +9,15 @@ module MultiTenant
     #
     # Use this ActiveRecord model as the tenant source.
     #
-    # The "current" option allows you to specify whether Client.current is a single record (the default) or an array of records.
-    #
     # @param using [String] (optional) column that contains the unique lookup identifier. Defaults to :code.
-    # @param current [Symbol] :single | :multiple
     #
-    def acts_as_tenant(using: :code, current: :single)
-      cattr_accessor :tenant_identifier, :tenant_thread_var, :multi_tenant_impl
+    def acts_as_tenant(using: :code)
+      cattr_accessor :tenant_identifier, :tenant_thread_var
       self.tenant_identifier = using
       self.tenant_thread_var = "current_tenant_#{object_id}".freeze # allows there to be multiple tenant classes
-      self.multi_tenant_impl = case current
-                               when :single then MultiTenant::Impl::SingleCurrent.new(self)
-                               when :multiple then MultiTenant::Impl::MultipleCurrent.new(self)
-                               else raise ArgumentError, "Unknown current option '#{current}'"
-                               end
-      self.extend MultiTenant::ActsAsTenant::ClassMethods
-      self.extend self.multi_tenant_impl.acts_as_tenant_class_methods
+      self.extend MultiTenant::ActsAsTenant::TenantGetters
+      self.extend MultiTenant::ActsAsTenant::TenantSetters
+      self.extend MultiTenant::ActsAsTenant::TenantHelpers
     end
 
     #
@@ -36,6 +29,44 @@ module MultiTenant
       respond_to? :tenant_identifier
     end
 
+    module TenantGetters
+      #
+      # Returns true if there are any current tenants set, false if not.
+      #
+      # @return [Boolean]
+      #
+      def current_tenants?
+        current_tenants.any?
+      end
+      alias_method :current?, :current_tenants?
+      alias_method :current_tenant?, :current_tenants?
+
+      #
+      # Returns the array of current tenants. Thread-safe.
+      #
+      # @return the array of tenant records
+      #
+      def current_tenants
+        Thread.current.thread_variable_get(tenant_thread_var) || []
+      end
+
+      #
+      # Return the current tenant record, if any. Thread-safe. If there are MULTIPLE current tenants set this will
+      # raise a RuntimeError.
+      #
+      # @return the current tenant record
+      #
+      def current_tenant
+        tenants = current_tenants
+        if tenants.size > 1
+          raise "#{self.name}.current/current_tenant was called when multiple current tenants were present?. Did you mean to call #{self.name}.current_tenants?"
+        else
+          tenants[0]
+        end
+      end
+      alias_method :current, :current_tenant
+    end
+
     #
     # Class methods applied to the tenant model.
     #
@@ -52,39 +83,48 @@ module MultiTenant
     #   # Manually set the current client to an AR record
     #   Client.current 
     #
-    module ClassMethods
+    module TenantSetters
       #
-      # Return the current tenant record, if any. Thread-safe.
+      # Set the current tenant record. You may either pass an ActiveRecord Client record, OR the value
+      # of the `:using` option you passed to `acts_as_tenant`. Thread-safe.
       #
-      # @return the current tenant record
+      # @param record_or_identifier the record or the identifier in the 'tenant_identifier' column.
       #
-      def current
-        Thread.current.thread_variable_get(tenant_thread_var) || resolve_tenant(nil)
+      def current_tenant=(record_or_identifier)
+        self.current_tenants = Array(record_or_identifier)
       end
+      alias_method :current=, :current_tenant=
 
       #
-      # Set the current tenant record. You may either pass an ActiveRecord Client record, OR the value
+      # Set the array of current tenant records. You may either pass an ActiveRecord Client record, OR the value
       # of the `:using` option you passed to `acts_as_tenant`. Thread-safe.
       #
-      # @param record_or_identifier the record or the identifier in the 'tenant_identifier' column.
+      # @param records_or_identifiers array of the records or identifiers in the 'tenant_identifier' column.
       #
-      def current=(record_or_identifier)
-        obj = resolve_tenant record_or_identifier
-        Thread.current.thread_variable_set tenant_thread_var, obj
+      def current_tenants=(records_or_identifiers)
+        records, identifiers = Array(records_or_identifiers).partition { |x| x.is_a? self }
+        tenants = if identifiers.any?
+                    records + where({tenant_identifier => identifiers}).to_a
+                  else
+                    records
+                  end
+        Thread.current.thread_variable_set tenant_thread_var, tenants
       end
+    end
 
+    module TenantHelpers
       #
       # Loops through each tenant, sets it as current, and yields to any given block.
       # At the end, current is always set back to what it was originally.
       #
       def with_each_tenant
-        old_current = self.current
+        old_tenants = self.current_tenants
         all.each do |tenant|
-          self.current = tenant
+          self.current_tenant = tenant
           yield if block_given?
         end
       ensure
-        self.current = old_current
+        self.current_tenants = old_tenants
       end
 
       #
@@ -92,11 +132,23 @@ module MultiTenant
       # At the end, current is always set back to what it was originally.
       #
       def with_tenant(record_or_identifier)
-        old_current = self.current
-        self.current = record_or_identifier
+        old_tenants = self.current_tenants
+        self.current_tenant = record_or_identifier
         yield if block_given?
       ensure
-        self.current = old_current
+        self.current_tenants = old_tenants
+      end
+
+      #
+      # Sets the given array of tenants as the current one and yields to a given block.
+      # At the end, current is always set back to what it was originally.
+      #
+      def with_tenants(records_or_identifiers)
+        old_tenants = self.current_tenants
+        self.current_tenants = records_or_identifiers
+        yield if block_given?
+      ensure
+        self.current_tenants = old_tenants
       end
 
       #
@@ -104,12 +156,14 @@ module MultiTenant
       # At the end, current is always set back to what it was originally.
       #
       def without_tenant
-        old_current = self.current
-        self.current = resolve_tenant nil
+        old_tenants = self.current_tenants
+        self.current_tenant = nil
         yield if block_given?
       ensure
-        self.current = old_current
+        self.current_tenants = old_tenants
       end
+
+      alias_method :without_tenants, :without_tenant
     end
   end
 end

data/lib/multi_tenant/belongs_to_tenant.rb

@@ -27,10 +27,16 @@ module MultiTenant
       self.tenant_foreign_key = reflection.foreign_key.to_sym
       self.tenant_primary_key = reflection.association_primary_key.to_sym
 
-      include tenant_class.multi_tenant_impl.belongs_to_tenant_instance_methods
-      default_scope(&tenant_class.multi_tenant_impl.belongs_to_tenant_default_scope(self))
+      include MultiTenant::BelongsToTenant::InstanceMethods
 
+      before_validation :assign_to_current_tenant
       validates_presence_of tenant_foreign_key
+      validate :ensure_assigned_to_current_tenants
+
+      default_scope {
+        current = tenant_class.current_tenants.map(&tenant_primary_key)
+        current.any? ? where({tenant_foreign_key => current}) : where('1=1')
+      }
     end
 
     #
@@ -41,6 +47,33 @@ module MultiTenant
     def belongs_to_tenant?
       respond_to? :tenant_class
     end
+
+    module InstanceMethods
+      private
+
+      #
+      # Assign this model to the current tenant (if any). If there are multiple current tenants this is a no-op.
+      #
+      def assign_to_current_tenant
+        if self.class.tenant_class.current_tenants.size == 1
+          current_tenant_id = self.class.tenant_class.current_tenant.send(self.class.tenant_primary_key)
+          send "#{self.class.tenant_foreign_key}=", current_tenant_id
+        end
+      end
+
+      #
+      # If the tenant_id is set, make sure it's one of the current ones.
+      #
+      def ensure_assigned_to_current_tenants
+        _tenants_ids = self.class.tenant_class.current_tenants.map { |t|
+          t.send(self.class.tenant_primary_key).to_s
+        }
+        _current_id = send self.class.tenant_foreign_key
+        if _tenants_ids.any? and _current_id.present? and !_tenants_ids.include?(_current_id.to_s)
+          errors.add(self.class.tenant_foreign_key, "is incorrect")
+        end
+      end
+    end
   end
 end
 

data/lib/multi_tenant/belongs_to_tenant_through.rb

@@ -22,8 +22,16 @@ module MultiTenant
       cattr_accessor :delegate_class
       self.delegate_class = ref.klass
 
-      impl = self.delegate_class.tenant_class.multi_tenant_impl
-      default_scope(&impl.belongs_to_tenant_through_default_scope(self, ref))
+      default_scope {
+        tenants = delegate_class.tenant_class.current_tenants
+        next where('1=1') if tenants.empty?
+
+        # Using straight sql so we can JOIN against two columns. Otherwise one must go into "WHERE", and Arel would apply it to UPDATEs and DELETEs.
+        quoted_tenant_ids = tenants.map { |t| connection.quote t.send delegate_class.tenant_primary_key }
+        joins("INNER JOIN #{ref.klass.table_name} ON #{ref.klass.table_name}.#{ref.foreign_key}=#{table_name}.#{ref.association_primary_key} AND #{ref.klass.table_name}.#{ref.klass.tenant_foreign_key} IN (#{quoted_tenant_ids.join(',')})").
+          distinct.
+          readonly(false) # using "joins" makes records readonly, which we don't want
+      }
     end
 
     #

data/lib/multi_tenant/middleware.rb

@@ -10,7 +10,8 @@ module MultiTenant
   #     # The ActiveRecord model that represents the tenants. Or a Proc returning it, or it's String name.
   #     model: -> { Tenant },
   #
-  #     # A Proc that returns the tenant identifier that's used to look up the tenant. (i.e. :using option passed to acts_as_tenant)
+  #     # A Proc that returns the tenant identifier that's used to look up the tenant. (i.e. :using option passed to acts_as_tenant).
+  #     # Also aliased as "identifiers".
   #     identifier: ->(req) { req.host.split(/\./)[0] },
   #
   #     # (optional) A Hash of fake identifiers that should be allowed through. Each identifier will have a
@@ -61,6 +62,7 @@ module MultiTenant
       @app = app
       self.model = opts.fetch :model
       self.identifier = opts.fetch :identifier
+      self.identifier = opts[:identifier] || opts[:identifiers] || raise("Option :identifier or :identifiers is required")
       self.globals = (opts[:globals] || {}).reduce({}) { |a, (global, patterns)|
         a[global] = patterns.reduce({}) { |aa, (path, methods)|
           aa[path] = methods == :any ? :any : Set.new(Array(methods).map { |m| m.to_s.upcase })
@@ -74,22 +76,26 @@ module MultiTenant
     # Rack request call
     def call(env)
       tenant_class.current = nil
-      impl = tenant_class.multi_tenant_impl
 
       request = Rack::Request.new env
-      tenant_identifier = identifier.(request)
+      id_resp = identifier.(request)
+      records_or_identifiers = Array(id_resp)
 
-      if (matching_globals = impl.matching_globals(tenant_identifier, globals)).any?
-        allowed = matching_globals.any? { |allowed_paths|
+      if (matching = matching_globals(records_or_identifiers)).any?
+        allowed = matching.any? { |allowed_paths|
           path_matches?(request, allowed_paths)
         }
-        return allowed ? @app.call(env) : not_found.(tenant_identifier)
+        return @app.call(env) if allowed
 
-      elsif (tenant_class.current = tenant_identifier) and tenant_class.current?
+        ids = identifiers records_or_identifiers
+        return not_found.(id_resp.is_a?(Array) ? ids : ids[0])
+
+      elsif (tenant_query.current_tenants = records_or_identifiers) and tenant_class.current?
         return @app.call env
 
       else
-        return not_found.(tenant_identifier)
+        ids = identifiers records_or_identifiers
+        return not_found.(id_resp.is_a?(Array) ? ids : ids[0])
       end
     ensure
       tenant_class.current = nil
@@ -101,11 +107,35 @@ module MultiTenant
       }
     end
 
-    # Infers and returns the tenant model class this middleware is handling
-    def tenant_class
-      @tenant_class ||= if self.model.respond_to?(:call)
+    def matching_globals(records_or_identifiers)
+      identifiers(records_or_identifiers).reduce([]) { |a, id|
+        a << globals[id] if globals.has_key? id
+        a
+      }
+    end
+
+    def identifiers(records_or_identifiers)
+      records_or_identifiers.map { |x|
+        x.is_a?(tenant_class) ? x.send(tenant_class.tenant_identifier) : x.to_s
+      }
+    end
+
+    def tenant_class(m = self.model)
+      @tenant_class ||= if m.respond_to?(:call)
+        tenant_class m.call
+      elsif m.respond_to? :constantize
+        m.constantize
+      elsif m.respond_to? :model
+        m.model
+      else
+        m
+      end
+    end
+
+    def tenant_query
+      @tenant_query ||= if self.model.respond_to?(:call)
         self.model.call
-      elsif self.model.respond_to?(:constantize)
+      elsif self.model.respond_to? :constantize
         self.model.constantize
       else
         self.model

data/lib/multi_tenant/proxies_to_tenant.rb

@@ -47,19 +47,24 @@ module MultiTenant
     # @param scope [Proc] (optional) An AR scope that will be run *against the proxy model*, i.e. *this* model. Useful for when the association's `:inverse_of` is a `has_many` or `has_many_and_belongs_to`.
     #
     def proxies_to_tenant(association_name, scope = nil)
-      reflection = reflections[association_name.to_s]
-      raise "`proxies_to_tenant :#{association_name}`: unable to find association `:#{association_name}`. Make sure you create the association *first*." if reflection.nil?
-      raise "`proxies_to_tenant :#{association_name}`: #{reflection.klass.name} must use `acts_as_tenant`" if !reflection.klass.acts_as_tenant?
-      raise "`proxies_to_tenant :#{association_name}`: the `:#{association_name}` association must use the `:inverse_of` option." if reflection.inverse_of.nil?
+      ref = reflections[association_name.to_s]
+      raise "`proxies_to_tenant :#{association_name}`: unable to find association `:#{association_name}`. Make sure you create the association *first*." if ref.nil?
+      raise "`proxies_to_tenant :#{association_name}`: #{ref.klass.name} must use `acts_as_tenant`" if !ref.klass.acts_as_tenant?
+      raise "`proxies_to_tenant :#{association_name}`: the `:#{association_name}` association must use the `:inverse_of` option." if ref.inverse_of.nil?
 
       cattr_accessor :proxied_tenant_class, :proxied_tenant_inverse_assoc, :proxied_tenant_inverse_scope
-      self.proxied_tenant_class = reflection.klass
-      self.proxied_tenant_inverse_assoc = reflection.inverse_of.name
+      self.proxied_tenant_class = ref.klass
+      self.proxied_tenant_inverse_assoc = ref.inverse_of.name
       self.proxied_tenant_inverse_scope = scope
 
-      impl = self.proxied_tenant_class.multi_tenant_impl
-      self.extend impl.proxies_to_tenant_class_methods(reflection)
-      self.extend ClassMethods
+      extend MultiTenant::ActsAsTenant::TenantGetters
+      extend case [ref.macro, ref.inverse_of.macro]
+             when [:has_many, :belongs_to], [:has_one, :belongs_to], [:belongs_to, :has_one]
+               ProxiesToTenantSingularInverseAssociation
+             else
+               raise MultiTenant::NotImplemented, "`proxies_to_tenant` does not currently support `#{ref.macro}` associations with `#{ref.inverse_of.macro} inverses."
+               ProxiesToTenantPluralInverseAssociation
+             end
     end
 
     #
@@ -72,11 +77,28 @@ module MultiTenant
     end
 
     #
-    # Class methods given to proxies.
+    # Class methods for tenant proxies that have a singular inverse association (i.e. belongs_to or has_one).
     #
-    module ClassMethods
-      def multi_tenant_impl
-        proxied_tenant_class.multi_tenant_impl
+    module ProxiesToTenantSingularInverseAssociation
+      # Returns the current record of the proxy model
+      def current_tenants
+        proxied_tenant_class
+          .current_tenants
+          .map(&proxied_tenant_inverse_assoc)
+      end
+    end
+
+    #
+    # Class methods for tenant proxies that have a plural inverse association (i.e. has_many).
+    # NOTE These are just some thoughts on *maybe* how to support this if we ever need it.
+    #
+    module ProxiesToTenantPluralInverseAssociation
+      # Returns the current record of the proxy model
+      def current_tenant
+        raise MultiTenant::NotImplemented, "needs confirmed"
+        if (tenant = proxied_tenant_class.current_tenant)
+          tenant.send(proxied_tenant_inverse_assoc).instance_eval(&proxied_tenant_inverse_scope).first
+        end
       end
     end
   end

data/lib/multi_tenant/version.rb

@@ -1,4 +1,4 @@
 module MultiTenant
   # Gem version
-  VERSION = '1.2.1'.freeze
+  VERSION = '2.0.0.pre.rc1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_multi_tenant
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 2.0.0.pre.rc1
 platform: ruby
 authors:
 - Jordan Hollinger
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-23 00:00:00.000000000 Z
+date: 2018-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -58,8 +58,6 @@ files:
 - lib/multi_tenant/acts_as_tenant.rb
 - lib/multi_tenant/belongs_to_tenant.rb
 - lib/multi_tenant/belongs_to_tenant_through.rb
-- lib/multi_tenant/impl/multiple_current.rb
-- lib/multi_tenant/impl/single_current.rb
 - lib/multi_tenant/middleware.rb
 - lib/multi_tenant/proxies_to_tenant.rb
 - lib/multi_tenant/version.rb
@@ -78,9 +76,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6

data/lib/multi_tenant/impl/multiple_current.rb

@@ -1,104 +0,0 @@
-module MultiTenant
-  module Impl
-    #
-    # An implementation where Tenant.current is an array of tenants. All queries will be scoped to ANY of these
-    # tenants.
-    #
-    class MultipleCurrent
-      attr_reader :tenant_class
-
-      def initialize(tenant_class)
-        @tenant_class = tenant_class
-      end
-
-      def acts_as_tenant_class_methods
-        ActsAsTenantClassMethods
-      end
-
-      def belongs_to_tenant_instance_methods
-        BelongsToTenantInstanceMethods
-      end
-
-      def belongs_to_tenant_default_scope(model)
-        -> {
-          current = tenant_class.current.map(&model.tenant_primary_key)
-          current.any? ? model.where({model.tenant_foreign_key => current}) : model.where('1=1')
-        }
-      end
-
-      def belongs_to_tenant_through_default_scope(model, ref)
-        -> {
-          tenants = model.delegate_class.tenant_class.current
-          next model.where('1=1') if tenants.empty?
-
-          # Using straight sql so we can JOIN against two columns. Otherwise one must go into "WHERE", and Arel would apply it to UPDATEs and DELETEs.
-          quoted_tenant_ids = tenants.map { |t| model.connection.quote t.send model.delegate_class.tenant_primary_key }
-          model.joins("INNER JOIN #{ref.klass.table_name} ON #{ref.klass.table_name}.#{ref.foreign_key}=#{model.table_name}.#{ref.association_primary_key} AND #{ref.klass.table_name}.#{ref.klass.tenant_foreign_key} IN (#{quoted_tenant_ids.join(',')})").
-            distinct.
-            readonly(false) # using "joins" makes records readonly, which we don't want
-        }
-      end
-
-      def proxies_to_tenant_class_methods(_ref)
-        raise MultiTenant::Impl::NotImplemented, "`proxies_to_tenant` is not currently supported for impl `:multiple`."
-      end
-
-      def matching_globals(records_or_identifiers, globals)
-        records_or_identifiers.reduce([]) { |a, rec_or_id|
-          id = rec_or_id.is_a?(tenant_class) ? rec_or_id.send(tenant_class.tenant_identifier) : rec_or_id
-          a << globals[id] if globals.has_key? id
-          a
-        }
-      end
-
-      #
-      # Class methods given to the tenant model.
-      #
-      module ActsAsTenantClassMethods
-        def self.extended(model)
-          model.current = []
-        end
-
-        def current?
-          !current.nil? && current.any?
-        end
-
-        def resolve_tenant(records_or_identifiers)
-          if records_or_identifiers.nil?
-            []
-          elsif records_or_identifiers.any? { |x| x.is_a? self }
-            records_or_identifiers
-          elsif records_or_identifiers.any?
-            where({tenant_identifier => records_or_identifiers}).to_a
-          else
-            []
-          end
-        end
-      end
-
-      #
-      # Instance methods given to tenant-owned models.
-      #
-      module BelongsToTenantInstanceMethods
-        def self.included(model)
-          model.class_eval do
-            validate :ensure_assigned_to_current_tenants
-          end
-        end
-
-        private
-
-        #
-        # If the tenant_id is set, make sure it's one of the current ones.
-        #
-        def ensure_assigned_to_current_tenants
-          _tenants = self.class.tenant_class.current.map(&:id)
-          _tenant_id = send self.class.tenant_foreign_key
-          if _tenants.any? and _tenant_id.present? and !_tenants.include?(_tenant_id.to_s)
-            errors.add(self.class.tenant_foreign_key, "is incorrect")
-          end
-        end
-      end
-    end
-  end
-end

data/lib/multi_tenant/impl/single_current.rb

@@ -1,124 +0,0 @@
-module MultiTenant
-  module Impl
-    #
-    # An implementation where Tenant.current is set to the current tenant, or nil. 
-    #
-    class SingleCurrent
-      attr_reader :tenant_class
-
-      def initialize(tenant_class)
-        @tenant_class = tenant_class
-      end
-
-      def acts_as_tenant_class_methods
-        ActsAsTenantClassMethods
-      end
-
-      def belongs_to_tenant_instance_methods
-        BelongsToTenantInstanceMethods
-      end
-
-      def belongs_to_tenant_default_scope(model)
-        -> {
-          current = model.tenant_class.current
-          current ? model.where({model.tenant_foreign_key => current.send(model.tenant_primary_key)}) : model.where('1=1')
-        }
-      end
-
-      def belongs_to_tenant_through_default_scope(model, ref)
-        -> {
-          tenant = model.delegate_class.tenant_class.current
-          next model.where('1=1') if tenant.nil?
-
-          # Using straight sql so we can JOIN against two columns. Otherwise one must go into "WHERE", and Arel would apply it to UPDATEs and DELETEs.
-          quoted_tenant_id = model.connection.quote tenant.send model.delegate_class.tenant_primary_key
-          model.joins("INNER JOIN #{ref.klass.table_name} ON #{ref.klass.table_name}.#{ref.foreign_key}=#{model.table_name}.#{ref.association_primary_key} AND #{ref.klass.table_name}.#{ref.klass.tenant_foreign_key}=#{quoted_tenant_id}").
-            readonly(false) # using "joins" makes records readonly, which we don't want
-        }
-      end
-
-      def proxies_to_tenant_class_methods(ref)
-        case [ref.macro, ref.inverse_of.macro]
-        when [:has_many, :belongs_to], [:has_one, :belongs_to], [:belongs_to, :has_one]
-          ProxiesToTenantSingularInverseAssociation
-        else
-          raise MultiTenant::Impl::NotImplemented, "`proxies_to_tenant` does not currently support `#{ref.macro}` associations with `#{ref.inverse_of.macro} inverses."
-          ProxiesToTenantPluralInverseAssociation
-        end
-      end
-
-      def matching_globals(record_or_identifier, globals)
-        id = record_or_identifier.is_a?(tenant_class) ? record_or_identifier.send(tenant_class.tenant_identifier) : record_or_identifier
-        globals.has_key?(id) ? [globals[id]] : []
-      end
-
-      #
-      # Class methods given to the tenant model.
-      #
-      module ActsAsTenantClassMethods
-        def current?
-          !current.nil?
-        end
-
-        def resolve_tenant(record_or_identifier)
-          if record_or_identifier.is_a? self
-            record_or_identifier
-          elsif record_or_identifier
-            where({tenant_identifier => record_or_identifier}).first
-          else
-            nil
-          end
-        end
-      end
-
-      #
-      # Instance methods given to tenant-owned models.
-      #
-      module BelongsToTenantInstanceMethods
-        def self.included(model)
-          model.class_eval do
-            before_validation :assign_to_tenant
-          end
-        end
-
-        private
-
-        #
-        # Assign this model to the current tenant (if any)
-        #
-        def assign_to_tenant
-          if self.class.tenant_class.current
-            current_tenant_id = self.class.tenant_class.current.send(self.class.tenant_primary_key)
-            send "#{self.class.tenant_foreign_key}=", current_tenant_id
-          end
-        end
-      end
-
-      #
-      # Class methods for tenant proxies that have a singular inverse association (i.e. belongs_to or has_one).
-      #
-      module ProxiesToTenantSingularInverseAssociation
-        # Returns the current record of the proxy model
-        def current
-          if (tenant = proxied_tenant_class.current)
-            tenant.send proxied_tenant_inverse_assoc
-          end
-        end
-      end
-
-      #
-      # Class methods for tenant proxies that have a plural inverse association (i.e. has_many).
-      # NOTE These are just some thoughts on *maybe* how to support this if we ever need it.
-      #
-      module ProxiesToTenantPluralInverseAssociation
-        # Returns the current record of the proxy model
-        def current
-          raise MultiTenant::Impl::NotImplemented, "needs confirmed"
-          if (tenant = proxied_tenant_class.current)
-            tenant.send(proxied_tenant_inverse_assoc).instance_eval(&proxied_tenant_inverse_scope).first
-          end
-        end
-      end
-    end
-  end
-end