knjrbfw 0.0.97 → 0.0.98

data/VERSION

@@ -1 +1 @@
-0.0.97
+0.0.98

data/knjrbfw.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "knjrbfw"
-  s.version = "0.0.97"
+  s.version = "0.0.98"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = "2012-09-13"
+  s.date = "2012-09-18"
   s.description = "Including stuff for HTTP, SSH and much more."
   s.email = "k@spernj.org"
   s.extra_rdoc_files = [

data/lib/knj/knj.rb

@@ -46,7 +46,9 @@ module Knj
   end
   
   #Loads a gem by a given name. First tries to load the gem from a custom parent directory to enable loading of development-gems.
-  def self.gem_require(gem_const, gem_name)
+  def self.gem_require(gem_const, gem_name = nil)
+    gem_name = gem_const.to_s.downcase.strip if !gem_name
+    
     #Return false if the constant is already loaded.
     return false if ::Kernel.const_defined?(gem_const)
     

data/lib/knj/knjdb/drivers/mysql/knjdb_mysql.rb

@@ -47,63 +47,65 @@ class KnjDB_mysql
   
   #Respawns the connection to the MySQL-database.
   def reconnect
-    case @subtype
-      when "mysql"
-        @conn = Mysql.real_connect(@knjdb.opts[:host], @knjdb.opts[:user], @knjdb.opts[:pass], @knjdb.opts[:db], @port)
-      when "mysql2"
-        require "rubygems"
-        require "mysql2"
-        
-        args = {
-          :host => @knjdb.opts[:host],
-          :username => @knjdb.opts[:user],
-          :password => @knjdb.opts[:pass],
-          :database => @knjdb.opts[:db],
-          :port => @port,
-          :symbolize_keys => true,
-          :cache_rows => false
-        }
-        
-        #Symbolize keys should also be given here, else table-data wont be symbolized for some reason - knj.
-        @query_args = {:symbolize_keys => true}
-        @query_args.merge!(@knjdb.opts[:query_args]) if @knjdb.opts[:query_args]
-        
-        pos_args = [:as, :async, :cast_booleans, :database_timezone, :application_timezone, :cache_rows, :connect_flags, :cast]
-        pos_args.each do |key|
-          args[key] = @knjdb.opts[key] if @knjdb.opts.key?(key)
-        end
-        
-        args[:as] = :array if @opts[:result] == "array"
-        
-        tries = 0
-        begin
-          tries += 1
-          @conn = Mysql2::Client.new(args)
-        rescue => e
-          if tries <= 3
-            if e.message == "Can't connect to local MySQL server through socket '/var/run/mysqld/mysqld.sock' (111)"
-              sleep 1
-              retry
+    @mutex.synchronize do
+      case @subtype
+        when "mysql"
+          @conn = Mysql.real_connect(@knjdb.opts[:host], @knjdb.opts[:user], @knjdb.opts[:pass], @knjdb.opts[:db], @port)
+        when "mysql2"
+          require "rubygems"
+          require "mysql2"
+          
+          args = {
+            :host => @knjdb.opts[:host],
+            :username => @knjdb.opts[:user],
+            :password => @knjdb.opts[:pass],
+            :database => @knjdb.opts[:db],
+            :port => @port,
+            :symbolize_keys => true,
+            :cache_rows => false
+          }
+          
+          #Symbolize keys should also be given here, else table-data wont be symbolized for some reason - knj.
+          @query_args = {:symbolize_keys => true}
+          @query_args.merge!(@knjdb.opts[:query_args]) if @knjdb.opts[:query_args]
+          
+          pos_args = [:as, :async, :cast_booleans, :database_timezone, :application_timezone, :cache_rows, :connect_flags, :cast]
+          pos_args.each do |key|
+            args[key] = @knjdb.opts[key] if @knjdb.opts.key?(key)
+          end
+          
+          args[:as] = :array if @opts[:result] == "array"
+          
+          tries = 0
+          begin
+            tries += 1
+            @conn = Mysql2::Client.new(args)
+          rescue => e
+            if tries <= 3
+              if e.message == "Can't connect to local MySQL server through socket '/var/run/mysqld/mysqld.sock' (111)"
+                sleep 1
+                retry
+              end
             end
+            
+            raise e
+          end
+        when "java"
+          if !@jdbc_loaded
+            require "java"
+            require "/usr/share/java/mysql-connector-java.jar" if File.exists?("/usr/share/java/mysql-connector-java.jar")
+            import "com.mysql.jdbc.Driver"
+            @jdbc_loaded = true
           end
           
-          raise e
-        end
-      when "java"
-        if !@jdbc_loaded
-          require "java"
-          require "/usr/share/java/mysql-connector-java.jar" if File.exists?("/usr/share/java/mysql-connector-java.jar")
-          import "com.mysql.jdbc.Driver"
-          @jdbc_loaded = true
-        end
-        
-        @conn = java.sql::DriverManager.getConnection("jdbc:mysql://#{@knjdb.opts[:host]}:#{@port}/#{@knjdb.opts[:db]}?user=#{@knjdb.opts[:user]}&password=#{@knjdb.opts[:pass]}&populateInsertRowWithDefaultValues=true&zeroDateTimeBehavior=round&characterEncoding=#{@encoding}&holdResultsOpenOverStatementClose=true")
-        self.query("SET SQL_MODE = ''")
-      else
-        raise "Unknown subtype: #{@subtype}"
+          @conn = java.sql::DriverManager.getConnection("jdbc:mysql://#{@knjdb.opts[:host]}:#{@port}/#{@knjdb.opts[:db]}?user=#{@knjdb.opts[:user]}&password=#{@knjdb.opts[:pass]}&populateInsertRowWithDefaultValues=true&zeroDateTimeBehavior=round&characterEncoding=#{@encoding}&holdResultsOpenOverStatementClose=true")
+          self.query("SET SQL_MODE = ''")
+        else
+          raise "Unknown subtype: #{@subtype}"
+      end
+      
+      self.query("SET NAMES '#{self.esc(@encoding)}'") if @encoding
     end
-    
-    self.query("SET NAMES '#{self.esc(@encoding)}'") if @encoding
   end
   
   #Executes a query and returns the result.

metadata

@@ -2,7 +2,7 @@
 name: knjrbfw
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.97
+  version: 0.0.98
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-13 00:00:00 Z
+date: 2012-09-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: wref
@@ -390,7 +390,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3777771227131467790
+      hash: 73923719738851392
       segments: 
       - 0
       version: "0"