acts_as_tenant 0.2.4 → 0.2.5

data/.gitignore

@@ -1,3 +1,4 @@
+.rvmrc
 *.gem
 .bundle
 Gemfile.lock

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+0.2.5
+-----
+* Added Rails 3.2 compatibility
+
 0.2.4
 -----
 * Added correct handling of child models that do not have their parent set (foreign key == nil)

data/README.md

@@ -11,7 +11,7 @@ In addition, acts_as_tenant:
 
 * sets the current tenant using the subdomain or allows you to pass in the current tenant yourself
 * protects against various types of nastiness directed at circumventing the tenant scoping
-* adds a method to validate uniqueness to a tenant, validates_uniqueness_to_tenant
+* adds a method to validate uniqueness to a tenant, `validates_uniqueness_to_tenant`
 * sets up a helper method containing the current tenant
 
 Installation
@@ -66,7 +66,7 @@ acts_as_tenant requires each scoped model to have a column in its schema linking
 Some examples to illustrate this behavior:
 
     # This manually sets the current tenant for testing purposes. In your app this is handled by the gem.
-    acts_as_tenant.current_tenant = Account.find(3)   
+    ActsAsTenant.current_tenant = Account.find(3)   
     
     # All searches are scoped by the tenant, the following searches will only return objects 
     # where account_id == 3
@@ -82,16 +82,21 @@ Some examples to illustrate this behavior:
       
     # It will not allow association with objects outside the current tenant scope
     # Assuming the Project with ID: 2 does not belong to Account with ID: 3
-    @task = Task.new  # => <#Task id: nil, name: bil, project_id: nil, :account_id: 3>
+    @task = Task.new  # => <#Task id: nil, name: nil, project_id: nil, :account_id: 3>
 
 Acts_as_tenant uses Rails' default_scope method to scope models. Rails 3.1 changed the way default_scope works in a good way. A user defined default_scope should integrate seamlessly with the one added by acts_as_tenant.
 
 **Validating attribute uniqueness**
+
 If you need to validate for uniqueness, chances are that you want to scope this validation to a tenant. You can do so by using:
 
     validates_uniqueness_to_tenant :name, :email
 
-All options available to Rails' own @validates_uniqueness_of@ are also available to this method.
+All options available to Rails' own `validates_uniqueness_of` are also available to this method.
+
+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`.
 
 To Do
 -----

data/lib/acts_as_tenant/model_extensions.rb

@@ -40,7 +40,7 @@ module ActsAsTenant
         # set the current_tenant on newly created objects
         before_validation Proc.new {|m|
           return unless ActsAsTenant.current_tenant
-          m.send "#{association}=".to_sym, ActsAsTenant.current_tenant
+          m.send "#{association}_id=".to_sym, ActsAsTenant.current_tenant.id
         }, :on => :create
     
         # set the default_scope to scope to current tenant
@@ -76,7 +76,7 @@ module ActsAsTenant
             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" unless association_class.where(:id => value).present? || value.nil?
+              record.errors.add attr, "is invalid (Acts_as_Tenant)" unless value.nil? || association_class.where(:id => value).present?
             end
           end
         end 

data/lib/acts_as_tenant/version.rb

@@ -1,3 +1,3 @@
 module ActsAsTenant
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_tenant
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-08 00:00:00.000000000Z
+date: 2012-01-28 00:00:00.000000000Z
 dependencies: []
 description: Integrates multi-tenancy into a Rails application in a convenient and
   out-of-your way manner
@@ -20,7 +20,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rvmrc
 - CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
@@ -55,7 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: acts_as_tenant
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Add multi-tenancy to Rails applications using a shared db strategy

data/.rvmrc

@@ -1 +0,0 @@
-rvm 1.9.2@rails31