Use RequestStore instead of Thread.current to fix #24. Clean up depen…

…dency requirements.
ErwinM · Feb 21, 2013 · 5325b47 · 5325b47
1 parent ffa49df
commit 5325b47
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 15 deletions.
diff --git a/acts_as_tenant.gemspec b/acts_as_tenant.gemspec
@@ -18,7 +18,10 @@ 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')

diff --git a/lib/acts_as_tenant.rb b/lib/acts_as_tenant.rb
@@ -3,10 +3,10 @@
 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/errors"
 require "acts_as_tenant/configuration"

diff --git a/lib/acts_as_tenant/model_extensions.rb b/lib/acts_as_tenant/model_extensions.rb
@@ -14,11 +14,11 @@ def self.fkey
   end
 
   def self.current_tenant=(tenant)
-    Thread.current[:current_tenant] = tenant
+    RequestStore.store[:current_tenant] = tenant
   end
 
   def self.current_tenant
-    Thread.current[:current_tenant]
+    RequestStore.store[:current_tenant]
   end
 
   def self.with_tenant(tenant, &block)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,18 +1,8 @@
 $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/errors'
-require 'acts_as_tenant/configuration'
-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"))