sack 1.2.2 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d0dcda61db650f139ef10c0445e28ffe9414774
-  data.tar.gz: f5f428caeb746a6f0785fc4fc20c1fbed1cedd4c
+  metadata.gz: 90bcc0a090fb37382416f80c5e3a617b38ff1498
+  data.tar.gz: 6f84ea73b3ad0237ab2a64ebd172aa424e712d5f
 SHA512:
-  metadata.gz: a249b6218fbda1c2bf5ec83b51db757cedf445f5e8fa75e048a058a270774fc5173718d7cc4d645ec29908535c480dba293f424ef2c2d2dfed867262b05c22f0
-  data.tar.gz: 5b13755787d931401464121e5eee17a3102ca1042a1b21b344ac19d111e75094789736ff603a54207cdca85cc931637ea7b1cbdcc328a2115814c00ccf424270
+  metadata.gz: 4379c6f945742fde6e37a7c1ec0ceb6815e8696f43ddc35f80c63cdd7ede14b323d986a2d0f46cd5869bdf84c82b5cf274158f0ff87ce9a5866694790e877786
+  data.tar.gz: d71837eef03ece759e12af73f241cb0850d537aed3314e8e5c8e60de9dfbb548dd87a87526c7e72f039813965fa38912d42d7c7e29a1720d2ab5fb13e6ef6d2a

data/lib/sack/connectors/mysql.rb

@@ -0,0 +1,45 @@
+# Sack
+# by Eresse <eresse@eresse.net>
+
+# External Includes
+require 'mysql2'
+
+# Internal Includes
+require 'sack/database/sanitizer'
+
+# Sack Module
+module Sack
+
+	# Connectors Module
+	module Connectors
+
+		# MySQL Connector Module:
+		# Provides MySQL connectivity for Sack Database.
+		module MySQLConnector
+
+			# Open:
+			# Opens a connection to a MySQL database.
+			# @param [String] conn_string The connection string (host=myServerAddress;database=myDataBase;username=myUsername;password=myPassword;)
+			# @return [Object] Database connection
+			def self.open conn_string
+				Mysql2::Client.new Hash[*(conn_string.split(';').inject([]) { |a, e| a + e.split('=') })]
+			end
+
+			# Close:
+			# Closes a previously-opened database connection.
+			# @param [Object] dbc Database connection
+			def self.close dbc
+				dbc.close
+			end
+
+			# Execute
+			# Executes an SQL statement with parameters
+			# @param [Object] dbc Database connection
+			# @param [String] q Statement
+			# @return [Array] Statement results
+			def self.exec dbc, q
+				dbc.query(q).rows
+			end
+		end
+	end
+end

data/lib/sack/connectors/sqlite3.rb

@@ -36,10 +36,9 @@ module Sack
 			# Executes an SQL statement with parameters
 			# @param [Object] dbc Database connection
 			# @param [String] q Statement
-			# @param [Array] params Statement parameters
 			# @return [Array] Statement results
 			def self.exec dbc, q
-				dbc.exec q
+				dbc.execute q
 			end
 		end
 	end

data/lib/sack/database.rb

@@ -3,7 +3,6 @@
 
 # External Includes
 require 'thread'
-require 'sqlite3'
 
 # Internal Includes
 require 'sack/database/data'
@@ -65,7 +64,7 @@ module Sack
 				db = @connector.open @connstring
 
 				# Yield Block
-				yield Data.new(db, @schema) if block_given?
+				yield Data.new(@connector, db, @schema) if block_given?
 
 				# Close Database
 				db.close

data/lib/sack/database/data.rb

@@ -22,9 +22,10 @@ module Sack
 
 			# Construct:
 			# Builds a *Data* object around a _db_ instance, set to operate on _schema_.
-			# @param [SQLite3::Database] db Database instance obtained by opening an SQLite3 file
+			# @param [Object] db Database instance obtained by DBMS file
 			# @param [Hash] schema Schema definition - see README
-			def initialize db, schema
+			def initialize connector, db, schema
+				@connector = connector
 				@db = db
 				@schema = schema
 			end
@@ -35,7 +36,7 @@ module Sack
 			# @param [Hash] fields A hash mapping of field names to type definition arrays (from _FTYPES_)
 			def create_table name, fields
 				fq = fields.collect { |fname, ftype| "#{Sanitizer.field_name fname} #{ftype.respond_to?(:each) ? ftype.collect { |e| FTYPES[Sanitizer.ftype e] }.join(' ') : FTYPES[Sanitizer.ftype ftype]}" }.join ', '
-				@db.execute "create table #{Sanitizer.table @schema, name} (#{fq});"
+				@connector.exec @db, "create table #{Sanitizer.table @schema, name} (#{fq});"
 			end
 
 			# Alter Table:
@@ -43,7 +44,7 @@ module Sack
 			# @param [Symbol] name Table name
 			# @param [Hash] fields A hash mapping of field names to type definition arrays (from _FTYPES_)
 			def alter_table name, fields
-				fields.each { |fname, ftype| @db.execute "alter table #{Sanitizer.table @schema, name} add #{Sanitizer.field_name fname} #{ftype.respond_to?(:each) ? ftype.collect { |e| FTYPES[Sanitizer.ftype e] }.join(' ') : FTYPES[Sanitizer.ftype ftype]};" rescue nil }
+				fields.each { |fname, ftype| @connector.exec @db, "alter table #{Sanitizer.table @schema, name} add #{Sanitizer.field_name fname} #{ftype.respond_to?(:each) ? ftype.collect { |e| FTYPES[Sanitizer.ftype e] }.join(' ') : FTYPES[Sanitizer.ftype ftype]};" rescue nil }
 			end
 
 			# Count:
@@ -51,7 +52,7 @@ module Sack
 			# @param [Symbol] table Table name
 			# @return [Fixnum] The number of rows present in the given _table_
 			def count table
-				@db.execute("select count(*) from #{Sanitizer.table @schema, table};")[0][0]
+				@connector.exec(@db, "select count(*) from #{Sanitizer.table @schema, table};")[0][0]
 			end
 
 			# Find:
@@ -72,7 +73,7 @@ module Sack
 			# @param [Object] id ID on which to filter
 			# @return [Array] An array of Hashes, each representing one row
 			def fetch table, id
-				hash_res(table.to_sym, @db.execute(Statement.prep("select * from #{Sanitizer.table @schema, table} where id = ?;", [id])))
+				hash_res(table.to_sym, @connector.exec(@db, Statement.prep("select * from #{Sanitizer.table @schema, table} where id = ?;", [id])))
 			end
 
 			# Fetch By Field:
@@ -82,7 +83,7 @@ module Sack
 			# @param [Object] val Field value
 			# @return [Array] An array of Hashes, each representing one row
 			def fetch_by table, field, val
-				hash_res(table.to_sym, @db.execute(Statement.prep("select * from #{Sanitizer.table @schema, table} where #{Sanitizer.field @schema, table, field} = ?;", [val])))
+				hash_res(table.to_sym, @connector.exec(@db, Statement.prep("select * from #{Sanitizer.table @schema, table} where #{Sanitizer.field @schema, table, field} = ?;", [val])))
 			end
 
 			# Fetch All:
@@ -90,7 +91,7 @@ module Sack
 			# @param [Symbol] table Table name
 			# @return [Array] An array of Hashes, each representing one row
 			def fetch_all table
-				hash_res(table.to_sym, @db.execute("select * from #{Sanitizer.table @schema, table};"))
+				hash_res(table.to_sym, @connector.exec(@db, "select * from #{Sanitizer.table @schema, table};"))
 			end
 
 			# Create:
@@ -98,7 +99,7 @@ module Sack
 			# @param [Symbol] table Table name
 			# @param [Hash] fields Fields to be inserted
 			def create table, fields
-				@db.execute Statement.prep("insert into #{Sanitizer.table @schema, table} (#{Generator.fields @schema, table, fields}) values (#{Generator.marks fields});", Generator.values(fields.values))
+				@connector.exec @db, Statement.prep("insert into #{Sanitizer.table @schema, table} (#{Generator.fields @schema, table, fields}) values (#{Generator.marks fields});", Generator.values(fields.values))
 			end
 
 			# Update:
@@ -107,7 +108,7 @@ module Sack
 			# @param [Object] id ID on which to filter
 			# @param [Hash] fields Fields to be updated
 			def update table, id, fields
-				@db.execute Statement.prep("update #{Sanitizer.table @schema, table} set #{Generator.update_marks @schema, table, fields} where id = ?;", [Generator.values(fields.values), id].flatten)
+				@connector.exec @db, Statement.prep("update #{Sanitizer.table @schema, table} set #{Generator.update_marks @schema, table, fields} where id = ?;", [Generator.values(fields.values), id].flatten)
 			end
 
 			# Update By Field:
@@ -117,7 +118,7 @@ module Sack
 			# @param [Object] val Field value
 			# @param [Hash] fields Fields to be updated
 			def update_by table, field, val, fields
-				@db.execute Statement.prep("update #{Sanitizer.table @schema, table} set #{Generator.update_marks @schema, table, fields} where #{Sanitizer.field @schema, table, field} = ?;", [Generator.values(fields.values), val].flatten)
+				@connector.exec @db, Statement.prep("update #{Sanitizer.table @schema, table} set #{Generator.update_marks @schema, table, fields} where #{Sanitizer.field @schema, table, field} = ?;", [Generator.values(fields.values), val].flatten)
 			end
 
 			# Save:
@@ -138,7 +139,7 @@ module Sack
 			# @param [Symbol] field Field name
 			# @param [Object] val Field value
 			def delete_by table, field, val
-				@db.execute Statement.prep("delete from #{Sanitizer.table @schema, table} where #{Sanitizer.field @schema, table, field} = ?;", [val])
+				@connector.exec @db, Statement.prep("delete from #{Sanitizer.table @schema, table} where #{Sanitizer.field @schema, table, field} = ?;", [val])
 			end
 
 			# Destroy By Field:
@@ -146,7 +147,7 @@ module Sack
 			# @param [Symbol] table Table name
 			# @param [Object] id ID of rows to be removed
 			def delete table, id
-				@db.execute Statement.prep("delete from #{Sanitizer.table @schema, table} where id = ?;", [id])
+				@connector.exec @db, Statement.prep("delete from #{Sanitizer.table @schema, table} where id = ?;", [id])
 			end
 
 			# Execute statement:
@@ -155,13 +156,13 @@ module Sack
 			# @param [Array] params Statement parameters
 			# @return [Object] Whatever the statement returned
 			def exec q, params = []
-				@db.execute Statement.prep(q, params)
+				@connector.exec @db, Statement.prep(q, params)
 			end
 
 			# Pull Results into Hash:
-			# Converts rows returned by SQLite3 into Hashes matching the provided schema.
+			# Converts rows returned by DBMS into Hashes matching the provided schema.
 			# @param [Symbol] table Table name
-			# @param [Array] x Results returned by SQLite3
+			# @param [Array] x Results returned by DBMS
 			# @return [Array] An array of Hashes, each representing a single row
 			def hash_res table, x
 				x

data/lib/sack/version.rb

@@ -5,5 +5,5 @@
 module Sack
 
 	# Version
-	VERSION = '1.2.2'
+	VERSION = '1.2.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sack
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.4
 platform: ruby
 authors:
 - Eresse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-01 00:00:00.000000000 Z
+date: 2017-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,6 +95,7 @@ files:
 - Rakefile
 - lib/sack.rb
 - lib/sack/connectors.rb
+- lib/sack/connectors/mysql.rb
 - lib/sack/connectors/sqlite3.rb
 - lib/sack/database.rb
 - lib/sack/database/data.rb