acts_as_tenant 0.2.9 → 0.3.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ae0af3ec60e0f5aec616181f0cb84dbf819838d5
+  data.tar.gz: 24f836a129e42dbe7bf60aff0eb5cf3942eabc4d
+SHA512:
+  metadata.gz: d5946028e86ba16bde4ed1ad232b2f89d75302111e44bcb765e144688e16f21c697d1951fae80160e5263c96c43871380e007a2ef813631278c932b2896f7e2c
+  data.tar.gz: 2a2f574538b2507d3837b1d6d3919acf409df8599afded9127c7d991baac5ba40f85e77f135ae1655bacce560ffe14672b462a43b909958c059ede1e17f4ca0a

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+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)

data/README.md

@@ -65,14 +65,19 @@ This approach is useful when running background processes for a specified tenant
 any code in this block will be scoped to the current tenant. All methods that set the current tenant are thread safe.
 
 **note:** If the current tenant is not set by one of these methods, Acts_as_tenant will be unable to apply the proper scope to your models. So make sure you use one of the two methods to tell acts_as_tenant about the current tenant.
-  
+
+**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.
+
 Scoping your models
 -------------------
     class Addaccounttousers < ActiveRecord::Migration
       def up
         add_column :users, :account_id, :integer
       end
-  
+    end
+
     class User < ActiveRecord::Base
       acts_as_tenant(:account)
     end
@@ -110,6 +115,19 @@ If you need to validate for uniqueness, chances are that you want to scope this
 
 All options available to Rails' own `validates_uniqueness_of` are also available to this method.
 
+Configuration options
+---------------------
+An initializer can be created to control (currently one) option in ActsAsTenant. Defaults
+are shown below with sample overrides following. In `config/initializer/acts_as_tenant.rb`:
+
+```ruby
+ActsAsTenant.configure do |config|
+  config.require_tenant = false # true
+end
+```
+
+* `config.require_tenant` when set to true will raise an ActsAsTenant::NoTenant error whenever a query is made without a tenant set.
+
 Note on testing
 ---------------
 Whenever you set the `current_tenant` in your tests, either through integration tests or directly by calling `ActsAsTenant.current_tenant = some_tenant`, make sure to clean up the tenant after each test by calling `ActsAsTenant.current_tenant = nil`.

data/acts_as_tenant.gemspec

@@ -18,9 +18,13 @@ Gem::Specification.new do |s|
   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')
   s.add_development_dependency('database_cleaner')
   s.add_development_dependency('sqlite3')
+  s.add_development_dependency('debugger')
 end

data/lib/acts_as_tenant.rb

@@ -3,13 +3,15 @@
 require "active_record"
 require "action_controller"
 require "active_model"
+require "request_store"
 
 #$LOAD_PATH.unshift(File.dirname(__FILE__))
 
-require "acts_as_tenant"
 require "acts_as_tenant/version"
-require "acts_as_tenant/controller_extensions.rb"
-require "acts_as_tenant/model_extensions.rb"
+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
 
@@ -18,5 +20,6 @@ if defined?(ActiveRecord::Base)
   ActionController::Base.extend ActsAsTenant::ControllerExtensions
 end
 
- 
+module ActsAsTenant
+end
   

data/lib/acts_as_tenant/configuration.rb

@@ -0,0 +1,26 @@
+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
+  
+    def require_tenant
+      @require_tenant ||= false
+    end
+  
+  end
+end

data/lib/acts_as_tenant/controller_extensions.rb

@@ -2,29 +2,25 @@ module ActsAsTenant
   module ControllerExtensions
     
     # this method allows setting the current_tenant by reading the subdomain and looking
-    # it up in the tenant-model passed to the method (defaults to Account). The method will 
-    # look for the subdomain in a column referenced by the second argument (defaults to subdomain).
+    # 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
-        attr_accessor :current_tenant
       end
-
+      
       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
             ActsAsTenant.current_tenant = tenant_class.where(tenant_column => request.subdomains.first).first
-            @current_tenant_instance = ActsAsTenant.current_tenant
           end
           
-          # helper method to have the current_tenant available in the controller  
           def current_tenant
             ActsAsTenant.current_tenant
           end
@@ -41,31 +37,7 @@ module ActsAsTenant
           ActsAsTenant.current_tenant = current_tenant_object
         end
         
-        private
-          # helper method to have the current_tenant available in the controller  
-          def current_tenant
-            ActsAsTenant.current_tenant
-          end
-      end
-    end
-    
-    
-    
-    # this method allows manual setting of the current_tenant by passing in a tenant object
-    # 
-    def set_current_tenant_to(current_tenant_object)
-      self.class_eval do
-        cattr_accessor :tenant_class
-        attr_accessor :current_tenant
-        before_filter lambda { 
-          ActiveSupport::Deprecation.warn "set_current_tenant_to is deprecated and will be removed from Acts_as_tenant in a future releases, please use set_current_tenant_through_filter instead.", caller
-          @current_tenant_instance = ActsAsTenant.current_tenant = current_tenant_object 
-          }
-        
-        helper_method :current_tenant
-        
-        private
-          # helper method to have the current_tenant available in the controller  
+        private 
           def current_tenant
             ActsAsTenant.current_tenant
           end

data/lib/acts_as_tenant/errors.rb

@@ -0,0 +1,19 @@
+module ActsAsTenant
+  class Error < StandardError
+  end
+
+  module Errors
+    class ModelNotScopedByTenant < ActsAsTenant::Error
+    end
+    
+    class NoTenantSet < ActsAsTenant::Error
+    end
+    
+    class ModelNotScopedByTenant < ActsAsTenant::Error
+    end
+    
+    class TenantIsImmutable < ActsAsTenant::Error
+    end
+    
+  end
+end

data/lib/acts_as_tenant/model_extensions.rb

@@ -1,117 +1,104 @@
-# ActsAsTenant
-
-
-module ActsAsTenant
-  
-  class << self
-    cattr_accessor :tenant_class
-
-    # This will also work whithin Fibers:
-    # http://devblog.avdi.org/2012/02/02/ruby-thread-locals-are-also-fiber-local/
-    def current_tenant=(tenant)
-      Thread.current[:current_tenant] = tenant
-    end
-
-    def current_tenant
-      Thread.current[:current_tenant]
-    end
-
-    # Sets the current_tenant within the given block
-    def with_tenant(tenant, &block)
-      if block.nil?
-        raise ArgumentError, "block required"
-      end
-
-      old_tenant = self.current_tenant
-      self.current_tenant = tenant
-
-      block.call
-
-      self.current_tenant= old_tenant
-    end
-  end
-  
-  module ModelExtensions
-    extend ActiveSupport::Concern
-  
-    # Alias the v_uniqueness_of method so we can scope it to the current tenant when relevant
-  
-    module ClassMethods
-    
-      def acts_as_tenant(association = :account)
-        
-        # Method that enables checking if a class is scoped by tenant
-        def self.is_scoped_by_tenant?
-          true
-        end
-        
-        ActsAsTenant.tenant_class ||= association
-        
-        # Setup the association between the class and the tenant class
-        belongs_to association
-      
-        # get the tenant model and its foreign key
-        reflection = reflect_on_association association
-        
-        # As the "foreign_key" method changed name in 3.1 we check for backward compatibility 
-        if reflection.respond_to?(:foreign_key)
-          fkey = reflection.foreign_key
-        else
-          fkey = reflection.association_foreign_key
-        end
-    
-        # set the current_tenant on newly created objects
-        before_validation Proc.new {|m|
-          return unless ActsAsTenant.current_tenant
-          m.send "#{association}_id=".to_sym, ActsAsTenant.current_tenant.id
-        }, :on => :create
-    
-        # set the default_scope to scope to current tenant
-        default_scope lambda {
-          where({fkey => ActsAsTenant.current_tenant.id}) if ActsAsTenant.current_tenant
-        }
-    
-        # Rewrite accessors to make tenant foreign_key/association immutable
-        define_method "#{fkey}=" do |integer|  
-          if new_record?
-            write_attribute(fkey, integer)  
-          else
-            raise "#{fkey} is immutable! [ActsAsTenant]"
-          end  
-        end
-      
-        define_method "#{association}=" do |model|  
-          if new_record?
-            super(model) 
-          else
-            raise "#{association} is immutable! [ActsAsTenant]"
-          end  
-        end
-      
-        # add validation of associations against tenant scope
-        # we can't do this for polymorphic associations so we 
-        # exempt them
-        reflect_on_all_associations.each do |a|
-          unless a == reflection || a.macro == :has_many || a.macro == :has_one || a.macro == :has_and_belongs_to_many || a.options[:polymorphic]
-            # check if the association is aliasing another class, if so 
-            # find the unaliased class name
-            association_class =  a.options[:class_name].nil? ? a.name.to_s.classify.constantize : a.options[:class_name].constantize
-            validates_each a.foreign_key.to_sym do |record, attr, value|
-              # Invalidate the association unless the parent is known to the tenant or no association has
-              # been set.
-              record.errors.add attr, "is invalid [ActsAsTenant]" unless value.nil? || association_class.where(:id => value).present?
-            end
-          end
-        end 
-      end
-      
-      def validates_uniqueness_to_tenant(fields, args ={})
-        raise "[ActsAsTenant] validates_uniqueness_to_tenant: no current tenant" unless respond_to?(:is_scoped_by_tenant?)
-        tenant_id = lambda { "#{ActsAsTenant.tenant_class.to_s.downcase}_id"}.call
-        args[:scope].nil? ? args[:scope] = tenant_id : args[:scope] << tenant_id
-        validates_uniqueness_of(fields, args)
-      end
-      
-    end
-  end
-end
+module ActsAsTenant
+  @@tenant_klass = nil
+  
+  def self.set_tenant_klass(klass)
+    @@tenant_klass = klass
+  end
+  
+  def self.tenant_klass
+    @@tenant_klass
+  end
+  
+  def self.fkey
+    "#{@@tenant_klass.to_s}_id"
+  end
+  
+  def self.current_tenant=(tenant)
+    RequestStore.store[:current_tenant] = tenant
+  end
+
+  def self.current_tenant
+    RequestStore.store[:current_tenant]
+  end
+
+  def self.with_tenant(tenant, &block)
+    if block.nil?
+      raise ArgumentError, "block required"
+    end
+
+    old_tenant = self.current_tenant
+    self.current_tenant = tenant
+    value = block.call
+    self.current_tenant = old_tenant
+    return value
+  end
+  
+  module ModelExtensions
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+  
+    module ClassMethods
+      def acts_as_tenant(association = :account)
+        belongs_to association
+        ActsAsTenant.set_tenant_klass(association)
+        
+        default_scope lambda {
+          if ActsAsTenant.configuration.require_tenant && ActsAsTenant.current_tenant.nil?
+            raise ActsAsTenant::Errors::NoTenantSet
+          end
+          where({ActsAsTenant.fkey => ActsAsTenant.current_tenant.id}) if ActsAsTenant.current_tenant
+        }
+
+        # Add the following validations to the receiving model:
+        # - new instances should have the tenant set
+        # - validate that associations belong to the tenant, currently only for belongs_to
+        #
+        before_validation Proc.new {|m|
+          if ActsAsTenant.current_tenant
+            m.send "#{association}_id=".to_sym, ActsAsTenant.current_tenant.id
+          end
+        }, :on => :create
+    
+        reflect_on_all_associations.each do |a|
+          unless a == reflect_on_association(association) || a.macro != :belongs_to || a.options[:polymorphic] 
+            association_class =  a.options[:class_name].nil? ? a.name.to_s.classify.constantize : a.options[:class_name].constantize
+            validates_each a.foreign_key.to_sym do |record, attr, value|
+              record.errors.add attr, "association is invalid [ActsAsTenant]" unless value.nil? || association_class.where(:id => value).present?
+            end
+          end
+        end
+        
+        # Dynamically generate the following methods:
+        # - Rewrite the accessors to make tenant immutable
+        # - Add a helper method to verify if a model has been scoped by AaT
+        #
+        define_method "#{ActsAsTenant.fkey}=" do |integer|
+          raise ActsAsTenant::Errors::TenantIsImmutable unless new_record?
+          write_attribute("#{ActsAsTenant.fkey}", integer)  
+        end
+
+        define_method "#{ActsAsTenant.tenant_klass.to_s}=" do |model|  
+          raise ActsAsTenant::Errors::TenantIsImmutable unless new_record?
+          super(model) 
+        end
+        
+        def scoped_by_tenant?
+          true
+        end
+      end
+      
+      def validates_uniqueness_to_tenant(fields, args ={})
+        raise ActsAsTenant::Errors::ModelNotScopedByTenant unless respond_to?(:scoped_by_tenant?)
+        tenant_id = lambda { "#{ActsAsTenant.fkey}"}.call
+        if args[:scope]
+          args[:scope] = Array(args[:scope]) << tenant_id
+        else
+          args[:scope] = tenant_id
+        end
+        
+        validates_uniqueness_of(fields, args)
+      end
+    end
+  end
+end

data/lib/acts_as_tenant/version.rb

@@ -1,3 +1,3 @@
 module ActsAsTenant
-  VERSION = "0.2.9"
+  VERSION = "0.3.1"
 end

data/spec/acts_as_tenant/configuration_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe ActsAsTenant::Configuration do
+  describe 'no configuration given' do
+    before do
+      ActsAsTenant.configure
+    end
+
+    it 'provides defaults' do
+      ActsAsTenant.configuration.require_tenant.should_not be_true
+    end
+  end
+
+  describe 'with config block' do
+    after do
+      ActsAsTenant.configure
+    end
+
+    it 'stores config' do
+      ActsAsTenant.configure do |config|
+        config.require_tenant = true
+      end
+
+      ActsAsTenant.configuration.require_tenant.should be_true
+    end
+
+  end
+end

data/spec/{model_extensions_spec.rb → acts_as_tenant/model_extensions_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 # Setup the db
-ActiveRecord::Schema.define(:version => 2) do
+ActiveRecord::Schema.define(:version => 1) do
   create_table :accounts, :force => true do |t|
     t.column :name, :string
   end
@@ -10,43 +10,35 @@ ActiveRecord::Schema.define(:version => 2) do
     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 :cities, :force => true do |t|
     t.column :name, :string
   end
-  
+
   create_table :sub_tasks, :force => true do |t|
     t.column :name, :string
+    t.column :attribute2, :string
     t.column :something_else, :integer
-  end
-
-  create_table :tools, :force => true do |t|
-    t.column :name, :string
     t.column :account_id, :integer
   end
 
-  create_table :managers_tools, {:force => true, id: false} do |t|
-    t.integer :manager_id
-    t.integer :tool_id
-  end
-  
 end
 
 # Setup the models
@@ -58,21 +50,19 @@ 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
-  has_and_belongs_to_many :tools
-
   acts_as_tenant :account
 end
 
 class Task < ActiveRecord::Base
   belongs_to :project
-  default_scope :conditions => { :completed => nil }, :order => "name"
-  
+  default_scope -> { where(:completed => nil).order("name") }
+
   acts_as_tenant :account
   validates_uniqueness_of :name
 end
@@ -84,12 +74,7 @@ end
 class SubTask < ActiveRecord::Base
   acts_as_tenant :account
   belongs_to :something_else, :class_name => "Project"
-end
-
-class Tool < ActiveRecord::Base
-  has_and_belongs_to_many :managers
-
-  acts_as_tenant :account
+  validates_uniqueness_to_tenant :name, scope: :attribute2
 end
 
 # Start testing!
@@ -100,11 +85,11 @@ describe ActsAsTenant do
     before { ActsAsTenant.current_tenant = :foo }
     it { ActsAsTenant.current_tenant == :foo }
   end
-  
+
   describe 'is_scoped_as_tenant should return the correct value' do
-    it {Project.respond_to?(:is_scoped_by_tenant?).should == true}
+    it {Project.respond_to?(:scoped_by_tenant?).should == true}
   end
-  
+
   describe 'Project.all should be scoped to the current tenant if set' do
     before do
       @account1 = Account.create!(:name => 'foo')
@@ -112,15 +97,15 @@ describe ActsAsTenant do
 
       @project1 = @account1.projects.create!(:name => 'foobar')
       @project2 = @account2.projects.create!(:name => 'baz')
-      
+
       ActsAsTenant.current_tenant= @account1
       @projects = Project.all
     end
-    
+
     it { @projects.length.should == 1 }
     it { @projects.should == [@project1] }
   end
-  
+
   describe 'Project.unscoped.all should return the unscoped value' do
     before do
       @account1 = Account.create!(:name => 'foo')
@@ -128,147 +113,123 @@ describe ActsAsTenant do
 
       @project1 = @account1.projects.create!(:name => 'foobar')
       @project2 = @account2.projects.create!(:name => 'baz')
-      
+
       ActsAsTenant.current_tenant= @account1
-      @projects = Project.unscoped.all
+      @projects = Project.unscoped
     end
-    
-    it { @projects.length.should == 2 }
+
+    it { @projects.count.should == 2 }
   end
-  
+
   describe 'Associations should be correctly scoped by current tenant' do
     before do
       @account = Account.create!(:name => 'foo')
       @project = @account.projects.create!(:name => 'foobar', :account_id => @account.id )
-      # the next line would normally be nearly impossible: a task assigned to a tenant project, 
+      # the next line would 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) 
-      
+      @task1 = Task.create!(:name => 'no_tenant', :project => @project)
+
       ActsAsTenant.current_tenant = @account
       @task2 = @project.tasks.create!(:name => 'baz')
       @tasks = @project.tasks
     end
-    
+
     it 'should correctly set the tenant on the task created with current_tenant set' do
       @task2.account.should == @account
     end
-    
+
     it 'should filter out the non-tenant task from the project' do
       @tasks.length.should == 1
     end
   end
-  
+
   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
-      @tasks.length.should == 3 
-      @tasks.should == [@task2, @task3, @task4] 
+      @tasks.length.should == 3
+      @tasks.should == [@task2, @task3, @task4]
     end
   end
-  
+
   describe 'tenant_id should be immutable' do
     before do
       @account = Account.create!(:name => 'foo')
       @project = @account.projects.create!(:name => 'bar')
     end
-    
+
     it { lambda {@project.account_id = @account.id + 1}.should raise_error }
   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_id => @account.id + 1)
-      
+
       ActsAsTenant.current_tenant = @account
       @project2 = Project.create!(:name => 'accessible_project')
       @task = @project2.tasks.create!(:name => 'bar')
     end
-  
+
     it { @task.update_attributes(:project_id => @project1.id).should == false }
   end
-  
+
   describe 'When using validates_uniqueness_to_tenant in a aat model' do
     before do
       @account = Account.create!(:name => 'foo')
       ActsAsTenant.current_tenant = @account
       @project1 = Project.create!(:name => 'bar')
     end
-    
+
     it 'should not be possible to create a duplicate within the same tenant' do
-      @project2 = Project.create(:name => 'bar').valid?.should == false
+      Project.create(:name => 'bar').valid?.should == false
     end
-    
+
     it 'should be possible to create a duplicate outside the tenant scope' do
-      @account = Account.create!(:name => 'baz')
-      ActsAsTenant.current_tenant = @account
-      @project2 = Project.create(:name => 'bar').valid?.should == true
+      account = Account.create!(:name => 'baz')
+      ActsAsTenant.current_tenant = account
+      Project.create(:name => 'bar').valid?.should == true
+    end
+
+    it 'applies additional scopes' do
+      subtask1 = SubTask.create!(:name => 'foo', :attribute2 => 'unique_scope')
+      SubTask.create(:name => 'foo', :attribute2 => 'another_scope').should be_valid
+      SubTask.create(:name => 'foo', :attribute2 => 'unique_scope').should_not be_valid
     end
   end
-  
+
   describe 'When using validates_uniqueness_of in a NON-aat model' do
     before do
       @city1 = City.create!(:name => 'foo')
     end
     it 'should not be possible to create duplicates' do
-      @city2 = City.create(:name => 'foo').valid?.should == false
+      City.create(:name => 'foo').valid?.should == false
     end
   end
-  
+
   describe "It should be possible to use aliased associations" do
-    it { @sub_task = SubTask.create(:name => 'foo').valid?.should == true }
+    it { SubTask.create(:name => 'foo').valid?.should == true }
   end
-  
+
   describe "It should be possible to create and save an AaT-enabled child without it having a parent" do
       @account = Account.create!(:name => 'baz')
       ActsAsTenant.current_tenant = @account
       Task.create(:name => 'bar').valid?.should == true
   end
 
-  describe "It should be possible to use direct many-to-many associations" do
-      @manager = Manager.create!(:name => 'fool')
-      @manager.tools.new(:name => 'golden hammer')
-      @manager.save.should == true
-  end
-
-  describe "It should be possible to use direct many-to-many associations" do
-    @manager = Manager.create!(:name => 'fool')
-    @manager.tools.new(:name => 'golden hammer')
-    @manager.save.should == true
-  end
-
-  describe "When using direct many-to-many associations they are correctly scoped to the tenant" do
-    before do
-      @account1 = Account.create!(:name => 'foo')
-      @account2 = Account.create!(:name => 'bar')
-
-      ActsAsTenant.current_tenant= @account1
-      @manager1 = Manager.create!(:name => 'fool')
-      @tool1 = @manager1.tools.create!(:name => 'golden hammer')
-
-      ActsAsTenant.current_tenant= @account2
-      @manager2 = Manager.create!(:name => 'pitty')
-      @tool2 = @manager2.tools.create!(:name => 'golden saw')
-
-      @tools = Tool.all
-    end
-    it { @tools.should == [@tool2] }
-  end
-
   describe "::with_tenant" do
     it "should set current_tenant to the specified tenant inside the block" do
       @account = Account.create!(:name => 'baz')
@@ -278,11 +239,10 @@ describe ActsAsTenant do
       end
     end
 
-
-    it "should return current_tenant to the previous tenant once exiting the block" do
+    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
 
@@ -291,8 +251,47 @@ describe ActsAsTenant do
       ActsAsTenant.current_tenant.should 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
+
+      value.should 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
+
+  context "tenant required" do
+    describe "raises exception if no tenant specified" do
+      before do
+        @account1 = Account.create!(:name => 'foo')
+        @project1 = @account1.projects.create!(:name => 'foobar')
+        ActsAsTenant.configuration.stub(require_tenant: true)
+      end
+      
+      it "should raise an error when no tenant is provided" do
+        expect { Project.all.load }.to raise_error(ActsAsTenant::Errors::NoTenantSet)
+      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
 end

data/spec/spec_helper.rb

@@ -1,30 +1,14 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'rspec'
-require 'active_record'
-require 'action_controller'
-require 'logger'
-require 'database_cleaner'
-
-require 'acts_as_tenant/model_extensions'
-require 'acts_as_tenant/controller_extensions'
 
-ActiveRecord::Base.send(:include, ActsAsTenant::ModelExtensions)
-ActionController::Base.extend ActsAsTenant::ControllerExtensions
+require 'database_cleaner'
+require 'acts_as_tenant'
 
 config = 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(config[ENV['DB'] || 'sqlite'])
 
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
-#Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
-
-#RSpec.configure do |config|
-#end
-
 RSpec.configure do |config|
-
   config.before(:suite) do
     DatabaseCleaner.strategy = :transaction
     DatabaseCleaner.clean_with(:truncation)
@@ -36,6 +20,7 @@ RSpec.configure do |config|
 
   config.after(:each) do
     DatabaseCleaner.clean
+    ActsAsTenant.current_tenant = nil
   end
 
 end

metadata

@@ -1,60 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_tenant
 version: !ruby/object:Gem::Version
-  version: 0.2.9
-  prerelease: 
+  version: 0.3.1
 platform: ruby
 authors:
 - Erwin Matthijssen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-07 00:00:00.000000000 Z
+date: 2013-06-24 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: request_store
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70124434956940 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70124434956940
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70124434955660 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70124434955660
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70124434955020 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70124434955020
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70124434954400 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: debugger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70124434954400
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Integrates multi-tenancy into a Rails application in a convenient and
   out-of-your way manner
 email:
@@ -71,38 +110,41 @@ files:
 - Rakefile
 - acts_as_tenant.gemspec
 - lib/acts_as_tenant.rb
+- lib/acts_as_tenant/configuration.rb
 - lib/acts_as_tenant/controller_extensions.rb
+- lib/acts_as_tenant/errors.rb
 - lib/acts_as_tenant/model_extensions.rb
 - lib/acts_as_tenant/version.rb
 - rails/init.rb
+- spec/acts_as_tenant/configuration_spec.rb
+- spec/acts_as_tenant/model_extensions_spec.rb
 - spec/database.yml
-- spec/model_extensions_spec.rb
 - spec/spec_helper.rb
 homepage: http://www.rollcallapp.com/blog
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: acts_as_tenant
-rubygems_version: 1.8.15
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Add multi-tenancy to Rails applications using a shared db strategy
 test_files:
+- spec/acts_as_tenant/configuration_spec.rb
+- spec/acts_as_tenant/model_extensions_spec.rb
 - spec/database.yml
-- spec/model_extensions_spec.rb
 - spec/spec_helper.rb