mysql_framework 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1464cd256c24c61d853fbcfe1fdb4d784fe4ec4ee4453c327502aceed7912f83
-  data.tar.gz: 9e4d0f30d3aba04788c8d12eeffb81cd3d8973f7dcffc38ea1abb6fd683e0be7
+  metadata.gz: 30e4dba5e1c3a4c988b3c1384bd9ef59b3a0efc0e562aa180aa8ee2bbcd31fff
+  data.tar.gz: c8a387e05c36ad6b900bcf3dc268c28222fee086c9eef9a56aab770cd4a04e25
 SHA512:
-  metadata.gz: e5ed2afe2631ff18469da0665dad07bb2e94ca7154548940297870c50a726de8261dfc66a0e6be65fb2411b00246a087d300d65af4bceff78094effe0a5cc840
-  data.tar.gz: 4e3f86db50a7a555b273776da36d1de80bd6872df1181a889e007c4e0364d981b1f68f6d636e44bd3c0068a89f30bc728eaf9d080b9ddf9e11bb90f4ad186f2c
+  metadata.gz: daf10b0a2e39f8b8837f90c87a6585ba8bb786499e9ab64718e8b93370098fc3a5878b8196c586ed5b8231c3a8f2ae5cea259b9c66495ed01c03b35a872e432c
+  data.tar.gz: a4dee54ea3cd66f3b08a12865cdd3e78b053973555cacd1ebaf576d624371197b5de4683bb2e0eb07d7d99e5774fc4b4255da296eb28513a41c7c8bacb24b293

data/lib/mysql_framework/connector.rb

@@ -32,21 +32,21 @@ module MysqlFramework
     end
 
     # This method is called to execute a prepared statement
-    def execute(query)
-      with_client do |client|
+    def execute(query, provided_client = nil)
+      with_client(provided_client) do |client|
         statement = client.prepare(query.sql)
         statement.execute(*query.params)
       end
     end
 
     # This method is called to execute a query
-    def query(query_string)
-      with_client { |client| client.query(query_string) }
+    def query(query_string, provided_client = nil)
+      with_client(provided_client) { |client| client.query(query_string) }
     end
 
     # This method is called to execute a query which will return multiple result sets in an array
-    def query_multiple_results(query_string)
-      with_client do |client|
+    def query_multiple_results(query_string, provided_client = nil)
+      with_client(provided_client) do |client|
         result = []
         result << client.query(query_string).to_a
         result << client.store_result&.to_a while client.next_result
@@ -72,11 +72,11 @@ module MysqlFramework
 
     def default_options
       {
-        host:      ENV.fetch('MYSQL_HOST'),
-        port:      ENV.fetch('MYSQL_PORT'),
-        database:  ENV.fetch('MYSQL_DATABASE'),
-        username:  ENV.fetch('MYSQL_USERNAME'),
-        password:  ENV.fetch('MYSQL_PASSWORD'),
+        host: ENV.fetch('MYSQL_HOST'),
+        port: ENV.fetch('MYSQL_PORT'),
+        database: ENV.fetch('MYSQL_DATABASE'),
+        username: ENV.fetch('MYSQL_USERNAME'),
+        password: ENV.fetch('MYSQL_PASSWORD'),
         reconnect: true
       }
     end

data/lib/mysql_framework/version.rb

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

data/spec/lib/mysql_framework/connector_spec.rb

@@ -5,18 +5,18 @@ require 'spec_helper'
 describe MysqlFramework::Connector do
   let(:default_options) do
     {
-      host:      ENV.fetch('MYSQL_HOST'),
-      port:      ENV.fetch('MYSQL_PORT'),
-      database:  ENV.fetch('MYSQL_DATABASE'),
-      username:  ENV.fetch('MYSQL_USERNAME'),
-      password:  ENV.fetch('MYSQL_PASSWORD'),
+      host: ENV.fetch('MYSQL_HOST'),
+      port: ENV.fetch('MYSQL_PORT'),
+      database: ENV.fetch('MYSQL_DATABASE'),
+      username: ENV.fetch('MYSQL_USERNAME'),
+      password: ENV.fetch('MYSQL_PASSWORD'),
       reconnect: true
     }
   end
   let(:options) do
     {
-      host:     'host',
-      port:     'port',
+      host: 'host',
+      port: 'port',
       database: 'database',
       username: 'username',
       password: 'password',
@@ -25,12 +25,14 @@ describe MysqlFramework::Connector do
   end
   let(:client) { double }
   let(:gems) { MysqlFramework::SqlTable.new('gems') }
+  let(:existing_client) { Mysql2::Client.new(default_options) }
 
   subject { described_class.new }
 
   describe '#initialize' do
     it 'sets default query options on the Mysql2 client' do
       subject
+
       expect(Mysql2::Client.default_query_options[:symbolize_keys]).to eq(true)
       expect(Mysql2::Client.default_query_options[:cast_booleans]).to eq(true)
     end
@@ -53,6 +55,7 @@ describe MysqlFramework::Connector do
     context 'when the connection pool has a client available' do
       it 'returns a client instance from the pool' do
         subject.instance_variable_get(:@connection_pool).push(client)
+
         expect(subject.check_out).to eq(client)
       end
     end
@@ -61,6 +64,7 @@ describe MysqlFramework::Connector do
   describe '#check_in' do
     it 'returns the provided client to the connection pool' do
       expect(subject.instance_variable_get(:@connection_pool)).to receive(:push).with(client)
+
       subject.check_in(client)
     end
   end
@@ -104,29 +108,46 @@ describe MysqlFramework::Connector do
       expect(results.length).to eq(1)
       expect(results[0][:id]).to eq(guid)
     end
+
+    it 'does not check out a new client when one is provided' do
+      expect(subject).not_to receive(:check_out)
+
+      guid = insert_query.params[0]
+      subject.execute(insert_query, existing_client)
+
+      results = subject.query("SELECT * FROM `gems` WHERE id = '#{guid}';", existing_client).to_a
+      expect(results.length).to eq(1)
+      expect(results[0][:id]).to eq(guid)
+    end
   end
 
   describe '#query' do
-    before :each do
-      allow(subject).to receive(:check_out).and_return(client)
-    end
+    before(:each) { allow(subject).to receive(:check_out).and_return(client) }
 
     it 'retrieves a client and calls query' do
       expect(client).to receive(:query).with('SELECT 1')
+
       subject.query('SELECT 1')
     end
+
+    it 'does not check out a new client when one is provided' do
+      expect(subject).not_to receive(:check_out)
+      expect(existing_client).to receive(:query).with('SELECT 1')
+
+      subject.query('SELECT 1', existing_client)
+    end
   end
 
   describe '#query_multiple_results' do
     let(:test) { MysqlFramework::SqlTable.new('test') }
     let(:manager) { MysqlFramework::Scripts::Manager.new }
     let(:connector) { MysqlFramework::Connector.new }
-    let(:timestamp) { Time.at(628232400) } # 1989-11-28 00:00:00 -0500
+    let(:timestamp) { Time.at(628_232_400) } # 1989-11-28 00:00:00 -0500
     let(:guid) { 'a3ccb138-48ae-437a-be52-f673beb12b51' }
     let(:insert) do
       MysqlFramework::SqlQuery.new.insert(test)
-        .into(test[:id],test[:name],test[:action],test[:created_at],test[:updated_at])
-        .values(guid,'name','action',timestamp,timestamp)
+        .into(test[:id], test[:name], test[:action], test[:created_at], test[:updated_at])
+        .values(guid, 'name', 'action', timestamp, timestamp)
     end
     let(:obj) do
       {
@@ -134,7 +155,7 @@ describe MysqlFramework::Connector do
         name: 'name',
         action: 'action',
         created_at: timestamp,
-        updated_at: timestamp,
+        updated_at: timestamp
       }
     end
 
@@ -145,13 +166,24 @@ describe MysqlFramework::Connector do
       connector.execute(insert)
     end
 
-    after :each do
-      manager.drop_all_tables
-    end
+    after(:each) { manager.drop_all_tables }
 
     it 'returns the results from the stored procedure' do
-      query = "call test_procedure"
+      query = 'call test_procedure'
       result = subject.query_multiple_results(query)
+
+      expect(result).to be_a(Array)
+      expect(result.length).to eq(2)
+      expect(result[0]).to eq([])
+      expect(result[1]).to eq([obj])
+    end
+
+    it 'does not check out a new client when one is provided' do
+      expect(subject).not_to receive(:check_out)
+
+      query = 'call test_procedure'
+      result = subject.query_multiple_results(query, existing_client)
+
       expect(result).to be_a(Array)
       expect(result.length).to eq(2)
       expect(result[0]).to eq([])
@@ -160,18 +192,14 @@ describe MysqlFramework::Connector do
   end
 
   describe '#transaction' do
-    before :each do
-      allow(subject).to receive(:check_out).and_return(client)
-    end
+    before(:each) { allow(subject).to receive(:check_out).and_return(client) }
 
     it 'wraps the client call with BEGIN and COMMIT statements' do
       expect(client).to receive(:query).with('BEGIN')
       expect(client).to receive(:query).with('SELECT 1')
       expect(client).to receive(:query).with('COMMIT')
 
-      subject.transaction do
-        subject.query('SELECT 1')
-      end
+      subject.transaction { subject.query('SELECT 1') }
     end
 
     context 'when an exception occurs' do
@@ -183,7 +211,7 @@ describe MysqlFramework::Connector do
           subject.transaction do
             raise
           end
-        rescue
+        rescue StandardError
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mysql_framework
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Sage
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-12 00:00:00.000000000 Z
+date: 2018-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler