connection_manager 0.3.4 → 0.3.5

data/lib/connection_manager/helpers/abstract_adapter_helper.rb

@@ -5,11 +5,11 @@ module ConnectionManager
     end
     
     def using_em_adapter?
-      (config[:adapter].match(/^em\_/) && defined?(EM) && EM::reactor_running?)
+      (@config[:adapter].match(/^em\_/) && defined?(EM) && EM::reactor_running?)
     end
     
     def readonly?
-      (config[:readonly] == true)
+      (@config[:readonly] == true)
     end 
     
     def replicated?
@@ -17,7 +17,7 @@ module ConnectionManager
     end
    
     def database_name
-      config[:database]
+      @config[:database]
     end
    
     def replication_keys(type=:slaves)
@@ -27,13 +27,13 @@ module ConnectionManager
     
     def slave_keys
       slave_keys = []
-      slave_keys = config[:slaves].collect{|r| r.to_sym} if config[:slaves]
+      slave_keys = @config[:slaves].collect{|r| r.to_sym} if @config[:slaves]
       slave_keys  
     end
     
     def master_keys
       master_keys = []
-      master_keys = config[:masters].collect{|r| r.to_sym} if config[:masters]
+      master_keys = @config[:masters].collect{|r| r.to_sym} if @config[:masters]
       master_keys
     end
   end

data/lib/connection_manager/helpers/connection_helpers.rb

@@ -5,7 +5,7 @@ module ConnectionManager
     
     # Returns the database_name of the connection unless set otherwise
     def database_name
-      @database_name = "#{connection.database_name.to_s}" unless @database_name
+      @database_name = "#{connection.config[:database].to_s}" if @database_name.blank?
       @database_name
     end
     

data/lib/connection_manager/version.rb

@@ -1,4 +1,4 @@
 module ConnectionManager
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: connection_manager
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-19 00:00:00.000000000Z
+date: 2012-07-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70345873640120 !ruby/object:Gem::Requirement
+  requirement: &70172411129200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70345873640120
+  version_requirements: *70172411129200
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70345873637640 !ruby/object:Gem::Requirement
+  requirement: &70172411128780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70345873637640
+  version_requirements: *70172411128780
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70345873637180 !ruby/object:Gem::Requirement
+  requirement: &70172411128320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70345873637180
+  version_requirements: *70172411128320
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70345873636720 !ruby/object:Gem::Requirement
+  requirement: &70172411127900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70345873636720
+  version_requirements: *70172411127900
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70345873636280 !ruby/object:Gem::Requirement
+  requirement: &70172411127480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70345873636280
+  version_requirements: *70172411127480
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70345873635760 !ruby/object:Gem::Requirement
+  requirement: &70172411126980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70345873635760
+  version_requirements: *70172411126980
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70345873635300 !ruby/object:Gem::Requirement
+  requirement: &70172413973980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70345873635300
+  version_requirements: *70172413973980
 description: Simplifies connecting to Muliple and Replication databases with rails
   and active_record
 email: