acts_as_tenant 0.2.1 → 0.2.2

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+0.2.2
+-----
+* Enhancements
+  * Added support for aliased associations ( belongs_to :something, :class_name => 'SomethingElse'). In previous version these would raise an 'uninitialized constant' error.
+
+0.2.1
+-----
+* Initial release

data/lib/acts_as_tenant/model_extensions.rb

@@ -70,8 +70,11 @@ module ActsAsTenant
         # exempt them
         reflect_on_all_associations.each do |a|
           unless a == reflection || a.macro == :has_many || 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
             validates_each a.foreign_key.to_sym do |record, attr, value|
-              record.errors.add attr, "is invalid" unless a.name.to_s.classify.constantize.where(:id => value).present?
+              record.errors.add attr, "is invalid" unless 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.1"
+  VERSION = "0.2.2"
 end

data/spec/model_extensions_spec.rb

@@ -26,6 +26,11 @@ ActiveRecord::Schema.define(:version => 1) do
     t.column :name, :string
   end
   
+  create_table :sub_tasks, :force => true do |t|
+    t.column :name, :string
+    t.column :something_else, :integer
+  end
+  
 end
 
 # Setup the models
@@ -48,11 +53,13 @@ class Task < ActiveRecord::Base
   validates_uniqueness_of :name
 end
 
-
 class City < ActiveRecord::Base
   validates_uniqueness_of :name
 end
 
+class SubTask < ActiveRecord::Base
+  belongs_to :something_else, :class_name => "Project"
+end
 
 # Start testing!
 describe ActsAsTenant do
@@ -83,6 +90,21 @@ describe ActsAsTenant do
     it { @projects.should == [@project1] }
   end
   
+  describe 'Project.unscoped.all should return the unscoped value' do
+    before do
+      @account1 = Account.create!(:name => 'foo')
+      @account2 = Account.create!(:name => 'bar')
+
+      @project1 = @account1.projects.create!(:name => 'foobar')
+      @project2 = @account2.projects.create!(:name => 'baz')
+      
+      ActsAsTenant.current_tenant= @account1
+      @projects = Project.unscoped.all
+    end
+    
+    it { @projects.length.should == 2 }
+  end
+  
   describe 'Associations should be correctly scoped by current tenant' do
     before do
       @account = Account.create!(:name => 'foo')
@@ -175,4 +197,10 @@ describe ActsAsTenant do
       @city2 = City.create(:name => 'foo').valid?.should == false
     end
   end
+  
+  describe "It should be possible to use aliased associations" do
+    it { @sub_task = SubTask.create(:name => 'foo').valid?.should == true }
+  end
+    
+  
 end

data/spec/spec_helper.rb

@@ -23,7 +23,7 @@ ActiveRecord::Base.establish_connection(config[ENV['DB'] || 'sqlite'])
 #RSpec.configure do |config|
 #end
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
 
   config.before(:suite) do
     DatabaseCleaner.strategy = :transaction

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_tenant
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-03 00:00:00.000000000Z
+date: 2011-10-09 00:00:00.000000000Z
 dependencies: []
 description: Integrates multi-tenancy into a Rails application in a convenient and
   out-of-your way manner
@@ -21,6 +21,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rvmrc
+- CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
 - README.md