mysql_framework 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cd76e0de90b8c56e1ae4d941f054b34d578e60a98bfc0e81edc37027610ae7b
-  data.tar.gz: b3059ba0eb90274b18211fc5efcf6a01a7eb6ad68c7397fbfa7964747638dd37
+  metadata.gz: 94c25e3c9a25a0ecd4c51807bb1c5906b44ac526af023445e4c6411d057b764a
+  data.tar.gz: 428bf47cf5598c9c5c14593447e329685f3c52af39a45e45e92b18215bdc5323
 SHA512:
-  metadata.gz: 38d21a76909ce03ba7877483b6aa588a651a52839d9e2339e7700f71913173267c725577591e5767b9e9014ce14437d2518757beffbfba67bc8595f2329277d2
-  data.tar.gz: 0429588b4d222a0c361d1516ad5ec89118787f284e79c242bd506e60c9fa132a673637cd06e183809c1d03a0ae7fdd12bcc7ee193d7d939eef9f20b25ed8d98c
+  metadata.gz: 9c3d58636754dfb8414caf2860b1c02c50d866a32d2c4610a2ff6e3779222bf567bb0779cbc4809555303b4477331f27e967f3b3dc80d0e7e86a1277256e7b82
+  data.tar.gz: 82d72de51ec32da66e77f793a813af8f8da1f074916c77fc40d30f2cda9dfac6e1756669668595405e89ff92091ef87cb1765a9f72259613b03c167f19eecbda

data/lib/mysql_framework/connector.rb

@@ -38,8 +38,7 @@ module MysqlFramework
     def check_out
       client = @connection_pool.pop(true)
 
-      # Prevent "mysql server has gone away" errors by detecting dead clients and creating a new one instead.
-      client = new_client if client.closed?
+      client.ping if @options[:reconnect]
 
       client
     rescue ThreadError
@@ -56,6 +55,8 @@ module MysqlFramework
 
     # This method is called to check a client back in to the connection when no longer needed.
     def check_in(client)
+      client = new_client if client.closed?
+
       @connection_pool.push(client)
     end
 

data/lib/mysql_framework/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MysqlFramework
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

data/spec/lib/mysql_framework/connector_spec.rb

@@ -23,7 +23,7 @@ describe MysqlFramework::Connector do
       reconnect: false
     }
   end
-  let(:client) { double(close: true, closed?: false) }
+  let(:client) { double(close: true, ping: true, closed?: false) }
   let(:gems) { MysqlFramework::SqlTable.new('gems') }
   let(:existing_client) { Mysql2::Client.new(default_options) }
 
@@ -88,19 +88,36 @@ describe MysqlFramework::Connector do
       it 'returns a client instance from the pool' do
         expect(subject.check_out).to eq(client)
       end
-    end
 
-    context '' do
-      let(:closed_client) { double(close: true, closed?: true) }
+      context 'and :reconnect is set to true' do
+        let(:options) do
+          {
+            host: ENV.fetch('MYSQL_HOST'),
+            port: ENV.fetch('MYSQL_PORT'),
+            database: "#{ENV.fetch('MYSQL_DATABASE')}_2",
+            username: ENV.fetch('MYSQL_USERNAME'),
+            password: ENV.fetch('MYSQL_PASSWORD'),
+            reconnect: true
+          }
+        end
 
-      before do
-        subject.connections.clear
-        subject.connections.push(closed_client)
+        subject { described_class.new(options) }
+
+        it 'pings the server to force a reconnect' do
+          expect(client).to receive(:ping)
+
+          subject.check_out
+        end
       end
 
-      it 'instantiates a new connection and returns it' do
-        expect(Mysql2::Client).to receive(:new).with(default_options).and_return(client)
-        expect(subject.check_out).to eq(client)
+      context 'and :reconnect is set to false' do
+        subject { described_class.new(options) }
+
+        it 'pings the server to force a reconnect' do
+          expect(client).not_to receive(:ping)
+
+          subject.check_out
+        end
       end
     end
 
@@ -139,6 +156,17 @@ describe MysqlFramework::Connector do
 
       subject.check_in(client)
     end
+
+    context 'when the connection has been closed by the server' do
+      let(:closed_client) { double(close: true, closed?: true) }
+
+      it 'instantiates a new connection and returns it' do
+        expect(Mysql2::Client).to receive(:new).with(default_options).and_return(client)
+        expect(subject.connections).to receive(:push).with(client)
+
+        subject.check_in(closed_client)
+      end
+    end
   end
 
   describe '#with_client' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mysql_framework
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Sage
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-02 00:00:00.000000000 Z
+date: 2018-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler