do_mysql 0.10.0 → 0.10.1

data/ext/{do_mysql_ext → do_mysql}/extconf.rb

@@ -2,6 +2,9 @@ ENV["RC_ARCHS"] = "" if RUBY_PLATFORM =~ /darwin/
 
 require 'mkmf'
 
+# Allow for custom compiler to be specified.
+RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
+
 # All instances of mysql_config on PATH ...
 def mysql_config_paths
   ENV['PATH'].split(File::PATH_SEPARATOR).collect do |path|
@@ -15,6 +18,10 @@ def default_mysql_config_path
   mysql_config_paths.compact.first
 end
 
+def mysql_config(type)
+  IO.popen("#{default_mysql_config_path} --#{type}").readline.chomp rescue nil
+end
+
 def default_prefix
   if mc = default_mysql_config_path
     File.dirname(File.dirname(mc))
@@ -33,13 +40,13 @@ if RUBY_PLATFORM =~ /mswin|mingw/
   have_func('mysql_query', 'mysql.h') || exit(1)
   have_func('mysql_ssl_set', 'mysql.h')
 elsif mc = with_config('mysql-config', default_mysql_config_path)
-  mc = default_mysql_config_path if mc == true
-  cflags = `#{mc} --cflags`.chomp
-  exit 1 if $? != 0
-  libs = `#{mc} --libs`.chomp
-  exit 1 if $? != 0
-  $CPPFLAGS += ' ' + cflags
-  $libs = libs + " " + $libs
+  includes = mysql_config('include').split(/\s+/).map do |dir|
+    dir.gsub(/^-I/, "")
+  end.uniq
+  libs     = mysql_config('libs').split(/\s+/).select {|lib| lib =~ /^-L/}.map do |dir|
+    dir.gsub(/^-L/, "")
+  end.uniq
+  dir_config('mysql', includes, libs)
 else
   inc, lib = dir_config('mysql', default_prefix)
   libs = ['m', 'z', 'socket', 'nsl']
@@ -64,4 +71,4 @@ if RUBY_VERSION < '1.8.6'
   $CFLAGS << ' -DRUBY_LESS_THAN_186'
 end
 
-create_makefile('do_mysql_ext')
+create_makefile('do_mysql/do_mysql')

data/lib/do_mysql.rb

@@ -19,26 +19,42 @@ if RUBY_PLATFORM =~ /java/
 
 end
 
-require 'do_mysql_ext'
+begin
+  require 'do_mysql/do_mysql'
+rescue LoadError
+  if RUBY_PLATFORM =~ /mingw|mswin/
+    RUBY_VERSION =~ /(\d+.\d+)/
+    require "do_mysql/#{$1}/do_mysql"
+  else
+    raise
+  end
+end
+
 require 'do_mysql/version'
-require 'do_mysql/transaction'
+require 'do_mysql/transaction' if RUBY_PLATFORM !~ /java/
 require 'do_mysql/encoding'
 
 if RUBY_PLATFORM =~ /java/
 
+  DataObjects::Mysql::Connection.class_eval do
+
+    def using_socket?
+      @using_socket
+    end
+
+    def secure?
+      false
+    end
+
+  end
+
+else
+
   module DataObjects
     module Mysql
       class Connection
-        def self.pool_size
-          20
-        end
-
-        def using_socket?
-          @using_socket
-        end
-
         def secure?
-          false
+          !(@ssl_cipher.nil? || @ssl_cipher.empty?)
         end
       end
     end

data/lib/do_mysql/version.rb

@@ -1,5 +1,5 @@
 module DataObjects
   module Mysql
-    VERSION = "0.10.0"
+    VERSION = '0.10.1'.freeze
   end
 end

data/spec/command_spec.rb

@@ -4,6 +4,6 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
 require 'data_objects/spec/command_spec'
 
 describe DataObjects::Mysql::Command do
-  it_should_behave_like 'a Command'
-  it_should_behave_like 'a Command with async'
+  behaves_like 'a Command'
+  behaves_like 'a Command with async'
 end

data/spec/connection_spec.rb

@@ -6,19 +6,21 @@ require 'cgi'
 
 describe DataObjects::Mysql::Connection do
 
-  before :all do
-    @driver = CONFIG.scheme
-    @user   = CONFIG.user
+  before do
+    @driver   = CONFIG.scheme
+    @user     = CONFIG.user
     @password = CONFIG.pass
-    @host   = CONFIG.host
-    @port   = CONFIG.port
+    @host     = CONFIG.host
+    @port     = CONFIG.port
     @database = CONFIG.database
-    @ssl    = CONFIG.ssl
+    @ssl      = CONFIG.ssl
   end
 
-  it_should_behave_like 'a Connection'
-  it_should_behave_like 'a Connection with authentication support'
-  it_should_behave_like 'a Connection with SSL support' unless JRUBY
+  behaves_like 'a Connection'
+  behaves_like 'a Connection with authentication support'
+  # FIXME: behaves_like 'a Connection with JDBC URL support' if JRUBY
+  behaves_like 'a Connection with SSL support' unless JRUBY
+  behaves_like 'a Connection via JDNI' if JRUBY
 
   if DataObjectsSpecHelpers.test_environment_supports_ssl?
 
@@ -26,22 +28,22 @@ describe DataObjects::Mysql::Connection do
 
       it 'should raise an error when passed ssl=true' do
         lambda { DataObjects::Connection.new("#{CONFIG.uri}?ssl=true") }.
-          should raise_error(ArgumentError)
+          should.raise(ArgumentError)
       end
 
       it 'should raise an error when passed a nonexistent client certificate' do
         lambda { DataObjects::Connection.new("#{CONFIG.uri}?ssl[client_cert]=nonexistent") }.
-          should raise_error(ArgumentError)
+          should.raise(ArgumentError)
       end
 
       it 'should raise an error when passed a nonexistent client key' do
         lambda { DataObjects::Connection.new("#{CONFIG.uri}?ssl[client_key]=nonexistent") }.
-          should raise_error(ArgumentError)
+          should.raise(ArgumentError)
       end
 
       it 'should raise an error when passed a nonexistent ca certificate' do
         lambda { DataObjects::Connection.new("#{CONFIG.uri}?ssl[ca_cert]=nonexistent") }.
-          should raise_error(ArgumentError)
+          should.raise(ArgumentError)
       end
 
       it 'should connect with a specified SSL cipher' do
@@ -51,7 +53,7 @@ describe DataObjects::Mysql::Connection do
 
       it 'should raise an error with an invalid SSL cipher' do
         lambda { DataObjects::Connection.new("#{CONFIG.uri}?#{CONFIG.ssl}&ssl[cipher]=invalid") }.
-          should raise_error
+          should.raise
       end
 
     end

data/spec/encoding_spec.rb

@@ -4,5 +4,6 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
 require 'data_objects/spec/encoding_spec'
 
 describe DataObjects::Mysql::Connection do
-  it_should_behave_like 'a driver supporting encodings'
+  behaves_like 'a driver supporting different encodings'
+  behaves_like 'returning correctly encoded strings for the default encoding'
 end

data/spec/reader_spec.rb

@@ -4,5 +4,5 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
 require 'data_objects/spec/reader_spec'
 
 describe DataObjects::Mysql::Reader do
-  it_should_behave_like 'a Reader'
+  behaves_like 'a Reader'
 end

data/spec/result_spec.rb

@@ -4,13 +4,13 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
 require 'data_objects/spec/result_spec'
 
 # splitting the descibe into two separate declaration avoids
-# concurrent execution of the "it_should_behave_like ....."
+# concurrent execution of the "behaves_like ....."
 # needed by some databases (sqlite3)
 
 describe DataObjects::Mysql::Result do
-  it_should_behave_like 'a Result'
+  behaves_like 'a Result'
 end
 
 describe DataObjects::Mysql::Result do
-  it_should_behave_like 'a Result which returns inserted keys'
+  behaves_like 'a Result which returns inserted keys'
 end

data/spec/spec_helper.rb

@@ -2,57 +2,45 @@ $TESTING=true
 JRUBY = RUBY_PLATFORM =~ /java/
 
 require 'rubygems'
-
-gem 'rspec', '>1.1.12'
-require 'spec'
-
 require 'date'
 require 'ostruct'
-require 'pathname'
 require 'fileutils'
+require 'win32console' if RUBY_PLATFORM =~ /mingw|mswin/
+
+driver_lib = File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift(driver_lib) unless $LOAD_PATH.include?(driver_lib)
 
-dir = File.dirname(__FILE__)
-lib_path = File.expand_path("#{dir}/../lib")
-$LOAD_PATH.unshift lib_path unless $LOAD_PATH.include?(lib_path)
-# put data_objects from repository in the load path
-# DO NOT USE installed gem of data_objects!
-do_lib_path = File.expand_path("#{dir}/../../data_objects/lib")
-$LOAD_PATH.unshift do_lib_path unless $LOAD_PATH.include?(do_lib_path)
-
-if JRUBY
-  jdbc_lib_path = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'do_jdbc', 'lib'))
-  $LOAD_PATH.unshift jdbc_lib_path unless $LOAD_PATH.include?(jdbc_lib_path)
-  require 'do_jdbc'
+# Prepend data_objects/do_jdbc in the repository to the load path.
+# DO NOT USE installed gems, except when running the specs from gem.
+repo_root = File.expand_path('../../..', __FILE__)
+(['data_objects'] << ('do_jdbc' if JRUBY)).compact.each do |lib|
+  lib_path = "#{repo_root}/#{lib}/lib"
+  $LOAD_PATH.unshift(lib_path) if File.directory?(lib_path) && !$LOAD_PATH.include?(lib_path)
 end
 
 require 'data_objects'
-
-DATAOBJECTS_SPEC_ROOT = Pathname(__FILE__).dirname.parent.parent + 'data_objects' + 'spec'
-Pathname.glob((DATAOBJECTS_SPEC_ROOT + 'lib/**/*.rb').to_s).each { |f| require f }
-
+require 'data_objects/spec/bacon'
+require 'data_objects/spec/helpers/ssl'
 require 'do_mysql'
 
-log_path = File.expand_path(File.join(File.dirname(__FILE__), '..', 'log', 'do.log'))
-FileUtils.mkdir_p(File.dirname(log_path))
-
-DataObjects::Mysql.logger = DataObjects::Logger.new(log_path, :debug)
-
+DataObjects::Mysql.logger = DataObjects::Logger.new(STDOUT, :off)
 at_exit { DataObjects.logger.flush }
 
-Spec::Runner.configure do |config|
-  config.include(DataObjects::Spec::PendingHelpers)
-end
-
 CONFIG = OpenStruct.new
 CONFIG.scheme   = 'mysql'
 CONFIG.user     = ENV['DO_MYSQL_USER'] || 'root'
 CONFIG.pass     = ENV['DO_MYSQL_PASS'] || ''
+CONFIG.user_info = unless CONFIG.user == 'root' && CONFIG.pass.empty?
+  "#{CONFIG.user}:#{CONFIG.pass}@"
+else
+  ''
+end
 CONFIG.host     = ENV['DO_MYSQL_HOST'] || 'localhost'
 CONFIG.port     = ENV['DO_MYSQL_PORT'] || '3306'
 CONFIG.database = ENV['DO_MYSQL_DATABASE'] || '/do_test'
 CONFIG.ssl      = SSLHelpers.query(:ca_cert, :client_cert, :client_key)
 
-CONFIG.uri = ENV["DO_MYSQL_SPEC_URI"] ||"#{CONFIG.scheme}://#{CONFIG.user}:#{CONFIG.pass}@#{CONFIG.host}:#{CONFIG.port}#{CONFIG.database}"
+CONFIG.uri = ENV["DO_MYSQL_SPEC_URI"] ||"#{CONFIG.scheme}://#{CONFIG.user_info}#{CONFIG.host}:#{CONFIG.port}#{CONFIG.database}"
 CONFIG.sleep = "SELECT sleep(1)"
 
 module DataObjectsSpecHelpers
@@ -226,3 +214,5 @@ module DataObjectsSpecHelpers
   end
 
 end
+
+include DataObjectsSpecHelpers

data/spec/typecast/array_spec.rb

@@ -4,5 +4,5 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 require 'data_objects/spec/typecast/array_spec'
 
 describe 'DataObjects::Mysql with Array' do
-  it_should_behave_like 'supporting Array'
+  behaves_like 'supporting Array'
 end

data/spec/typecast/bigdecimal_spec.rb

@@ -4,6 +4,6 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 require 'data_objects/spec/typecast/bigdecimal_spec'
 
 describe 'DataObjects::Mysql with BigDecimal' do
-  it_should_behave_like 'supporting BigDecimal'
-  it_should_behave_like 'supporting BigDecimal autocasting'
+  behaves_like 'supporting BigDecimal'
+  behaves_like 'supporting BigDecimal autocasting'
 end

data/spec/typecast/boolean_spec.rb

@@ -4,6 +4,6 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 require 'data_objects/spec/typecast/boolean_spec'
 
 describe 'DataObjects::Mysql with Boolean' do
-  it_should_behave_like 'supporting Boolean'
-  it_should_behave_like 'supporting Boolean autocasting'
+  behaves_like 'supporting Boolean'
+  behaves_like 'supporting Boolean autocasting'
 end

data/spec/typecast/byte_array_spec.rb

@@ -4,5 +4,5 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 require 'data_objects/spec/typecast/byte_array_spec'
 
 describe 'DataObjects::Mysql with ByteArray' do
-  it_should_behave_like 'supporting ByteArray'
+  behaves_like 'supporting ByteArray'
 end

data/spec/typecast/class_spec.rb

@@ -4,5 +4,5 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 require 'data_objects/spec/typecast/class_spec'
 
 describe 'DataObjects::Mysql with Class' do
-  it_should_behave_like 'supporting Class'
+  behaves_like 'supporting Class'
 end

data/spec/typecast/date_spec.rb

@@ -4,6 +4,6 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 require 'data_objects/spec/typecast/date_spec'
 
 describe 'DataObjects::Mysql with Date' do
-  it_should_behave_like 'supporting Date'
-  it_should_behave_like 'supporting Date autocasting'
+  behaves_like 'supporting Date'
+  behaves_like 'supporting Date autocasting'
 end

data/spec/typecast/datetime_spec.rb

@@ -4,6 +4,6 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 require 'data_objects/spec/typecast/datetime_spec'
 
 describe 'DataObjects::Mysql with DateTime' do
-  it_should_behave_like 'supporting DateTime'
-  it_should_behave_like 'supporting DateTime autocasting'
+  behaves_like 'supporting DateTime'
+  behaves_like 'supporting DateTime autocasting'
 end

data/spec/typecast/float_spec.rb

@@ -4,6 +4,6 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 require 'data_objects/spec/typecast/float_spec'
 
 describe 'DataObjects::Mysql with Float' do
-  it_should_behave_like 'supporting Float'
-  it_should_behave_like 'supporting Float autocasting'
+  behaves_like 'supporting Float'
+  behaves_like 'supporting Float autocasting'
 end

data/spec/typecast/integer_spec.rb

@@ -4,5 +4,5 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 require 'data_objects/spec/typecast/integer_spec'
 
 describe 'DataObjects::Mysql with Integer' do
-  it_should_behave_like 'supporting Integer'
+  behaves_like 'supporting Integer'
 end

data/spec/typecast/nil_spec.rb

@@ -4,7 +4,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 require 'data_objects/spec/typecast/nil_spec'
 
 describe 'DataObjects::Mysql with Nil' do
-  it_should_behave_like 'supporting Nil'
-  it_should_behave_like 'supporting writing an Nil'
-  it_should_behave_like 'supporting Nil autocasting'
+  behaves_like 'supporting Nil'
+  behaves_like 'supporting writing an Nil'
+  behaves_like 'supporting Nil autocasting'
 end

data/spec/typecast/other_spec.rb

@@ -0,0 +1,8 @@
+# encoding: utf-8
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+require 'data_objects/spec/typecast/other_spec'
+
+describe 'DataObjects::H2 with other (unknown) type' do
+  behaves_like 'supporting other (unknown) type'
+end

data/spec/typecast/range_spec.rb

@@ -4,5 +4,5 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 require 'data_objects/spec/typecast/range_spec'
 
 describe 'DataObjects::Mysql with Range' do
-  it_should_behave_like 'supporting Range'
+  behaves_like 'supporting Range'
 end

data/spec/typecast/string_spec.rb

@@ -4,5 +4,5 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 require 'data_objects/spec/typecast/string_spec'
 
 describe 'DataObjects::Mysql with String' do
-  it_should_behave_like 'supporting String'
+  behaves_like 'supporting String'
 end

data/spec/typecast/time_spec.rb

@@ -4,5 +4,5 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 require 'data_objects/spec/typecast/time_spec'
 
 describe 'DataObjects::Mysql with Time' do
-  it_should_behave_like 'supporting Time'
+  behaves_like 'supporting Time'
 end

data/tasks/compile.rake

@@ -0,0 +1,65 @@
+begin
+  gem 'rake-compiler', '~>0.7'
+  require 'rake/extensiontask'
+  require 'rake/javaextensiontask'
+
+  # Hack to avoid "allocator undefined for Proc" issue when unpacking Gems:
+  # gemspec provided by Jeweler uses Rake::FileList for files, test_files and
+  # extra_rdoc_files, and procs cannot be marshalled.
+  def gemspec
+    @clean_gemspec ||= eval("#{Rake.application.jeweler.gemspec.to_ruby}") # $SAFE = 3\n
+  end
+
+  Rake::ExtensionTask.new('do_mysql', gemspec) do |ext|
+    ext.lib_dir = "lib/#{gemspec.name}"
+    mysql_lib = File.expand_path(File.join(File.dirname(__FILE__), '..', 'vendor', "mysql-#{BINARY_VERSION}-win32"))
+
+    # automatically add build options to avoid need of manual input
+    if RUBY_PLATFORM =~ /mswin|mingw/ then
+      ext.config_options << "--with-mysql-include=#{mysql_lib}/include"
+      ext.config_options << "--with-mysql-lib=#{mysql_lib}/lib/opt"
+    else
+      ext.cross_compile = true
+      ext.cross_platform = ['x86-mingw32', 'x86-mswin32-60']
+      ext.cross_config_options << "--with-mysql-include=#{mysql_lib}/include"
+      ext.cross_config_options << "--with-mysql-lib=#{mysql_lib}/lib/opt"
+
+      ext.cross_compiling do |gemspec|
+        gemspec.post_install_message = <<-POST_INSTALL_MESSAGE
+
+  ======================================================================================================
+
+    You've installed the binary version of #{gemspec.name}.
+    It was built using MySQL version #{BINARY_VERSION}.
+    It's recommended to use the exact same version to avoid potential issues.
+
+    At the time of building this gem, the necessary DLL files where available
+    in the following download:
+
+    http://dev.mysql.com/get/Downloads/MySQL-5.0/mysql-noinstall-#{BINARY_VERSION}-win32.zip/from/pick
+
+    You can put the lib\\opt\\libmysql.dll available in this package in your Ruby bin
+    directory, for example C:\\Ruby\\bin
+
+  ======================================================================================================
+
+        POST_INSTALL_MESSAGE
+      end
+
+    end
+
+  end
+
+  Rake::JavaExtensionTask.new('do_mysql', gemspec) do |ext|
+    ext.lib_dir   = "lib/#{gemspec.name}"
+    ext.ext_dir   = 'ext-java/src/main/java'
+    ext.debug     = ENV.has_key?('DO_JAVA_DEBUG') && ENV['DO_JAVA_DEBUG']
+    ext.classpath = '../do_jdbc/lib/do_jdbc_internal.jar'
+    ext.java_compiling do |gem|
+      gem.add_dependency 'jdbc-mysql', '>=5.0.4'
+      gem.add_dependency 'do_jdbc',    '0.10.1'
+    end
+  end
+rescue LoadError
+  warn "To compile, install rake-compiler (gem install rake-compiler)"
+end