connection_manager 0.3.4 → 0.3.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. data/lib/connection_manager/helpers/abstract_adapter_helper.rb +5 -5
  2. data/lib/connection_manager/helpers/connection_helpers.rb +1 -1
  3. data/lib/connection_manager/version.rb +1 -1
  4. metadata +16 -16
data/lib/connection_manager/helpers/abstract_adapter_helper.rb CHANGED
@@ -5,11 +5,11 @@ module ConnectionManager
5
5
  end
6
6
 
7
7
  def using_em_adapter?
8
- (config[:adapter].match(/^em\_/) && defined?(EM) && EM::reactor_running?)
8
+ (@config[:adapter].match(/^em\_/) && defined?(EM) && EM::reactor_running?)
9
9
  end
10
10
 
11
11
  def readonly?
12
- (config[:readonly] == true)
12
+ (@config[:readonly] == true)
13
13
  end
14
14
 
15
15
  def replicated?
@@ -17,7 +17,7 @@ module ConnectionManager
17
17
  end
18
18
 
19
19
  def database_name
20
- config[:database]
20
+ @config[:database]
21
21
  end
22
22
 
23
23
  def replication_keys(type=:slaves)
@@ -27,13 +27,13 @@ module ConnectionManager
27
27
 
28
28
  def slave_keys
29
29
  slave_keys = []
30
- slave_keys = config[:slaves].collect{|r| r.to_sym} if config[:slaves]
30
+ slave_keys = @config[:slaves].collect{|r| r.to_sym} if @config[:slaves]
31
31
  slave_keys
32
32
  end
33
33
 
34
34
  def master_keys
35
35
  master_keys = []
36
- master_keys = config[:masters].collect{|r| r.to_sym} if config[:masters]
36
+ master_keys = @config[:masters].collect{|r| r.to_sym} if @config[:masters]
37
37
  master_keys
38
38
  end
39
39
  end
data/lib/connection_manager/helpers/connection_helpers.rb CHANGED
@@ -5,7 +5,7 @@ module ConnectionManager
5
5
 
6
6
  # Returns the database_name of the connection unless set otherwise
7
7
  def database_name
8
- @database_name = "#{connection.database_name.to_s}" unless @database_name
8
+ @database_name = "#{connection.config[:database].to_s}" if @database_name.blank?
9
9
  @database_name
10
10
  end
11
11
 
data/lib/connection_manager/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  module ConnectionManager
2
- VERSION = "0.3.4"
2
+ VERSION = "0.3.5"
3
3
  end
4
4
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: connection_manager
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.4
4
+ version: 0.3.5
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-06-19 00:00:00.000000000Z
12
+ date: 2012-07-10 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: activerecord
16
- requirement: &70345873640120 !ruby/object:Gem::Requirement
16
+ requirement: &70172411129200 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '3.0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70345873640120
24
+ version_requirements: *70172411129200
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: rspec
27
- requirement: &70345873637640 !ruby/object:Gem::Requirement
27
+ requirement: &70172411128780 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :development
34
34
  prerelease: false
35
- version_requirements: *70345873637640
35
+ version_requirements: *70172411128780
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: autotest
38
- requirement: &70345873637180 !ruby/object:Gem::Requirement
38
+ requirement: &70172411128320 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *70345873637180
46
+ version_requirements: *70172411128320
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: mocha
49
- requirement: &70345873636720 !ruby/object:Gem::Requirement
49
+ requirement: &70172411127900 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *70345873636720
57
+ version_requirements: *70172411127900
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: factory_girl
60
- requirement: &70345873636280 !ruby/object:Gem::Requirement
60
+ requirement: &70172411127480 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '0'
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *70345873636280
68
+ version_requirements: *70172411127480
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: activesupport
71
- requirement: &70345873635760 !ruby/object:Gem::Requirement
71
+ requirement: &70172411126980 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ~>
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '3.0'
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *70345873635760
79
+ version_requirements: *70172411126980
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: mysql2
82
- requirement: &70345873635300 !ruby/object:Gem::Requirement
82
+ requirement: &70172413973980 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
87
87
  version: '0'
88
88
  type: :development
89
89
  prerelease: false
90
- version_requirements: *70345873635300
90
+ version_requirements: *70172413973980
91
91
  description: Simplifies connecting to Muliple and Replication databases with rails
92
92
  and active_record
93
93
  email: