db-charmer 1.3.4 → 1.4.0

data/VERSION

@@ -1 +1 @@
-1.3.4
+1.4.0

data/db-charmer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{db-charmer}
-  s.version = "1.3.4"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexey Kovyrin"]
-  s.date = %q{2009-10-28}
+  s.date = %q{2009-11-02}
   s.description = %q{ActiveRecord Connections Magic (slaves, multiple connections, etc)}
   s.email = %q{alexey@kovyrin.net}
   s.extra_rdoc_files = [
@@ -27,7 +27,6 @@ Gem::Specification.new do |s|
      "init.rb",
      "lib/db_charmer.rb",
      "lib/db_charmer/active_record_extensions.rb",
-     "lib/db_charmer/association_proxy.rb",
      "lib/db_charmer/connection_factory.rb",
      "lib/db_charmer/connection_proxy.rb",
      "lib/db_charmer/connection_switch.rb",

data/lib/db_charmer.rb

@@ -14,20 +14,29 @@ module DbCharmer
   def self.connections_should_exist?
     !! connections_should_exist
   end
-  
+
   def self.logger
     return Rails.logger if defined?(Rails)
     @logger ||= Logger.new(STDERR)
   end
 end
 
+class Object
+  def self.proxy?
+    false
+  end
+
+  def proxy?
+    false
+  end
+end
+
 puts "Extending AR..."
 
 require 'db_charmer/active_record_extensions'
 require 'db_charmer/connection_factory'
 require 'db_charmer/connection_proxy'
 require 'db_charmer/connection_switch'
-require 'db_charmer/association_proxy'
 require 'db_charmer/scope_proxy'
 require 'db_charmer/multi_db_proxy'
 
@@ -40,12 +49,36 @@ ActiveRecord::Base.extend(DbCharmer::ConnectionSwitch::ClassMethods)
 # Enable connection proxy in AR
 ActiveRecord::Base.extend(DbCharmer::MultiDbProxy::ClassMethods)
 ActiveRecord::Base.extend(DbCharmer::MultiDbProxy::MasterSlaveClassMethods)
-#ActiveRecord::Base.send(:include, DbCharmer::MultiDbProxy::InstanceMethods)
+ActiveRecord::Base.send(:include, DbCharmer::MultiDbProxy::InstanceMethods)
 
-# Enable connection proxy for associations and scopes
-ActiveRecord::Associations::AssociationProxy.send(:include, DbCharmer::AssociationProxy::InstanceMethods)
+# Enable connection proxy for scopes
 ActiveRecord::NamedScope::Scope.send(:include, DbCharmer::ScopeProxy::InstanceMethods)
 
+# Enable connection proxy for associations
+# WARNING: Inject methods to association class right here (they proxy include calls somewhere else, so include does not work)
+module ActiveRecord
+  module Associations
+    class AssociationProxy
+      def proxy?
+        true
+      end
+
+      def on_db(con, proxy_target = nil, &block)
+        proxy_target ||= self
+        @reflection.klass.on_db(con, proxy_target, &block)
+      end
+
+      def on_slave(con = nil, &block)
+        @reflection.klass.on_slave(con, self, &block)
+      end
+
+      def on_master(&block)
+        @reflection.klass.on_master(self, &block)
+      end
+    end
+  end
+end
+
 puts "Doing the magic..."
 
 require 'db_charmer/db_magic'

data/lib/db_charmer/connection_switch.rb

@@ -20,7 +20,6 @@ module DbCharmer
       end
 
       def switch_connection_to(conn, require_config_to_exist = true)
-#        puts "DEBUG: Assigning connection proxy for #{self}"
         self.db_charmer_connection_proxy = coerce_to_connection_proxy(conn, require_config_to_exist)
         self.hijack_connection!
       end

data/lib/db_charmer/finder_overrides.rb

@@ -5,7 +5,7 @@ module DbCharmer
       MASTER_METHODS = [ :update, :create, :delete, :destroy, :delete_all, :destroy_all, :update_all, :update_counters ]
 
       SLAVE_METHODS.each do |slave_method|
-        class_eval <<-EOF
+        class_eval <<-EOF, __FILE__, __LINE__ + 1
           def #{slave_method}(*args, &block)
             first_level_on_slave do
               super(*args, &block)
@@ -15,7 +15,7 @@ module DbCharmer
       end
 
       MASTER_METHODS.each do |master_method|
-        class_eval <<-EOF
+        class_eval <<-EOF, __FILE__, __LINE__ + 1
           def #{master_method}(*args, &block)
             on_master do
               super(*args, &block)

data/lib/db_charmer/multi_db_proxy.rb

@@ -1,8 +1,8 @@
 module DbCharmer
   module MultiDbProxy
     class OnDbProxy < BlankSlate
-      def initialize(model_class, slave)
-        @model = model_class
+      def initialize(proxy_target, slave)
+        @proxy_target = proxy_target
         @slave = slave
       end
 
@@ -10,11 +10,11 @@ module DbCharmer
 
       def method_missing(meth, *args, &block)
         # Switch connection and proxy the method call
-        @model.on_db(@slave) do |m|
+        @proxy_target.on_db(@slave) do |m|
           res = m.__send__(meth, *args, &block)
 
-          # If result is a scope, return a new proxy for it, otherwise return the result itself
-          (res.class == ActiveRecord::NamedScope::Scope) ? OnDbProxy.new(res, @slave) : res
+          # If result is a scope/association, return a new proxy for it, otherwise return the result itself
+          (res.proxy?) ? OnDbProxy.new(res, @slave) : res
         end
       end
     end
@@ -22,7 +22,7 @@ module DbCharmer
     module ClassMethods
       def on_db(con, proxy_target = nil)
         proxy_target ||= self
-        
+
         # Chain call
         return OnDbProxy.new(proxy_target, con) unless block_given?
 
@@ -38,7 +38,14 @@ module DbCharmer
         end
       end
     end
-    
+
+    module InstanceMethods
+      def on_db(con, proxy_target = nil, &block)
+        proxy_target ||= self
+        self.class.on_db(con, proxy_target, &block)
+      end
+    end
+
     module MasterSlaveClassMethods
       def on_slave(con = nil, proxy_target = nil, &block)
         con ||= db_charmer_random_slave

data/lib/db_charmer/scope_proxy.rb

@@ -1,9 +1,13 @@
 module DbCharmer
   module ScopeProxy
     module InstanceMethods
+      def proxy?
+        true
+      end
+
       def on_db(con, proxy_target = nil, &block)
         proxy_target ||= self
-        proxy_scope.on_db(con, self, &block)
+        proxy_scope.on_db(con, proxy_target, &block)
       end
 
       def on_slave(con = nil, &block)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: db-charmer
 version: !ruby/object:Gem::Version 
-  version: 1.3.4
+  version: 1.4.0
 platform: ruby
 authors: 
 - Alexey Kovyrin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-28 00:00:00 -04:00
+date: 2009-11-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,7 +42,6 @@ files:
 - init.rb
 - lib/db_charmer.rb
 - lib/db_charmer/active_record_extensions.rb
-- lib/db_charmer/association_proxy.rb
 - lib/db_charmer/connection_factory.rb
 - lib/db_charmer/connection_proxy.rb
 - lib/db_charmer/connection_switch.rb

data/lib/db_charmer/association_proxy.rb

@@ -1,18 +0,0 @@
-module DbCharmer
-  module AssociationProxy
-    module InstanceMethods
-      def on_db(con, proxy_target = nil, &block)
-        proxy_target ||= self
-        @reflection.klass.on_db(con, proxy_target, &block)
-      end
-
-      def on_slave(con = nil, &block)
-        @reflection.klass.on_slave(con, self, &block)
-      end
-
-      def on_master(&block)
-        @reflection.klass.on_master(self, &block)
-      end
-    end
-  end
-end