acts_as_tenant 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: ae0af3ec60e0f5aec616181f0cb84dbf819838d5
-  data.tar.gz: 24f836a129e42dbe7bf60aff0eb5cf3942eabc4d
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NTdlZmJkZjFiNWQ5YzUxNDM0OWJiOWEzYWMzZTIzZWM3ZmMzN2RmOA==
+  data.tar.gz: !binary |-
+    NTViNTg4MDVkYjIwYmY4Y2VlZWY0NGVkNmE2MzEzNjk2ODE5YjEwOA==
 SHA512:
-  metadata.gz: d5946028e86ba16bde4ed1ad232b2f89d75302111e44bcb765e144688e16f21c697d1951fae80160e5263c96c43871380e007a2ef813631278c932b2896f7e2c
-  data.tar.gz: 2a2f574538b2507d3837b1d6d3919acf409df8599afded9127c7d991baac5ba40f85e77f135ae1655bacce560ffe14672b462a43b909958c059ede1e17f4ca0a
+  metadata.gz: !binary |-
+    MzZlMWJmNzAyZGQ2NDUwYWFmYjIzN2Q3YjliZDhlMjA4NGVjNzcwMGE4Yzc1
+    MzRmOGZmNTE0Yzk3NTY3YTI5ZTU2ZTBhNDczYTlmZjU0Y2JjYWY1MDM5ODE5
+    NTNhODA2ZjczYzk4Y2VkZjg4MDhmYTNlMDc5Y2UzZjgyNzBmZDA=
+  data.tar.gz: !binary |-
+    MjM2NzliNjViYjlkNjQyNjdmODNiMWY2MGFkODQ1ZjJiODQ1YjRjMzJkOWM2
+    MGFjNjJkNWVhNDkxMTE1NGZmZGIwZDM2ODA0ZWE3MmM0ZDQxMGNmYTcwMTVh
+    YzM3OWU5ZjUyYTJmZmExYTEyMDFiY2YyZmIzZThhYzhlMGYxNzI=

data/CHANGELOG.md

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

data/README.md

@@ -1,6 +1,8 @@
 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).
 
 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.

data/Rakefile

@@ -1 +1,5 @@
 require 'bundler/gem_tasks'
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+task :default => :spec

data/acts_as_tenant.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
   #s.add_dependency('request_store', '>= 1.0.5')
 
   s.add_development_dependency('rspec')
+  s.add_development_dependency('rspec-rails')
   s.add_development_dependency('database_cleaner')
   s.add_development_dependency('sqlite3')
   s.add_development_dependency('debugger')

data/lib/acts_as_tenant/controller_extensions.rb

@@ -18,7 +18,7 @@ module ActsAsTenant
         
         private
           def find_tenant_by_subdomain
-            ActsAsTenant.current_tenant = tenant_class.where(tenant_column => request.subdomains.first).first
+            ActsAsTenant.current_tenant = tenant_class.where(tenant_column => request.subdomains.last).first
           end
           
           def current_tenant

data/lib/acts_as_tenant/model_extensions.rb

@@ -29,8 +29,10 @@ module ActsAsTenant
     old_tenant = self.current_tenant
     self.current_tenant = tenant
     value = block.call
-    self.current_tenant = old_tenant
     return value
+
+  ensure
+    self.current_tenant = old_tenant
   end
   
   module ModelExtensions
@@ -47,7 +49,7 @@ module ActsAsTenant
           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
+          where("#{self.table_name}.#{ActsAsTenant.fkey} = ?", ActsAsTenant.current_tenant.id)  if ActsAsTenant.current_tenant
         }
 
         # Add the following validations to the receiving model:
@@ -74,13 +76,13 @@ module ActsAsTenant
         # - 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)  
+          raise ActsAsTenant::Errors::TenantIsImmutable unless new_record? || send(ActsAsTenant.fkey).nil?
+          write_attribute("#{ActsAsTenant.fkey}", integer)
         end
 
-        define_method "#{ActsAsTenant.tenant_klass.to_s}=" do |model|  
-          raise ActsAsTenant::Errors::TenantIsImmutable unless new_record?
-          super(model) 
+        define_method "#{ActsAsTenant.tenant_klass.to_s}=" do |model|
+          raise ActsAsTenant::Errors::TenantIsImmutable unless new_record? || send(ActsAsTenant.fkey).nil?
+          super(model)
         end
         
         def scoped_by_tenant?

data/lib/acts_as_tenant/version.rb

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

data/spec/acts_as_tenant/model_extensions_spec.rb

@@ -4,6 +4,7 @@ require 'spec_helper'
 ActiveRecord::Schema.define(:version => 1) do
   create_table :accounts, :force => true do |t|
     t.column :name, :string
+    t.column :subdomain, :string
   end
 
   create_table :projects, :force => true do |t|
@@ -165,7 +166,7 @@ describe ActsAsTenant do
     end
   end
 
-  describe 'tenant_id should be immutable' do
+  describe 'tenant_id should be immutable, if already set' do
     before do
       @account = Account.create!(:name => 'foo')
       @project = @account.projects.create!(:name => 'bar')
@@ -174,6 +175,16 @@ describe ActsAsTenant do
     it { lambda {@project.account_id = @account.id + 1}.should 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 { @project.account_id.should be_nil }
+    it { lambda { @project.account = @account }.should_not raise_error }
+  end
+
   describe 'Associations can only be made with in-scope objects' do
     before do
       @account = Account.create!(:name => 'foo')
@@ -275,7 +286,7 @@ describe ActsAsTenant do
         @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

data/spec/acts_as_tenant/tenant_by_filter_spec.rb

@@ -0,0 +1,33 @@
+require "spec_helper"
+
+#Setup test specific ApplicationController
+class Account
+  attr_accessor :name
+end
+
+class ApplicationController2 < ActionController::Base
+  include Rails.application.routes.url_helpers
+  set_current_tenant_through_filter
+  before_filter :your_method_that_finds_the_current_tenant
+
+  def your_method_that_finds_the_current_tenant
+    current_account = Account.new
+    current_account.name = 'account1'
+    set_current_tenant(current_account)
+  end
+  
+end
+
+# Start testing
+describe ApplicationController2, :type => :controller do
+  controller do
+    def index
+      render :text => "custom called"
+    end
+  end
+  
+  it 'Finds the correct tenant using the filter command' do
+    get :index
+    ActsAsTenant.current_tenant.name.should eq 'account1'
+  end
+end

data/spec/acts_as_tenant/tenant_by_subdomain_spec.rb

@@ -0,0 +1,32 @@
+require "spec_helper"
+
+#Setup test specific ApplicationController
+class Account; end # this is so the spec will work in isolation
+
+class ApplicationController < ActionController::Base
+  include Rails.application.routes.url_helpers
+  set_current_tenant_by_subdomain
+end
+
+# Start testing
+describe ApplicationController, :type => :controller do
+  controller do
+    def index
+      render :text => "custom called"
+    end
+  end
+  
+  it 'Finds the correct tenant with a subdomain.example.com' do
+    @request.host = "account1.example.com"
+    Account.should_receive(:where).with({subdomain: 'account1'}) {['account1']}
+    get :index
+    ActsAsTenant.current_tenant.should eq 'account1'
+  end
+  
+  it 'Finds the correct tenant with a www.subdomain.example.com' do
+    @request.host = "www.account1.example.com"
+    Account.should_receive(:where).with({subdomain: 'account1'}) {['account1']}
+    get :index
+    ActsAsTenant.current_tenant.should eq 'account1'
+  end
+end

data/spec/spec_helper.rb

@@ -3,6 +3,8 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require 'database_cleaner'
 require 'acts_as_tenant'
+require 'rspec/rails'
+require 'rails'
 
 config = YAML::load(IO.read(File.join(File.dirname(__FILE__), 'database.yml')))
 ActiveRecord::Base.logger = Logger.new(File.join(File.dirname(__FILE__), "debug.log"))
@@ -22,5 +24,14 @@ RSpec.configure do |config|
     DatabaseCleaner.clean
     ActsAsTenant.current_tenant = nil
   end
+  
+  config.infer_base_class_for_anonymous_controllers = true
+end
 
-end
+# Setup a test app
+module Rollcall
+  class Application < Rails::Application; end
+end
+
+Rollcall::Application.config.secret_token = '1234567890123456789012345678901234567890'
+Rollcall::Application.config.secret_key_base = '1234567890123456789012345678901234567890'

metadata

@@ -1,97 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_tenant
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Erwin Matthijssen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-24 00:00:00.000000000 Z
+date: 2014-01-04 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: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   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: rspec-rails
+  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: database_cleaner
   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: sqlite3
   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: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Integrates multi-tenancy into a Rails application in a convenient and
@@ -118,6 +132,8 @@ files:
 - rails/init.rb
 - spec/acts_as_tenant/configuration_spec.rb
 - spec/acts_as_tenant/model_extensions_spec.rb
+- spec/acts_as_tenant/tenant_by_filter_spec.rb
+- spec/acts_as_tenant/tenant_by_subdomain_spec.rb
 - spec/database.yml
 - spec/spec_helper.rb
 homepage: http://www.rollcallapp.com/blog
@@ -129,22 +145,24 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: acts_as_tenant
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 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/acts_as_tenant/tenant_by_filter_spec.rb
+- spec/acts_as_tenant/tenant_by_subdomain_spec.rb
 - spec/database.yml
 - spec/spec_helper.rb