db-charmer 1.3.1 → 1.3.2

data/VERSION

@@ -1 +1 @@
-1.3.1
+1.3.2

data/db-charmer.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{db-charmer}
-  s.version = "1.3.1"
+  s.version = "1.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexey Kovyrin"]
-  s.date = %q{2009-10-09}
+  s.date = %q{2009-10-28}
   s.description = %q{ActiveRecord Connections Magic (slaves, multiple connections, etc)}
   s.email = %q{alexey@kovyrin.net}
   s.extra_rdoc_files = [
@@ -34,7 +34,8 @@ Gem::Specification.new do |s|
      "lib/db_charmer/db_magic.rb",
      "lib/db_charmer/finder_overrides.rb",
      "lib/db_charmer/multi_db_migrations.rb",
-     "lib/db_charmer/multi_db_proxy.rb"
+     "lib/db_charmer/multi_db_proxy.rb",
+     "lib/db_charmer/scope_proxy.rb"
   ]
   s.homepage = %q{http://github.com/kovyrin/db-charmer}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -55,3 +56,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rails>, [">= 2.2.0"])
   end
 end
+

data/lib/db_charmer.rb

@@ -28,6 +28,7 @@ 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'
 
 # Enable misc AR extensions
@@ -41,8 +42,9 @@ ActiveRecord::Base.extend(DbCharmer::MultiDbProxy::ClassMethods)
 ActiveRecord::Base.extend(DbCharmer::MultiDbProxy::MasterSlaveClassMethods)
 #ActiveRecord::Base.send(:include, DbCharmer::MultiDbProxy::InstanceMethods)
 
-# Enable connection proxy for associations
+# Enable connection proxy for associations and scopes
 ActiveRecord::Associations::AssociationProxy.send(:include, DbCharmer::AssociationProxy::InstanceMethods)
+ActiveRecord::NamedScope::Scope.send(:include, DbCharmer::ScopeProxy::InstanceMethods)
 
 puts "Doing the magic..."
 

data/lib/db_charmer/multi_db_proxy.rb

@@ -9,8 +9,12 @@ module DbCharmer
     private
 
       def method_missing(meth, *args, &block)
+        # Switch connection and proxy the method call
         @model.on_db(@slave) do |m|
-          m.__send__(meth, *args, &block)
+          res = m.__send__(meth, *args, &block)
+
+          # If result is a scope, return a new proxy for it, otherwise return the result itself
+          res.kind_of?(ActiveRecord::NamedScope::Scope) ? res.on_db(@slave) : res
         end
       end
     end

data/lib/db_charmer/scope_proxy.rb

@@ -0,0 +1,17 @@
+module DbCharmer
+  module ScopeProxy
+    module InstanceMethods
+      def on_db(con, &block)
+        proxy_scope.on_db(con, self, &block)
+      end
+
+      def on_slave(con = nil, &block)
+        proxy_scope.on_slave(con, self, &block)
+      end
+
+      def on_master(&block)
+        proxy_scope.on_master(self, &block)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: db-charmer
 version: !ruby/object:Gem::Version 
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors: 
 - Alexey Kovyrin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-09 00:00:00 -04:00
+date: 2009-10-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,6 +50,7 @@ files:
 - lib/db_charmer/finder_overrides.rb
 - lib/db_charmer/multi_db_migrations.rb
 - lib/db_charmer/multi_db_proxy.rb
+- lib/db_charmer/scope_proxy.rb
 has_rdoc: true
 homepage: http://github.com/kovyrin/db-charmer
 licenses: []