acts_as_tenant 0.2.2 → 0.2.3

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+0.2.3
+-----
+* Added support for models that declare a has_one relationships, these would error out in the previous versions.
+
+
 0.2.2
 -----
 * Enhancements

data/lib/acts_as_tenant/model_extensions.rb

@@ -69,7 +69,7 @@ module ActsAsTenant
         # 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.options[:polymorphic]
+          unless a == reflection || a.macro == :has_many || a.macro == :has_one || 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

data/lib/acts_as_tenant/version.rb

@@ -1,3 +1,3 @@
 module ActsAsTenant
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/spec/model_extensions_spec.rb

@@ -11,6 +11,12 @@ ActiveRecord::Schema.define(:version => 1) do
     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
@@ -39,12 +45,18 @@ class Account < ActiveRecord::Base
 end
 
 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
+  acts_as_tenant :account
+end
+
 class Task < ActiveRecord::Base
   belongs_to :project
   default_scope :conditions => { :completed => nil }, :order => "name"
@@ -58,6 +70,7 @@ class City < ActiveRecord::Base
 end
 
 class SubTask < ActiveRecord::Base
+  acts_as_tenant :account
   belongs_to :something_else, :class_name => "Project"
 end
 
@@ -201,6 +214,5 @@ describe ActsAsTenant do
   describe "It should be possible to use aliased associations" do
     it { @sub_task = SubTask.create(:name => 'foo').valid?.should == true }
   end
-    
   
 end

metadata

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