mysql_framework 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 889fe8ccc0b85df3fe457ceeacaf4ac66a8953fe6d68a62a066d0700c26d05fc
-  data.tar.gz: 619ace891bdf1d809774628ab8322298cb019ffa92d260467a13835fff4359d3
+  metadata.gz: 1464cd256c24c61d853fbcfe1fdb4d784fe4ec4ee4453c327502aceed7912f83
+  data.tar.gz: 9e4d0f30d3aba04788c8d12eeffb81cd3d8973f7dcffc38ea1abb6fd683e0be7
 SHA512:
-  metadata.gz: a6303e0423b54b92e7bf02dcd651a9da14b6a707b6848e046221ea769428e6633308da95389a83a16c1bc26343fcb106b15cb75cc1d79b2ee29c6c4cfe26c07b
-  data.tar.gz: 9f4c4372b49495c9660e269eec2eec9d3df901d15c4566c5694c2f463453eeeeb2a0f1eabd68e145aabf0d007249bdb1e5a1a963ddb942be4742544725a2b7a0
+  metadata.gz: e5ed2afe2631ff18469da0665dad07bb2e94ca7154548940297870c50a726de8261dfc66a0e6be65fb2411b00246a087d300d65af4bceff78094effe0a5cc840
+  data.tar.gz: 4e3f86db50a7a555b273776da36d1de80bd6872df1181a889e007c4e0364d981b1f68f6d636e44bd3c0068a89f30bc728eaf9d080b9ddf9e11bb90f4ad186f2c

data/lib/mysql_framework/connector.rb

@@ -24,11 +24,11 @@ module MysqlFramework
     end
 
     # This method is called to use a client from the connection pool.
-    def with_client
-      client = check_out
+    def with_client(provided = nil)
+      client = provided || check_out
       yield client
     ensure
-      check_in(client) unless client.nil?
+      check_in(client) unless provided
     end
 
     # This method is called to execute a prepared statement

data/lib/mysql_framework/version.rb

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

data/spec/lib/mysql_framework/connector_spec.rb

@@ -66,7 +66,12 @@ describe MysqlFramework::Connector do
   end
 
   describe '#with_client' do
-    it 'obtains a client from the pool to use' do
+    it 'uses the client that is provided, if passed one' do
+      expect(subject).not_to receive(:check_out)
+      expect { |b| subject.with_client(client, &b) }.to yield_with_args(client)
+    end
+
+    it 'obtains a client from the pool to use, if no client is provided' do
       allow(subject).to receive(:check_out).and_return(client)
       expect { |b| subject.with_client(&b) }.to yield_with_args(client)
     end

data/spec/spec_helper.rb

@@ -1,15 +1,18 @@
+# frozen_string_literal: true
+
 require 'simplecov'
+
 SimpleCov.start do
   add_filter 'spec/'
 end
 
-ENV['MYSQL_DATABASE']   ||= 'test_database'
-ENV['MYSQL_HOST']       ||= '127.0.0.1'
+ENV['MYSQL_DATABASE'] ||= 'test_database'
+ENV['MYSQL_HOST'] ||= '127.0.0.1'
 ENV['MYSQL_PARTITIONS'] ||= '5'
-ENV['MYSQL_PASSWORD']   ||= ''
-ENV['MYSQL_PORT']       ||= '3306'
-ENV['MYSQL_USERNAME']   ||= 'root'
-ENV['REDIS_URL']        ||= 'redis://127.0.0.1:6379'
+ENV['MYSQL_PASSWORD'] ||= ''
+ENV['MYSQL_PORT'] ||= '3306'
+ENV['MYSQL_USERNAME'] ||= 'root'
+ENV['REDIS_URL'] ||= 'redis://127.0.0.1:6379'
 
 require 'bundler'
 require 'mysql_framework'
@@ -22,6 +25,8 @@ require_relative 'support/tables/test'
 require_relative 'support/tables/demo'
 
 RSpec.configure do |config|
+  config.before(:each) { MysqlFramework.logger.level = Logger::ERROR }
+
   config.expect_with :rspec do |expectations|
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true
   end
@@ -31,22 +36,24 @@ RSpec.configure do |config|
   end
 end
 
-client = Mysql2::Client.new({
-  host:      ENV.fetch('MYSQL_HOST'),
-  port:      ENV.fetch('MYSQL_PORT'),
-  username:  ENV.fetch('MYSQL_USERNAME'),
-  password:  ENV.fetch('MYSQL_PASSWORD'),
-})
+client = Mysql2::Client.new(
+  host: ENV.fetch('MYSQL_HOST'),
+  port: ENV.fetch('MYSQL_PORT'),
+  username: ENV.fetch('MYSQL_USERNAME'),
+  password: ENV.fetch('MYSQL_PASSWORD')
+)
 client.query("DROP DATABASE IF EXISTS `#{ENV.fetch('MYSQL_DATABASE')}`;")
 client.query("CREATE DATABASE `#{ENV.fetch('MYSQL_DATABASE')}`;")
 
 connector = MysqlFramework::Connector.new
 connector.query("DROP TABLE IF EXISTS `#{ENV.fetch('MYSQL_DATABASE')}`.`gems`")
-connector.query("CREATE TABLE `#{ENV.fetch('MYSQL_DATABASE')}`.`gems` (
-                  `id` CHAR(36) NOT NULL,
-                  `name` VARCHAR(255) NULL,
-                  `author` VARCHAR(255) NULL,
-                  `created_at` DATETIME,
-                  `updated_at` DATETIME,
-                  PRIMARY KEY (`id`)
-               )")
+connector.query(<<~SQL)
+  CREATE TABLE `#{ENV.fetch('MYSQL_DATABASE')}`.`gems` (
+    `id` CHAR(36) NOT NULL,
+    `name` VARCHAR(255) NULL,
+    `author` VARCHAR(255) NULL,
+    `created_at` DATETIME,
+    `updated_at` DATETIME,
+    PRIMARY KEY (`id`)
+  )
+SQL

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mysql_framework
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Sage
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-03 00:00:00.000000000 Z
+date: 2018-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A lightweight framework to provide managers for working with MySQL.