acts_as_tenant 0.2.5 → 0.2.6

data/CHANGELOG.md

@@ -1,6 +1,11 @@
+0.2.6
+-----
+* Fixed a bug with resolving the tenant model name (thx devton!)
+* Added support for using relations: User.create(:account => Account.first) now works, while it wouldn't before (thx bnmrrs)
+
 0.2.5
 -----
-* Added Rails 3.2 compatibility
+* Added Rails 3.2 compatibility (thx nickveys!)
 
 0.2.4
 -----

data/lib/acts_as_tenant/controller_extensions.rb

@@ -10,7 +10,7 @@ module ActsAsTenant
         attr_accessor :current_tenant
       end
 
-      self.tenant_class = tenant.to_s.capitalize.constantize
+      self.tenant_class = tenant.to_s.camelcase.constantize
       self.tenant_column = column.to_sym
 
       self.class_eval do

data/lib/acts_as_tenant/model_extensions.rb

@@ -53,15 +53,15 @@ module ActsAsTenant
           if new_record?
             write_attribute(fkey, integer)  
           else
-            raise "#{fkey} is immutable!"
+            raise "#{fkey} is immutable! [ActsAsTenant]"
           end  
         end
       
         define_method "#{association}=" do |model|  
           if new_record?
-            write_attribute(association, model)  
+            super(model) 
           else
-            raise "#{association} is immutable!"
+            raise "#{association} is immutable! [ActsAsTenant]"
           end  
         end
       
@@ -76,14 +76,14 @@ 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 (Acts_as_Tenant)" unless value.nil? || association_class.where(:id => value).present?
+              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?)
+        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)

data/lib/acts_as_tenant/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_tenant
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-28 00:00:00.000000000Z
+date: 2012-02-09 00:00:00.000000000Z
 dependencies: []
 description: Integrates multi-tenancy into a Rails application in a convenient and
   out-of-your way manner