multi_connection 0.0.1 → 0.0.2

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 813b4c924052a1fd5e41615110da84fc58f6d121
4
- data.tar.gz: 7dcf40d50238ae9d386d2b6c87a97b0a6136d047
3
+ metadata.gz: 11db494b0e95edd1514be67e6a7081c027cd1b31
4
+ data.tar.gz: f523f2e9f733869bebd62cbb3fb3da8059d983e3
5
5
  SHA512:
6
- metadata.gz: 02d44a0071beaf68edb6236f1a1532a56c97eaca838240154de7141f613aed8bf62dd46f9087da97a36c2d1b9040b8db2d4ee228ca816eef524e287a61ac325a
7
- data.tar.gz: 177fddd14c812ae83c3a2163d3e3bb9f087f933214b25aeef7a13e5215dd791a3a9e900143a248c9c3a1b03efab8985aab535cd7b2b218ab53b8d8da5d09dd6f
6
+ metadata.gz: e4ff183a37a90c34804fdde47e3dd283510399781bc483d16924f3bdab2249e816ee46c999ff5164f538484ae32e635ce44b0cc8cbdcc2c6b49a872ef0a078c9
7
+ data.tar.gz: 36fceb28886b1f57776fbd71ebb56442de5c89ceedb79004b44cd6507249b51cf979b36a4d54980fce6fc082f5a0372c60fd04e9c25db5e4989c53d194157668
@@ -1,7 +1,7 @@
1
1
  module MultiConnection
2
2
  class Railtie < ::Rails::Railtie
3
- initializer 'multi_connection', after: 'active_record.initialize_database' do
4
- ActiveSupport.on_load :active_record do
3
+ initializer 'multi_connection' do
4
+ ::ActiveSupport.on_load :active_record do
5
5
  ::ActiveRecord::Base.extend ::MultiConnection::ConnectionHandling
6
6
  end
7
7
  end
@@ -1,3 +1,3 @@
1
1
  module MultiConnection
2
- VERSION = "0.0.1"
2
+ VERSION = "0.0.2"
3
3
  end
@@ -89,9 +89,9 @@ module MultiConnection
89
89
  end
90
90
  end
91
91
 
92
- begin
93
- require 'rails'
92
+ if defined?(Rails)
94
93
  require 'multi_connection/railtie'
95
- rescue LoadError
94
+ else
95
+ ::ActiveRecord::Base.extend ::MultiConnection::ConnectionHandling
96
96
  end
97
97
 
@@ -23,6 +23,6 @@ Gem::Specification.new do |spec|
23
23
  spec.add_development_dependency "rspec", "~> 3.0.0"
24
24
  spec.add_development_dependency "sqlite3"
25
25
 
26
- spec.add_dependency "activerecord", ">= 3.2.0"
26
+ spec.add_dependency "activerecord", ">= 4.0.0"
27
27
  spec.add_dependency "thread_safe"
28
28
  end
data/spec/spec_helper.rb CHANGED
@@ -1,10 +1,6 @@
1
1
  require 'active_record'
2
2
  require 'multi_connection'
3
3
 
4
- class ActiveRecord::Base
5
- extend MultiConnection::ConnectionHandling
6
- end
7
-
8
4
  ActiveRecord::Base.configurations = {
9
5
  'default' => { adapter: 'sqlite3', database: 'default', timeout: 100 },
10
6
  'db2' => { adapter: 'sqlite3', database: 'db2', timeout: 100 },
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: multi_connection
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.1
4
+ version: 0.0.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - wenjun.yan
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-09-03 00:00:00.000000000 Z
11
+ date: 2014-09-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -72,14 +72,14 @@ dependencies:
72
72
  requirements:
73
73
  - - ">="
74
74
  - !ruby/object:Gem::Version
75
- version: 3.2.0
75
+ version: 4.0.0
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
80
  - - ">="
81
81
  - !ruby/object:Gem::Version
82
- version: 3.2.0
82
+ version: 4.0.0
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: thread_safe
85
85
  requirement: !ruby/object:Gem::Requirement