slave_pools 1.0.0.rc2 → 1.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ada15436188b84a0fae0247b38aeac4ec0344649
-  data.tar.gz: 480836da042e92a4c86fc213a9b1033c3e628af7
+  metadata.gz: 9e6a45beb574601032f4618737cb16626fad3b32
+  data.tar.gz: edf4ff14ab00c4eb85551b9a977c52c362bdef43
 SHA512:
-  metadata.gz: 16ec508961e20c2785b7c9851ffde2856c72f07220abc6a0364c175cac98ead0cbb6c972de9b1d87635636d8626774fab8e190fdaa8f762873955fdd2a251933
-  data.tar.gz: 855daf885ddb869034f642f15677e388475b1a220b1846d3a5ec6fa49570dc2ff22fe7d555043986288bfd183a1b044f989bdc8bb0870958affe13b400a9fbdc
+  metadata.gz: 2daa6e7d816fd82fb85d8f34644be0e9588ec6e34653e6887b3a866f9affb47091f82503963fc067b74e77c84c2085e5c23acc7ee0a641677015b6c8c5fbaa3b
+  data.tar.gz: 6c3770d21e1d19b4b8bec198730bace7f95a109af22644fda294b552db13d0bbd98e5da38f37d703d8492a65e71bec445cc4161165aeee5078ea3e39eb6f75de

data/lib/slave_pools/connection_proxy.rb

@@ -131,13 +131,10 @@ module SlavePools
     private
 
     def log_proxy_state
-      SlavePools.log :error, "Master Value: #{master}"
+      SlavePools.log :error, "Current Connection: #{current}"
+      SlavePools.log :error, "Current Pool Name: #{current_pool.name}"
+      SlavePools.log :error, "Current Pool Members: #{current_pool.slaves}"
       SlavePools.log :error, "Master Depth: #{master_depth}"
-      SlavePools.log :error, "Current Value: #{current}"
-      SlavePools.log :error, "Current Pool: #{current_pool}"
-      SlavePools.log :error, "Current Pool Slaves: #{current_pool.slaves}" if current_pool
-      SlavePools.log :error, "Current Pool Name: #{current_pool.name}" if current_pool
-      SlavePools.log :error, "Default Pool: #{default_pool}"
     end
   end
 end

data/lib/slave_pools/pools.rb

@@ -15,6 +15,11 @@ module SlavePools
         )
       end
 
+      if pools.empty?
+        SlavePools.log :info, "No pools found for #{SlavePools.config.environment}. Loading a default pool with master instead."
+        pools[:default] = SlavePools::Pool.new('default', [ActiveRecord::Base])
+      end
+
       super pools
     end
 
@@ -24,7 +29,6 @@ module SlavePools
     def pool_configurations
       ActiveRecord::Base.configurations.map do |name, config|
         next unless name.to_s =~ /#{SlavePools.config.environment}_pool_(.*)_name_(.*)/
-        next unless connection_valid?(config)
         [name, $1, $2]
       end.compact
     end
@@ -44,17 +48,5 @@ module SlavePools
       }, __FILE__, __LINE__
       SlavePools.const_get(class_name)
     end
-
-    # tests a connection to be sure it's configured
-    def connection_valid?(db_config)
-      ActiveRecord::Base.establish_connection(db_config)
-      return ActiveRecord::Base.connection && ActiveRecord::Base.connected?
-    rescue => e
-      SlavePools.log :error, "Could not connect to #{db_config.inspect}"
-      SlavePools.log :error, e.to_s
-      return false
-    ensure
-      ActiveRecord::Base.establish_connection(SlavePools.config.environment)
-    end
   end
 end

data/lib/slave_pools/version.rb

@@ -1,3 +1,3 @@
 module SlavePools
-  VERSION = "1.0.0.rc2"
+  VERSION = "1.0.0.rc3"
 end

data/lib/slave_pools.rb

@@ -20,11 +20,6 @@ module SlavePools
     end
 
     def setup!
-      if pools.empty?
-        log :info, "No pools found for #{config.environment}. Loading a default pool with master instead."
-        pools['default'] = SlavePools::Pool.new('default', [ActiveRecord::Base])
-      end
-
       ConnectionProxy.generate_safe_delegations
 
       ActiveRecord::Base.send(:extend, SlavePools::Hijack)

data/spec/connection_proxy_spec.rb

@@ -29,10 +29,6 @@ describe SlavePools do
     defined?(SlavePools::SecondaryDb3).should_not be_nil
   end
 
-  it "should not generate classes for an invalid DB in the database.yml" do
-    defined?(SlavePools::DefaultFakeDb).should be_nil
-  end
-
   context "with_master" do
     it 'should revert to previous slave connection' do
       @proxy.current = @proxy.current_slave

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slave_pools
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc2
+  version: 1.0.0.rc3
 platform: ruby
 authors:
 - Dan Drabik
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-31 00:00:00.000000000 Z
+date: 2014-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord