roqua-support 0.1.30 → 0.1.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a7e7e17065382daf49bff625d1a8008a0a4c0ba
-  data.tar.gz: 9a6b746e175193312045d7a94dc67a57d55577bb
+  metadata.gz: ed3f4fd495ac70793c3205d0ef1d26c30660c7e8
+  data.tar.gz: 673b3bee6a8251f9cb0f2c8700f9e42c0444a5c9
 SHA512:
-  metadata.gz: b507ccf0d36fc1941ad3bfb8f4a2714ce0da6e435a6c7356016ecdaffd7d77a6617822803b8ec8e4521b349d9befc228220f1f311248690f87880cfb2a46cfa8
-  data.tar.gz: 9140cb6bc4ea4b6c7b0e13276b0474b4cb3365238cb7e9166d717e85cc80d3eed2f47d7f0997c706cfe6be91afbb662d8abfa09f6dc2a7f536738718e1dd2374
+  metadata.gz: cc14ae28e46cc910743f30789d8aa133a662353272b1a2650dabb905cf69b39fd1feb5a3b8b71db03655d0bdc5246b806ac5c616f1154815dc2702b1e55b6a91
+  data.tar.gz: e4bdbcae705a0c8b1879602ed920c1798106b0c9458ea6a55b3e4f4cb52602466ba7a5db78faccbd823cbdeb96daaf7673ce117cb580fdd091d4a01bb30edd0c

data/Gemfile.lock

@@ -8,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    roqua-support (0.1.30)
+    roqua-support (0.1.31)
       active_interaction (~> 3.0)
       activesupport (>= 3.2, < 6)
       naught (~> 1.0)

data/lib/roqua-support/version.rb

@@ -1,5 +1,5 @@
 module Roqua
   module Support
-    VERSION = '0.1.30'.freeze
+    VERSION = '0.1.31'.freeze
   end
 end

data/lib/roqua/status_checks/check_db_connection.rb

@@ -2,10 +2,8 @@ module Roqua
   module StatusChecks
     module CheckDbConnection
       def self.connected?
-        ActiveRecord::Base.establish_connection
-        ActiveRecord::Base.connection
-        ActiveRecord::Base.connected?
-      rescue
+        ActiveRecord::Base.connection.active?
+      rescue StandardError
         false # Check must return boolean, not an exception.
       end
     end

data/spec/roqua/status_checks/check_db_connection_spec.rb

@@ -2,14 +2,11 @@ require 'spec_helper'
 
 describe 'Roqua::StatusChecks::CheckDbConnection' do
   it 'returns true when there is a db connection' do
-    allow(ActiveRecord::Base).to receive(:establish_connection).and_return(true)
-    allow(ActiveRecord::Base).to receive(:connection).and_return(true)
-    allow(ActiveRecord::Base).to receive(:connected?).and_return(true)
-
     expect(Roqua::StatusChecks::CheckDbConnection.connected?).to be_truthy
   end
 
   it 'returns false when there is no db configured' do
+    allow(ActiveRecord::Base).to receive_message_chain(:connection, :active?).and_return(false)
     expect(Roqua::StatusChecks::CheckDbConnection.connected?).to be_falsey
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roqua-support
 version: !ruby/object:Gem::Version
-  version: 0.1.30
+  version: 0.1.31
 platform: ruby
 authors:
 - Marten Veldthuis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-16 00:00:00.000000000 Z
+date: 2018-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_interaction