mysql_framework 0.1.2.rc1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f327b700f17750938d41a83a10dbb3870339cc053ac9f85b8b190fcaa952ecd3
-  data.tar.gz: 6ee8a9ce9d1b286330cbf269bbe117c0c098690b086536e199f7da9eb93d01da
+  metadata.gz: b6968df02ffdf51ca8bfd97439bd9dec1ba2c958daac8875e0b5d6bb49f1ae46
+  data.tar.gz: 95f5f9ab5f79185f714a673ea8117b31f2daa5eddefe33ca0c5a7eaf170efa35
 SHA512:
-  metadata.gz: eaf60ca0754e7df7259fa3c4ef99b75925c803a587d9ed02c628a1bbfdfb73afff9dd818223de93a0ce077bbbf20419aaaf452fd04742573af458ca8d5d30820
-  data.tar.gz: d30a6dfbaeb8c943339db350bfa629680974963343682b54baadc4d956bd6ab0ef16387beb5c0e257c7a6cecfd90c5849029e842f3c5cb114c9b992d612f1085
+  metadata.gz: 447e5df159a57b64c82dcdb174501f2263cb04df75adcc9d55a45af027f6fb0504c67a17a7b99d5c2c9f049bfec4906a7c1fe28b93bde5325abaaab3cf381dce
+  data.tar.gz: 8793497128e20a8966c3ac4906ee7ae3d1d8db08895b62523e2696e410d360c534d6cc4442c0d875cb48c3ddecf95a8140322fbba2b646382d0c6b3707e8e186

data/lib/mysql_framework/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MysqlFramework
-  VERSION = '0.1.2.rc1'
+  VERSION = '0.1.2'
 end

data/spec/lib/mysql_framework/connector_spec.rb

@@ -28,10 +28,24 @@ describe MysqlFramework::Connector do
   let(:client) { double(close: true, ping: true, closed?: false) }
   let(:gems) { MysqlFramework::SqlTable.new('gems') }
   let(:existing_client) { Mysql2::Client.new(default_options) }
+  let(:connection_pooling_enabled) { 'true' }
 
   subject { described_class.new }
 
-  before(:each) { subject.setup }
+  before(:each) do
+    original_fetch = ENV.method(:fetch)
+
+    allow(ENV).to receive(:fetch) do |var, default|
+      if var == 'MYSQL_CONNECTION_POOL_ENABLED'
+        connection_pooling_enabled
+      else
+        original_fetch.call(var, default)
+      end
+    end
+
+    subject.setup
+  end
+
   after(:each) { subject.dispose }
 
   describe '#initialize' do
@@ -69,10 +83,22 @@ describe MysqlFramework::Connector do
   end
 
   describe '#setup' do
-    it 'creates a connection pool with the specified number of conections' do
-      subject.setup
+    context 'when connection pooling is enabled' do
+      it 'creates a connection pool with the specified number of conections' do
+        subject.setup
+
+        expect(subject.connections.length).to eq(start_pool_size)
+      end
+    end
+
+    context 'when connection pooling is disabled' do
+      let(:connection_pooling_enabled) { 'false' }
 
-      expect(subject.connections.length).to eq(start_pool_size)
+      it "doesn't create a connection pool" do
+        subject.setup
+
+        expect(subject.connections).to be_nil
+      end
     end
   end
 
@@ -92,42 +118,55 @@ describe MysqlFramework::Connector do
   end
 
   describe '#check_out' do
-    context 'when there are available connections' do
-      before do
-        subject.connections.clear
-        subject.connections.push(client)
-      end
+    context 'when connection pooling is enabled' do
+      context 'when there are available connections' do
+        before do
+          subject.connections.clear
+          subject.connections.push(client)
+        end
 
-      it 'returns a client instance from the pool' do
-        expect(subject.check_out).to eq(client)
-      end
+        it 'returns a client instance from the pool' do
+          expect(subject.check_out).to eq(client)
+        end
 
-      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
-          }
+        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
+
+          subject { described_class.new(options) }
+
+          it 'pings the server to force a reconnect' do
+            expect(client).to receive(:ping)
+
+            subject.check_out
+          end
         end
 
-        subject { described_class.new(options) }
+        context 'and :reconnect is set to false' do
+          subject { described_class.new(options) }
 
-        it 'pings the server to force a reconnect' do
-          expect(client).to receive(:ping)
+          it 'pings the server to force a reconnect' do
+            expect(client).not_to receive(:ping)
 
-          subject.check_out
+            subject.check_out
+          end
         end
       end
 
-      context 'and :reconnect is set to false' do
-        subject { described_class.new(options) }
+      context 'when connection pooling is disabled' do
+        let(:connection_pooling_enabled) { 'false' }
 
-        it 'pings the server to force a reconnect' do
-          expect(client).not_to receive(:ping)
+        it 'instantiates and returns a new connection directly' do
+          expect(subject.connections).not_to receive(:pop)
+          expect(Mysql2::Client).to receive(:new)
 
           subject.check_out
         end
@@ -164,20 +203,33 @@ describe MysqlFramework::Connector do
   end
 
   describe '#check_in' do
-    it 'returns the provided client to the connection pool' do
-      expect(subject.connections).to receive(:push).with(client)
+    context 'when connection pooling is enabled' do
+      it 'returns the provided client to the connection pool' do
+        expect(subject.connections).to receive(:push).with(client)
+
+        subject.check_in(client)
+      end
 
-      subject.check_in(client)
+      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
 
-    context 'when the connection has been closed by the server' do
-      let(:closed_client) { double(close: true, closed?: true) }
+    context 'when connection pooling is disabled' do
+      let(:connection_pooling_enabled) { 'false' }
 
-      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)
+      it 'closes the connection and does not add it to the connection pool' do
+        expect(client).to receive(:close)
+        expect(subject.connections).not_to receive(:push)
 
-        subject.check_in(closed_client)
+        subject.check_in(client)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mysql_framework
 version: !ruby/object:Gem::Version
-  version: 0.1.2.rc1
+  version: 0.1.2
 platform: ruby
 authors:
 - Sage
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-30 00:00:00.000000000 Z
+date: 2018-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -148,9 +148,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.8