decisiv-sharded_database 0.1.4.2 → 0.1.5.1

data/Rakefile

@@ -8,6 +8,7 @@ task :default => :test
 desc 'Test the sharded_database plugin.'
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
+  t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
   t.verbose = true
 end

data/lib/sharded_database/aggregate.rb

@@ -21,7 +21,7 @@ module ShardedDatabase
 
       def find_with_raw(*args)
         @raw = args.last.is_a?(Hash) && args.last.delete(:raw)
-        @raw ? temporarily_remove(:after_find) { find_without_raw(*args) } : find_without_raw(*args)
+        @raw ? temporarily_undef_method(:after_find) { find_without_raw(*args) } : find_without_raw(*args)
       end
 
       def preserve_attributes(*attrs)
@@ -55,10 +55,33 @@ module ShardedDatabase
             undef_method(m) unless m =~ /^__|proxy_|inspect/
           end
         end
-        
+
         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}
+              end
+            end
+          }, __FILE__, __LINE__
         end
         
       end

data/lib/sharded_database/aggregate_proxy.rb

@@ -1,6 +1,6 @@
 module ShardedDatabase
   module AggregateProxy
-    
+
     def ===(other)
       other === load_target
     end
@@ -21,7 +21,7 @@ module ShardedDatabase
 
     def method_missing(method, *args, &block)
       if association_method?(method)
-        apply_connection_to_association(method)
+        #apply_connection_to_association(method)
       end
       load_target.respond_to?(method) ? load_target.send(method, *args, &block) : super
     end
@@ -35,30 +35,6 @@ module ShardedDatabase
       eigen.delegate :connection, :to => target_class
       yield(requesting_class)
     end
-    
-    def apply_connection_to_association(method)
-      load_target.metaclass.send(:attr_accessor, :source_class)
-      load_target.source_class = @klass
-      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}
-          end
-        end
-      }, __FILE__, __LINE__
-    end
 
   end
 end

data/lib/sharded_database/core_extensions.rb

@@ -1,6 +1,6 @@
 class Object
   
-  def temporarily_remove(method, &block)
+  def temporarily_undef_method(method, &block)
     alias_method "original_#{method}", method
     undef_method(method)
     return yield

data/lib/sharded_database.rb

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

data/test/lib/database.yml

@@ -1,20 +1,20 @@
 master:
   adapter: mysql
-  database: database_master
+  database: sharded_database_master
   username: root
   password: 
   host: localhost
 
 one_db:
   adapter: mysql
-  database: database_mck
+  database: sharded_database_one
   username: root
   password: 
   host: localhost
   
 two_db:
   adapter: mysql
-  database: database_vlv
+  database: sharded_database_two
   username: root
   password: 
   host: localhost

data/test/lib/models.rb

@@ -36,6 +36,11 @@ end
 class Estimate < ActiveRecord::Base
   belongs_to :company
   has_many :items
+  
+  def call_company
+    company
+  end
+  
 end
 
 class Item < ActiveRecord::Base

data/test/sharded_database/association_test.rb

@@ -30,6 +30,10 @@ class AssociationTest < ShardedDatabase::TestCase
       assert_equal @parent.company.object_id, @parent.company.object_id
     end
     
+    should 'allow instance methods to the proxied object to access associations' do
+      assert_equal @parent.call_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.4.2
+  version: 0.1.5.1
 platform: ruby
 authors: 
 - Brennan Dunn
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-20 00:00:00 -08:00
+date: 2009-01-21 00:00:00 -08:00
 default_executable: 
 dependencies: []