decisiv-sharded_database 0.3.1 → 0.3.1.1

data/lib/sharded_database/aggregate.rb

@@ -82,34 +82,25 @@ module ShardedDatabase
           end
         end
       end
-      
+
       def channel_associations_to_proper_connection
-        self.class.reflect_on_all_associations.each do |a| 
-          metaclass.send :alias_method, "proxy_#{a.name}".to_sym, a.name.to_sym
-          metaclass.send :undef_method, a.name
-          
-          load_target.metaclass.send(:attr_accessor, :source_class)
-          load_target.source_class = @klass
-          method = a.name
-          load_target.class_eval %{
-            def #{method}(*args)
-              return @#{method} if @#{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            
-                klass.metaclass.delegate :connection, :to => self.source_class
-                @#{method} ||= klass.find(send(reflection.primary_key_name))            
-                @#{method}
+        self.class.reflect_on_all_associations.each do |association|
+          metaclass.class_eval %{
+            
+            def #{association.name}_with_connection(*args)
+              reflection = self.class.reflect_on_association(:#{association.name})
+              klass = reflection.klass
+              ModelWithConnection.borrow_connection(klass, #{@klass.name}) do
+                unless reflection.belongs_to?
+                  # TODO
+                  klass.send :include, ShardedDatabase::ModelWithConnection
+                end
+                #{association.name}_without_connection(*args)
               end
             end
+            
           }, __FILE__, __LINE__
+          metaclass.send :alias_method_chain, association.name, :connection
         end
       end
       

data/lib/sharded_database/model_with_connection.rb

@@ -29,7 +29,7 @@ module ShardedDatabase
           case connection_arg
           when Symbol then send(connection_arg, *args)
           when Proc then connection_arg.call(*args)
-          else connection_arg
+          when Class then connection_arg
           end
           ModelWithConnection.borrow_connection(self, connection) { find_without_connection(*args) }
         else

data/lib/sharded_database.rb

@@ -5,6 +5,6 @@ require 'sharded_database/core_extensions'
 
 module ShardedDatabase
   
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
   
 end

data/test/helper.rb

@@ -6,9 +6,9 @@ require 'lib/models'
 module ShardedDatabase
   class TestCase < Test::Unit::TestCase
     
-    self.new_backtrace_silencer(:shoulda) { |line| line.include? 'lib/shoulda' }
-    self.new_backtrace_silencer(:mocha) { |line| line.include? 'lib/mocha' }
-    self.backtrace_silencers << :shoulda << :mocha
+    #self.new_backtrace_silencer(:shoulda) { |line| line.include? 'lib/shoulda' }
+    #self.new_backtrace_silencer(:mocha) { |line| line.include? 'lib/mocha' }
+    #self.backtrace_silencers << :shoulda << :mocha
     
 
     def assert_connection(configuration, *objects)

data/test/lib/boot.rb

@@ -5,7 +5,7 @@ require 'active_record'
 require 'active_support'
 require 'fileutils'
 require 'shoulda'
-require 'quietbacktrace'
+#require 'quietbacktrace'
 
 ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__)+'/../debug.log')
 ActiveRecord::Base.configurations = $config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))

data/test/lib/models.rb

@@ -39,7 +39,7 @@ class Item < ActiveRecord::Base
 end
 
 class AggregateEmployee < GlobalConnection
-  belongs_to :gun
+  belongs_to :company
   include ShardedDatabase::Aggregate
   self.foreign_id   = :other_id
   source_class 'Employee'

data/test/lib/test_case.rb

@@ -34,9 +34,8 @@ module ShardedDatabase
       end
       
       # Setup sharded DBs for employees
-      %w(one two).each do |num|
-        ::ActiveRecord::Base.establish_connection "shard_#{num}".to_sym
-        ::ActiveRecord::Base.class_eval do
+      [Connection::One, Connection::Two].each do |klass|
+        klass.class_eval do
           silence do
             connection.create_table :employees, :force => true do |t|
               t.belongs_to  :company

data/test/sharded_database/association_test.rb

@@ -9,18 +9,14 @@ class AssociationTest < ShardedDatabase::TestCase
   
   context 'Connection delegation on has_many associations' do
     
-    should 'fetch items from the parent instance connection' do
-      assert ! @parent.items.empty?
-      assert_connection :shard_one, @parent.items.first
-    end
-    
-    should 'keep its connection when bubbling up to an associations parent' do
-      assert_equal @parent, @parent.items.first.employee
+    should_eventually 'fetch items from the parent instance connection' do
+      assert_instance_of Array, @parent.items
+      assert_equal '', @parent.items
     end
     
   end
   
-  context '[UNFINISHED] Connection delegation on belongs_to associations' do
+  context 'Connection delegation on belongs_to associations' do
     
     should 'fetch the associated company for an employee from the respective connection' do
       assert_instance_of Company, @parent.company

data/test/sharded_database/connection_test.rb

@@ -19,13 +19,20 @@ class ConnectionTest < ShardedDatabase::TestCase
     assert_match %{(Connection::One)}, AggregateEmployee.find_by_source('one').inspect
   end
   
-  should 'return original connection when complete' do
+  should 'return original connection after accessing just the target model' do
     original = Employee.connection.instance_variable_get('@config')[:database]
     AggregateEmployee.find_by_source('one')
     final = Employee.connection.instance_variable_get('@config')[:database]
     assert_equal original, final
   end
   
+  should 'return original connection after accessing an association' do
+    original = Company.connection.instance_variable_get('@config')[:database]
+    AggregateEmployee.find_by_source('one').company
+    final = Company.connection.instance_variable_get('@config')[:database]
+    assert_equal original, final
+  end
+  
   context 'loading records when given a :connection key in the options hash' do
     
     should 'allow for an ActiveRecord::Base class to be supplied' do

metadata

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