ar-multidb 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/multidb/balancer.rb

@@ -1,15 +1,19 @@
 module Multidb
   
   class Candidate
-    def initialize(config)
-      adapter = config[:adapter]
-      begin
-        require "active_record/connection_adapters/#{adapter}_adapter"
-      rescue LoadError
-        raise "Please install the #{adapter} adapter: `gem install activerecord-#{adapter}-adapter` (#{$!})"
+    def initialize(target)
+      if target.is_a?(Hash)
+        adapter = target[:adapter]
+        begin
+          require "active_record/connection_adapters/#{adapter}_adapter"
+        rescue LoadError
+          raise "Please install the #{adapter} adapter: `gem install activerecord-#{adapter}-adapter` (#{$!})"
+        end
+        @connection_pool = ActiveRecord::ConnectionAdapters::ConnectionPool.new(
+          ActiveRecord::Base::ConnectionSpecification.new(target, "#{adapter}_connection"))
+      else
+        @connection_pool = target
       end
-      @connection_pool = ActiveRecord::ConnectionAdapters::ConnectionPool.new(
-        ActiveRecord::Base::ConnectionSpecification.new(config, "#{adapter}_connection"))
     end
     
     def connection
@@ -30,7 +34,7 @@ module Multidb
           @candidates[name].push(candidate)
         end
       end
-      @default_candidate = Candidate.new(@configuration.default_adapter)
+      @default_candidate = Candidate.new(@configuration.default_pool)
       unless @candidates.include?(:default)
         @candidates[:default] = [@default_candidate]
       end

data/lib/multidb/configuration.rb

@@ -15,10 +15,12 @@ module Multidb
   
   class Configuration
     def initialize(default_adapter, configuration_hash)
+      @default_pool = ActiveRecord::Base.connection_pool
       @default_adapter = default_adapter
       @raw_configuration = configuration_hash
     end
 
+    attr_reader :default_pool
     attr_reader :default_adapter
     attr_reader :raw_configuration
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ar-multidb
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Alexander Staubo