ar-multidb 0.1.3 → 0.1.4

data/README.markdown

@@ -119,6 +119,23 @@ Note that the symbol `:default` will (unless you override it) refer to the defau
 top-level ActiveRecord configuration.
 
 
+Development mode
+================
+
+In development you will typically want `Multidb.use(:slave)` to still work, but you
+probably don't want to run multiple databases on your development box. To make `use`
+silently fall back to using the default connection, simply set `fallback: true` in
+`database.yml`:
+
+    production:
+      adapter: postgresql
+      database: myapp_production
+      username: ohoh
+      password: mymy
+      host: db1
+      multidb:
+        fallback: true
+
 Legal
 =====
 

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/multidb.rb

@@ -11,8 +11,8 @@ module Multidb
         ActiveRecord::Base.class_eval do
           include Multidb::ModelExtensions
         end
-        @balancer = Balancer.new(@configuration)
       end
+      @balancer = Balancer.new(@configuration)
     end
     
     attr_reader :balancer

data/lib/multidb/balancer.rb

@@ -16,8 +16,12 @@ module Multidb
       end
     end
     
-    def connection
-      @connection_pool.connection
+    def connection(&block)
+      if block_given?
+        @connection_pool.with_connection(&block)
+      else
+        @connection_pool.connection
+      end
     end
   end
   
@@ -26,7 +30,7 @@ module Multidb
     def initialize(configuration)
       @candidates = {}.with_indifferent_access
       @configuration = configuration
-      @configuration.raw_configuration[:databases].each_pair do |name, config|
+      (@configuration.raw_configuration[:databases] || {}).each_pair do |name, config|
         configs = config.is_a?(Array) ? config : [config]
         configs.each do |config|          
           candidate = Candidate.new(@configuration.default_adapter.merge(config))
@@ -34,6 +38,13 @@ module Multidb
           @candidates[name].push(candidate)
         end
       end
+      if @configuration.raw_configuration.include?(:fallback)
+        @fallback = @configuration.raw_configuration[:fallback]
+      elsif defined?(Rails)
+        @fallback = %w(development test).include?(Rails.env)
+      else
+        @fallback = false
+      end
       @default_candidate = Candidate.new(@configuration.default_pool)
       unless @candidates.include?(:default)
         @candidates[:default] = [@default_candidate]
@@ -41,8 +52,9 @@ module Multidb
     end
     
     def get(name, &block)
-      candidates = @candidates[name] || []
-      raise ArgumentError, "No such database connection '#{name}'" if candidates.blank?
+      candidates = @candidates[name]
+      candidates ||= @fallback ? @candidates[:default] : []
+      raise ArgumentError, "No such database connection '#{name}'" if candidates.empty?
       candidate = candidates.respond_to?(:sample) ? 
         candidates.sample : candidates[rand(candidates.length)]
       block_given? ? yield(candidate) : candidate
@@ -51,18 +63,19 @@ module Multidb
     def use(name, &block)
       result = nil
       get(name) do |candidate|
-        connection = candidate.connection
         if block_given?
-          previous_connection, Thread.current[:multidb_connection] = 
-            Thread.current[:multidb_connection], connection
-          begin
-            result = yield
-          ensure
-            Thread.current[:multidb_connection] = previous_connection
+          candidate.connection do |connection|
+            previous_connection, Thread.current[:multidb_connection] = 
+              Thread.current[:multidb_connection], connection
+            begin
+              result = yield
+            ensure
+              Thread.current[:multidb_connection] = previous_connection
+            end
+            result
           end
-          result
         else
-          result = Thread.current[:multidb_connection] = connection
+          result = Thread.current[:multidb_connection] = candidate.connection
         end
       end
       result

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ar-multidb
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Alexander Staubo
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-19 00:00:00 +02:00
+date: 2011-05-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency