multi_connection 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 813b4c924052a1fd5e41615110da84fc58f6d121
-  data.tar.gz: 7dcf40d50238ae9d386d2b6c87a97b0a6136d047
+  metadata.gz: 11db494b0e95edd1514be67e6a7081c027cd1b31
+  data.tar.gz: f523f2e9f733869bebd62cbb3fb3da8059d983e3
 SHA512:
-  metadata.gz: 02d44a0071beaf68edb6236f1a1532a56c97eaca838240154de7141f613aed8bf62dd46f9087da97a36c2d1b9040b8db2d4ee228ca816eef524e287a61ac325a
-  data.tar.gz: 177fddd14c812ae83c3a2163d3e3bb9f087f933214b25aeef7a13e5215dd791a3a9e900143a248c9c3a1b03efab8985aab535cd7b2b218ab53b8d8da5d09dd6f
+  metadata.gz: e4ff183a37a90c34804fdde47e3dd283510399781bc483d16924f3bdab2249e816ee46c999ff5164f538484ae32e635ce44b0cc8cbdcc2c6b49a872ef0a078c9
+  data.tar.gz: 36fceb28886b1f57776fbd71ebb56442de5c89ceedb79004b44cd6507249b51cf979b36a4d54980fce6fc082f5a0372c60fd04e9c25db5e4989c53d194157668

data/lib/multi_connection/railite.rb

@@ -1,7 +1,7 @@
 module MultiConnection
   class Railtie < ::Rails::Railtie
-    initializer 'multi_connection', after: 'active_record.initialize_database' do
-      ActiveSupport.on_load :active_record do
+    initializer 'multi_connection' do
+      ::ActiveSupport.on_load :active_record do
         ::ActiveRecord::Base.extend ::MultiConnection::ConnectionHandling
       end
     end

data/lib/multi_connection/version.rb

@@ -1,3 +1,3 @@
 module MultiConnection
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/multi_connection.rb

@@ -89,9 +89,9 @@ module MultiConnection
   end
 end
 
-begin
-  require 'rails'
+if defined?(Rails)
   require 'multi_connection/railtie'
-rescue LoadError
+else
+  ::ActiveRecord::Base.extend ::MultiConnection::ConnectionHandling
 end
 

data/multi_connection.gemspec

@@ -23,6 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0.0"
   spec.add_development_dependency "sqlite3"
 
-  spec.add_dependency "activerecord", ">= 3.2.0"
+  spec.add_dependency "activerecord", ">= 4.0.0"
   spec.add_dependency "thread_safe"
 end

data/spec/spec_helper.rb

@@ -1,10 +1,6 @@
 require 'active_record'
 require 'multi_connection'
 
-class ActiveRecord::Base
-  extend MultiConnection::ConnectionHandling
-end
-
 ActiveRecord::Base.configurations = {
   'default' => { adapter: 'sqlite3', database: 'default', timeout: 100 },
   'db2' => { adapter: 'sqlite3', database: 'db2', timeout: 100 },

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multi_connection
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - wenjun.yan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-03 00:00:00.000000000 Z
+date: 2014-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: thread_safe
   requirement: !ruby/object:Gem::Requirement