do_h2 0.10.3-java → 0.10.4-java

data/ChangeLog.markdown

@@ -1,3 +1,16 @@
+## 0.10.4 2011-04-28
+
+New features
+* Add save point to transactions (all)
+* JRuby 1.9 mode support (encodings etc.)
+
+Bugfixes
+* Fix bug when using nested transactions in concurrent scenarios (all)
+* Use column aliases instead of names (jruby)
+
+Other
+* Switch back to RSpec
+
 ## 0.10.3 2011-01-30
 * No changes
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008 - 2010 Alex Coles, Ikonoklastik Productions
+Copyright (c) 2008 - 2011 Alex Coles, Ikonoklastik Productions
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.markdown

@@ -53,7 +53,7 @@ For more information, see the H2 driver wiki page:
 ## Developers
 
 Follow the above installation instructions. Additionally, you'll need:
-  * `bacon` gem for running specs.
+  * `rspec` gem for running specs.
   * `YARD` gem for generating documentation.
 
 See the DataObjects wiki for more comprehensive information:
@@ -69,10 +69,7 @@ To run specs without compiling extensions first:
 
 To run individual specs:
 
-    jruby -S rake spec TEST=spec/connection_spec.rb
-
-(Note that the `rake` task uses a `TEST` parameter, not `SPEC`. This is because
-the `Rake::TestTask` is used for executing the Bacon specs).
+    jruby -S rake spec SPEC=spec/connection_spec.rb
 
 ## License
 

data/Rakefile

@@ -1,5 +1,7 @@
 require 'pathname'
-require 'rubygems'
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
 require 'rake'
 require 'rake/clean'
 
@@ -14,41 +16,8 @@ SUDO     = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS'])
 
 CLEAN.include(%w[ {tmp,pkg}/ **/*.{o,so,bundle,jar,log,a,gem,dSYM,obj,pdb,exp,DS_Store,rbc,db} ext-java/target ])
 
-begin
-  gem 'jeweler', '~> 1.4'
-  require 'jeweler'
-
-  Jeweler::Tasks.new do |gem|
-    gem.name        = 'do_h2'
-    gem.version     = DataObjects::H2::VERSION
-    gem.summary     = 'DataObjects H2 Driver'
-    gem.description = 'Implements the DataObjects API for H2'
-    gem.platform    = 'java'
-    gem.files       = FileList['lib/**/*.rb', 'spec/**/*.rb', 'tasks/**/*.rake',
-                               'LICENSE', 'Rakefile', '*.{markdown,rdoc,txt,yml}',
-                               'lib/*.jar']
-    gem.extra_rdoc_files = FileList['README*', 'ChangeLog*', 'LICENSE']
-    gem.test_files  = FileList['spec/**/*.rb']
-
-    gem.add_dependency 'data_objects', DataObjects::H2::VERSION
-    gem.add_dependency 'do_jdbc',      DataObjects::H2::VERSION
-    gem.add_dependency 'jdbc-h2',      '~>1.1.107'
-
-    gem.add_development_dependency 'bacon',         '~>1.1'
-    gem.add_development_dependency 'rake-compiler', '~>0.7'
-
-    gem.has_rdoc = false
-    gem.rubyforge_project = 'dorb'
-    gem.authors     = [ 'Alex Coles' ]
-    gem.email       = 'alex@alexbcoles.com'
-  end
-
-  Rake::Task['build'].clear_actions if Rake::Task.task_defined?('build')
-  task :build => [ :java, :gem ]
-
-  Jeweler::GemcutterTasks.new
-
-  FileList['tasks/**/*.rake'].each { |task| import task }
-rescue LoadError
-  puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler'
-end
+
+Rake::Task['build'].clear_actions if Rake::Task.task_defined?('build')
+task :build => [ :java, :gem ]
+
+FileList['tasks/**/*.rake'].each { |task| import task }

data/lib/do_h2.rb

@@ -4,20 +4,24 @@ if RUBY_PLATFORM =~ /java/
   require 'do_jdbc'
   require 'java'
 
+  module DataObjects
+    module H2
+      JDBC_DRIVER = 'org.h2.Driver'
+    end
+  end
 
-  driver = 'org.h2.Driver'
-   begin
-    java.lang.Thread.currentThread.getContextClassLoader().loadClass(driver, true)
+  begin
+    java.lang.Thread.currentThread.getContextClassLoader().loadClass(DataObjects::H2::JDBC_DRIVER, true)
   rescue
     require 'jdbc/h2'     # the JDBC driver, packaged as a gem
-   end
+  end
 
   require 'do_h2/do_h2'   # the Java extension for this DO driver
 
   # Another way of loading the JDBC Class. This seems to be more reliable
   # than Class.forName() within the data_objects.Connection Java class,
   # which is currently not working as expected.
-  java_import driver
+  java_import DataObjects::H2::JDBC_DRIVER
 
 else
   warn "do_h2 is only for use with JRuby"

data/lib/do_h2/version.rb

@@ -1,5 +1,5 @@
 module DataObjects
   module H2
-    VERSION = '0.10.3'
+    VERSION = '0.10.4'
   end
 end

data/spec/command_spec.rb

@@ -1,9 +1,9 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
-require 'data_objects/spec/command_spec'
+require 'data_objects/spec/shared/command_spec'
 
 describe DataObjects::H2::Command do
-  behaves_like 'a Command'
-#  behaves_like 'a Command with async'
+  it_should_behave_like 'a Command'
+#  it_should_behave_like 'a Command with async'
 end

data/spec/connection_spec.rb

@@ -1,21 +1,21 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
-require 'data_objects/spec/connection_spec'
+require 'data_objects/spec/shared/connection_spec'
 
 describe DataObjects::H2::Connection do
 
-  before do
-    @driver   = 'h2'
-    @user     = ''
+  before :all do
+    @driver = 'h2'
+    @user   = ''
     @password = ''
-    @host     = ''
-    @port     = ''
+    @host   = ''
+    @port   = ''
     @database = "#{File.expand_path(File.dirname(__FILE__))}/test.db"
   end
 
-  behaves_like 'a Connection'
-  #behaves_like 'a Connection with authentication support'
-  behaves_like 'a Connection with JDBC URL support'
-  behaves_like 'a Connection via JDNI'
+  it_should_behave_like 'a Connection'
+  #it_should_behave_like 'a Connection with authentication support'
+  it_should_behave_like 'a Connection with JDBC URL support'
+  it_should_behave_like 'a Connection via JDNI'
 end

data/spec/encoding_spec.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
-require 'data_objects/spec/encoding_spec'
+require 'data_objects/spec/shared/encoding_spec'
 
 describe DataObjects::H2::Connection do
-  #behaves_like 'a driver supporting different encodings'
+  #it_should_behave_like 'a driver supporting different encodings'
 end

data/spec/reader_spec.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
-require 'data_objects/spec/reader_spec'
+require 'data_objects/spec/shared/reader_spec'
 
 describe DataObjects::H2::Reader do
-  behaves_like 'a Reader'
+  it_should_behave_like 'a Reader'
 end

data/spec/result_spec.rb

@@ -1,16 +1,16 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
-require 'data_objects/spec/result_spec'
+require 'data_objects/spec/shared/result_spec'
 
 # splitting the descibe into two separate declaration avoids
-# concurrent execution of the "behaves_like ....."
+# concurrent execution of the "it_should_behave_like ....."
 # needed by some databases (sqlite3)
 
 describe DataObjects::H2::Result do
-  behaves_like 'a Result'
+  it_should_behave_like 'a Result'
 end
 
 describe DataObjects::H2::Result do
-  behaves_like 'a Result which returns inserted key with sequences'
+  it_should_behave_like 'a Result which returns inserted key with sequences'
 end

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ $TESTING=true
 JRUBY = true
 
 require 'rubygems'
+require 'rspec'
 require 'date'
 require 'ostruct'
 require 'fileutils'
@@ -18,21 +19,18 @@ repo_root = File.expand_path('../../..', __FILE__)
 end
 
 require 'data_objects'
-require 'data_objects/spec/bacon'
+require 'data_objects/spec/setup'
+require 'data_objects/spec/lib/pending_helpers'
 require 'do_h2'
 
 DataObjects::H2.logger = DataObjects::Logger.new(STDOUT, :off)
 at_exit { DataObjects.logger.flush }
 
-CONFIG = OpenStruct.new
-# CONFIG.scheme   = 'h2'
-# CONFIG.user     = ENV['DO_H2_USER'] || 'h2'
-# CONFIG.pass     = ENV['DO_H2_PASS'] || ''
-# CONFIG.host     = ENV['DO_H2_HOST'] || ''
-# CONFIG.port     = ENV['DO_H2_PORT'] || ''
-# CONFIG.database = ENV['DO_H2_DATABASE'] || "#{File.expand_path(File.dirname(__FILE__))}/testdb"
 
-CONFIG.uri = ENV["DO_H2_SPEC_URI"] || "jdbc:h2:mem"
+CONFIG              = OpenStruct.new
+CONFIG.uri          = ENV["DO_H2_SPEC_URI"] || "jdbc:h2:mem"
+CONFIG.driver       = 'h2'
+CONFIG.jdbc_driver  = DataObjects::H2::JDBC_DRIVER
 
 module DataObjectsSpecHelpers
 
@@ -165,4 +163,7 @@ module DataObjectsSpecHelpers
   end
 end
 
-include DataObjectsSpecHelpers
+RSpec.configure do |config|
+  config.include(DataObjectsSpecHelpers)
+  config.include(DataObjects::Spec::PendingHelpers)
+end

data/spec/typecast/array_spec.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
-require 'data_objects/spec/typecast/array_spec'
+require 'data_objects/spec/shared/typecast/array_spec'
 
 describe 'DataObjects::H2 with Array' do
-  behaves_like 'supporting Array'
+  it_should_behave_like 'supporting Array'
 end

data/spec/typecast/bigdecimal_spec.rb

@@ -1,9 +1,9 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
-require 'data_objects/spec/typecast/bigdecimal_spec'
+require 'data_objects/spec/shared/typecast/bigdecimal_spec'
 
 describe 'DataObjects::H2 with BigDecimal' do
-  behaves_like 'supporting BigDecimal'
-  behaves_like 'supporting BigDecimal autocasting'
+  it_should_behave_like 'supporting BigDecimal'
+  it_should_behave_like 'supporting BigDecimal autocasting'
 end

data/spec/typecast/boolean_spec.rb

@@ -1,9 +1,9 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
-require 'data_objects/spec/typecast/boolean_spec'
+require 'data_objects/spec/shared/typecast/boolean_spec'
 
 describe 'DataObjects::H2 with Boolean' do
-  behaves_like 'supporting Boolean'
-  behaves_like 'supporting Boolean autocasting'
+  it_should_behave_like 'supporting Boolean'
+  it_should_behave_like 'supporting Boolean autocasting'
 end

data/spec/typecast/byte_array_spec.rb

@@ -1,9 +1,9 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
-require 'data_objects/spec/typecast/byte_array_spec'
+require 'data_objects/spec/shared/typecast/byte_array_spec'
 
 describe 'DataObjects::H2 with ByteArray' do
   # We need to switch to using parameter binding for this to work with H2
-  # behaves_like 'supporting ByteArray'
+  # it_should_behave_like 'supporting ByteArray'
 end

data/spec/typecast/class_spec.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
-require 'data_objects/spec/typecast/class_spec'
+require 'data_objects/spec/shared/typecast/class_spec'
 
 describe 'DataObjects::H2 with Class' do
-  behaves_like 'supporting Class'
+  it_should_behave_like 'supporting Class'
 end

data/spec/typecast/date_spec.rb

@@ -1,9 +1,9 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
-require 'data_objects/spec/typecast/date_spec'
+require 'data_objects/spec/shared/typecast/date_spec'
 
 describe 'DataObjects::H2 with Date' do
-  behaves_like 'supporting Date'
-  behaves_like 'supporting Date autocasting'
+  it_should_behave_like 'supporting Date'
+  it_should_behave_like 'supporting Date autocasting'
 end

data/spec/typecast/datetime_spec.rb

@@ -1,9 +1,9 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
-require 'data_objects/spec/typecast/datetime_spec'
+require 'data_objects/spec/shared/typecast/datetime_spec'
 
 describe 'DataObjects::H2 with DateTime' do
-  behaves_like 'supporting DateTime'
-  behaves_like 'supporting DateTime autocasting'
+  it_should_behave_like 'supporting DateTime'
+  it_should_behave_like 'supporting DateTime autocasting'
 end

data/spec/typecast/float_spec.rb

@@ -1,9 +1,9 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
-require 'data_objects/spec/typecast/float_spec'
+require 'data_objects/spec/shared/typecast/float_spec'
 
 describe 'DataObjects::H2 with Float' do
-  behaves_like 'supporting Float'
-  behaves_like 'supporting Float autocasting'
+  it_should_behave_like 'supporting Float'
+  it_should_behave_like 'supporting Float autocasting'
 end

data/spec/typecast/integer_spec.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
-require 'data_objects/spec/typecast/integer_spec'
+require 'data_objects/spec/shared/typecast/integer_spec'
 
 describe 'DataObjects::H2 with Integer' do
-  behaves_like 'supporting Integer'
+  it_should_behave_like 'supporting Integer'
 end

data/spec/typecast/nil_spec.rb

@@ -1,10 +1,10 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
-require 'data_objects/spec/typecast/nil_spec'
+require 'data_objects/spec/shared/typecast/nil_spec'
 
 describe 'DataObjects::H2 with Nil' do
-  behaves_like 'supporting Nil'
-  behaves_like 'supporting writing an Nil'
-  behaves_like 'supporting Nil autocasting'
+  it_should_behave_like 'supporting Nil'
+  it_should_behave_like 'supporting writing an Nil'
+  it_should_behave_like 'supporting Nil autocasting'
 end

data/spec/typecast/other_spec.rb

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

data/spec/typecast/range_spec.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
-require 'data_objects/spec/typecast/range_spec'
+require 'data_objects/spec/shared/typecast/range_spec'
 
 describe 'DataObjects::H2 with Range' do
-  behaves_like 'supporting Range'
+  it_should_behave_like 'supporting Range'
 end

data/spec/typecast/string_spec.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
-require 'data_objects/spec/typecast/string_spec'
+require 'data_objects/spec/shared/typecast/string_spec'
 
 describe 'DataObjects::H2 with String' do
-  behaves_like 'supporting String'
+  it_should_behave_like 'supporting String'
 end

data/spec/typecast/time_spec.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
-require 'data_objects/spec/typecast/time_spec'
+require 'data_objects/spec/shared/typecast/time_spec'
 
 describe 'DataObjects::H2 with Time' do
-  behaves_like 'supporting Time'
+  it_should_behave_like 'supporting Time'
 end

data/tasks/compile.rake

@@ -2,11 +2,8 @@ begin
   gem 'rake-compiler', '~>0.7'
   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
+    @clean_gemspec ||= Gem::Specification::load(File.expand_path('../../do_h2.gemspec', __FILE__))
   end
 
   Rake::JavaExtensionTask.new('do_h2', gemspec) do |ext|

data/tasks/spec.rake

@@ -1,23 +1,12 @@
-require 'rake/testtask'
+require 'rspec/core/rake_task'
 
-spec_defaults = lambda do |spec|
-  spec.libs   << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.verbose = true
+RSpec::Core::RakeTask.new(:spec => [:clean, :compile]) do |spec|
+  spec.pattern      = './spec/**/*_spec.rb'
+  spec.skip_bundler = true
 end
 
-Rake::TestTask.new(:spec => [ :clean, :compile ], &spec_defaults)
-Rake::TestTask.new(:spec_no_compile, &spec_defaults)
-
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |spec|
-    spec.libs   << 'spec'
-    spec.pattern = 'spec/**/*_spec.rb'
-    spec.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort 'RCov is not available. In order to run rcov, you must: gem install rcov'
-  end
+RSpec::Core::RakeTask.new(:rcov => [:clean, :compile]) do |rcov|
+  rcov.pattern    = "./spec/**/*_spec.rb"
+  rcov.rcov       = true
+  rcov.rcov_opts  = File.read('spec/rcov.opts').split(/\s+/)
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: do_h2
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 63
   prerelease: false
   segments: 
   - 0
   - 10
-  - 3
-  version: 0.10.3
+  - 4
+  version: 0.10.4
 platform: java
 authors: 
 - Alex Coles
@@ -15,44 +15,42 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-30 00:00:00 +01:00
+date: 2011-03-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: data_objects
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 49
+        hash: 63
         segments: 
         - 0
         - 10
-        - 3
-        version: 0.10.3
+        - 4
+        version: 0.10.4
   type: :runtime
+  name: data_objects
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: do_jdbc
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 49
+        hash: 63
         segments: 
         - 0
         - 10
-        - 3
-        version: 0.10.3
+        - 4
+        version: 0.10.4
   type: :runtime
+  name: do_jdbc
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: jdbc-h2
-  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -65,25 +63,25 @@ dependencies:
         - 107
         version: 1.1.107
   type: :runtime
+  name: jdbc-h2
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: bacon
-  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 9
         segments: 
-        - 1
-        - 1
-        version: "1.1"
+        - 2
+        - 5
+        version: "2.5"
   type: :development
+  name: rspec
+  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rake-compiler
-  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -95,6 +93,8 @@ dependencies:
         - 7
         version: "0.7"
   type: :development
+  name: rake-compiler
+  prerelease: false
   version_requirements: *id005
 description: Implements the DataObjects API for H2
 email: alex@alexbcoles.com
@@ -103,12 +103,16 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.markdown
 - ChangeLog.markdown
 - LICENSE
+- README.markdown
 files: 
-- lib/do_h2/version.rb
+- ChangeLog.markdown
+- LICENSE
+- README.markdown
+- Rakefile
 - lib/do_h2.rb
+- lib/do_h2/version.rb
 - spec/command_spec.rb
 - spec/connection_spec.rb
 - spec/encoding_spec.rb
@@ -132,18 +136,14 @@ files:
 - tasks/compile.rake
 - tasks/release.rake
 - tasks/spec.rake
-- LICENSE
-- Rakefile
-- ChangeLog.markdown
-- README.markdown
 - lib/do_h2/do_h2.jar
-has_rdoc: false
+has_rdoc: true
 homepage: 
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement