MYSQLSafe 0.0.5 → 0.0.6

data/lib/MYSQLSafe/base.rb

@@ -2,27 +2,23 @@ require 'mysql'
 
 module MYSQLSafe
 	class Base
-		attr_accessor :encoding
-		attr_reader :host, :database, :user
-		
-		def host=(host_string)
-			@host = esc_enc_string(host_string)
-		end
-		def database=(database_string)
-			@database = esc_enc_string(database_string)
-		end
-		def user=(user_string)
-			@user = esc_enc_string(user_string)
-		end
-		def password=(password_string)
-			@password = esc_enc_string(password_string)
-		end
+		attr_accessor :host, :database, :user, :encoding, :password
 		
 		def connect_safe(raw_sql)
+			@mysql_array = []
+			@encoding ||= 'utf-8'
+			options = {}
+			self.instance_variables.map{|name| options = options.merge({ name.to_s.delete("@") => self.instance_variable_get(name) }) }
+			options.each do |k,v|
+				options[k] = esc_enc_string(v)
+			end
+			
+			
 			sql = esc_enc_string(raw_sql)
-			if @host && @database && @user && @password
+			if options["host"] && options["database"] && options["user"] && options["password"]
 				begin
-					@cxtn = Mysql.new(@host, @db, @user, @password)
+					options.each {|k,v| puts "#{k} => #{v}"}
+					@cxtn = Mysql.new(options[host], options[database], options[user], options[password])
 					table_names = get_table_names
 					table_match = match_name(table_names, sql)
 					
@@ -40,16 +36,19 @@ module MYSQLSafe
 					end
 					
 					mysql_object = cxtn.query(ticked_sql)
-					mysql_array = []
-					mysql_object.each { |row| mysql_array.push(row) }
-					
-					return mysql_array
+					mysql_object.each { |row| @mysql_array.push(row) }
+					puts "After push: #{@mysql_array}"
+				rescue Mysql::Error => msqle
+					puts "Error! #{msqle}, #{@mysql_array}"
+					@mysql_array.push(["MYSQL Error: #{msqle}"])
 				ensure
-					@cxtn.close
+					@cxtn.close if @cxtn
 				end
 			else
-				raise 'MYSQLSafe error: Host, Database, User and Password must be set to run a query'
+				raise "MYSQLSafe error: Host, Database, User and Password must be set to run a query. You included #{options}"
 			end
+			puts "@mysql_array is #{@mysql_array} a #{@mysql_array.class}"
+			return @mysql_array
 		end
 		
 		private
@@ -108,15 +107,16 @@ module MYSQLSafe
 		end
 		
 		def esc_enc_string(string)
-			return esc_string(enc_string(string))
+			return esc_string(enc_string(string.to_s))
 		end
 		
 		def enc_string(string)
-			return string.encode!("#{@encoding}", "#{@encoding}", :invalid => :replace)
+			return string.encode("#{@encoding}", "#{@encoding}", :invalid => :replace)
 		end
 		
 		def esc_string(string)
 			return Mysql.escape_string(string)
 		end
+		
 	end
 end

data/lib/MYSQLSafe/version.rb

@@ -1,3 +1,3 @@
 module MYSQLSafe
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/test/lib/MYSQLSafe/base_test.rb

@@ -2,37 +2,50 @@ require_relative '../../test_helper.rb'
 
 describe MYSQLSafe::Base do
 	
-	obj { MYSQLSafe::Base }
+	before do
+		@obj = MYSQLSafe::Base.new
+	end
 	
   it "should allow enconding to be set and read" do
-		enconding_name = 'utf-8'
-		obj.enconding = enconding_name
-		obj.enconding.should_equal enconding_name
+		encoding_name = 'utf-8'
+		@obj.encoding = encoding_name
+		@obj.encoding.must_equal encoding_name
 	end
   it "should allow username to be set and read" do
 		username = 'sam'
-		obj.user = username
-		obj.user.should_equal username
+		@obj.user = username
+		@obj.user.must_equal username
 	end
   it "should allow host to be set and read" do
 		hostname = 'localhost'
-		obj.host = hostname
-		obj.host.should_equal hostname
+		@obj.host = hostname
+		@obj.host.must_equal hostname
 	end
   it "should allow database to be set and read" do
 		database_name = 'test'
-		obj.database = database_name
-		obj.database.should_equal database_name
+		@obj.database = database_name
+		@obj.database.must_equal database_name
 	end
 	
-  it "must allow password to be set, but not read" do
-		password_key = $MYSQLPASSWORD
-		obj.password = password_key
-		obj.password.must_be_kind_of Exception
+  it "must allow password to be set and read" do
+		password_key = ENV['MYSQLPASSWORD'] || "password"
+		@obj.password = password_key
+		@obj.password.must_equal password_key
 	end
 	
-  it "should allow connections to be made" do
-		obj.connect_safe("SELECT * FROM test LIMIT 1")
-		obj.database.should_be_type_of Array
+  it "should allow connections to be made, and return an array" do
+		encoding_name = 'utf-8'
+		@obj.encoding = encoding_name
+		username = 'sam'
+		@obj.user = username
+		hostname = 'localhost'
+		@obj.host = hostname
+		database_name = 'test'
+		@obj.database = database_name
+		password_key = ENV['MYSQLPASSWORD'] || "password"
+		@obj.password = password_key
+		
+		success = @obj.connect_safe("SELECT * FROM test LIMIT 1")
+		success.must_be_instance_of Array
 	end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: MYSQLSafe
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors: