glebpom-db-charmer 1.4.0 → 1.4.2

data/VERSION

@@ -1 +1 @@
-1.4.0
+1.4.2

data/db-charmer.gemspec

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: glebpom-db-charmer
 version: !ruby/object:Gem::Version 
-  version: 1.4.0
+  version: 1.4.2
 platform: ruby
 authors: 
 - Alexey Kovyrin
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-28 00:00:00 +04:00
+date: 2009-10-01 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 

data/lib/db_charmer.rb

@@ -59,7 +59,7 @@ require 'db_charmer/multi_db_migrations'
 require 'db_charmer/multi_db_proxy'
 
 # Enable multi-db migrations
-ActiveRecord::Migration.extend(DbCharmer::MultiDbMigrations::ClassMethods)
+ActiveRecord::Migration.extend(DbCharmer::MultiDbMigrations)
 
 # Enable the magic
 ActiveRecord::Base.extend(DbCharmer::DbMagic::ClassMethods)

data/lib/db_charmer/active_record_extensions.rb

@@ -61,12 +61,12 @@ module DbCharmer
 
       #-----------------------------------------------------------------------------
       def hijack_connection!
-        # FIXME: make sure we do not do it more often then needed
-#        puts "DEBUG: Hijacking connection for #{self.to_s}"
-        class << self 
-          def connection
-            db_charmer_connection_proxy || super
+        return if self.respond_to?(:connection_with_magic)
+        class << self
+          def connection_with_magic
+            db_charmer_connection_proxy || connection_without_magic
           end
+          alias_method_chain :connection, :magic
         end
       end
 

data/lib/db_charmer/multi_db_migrations.rb

@@ -1,41 +1,28 @@
 module DbCharmer
   module MultiDbMigrations
-    class MigrationAbstractClass < ActiveRecord::Base
-      abstract_class = true
-      hijack_connection!
-    end
-
-    module ClassMethods
-      def hijack_connection!
-        class << self
-          def connection
-#            puts "DEBUG: Retrieving migration connection"
-            MigrationAbstractClass.connection
-          end
-        end
-      end
+    @@multi_db_name = nil
 
-      def on_db(db_name)
-        hijack_connection!
-        announce "Switching connection to #{db_name}"
-        old_proxy = MigrationAbstractClass.db_charmer_connection_proxy
-        MigrationAbstractClass.switch_connection_to(db_name, DbCharmer.migration_connections_should_exist?)
-        yield
-      ensure
-        announce "Checking all database connections"
-        ActiveRecord::Base.verify_active_connections!
-        announce "Switching connection back to default"
-        MigrationAbstractClass.switch_connection_to(old_proxy)
-      end
+    def migrate_with_db_wrapper(direction)
+      on_db(@@multi_db_name) { migrate_without_db_wrapper(direction) }
+    end
 
-      def works_on_db(db_name)
-        hijack_connection!
-        MigrationAbstractClass.switch_connection_to(db_name, DbCharmer.migration_connections_should_exist?)
-      end
+    def on_db(db_name)
+      announce "Switching connection to #{db_name}"
+      old_proxy = ActiveRecord::Base.db_charmer_connection_proxy
+      ActiveRecord::Base.switch_connection_to(db_name, DbCharmer.migration_connections_should_exist?)
+      yield
+    ensure
+      announce "Checking all database connections"
+      ActiveRecord::Base.verify_active_connections!
+      announce "Switching connection back to default"
+      ActiveRecord::Base.switch_connection_to(old_proxy)
+    end
 
-      def db_magic(opts = {})
-        raise ArgumentError, "No connection name - no magic!" unless opts[:connection]
-        works_on_db(opts[:connection])
+    def db_magic(opts = {})
+      raise ArgumentError, "No connection name - no magic!" unless opts[:connection]
+      @@multi_db_name = opts[:connection]
+      class << self
+        alias_method_chain :migrate, :db_wrapper
       end
     end
   end

data/lib/db_charmer/multi_db_proxy.rb

@@ -38,7 +38,7 @@ module DbCharmer
     module MasterSlaveClassMethods
       def on_slave(con = nil, proxy_target = nil, &block)
         con ||= db_charmer_random_slave
-        raise ArgumentError, "No slaves found in the class and no slave connection given" unless con
+        raise ArgumentError, "No slaves found in the class and no slave connection given" if con.nil? && DbCharmer.switch_connection?
         on_db(con, proxy_target, &block)
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: glebpom-db-charmer
 version: !ruby/object:Gem::Version 
-  version: 1.4.0
+  version: 1.4.2
 platform: ruby
 authors: 
 - Alexey Kovyrin
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-28 00:00:00 +04:00
+date: 2009-10-01 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency