db-charmer 1.5.3 → 1.5.4

data/CHANGES

@@ -1,3 +1,11 @@
+1.5.3 -> 1.5.4:
+
+Added DbCharmer.with_remapped_databases, so that you can change the connection for
+many models simultaneously, and implicitly. Very useful for work where you want to use
+a particular slave for a whole range of database access.
+
+----------------------------------------------------------------------------------------
+
 1.5.1 -> 1.5.3:
 
 Few changes:

data/README.rdoc

@@ -232,6 +232,29 @@ and HABTM associations connection switching:
   @user.on_slave.posts
 
 
+=== Bulk Connection Management
+
+Sometimes you want to run code where a large number of tables may be used, and you'd like
+them all to use an alternate database. You can now do this:
+
+  DbCharmer.with_remapped_databases(:logs => :big_logs_slave) { ... }
+
+Any model whose default database is +:logs+ (e.g., <tt>db_charmer :connection => :logs</tt>)
+will now have its connection switched to +:big_logs_slave+ in that block. This is lower
+precedence than any other +DbCharmer+ method, so <tt>Model.on_db(:foo).find(...)</tt> and
+such things will still use the database they specify, not the one that model was remapped
+to.
+
+You can specify any number of remappings at once, and you can also use +:master+ as a database
+name that matches any model that has not had its connection set by +DbCharmer+ at all.
+
+*Note*: +DbCharmer+ works via +alias_method_chain+ in model classes. It is very careful
+to only patch the models it needs to. However, if you use +with_remapped_databases+ and 
+remap the default database (+:master+), then it has no choice but to patch all subclasses
+of +ActiveRecord::Base+. This should not cause any serious problems or any big performance
+impact, but it is worth noting.
+
+
 === Named Scopes Support
 
 To make it easier for +DbCharmer+ users to use connections switching methods with named scopes,

data/VERSION

@@ -1 +1 @@
-1.5.3
+1.5.4

data/db-charmer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{db-charmer}
-  s.version = "1.5.3"
+  s.version = "1.5.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexey Kovyrin"]
-  s.date = %q{2010-03-10}
+  s.date = %q{2010-03-12}
   s.description = %q{ActiveRecord Connections Magic (slaves, multiple connections, etc)}
   s.email = %q{alexey@kovyrin.net}
   s.extra_rdoc_files = [

data/lib/db_charmer.rb

@@ -19,6 +19,37 @@ module DbCharmer
     return Rails.logger if defined?(Rails)
     @logger ||= Logger.new(STDERR)
   end
+  
+  def self.with_remapped_databases(mappings, &proc)
+    old_mappings = ActiveRecord::Base.db_charmer_database_remappings
+    begin
+      ActiveRecord::Base.db_charmer_database_remappings = mappings
+      if mappings[:master] || mappings['master']
+        with_all_hijacked(&proc)
+      else
+        proc.call
+      end
+    ensure
+      ActiveRecord::Base.db_charmer_database_remappings = old_mappings
+    end
+  end
+  
+  def self.hijack_new_classes?
+    @@hijack_new_classes
+  end
+  
+  private
+  @@hijack_new_classes = false
+  def self.with_all_hijacked
+    old_hijack_new_classes = @@hijack_new_classes
+    begin
+      @@hijack_new_classes = true
+      ActiveRecord::Base.send(:subclasses).each { |s| s.hijack_connection! }
+      yield
+    ensure
+      @@hijack_new_classes = old_hijack_new_classes
+    end
+  end
 end
 
 class Object
@@ -101,3 +132,15 @@ ActiveRecord::Base.extend(DbCharmer::DbMagic::ClassMethods)
 
 # Setup association preload magic
 ActiveRecord::Base.extend(DbCharmer::AssociationPreload::ClassMethods)
+
+class ActiveRecord::Base
+  class << self
+    def inherited_with_hijacking(subclass)
+      out = inherited_without_hijacking(subclass)
+      hijack_connection! if DbCharmer.hijack_new_classes?
+      out
+    end
+    
+    alias_method_chain :inherited, :hijacking
+  end
+end

data/lib/db_charmer/active_record_extensions.rb

@@ -63,12 +63,32 @@ module DbCharmer
         db_charmer_connection_level.zero?
       end
 
+      #-----------------------------------------------------------------------------
+      @@db_charmer_database_remappings = Hash.new
+      def db_charmer_remapped_connection
+        return nil if (db_charmer_connection_level || 0) > 0
+        name = db_charmer_connection_proxy.db_charmer_connection_name if db_charmer_connection_proxy
+        name = (name || :master).to_sym
+        
+        remapped = @@db_charmer_database_remappings[name]
+        return DbCharmer::ConnectionFactory.connect(remapped, true) if remapped
+      end
+      
+      def db_charmer_database_remappings
+        @@db_charmer_database_remappings
+      end
+      
+      def db_charmer_database_remappings=(mappings)
+        raise "Mappings must be nil or respond to []" if mappings && (! mappings.respond_to?(:[]))
+        @@db_charmer_database_remappings = mappings || { }
+      end
+
       #-----------------------------------------------------------------------------
       def hijack_connection!
         return if self.respond_to?(:connection_with_magic)
         class << self
           def connection_with_magic
-            db_charmer_connection_proxy || connection_without_magic
+            db_charmer_remapped_connection || db_charmer_connection_proxy || connection_without_magic
           end
           alias_method_chain :connection, :magic
         end

data/lib/db_charmer/connection_factory.rb

@@ -21,7 +21,7 @@ module DbCharmer
     # Establish connection with a specified name
     def self.establish_connection(db_name, should_exist = false)
       abstract_class = generate_abstract_class(db_name, should_exist)
-      DbCharmer::ConnectionProxy.new(abstract_class)
+      DbCharmer::ConnectionProxy.new(abstract_class, db_name)
     end
 
     # Generate an abstract AR class with specified connection established

data/lib/db_charmer/connection_proxy.rb

@@ -1,7 +1,12 @@
 module DbCharmer
   class ConnectionProxy < BlankSlate
-    def initialize(abstract_class)
+    def initialize(abstract_class, db_name)
       @abstract_connection_class = abstract_class
+      @db_name = db_name
+    end
+
+    def db_charmer_connection_name
+      @db_name
     end
 
     def method_missing(meth, *args, &block)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 5
-  - 3
-  version: 1.5.3
+  - 4
+  version: 1.5.4
 platform: ruby
 authors: 
 - Alexey Kovyrin
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-10 00:00:00 -05:00
+date: 2010-03-12 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency