active_record_host_pool 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 845aaec086857a96f06d01811462e9470f325c12
-  data.tar.gz: 471aff8ae49c1d0e8b4954537b8f11c0b9bdfcef
+  metadata.gz: ed2c6298e6e97323f95bf2ebdb3414c64943b129
+  data.tar.gz: a3ffbacc3eb9b673f6a34d2f5aa188f53b10a1c8
 SHA512:
-  metadata.gz: 38e24829caad45f4a924c1862dd6396056e1d52a2ac9336b16a48e48e001597c50fb9389d57df92cefbadab4789c61a618551207850c153ba6b6b3136186b1df
-  data.tar.gz: cc2a4d67f037f23219bf3b181c0a52629df43e7f31602c9abce2241e7b7c43d898f8eeb6001a4c60d3a667f16957287fd95e4ed57c5b8ce08eea0480bfcb238e
+  metadata.gz: 5dc67a54dacb5c5f3d681b20edf988492d4a7ae6214d3c1263069a0ae467569daef7021b9a394679beddf831702ff9779ca8cf8ed51485c0a274fe61833f5483
+  data.tar.gz: 9987fbf49b040a43df296b26b754d124e903010f6dfcc300fbe6a78854aceffda6700eb2abaee8f4c8b4080aa91b9554901cce94811dd427451ca605eb66c825

data/lib/active_record_host_pool/connection_adapter_mixin.rb

@@ -7,41 +7,53 @@ end
 
 module ActiveRecordHostPool
   module DatabaseSwitch
-    def self.prepended(base)
+    def self.included(base)
       base.class_eval do
         attr_accessor(:_host_pool_current_database)
+
+        alias_method :execute_without_switching, :execute
+        alias_method :execute, :execute_with_switching
+
+        alias_method :drop_database_without_no_switching, :drop_database
+        alias_method :drop_database, :drop_database_with_no_switching
+
+        alias_method :create_database_without_no_switching, :create_database
+        alias_method :create_database, :create_database_with_no_switching
+
+        alias_method :disconnect_without_host_pooling!, :disconnect!
+        alias_method :disconnect!, :disconnect_with_host_pooling!
       end
     end
 
-    def execute(*args)
+    def execute_with_switching(*args)
       if _host_pool_current_database && ! @_no_switch
         _switch_connection
       end
-      super
+      execute_without_switching(*args)
     end
 
-    def drop_database(*args)
+    def drop_database_with_no_switching(*args)
       begin
         @_no_switch = true
-        super
+        drop_database_without_no_switching(*args)
       ensure
         @_no_switch = false
       end
     end
 
-    def create_database(*args)
+    def create_database_with_no_switching(*args)
       begin
         @_no_switch = true
-        super
+        create_database_without_no_switching(*args)
       ensure
         @_no_switch = false
       end
     end
 
-    def disconnect!
+    def disconnect_with_host_pooling!
       @_cached_current_database = nil
       @_cached_connection_object_id = nil
-      super
+      disconnect_without_host_pooling!
     end
 
     private
@@ -86,5 +98,5 @@ end
 
 ["MysqlAdapter", "Mysql2Adapter"].each do |k|
   next unless ActiveRecord::ConnectionAdapters.const_defined?(k)
-  ActiveRecord::ConnectionAdapters.const_get(k).class_eval { prepend ActiveRecordHostPool::DatabaseSwitch }
+  ActiveRecord::ConnectionAdapters.const_get(k).class_eval { include ActiveRecordHostPool::DatabaseSwitch }
 end

data/lib/active_record_host_pool/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordHostPool
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_host_pool
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Ben Osheroff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-20 00:00:00.000000000 Z
+date: 2016-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord