decisiv-sharded_database 0.1.3 → 0.1.4

data/lib/sharded_database.rb

@@ -4,6 +4,6 @@ require 'sharded_database/core_extensions'
 
 module ShardedDatabase
   
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
   
 end

data/lib/sharded_database/aggregate_proxy.rb

@@ -41,10 +41,25 @@ module ShardedDatabase
       load_target.source_class = @klass
       load_target.class_eval %{
         def #{method}(*args)
-          proxy_#{method}.proxy_reflection.klass.metaclass.delegate :connection, :to => self.source_class
-          proxy_#{method}
+          if proxy_#{method}.respond_to?(:proxy_reflection)
+            proxy_#{method}.proxy_reflection.klass.metaclass.delegate :connection, :to => self.source_class
+            proxy_#{method}
+          else
+            # Hacked implementation of belongs_to to superficially simulate an association proxy
+            # Revisit this later and do it properly.
+            
+            reflection = self.class.reflect_on_all_associations.find { |a| a.name == :#{method} }
+            klass = reflection.klass
+            
+            @original_connection = klass.connection
+            klass.metaclass.delegate :connection, :to => self.source_class
+            value = klass.find(send(reflection.primary_key_name))
+            klass.metaclass.delegate :connection, :to => @original_connection
+            
+            value
+          end
         end
-      }
+      }, __FILE__, __LINE__
     end
 
   end

data/test/lib/models.rb

@@ -18,6 +18,7 @@ class GlobalConnection < ActiveRecord::Base
 end
 
 class AggregateEstimate < GlobalConnection
+  belongs_to :gun
   include ShardedDatabase::Aggregate
   self.foreign_id   = :other_id
   preserve_attributes :source
@@ -28,7 +29,12 @@ class AggregateEstimate < GlobalConnection
   
 end
 
-class Estimate < ActiveRecord::Base  
+class Company < ActiveRecord::Base
+  has_many :items
+end
+
+class Estimate < ActiveRecord::Base
+  belongs_to :company
   has_many :items
 end
 

data/test/lib/test_case.rb

@@ -39,6 +39,7 @@ module ShardedDatabase
         ::ActiveRecord::Base.class_eval do
           silence do
             connection.create_table :estimates, :force => true do |t|
+              t.belongs_to  :company
               t.string      :name
             end
             
@@ -46,6 +47,11 @@ module ShardedDatabase
               t.belongs_to  :estimate
               t.string      :name
             end
+            
+            connection.create_table :companies, :force => true do |t|
+              t.string      :name
+            end
+            
           end
         end
       end
@@ -53,8 +59,11 @@ module ShardedDatabase
     end
     
     def setup_models
-      one_estimate = Class.new(Connection::One) { set_table_name 'estimates' ; has_many(:items) }
-      @one_1 = one_estimate.create :name => 'One Estimate'
+      one_company = Class.new(Connection::One) { set_table_name 'companies' }
+      @company_1 = one_company.create :name => 'One Company'
+      
+      one_estimate = Class.new(Connection::One) { set_table_name 'estimates' ; has_many(:items) ; belongs_to(:company) }
+      @one_1 = one_estimate.create :name => 'One Estimate', :company_id => @company_1.id
       
       two_estimate = Class.new(Connection::Two) { set_table_name 'estimates' ; has_many(:items) }
       @two_1 = two_estimate.create :name => 'One Estimate 1'

data/test/sharded_database/association_test.rb

@@ -1,15 +1,14 @@
 require File.dirname(__FILE__) + '/../helper'
 
 class AssociationTest < ShardedDatabase::TestCase
-  def setup ; setup_environment ; end
   
+  def setup
+    setup_environment
+    @parent = AggregateEstimate.find_by_source('one')
+  end
   
   context 'Connection delegation on has_many associations' do
     
-    setup do
-      @parent = AggregateEstimate.find_by_source('one')
-    end
-    
     should 'fetch items from the parent instance connection' do
       assert ! @parent.items.empty?
       assert_connection :one_db, @parent.items.first
@@ -21,4 +20,12 @@ class AssociationTest < ShardedDatabase::TestCase
     
   end
   
+  context '[UNFINISHED] Connection delegation on belongs_to associations' do
+    
+    should 'fetch the associated company for an estimate from the respective connection' do
+      assert_instance_of Company, @parent.company
+    end
+    
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: decisiv-sharded_database
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Brennan Dunn
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-12 00:00:00 -08:00
+date: 2009-01-20 00:00:00 -08:00
 default_executable: 
 dependencies: []