do_oracle 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) 2007 - 2010 Yehuda Katz, Dirkjan Bussink, Raimonds Simanovskis
+Copyright (c) 2007 - 2011 Yehuda Katz, Dirkjan Bussink, Raimonds Simanovskis
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.markdown

@@ -18,10 +18,6 @@ An example of usage:
     @reader = @connection.create_command('SELECT * FROM users').execute_reader
     @reader.next!
 
-In the future, the `Connection` constructor will be able to be passed either a
-DataObjects-style URL or JDBC style URL, when using do\_oracle on JRuby. However,
-this feature is not currently working reliably and is a known issue.
-
 ## Requirements
 
 This driver is provided for the following platforms:
@@ -62,7 +58,7 @@ For more information, see the Oracle 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 on installing and
@@ -95,10 +91,7 @@ To run specs without compiling extensions first:
 
 To run individual specs:
 
-    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).
+    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'
 
@@ -15,51 +17,14 @@ BINARY_VERSION = '10.2.0.4.0'
 
 CLEAN.include(%w[ {tmp,pkg}/ **/*.{o,so,bundle,jar,log,a,gem,dSYM,obj,pdb,exp,DS_Store,rbc,db} ext/do_oracle/Makefile ext-java/target ])
 
-begin
-  gem 'jeweler', '~> 1.4'
-  require 'jeweler'
-
-  Jeweler::Tasks.new do |gem|
-    gem.name        = 'do_oracle'
-    gem.version     = DataObjects::Oracle::VERSION
-    gem.summary     = 'DataObjects Oracle Driver'
-    gem.description = 'Implements the DataObjects API for Oracle'
-    gem.platform    = Gem::Platform::RUBY
-    gem.files       = Dir['lib/**/*.rb', 'spec/**/*.rb', 'tasks/**/*.rake',
-                          'ext/**/*.{rb,c,h}', 'LICENSE', 'Rakefile',
-                          '*.{markdown,rdoc,txt,yml}']
-    gem.extra_rdoc_files = FileList['README*', 'ChangeLog*', 'INSTALL.markdown',
-                                    'LICENSE']
-    gem.test_files  = FileList['spec/**/*.rb']
-
-    # rake-compiler should generate gemspecs for other platforms (e.g. 'java')
-    # and modify dependencies and extensions appropriately
-    gem.extensions << 'ext/do_oracle/extconf.rb'
-
-    gem.add_dependency 'data_objects', DataObjects::Oracle::VERSION
-    gem.add_dependency 'ruby-oci8',    '~>2.0'
-
-    gem.add_development_dependency 'bacon',         '~>1.1'
-    gem.add_development_dependency 'rake-compiler', '= 0.7.0'
 
-    gem.has_rdoc = false
-    gem.rubyforge_project = 'dorb'
-    gem.authors     = [ 'Raimonds Simanovskis' ]
-    gem.email       = 'raimonds.simanovskis@gmail.com'
+if JRUBY
+  Rake::Task['build'].clear_actions   if Rake::Task.task_defined?('build')
+  Rake::Task['install'].clear_actions if Rake::Task.task_defined?('install')
+  task :build => [ :java, :gem ]
+  task :install do
+    sh "#{Config::CONFIG['RUBY_INSTALL_NAME']} -S gem install pkg/do_oracle-#{DataObjects::Oracle::VERSION}-java.gem"
   end
-
-  if JRUBY
-    Rake::Task['build'].clear_actions   if Rake::Task.task_defined?('build')
-    Rake::Task['install'].clear_actions if Rake::Task.task_defined?('install')
-    task :build => [ :java, :gem ]
-    task :install do
-      sh "#{Config::CONFIG['RUBY_INSTALL_NAME']} -S gem install pkg/do_oracle-#{DataObjects::Oracle::VERSION}-java.gem"
-    end
-  end
-
-  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
+
+FileList['tasks/**/*.rake'].each { |task| import task }

data/lib/do_oracle.rb

@@ -21,12 +21,19 @@ end
 require 'do_oracle/version'
 
 if RUBY_PLATFORM =~ /java/
+
+  module DataObjects
+    module Oracle
+      JDBC_DRIVER = 'oracle.jdbc.OracleDriver'
+    end
+  end
+
   # Oracle JDBC driver (ojdbc14.jar or ojdbc5.jar) file should be in JRUBY_HOME/lib or should be in Java class path
   # Register Oracle JDBC driver
   begin
     java.sql.DriverManager.registerDriver Java::oracle.jdbc.OracleDriver.new
   rescue NameError => e
-    raise ConnectionError, "Cannot load Oracle JDBC driver, put it (ojdbc14.jar or ojdbc5.jar) in JRUBY_HOME/lib or in the java extension directory or include in Java class path or call jruby with the option -J-Djava.ext.dirs=/path/to/directory/with/oracle/jars"
+    raise LoadError, "Cannot load Oracle JDBC driver, put it (ojdbc14.jar or ojdbc5.jar) in JRUBY_HOME/lib or in the java extension directory or include in Java class path or call jruby with the option -J-Djava.ext.dirs=/path/to/directory/with/oracle/jars"
   end
   # JDBC driver has transactions implementation in Java
 

data/lib/do_oracle/version.rb

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

data/spec/command_spec.rb

@@ -1,13 +1,13 @@
 # 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::Oracle::Command do
-  behaves_like 'a Command'
+  it_should_behave_like 'a Command'
 
   if JRUBY
-    behaves_like 'a Command with async'
+    it_should_behave_like 'a Command with async'
   else
     describe 'running queries in parallel' do
 

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::Oracle::Connection do
 
-  before do
-    @driver   = CONFIG.scheme
-    @user     = CONFIG.user
+  before :all 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
   end
 
-  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 via JDNI' if JRUBY
+  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' if JRUBY
+  it_should_behave_like 'a Connection via JDNI' if JRUBY
 end

data/spec/encoding_spec.rb

@@ -1,10 +1,10 @@
 # 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::Oracle::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::Oracle::Reader do
-  behaves_like 'a Reader'
+  it_should_behave_like 'a Reader'
 end

data/spec/result_spec.rb

@@ -1,23 +1,26 @@
 # 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'
 
 describe DataObjects::Oracle::Result do
-  behaves_like 'a Result'
-end
-
-def current_sequence_value(seq_name)
-  reader = @connection.create_command("SELECT #{seq_name}.currval FROM dual").execute_reader
-  reader.next!
-  value = reader.values.first
-  reader.close
-  value
+  it_should_behave_like 'a Result'
 end
 
 describe DataObjects::Oracle::Result do
+  #include DataObjectsSpecHelpers
+
+  def current_sequence_value(seq_name)
+    reader = @connection.create_command("SELECT #{seq_name}.currval FROM dual").execute_reader
+    reader.next!
+    value = reader.values.first
+    reader.close
+    value
+  end
 
-  setup_test_environment(false)
+  before :all do
+    setup_test_environment(false)
+  end
 
   describe 'without using RETURNING' do
 
@@ -31,7 +34,7 @@ describe DataObjects::Oracle::Result do
       @connection.close
     end
 
-    it 'should respond to #affected_rows' do @result.should.respond_to(:affected_rows) end
+    it { @result.should respond_to(:affected_rows) }
 
     describe 'affected_rows' do
 
@@ -41,12 +44,12 @@ describe DataObjects::Oracle::Result do
 
     end
 
-    it 'should respond to #insert_id' do @result.should.respond_to(:insert_id) end
+    it { @result.should respond_to(:insert_id) }
 
     describe 'insert_id' do
 
       it 'should return nil' do
-        @result.insert_id.should.be.nil
+        @result.insert_id.should be_nil
       end
 
       it 'should be retrievable through currval' do
@@ -70,7 +73,7 @@ describe DataObjects::Oracle::Result do
       @connection.close
     end
 
-    it 'should respond to #affected_rows' do @result.should.respond_to(:affected_rows) end
+    it { @result.should respond_to(:affected_rows) }
 
     describe 'affected_rows' do
 
@@ -80,7 +83,7 @@ describe DataObjects::Oracle::Result do
 
     end
 
-    it 'should respond to #insert_id' do @result.should.respond_to(:insert_id) end
+    it { @result.should respond_to(:insert_id) }
 
     describe 'insert_id' do
 

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ $TESTING=true
 JRUBY = RUBY_PLATFORM =~ /java/
 
 require 'rubygems'
+require 'rspec'
 require 'date'
 require 'ostruct'
 require 'fileutils'
@@ -18,12 +19,14 @@ 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_oracle'
 
 DataObjects::Oracle.logger = DataObjects::Logger.new(STDOUT, :off)
 at_exit { DataObjects.logger.flush }
 
+
 # Set default time zone in MRI if not set in environment
 # as otherwise wrong time zone is set for database connection
 ENV['TZ'] ||= 'EET' unless JRUBY
@@ -36,9 +39,12 @@ CONFIG.host     = ENV['DO_ORACLE_HOST'] || 'localhost'
 CONFIG.port     = ENV['DO_ORACLE_PORT'] || '1521'
 CONFIG.database = ENV['DO_ORACLE_DATABASE'] || '/orcl'
 
-CONFIG.uri = ENV["DO_ORACLE_SPEC_URI"] ||"#{CONFIG.scheme}://#{CONFIG.user}:#{CONFIG.pass}@#{CONFIG.host}:#{CONFIG.port}#{CONFIG.database}"
-CONFIG.sleep = "BEGIN SYS.DBMS_LOCK.sleep(seconds => 1); END;"
-CONFIG.testsql = "SELECT 1 FROM dual"
+CONFIG.driver       = 'oracle'
+CONFIG.jdbc_driver  = DataObjects::Oracle.const_get('JDBC_DRIVER') rescue nil
+CONFIG.uri          = ENV["DO_ORACLE_SPEC_URI"] ||"#{CONFIG.scheme}://#{CONFIG.user}:#{CONFIG.pass}@#{CONFIG.host}:#{CONFIG.port}#{CONFIG.database}"
+CONFIG.jdbc_uri     = "jdbc:oracle:thin:#{CONFIG.user}/#{CONFIG.pass}@//#{CONFIG.host}:#{CONFIG.port}#{CONFIG.database}"
+CONFIG.sleep        = "BEGIN SYS.DBMS_LOCK.sleep(seconds => 1); END;"
+CONFIG.testsql      = "SELECT 1 FROM dual"
 
 module DataObjectsSpecHelpers
 
@@ -191,4 +197,7 @@ module DataObjectsSpecHelpers
 
 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::Oracle 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::Oracle 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::Oracle 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,11 +1,14 @@
 # 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::Oracle with ByteArray' do
+  include DataObjectsSpecHelpers
 
-  setup_test_environment
+  before :all do
+    setup_test_environment
+  end
 
   before do
     @connection = DataObjects::Connection.new(CONFIG.uri)
@@ -30,7 +33,7 @@ describe 'DataObjects::Oracle with ByteArray' do
       end
 
       it 'should return the correctly typed result' do
-        @values.first.should.be.kind_of(::Extlib::ByteArray)
+        @values.first.should be_kind_of(::Extlib::ByteArray)
       end
 
       it 'should return the correct result' do
@@ -54,7 +57,7 @@ describe 'DataObjects::Oracle with ByteArray' do
       end
 
       it 'should return the correctly typed result' do
-        @values.first.should.be.kind_of(::Extlib::ByteArray)
+        @values.first.should be_kind_of(::Extlib::ByteArray)
       end
 
       it 'should return the correct result' do

data/spec/typecast/class_spec.rb

@@ -1,11 +1,15 @@
 # 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::Oracle with Class' do
 
-  setup_test_environment
+  include DataObjectsSpecHelpers
+
+  before :all do
+    setup_test_environment
+  end
 
   before do
     @connection = DataObjects::Connection.new(CONFIG.uri)
@@ -32,7 +36,7 @@ describe 'DataObjects::Oracle with Class' do
       end
 
       it 'should return the correctly typed result' do
-        @values.first.should.be.kind_of(Class)
+        @values.first.should be_kind_of(Class)
       end
 
       it 'should return the correct result' do

data/spec/typecast/date_spec.rb

@@ -1,11 +1,11 @@
 # 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::Oracle with Date' do
-  behaves_like 'supporting Date'
+  it_should_behave_like 'supporting Date'
 
   # Oracle will cast DATE type to Time
-  # behaves_like 'supporting Date autocasting'
+  # 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::Oracle 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,16 +1,20 @@
 # 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::Oracle 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
 
 describe 'DataObjects::Oracle with Float supporting Float autocasting' do
 
-  setup_test_environment
+  include DataObjectsSpecHelpers
+
+  before :all do
+    setup_test_environment
+  end
 
   before do
     @connection = DataObjects::Connection.new(CONFIG.uri)
@@ -35,13 +39,13 @@ describe 'DataObjects::Oracle with Float supporting Float autocasting' do
       end
 
       it 'should return the correctly typed result' do
-        @values.first.should.be.kind_of(Float)
-        @values.last.should.be.kind_of(Float)
+        @values.first.should be_kind_of(Float)
+        @values.last.should be_kind_of(Float)
       end
 
       it 'should return the correct result' do
-        @values.first.should.be.close(13.4, 0.000001)
-        @values.last.should.be.close(10.23, 0.000001)
+        @values.first.should be_within(0.000001).of(13.4)
+        @values.last.should  be_within(0.000001).of(10.23)
       end
 
     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::Oracle 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::Oracle 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::Oracle with Range' do
-  behaves_like 'supporting Range'
+  it_should_behave_like 'supporting Range'
 end

data/spec/typecast/string_spec.rb

@@ -1,15 +1,19 @@
 # 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::Oracle with String' do
-#   behaves_like 'supporting String'
+#   it_should_behave_like 'supporting String'
 # end
 
 describe 'DataObjects::Oracle with String' do
 
-  setup_test_environment
+  include DataObjectsSpecHelpers
+
+  before :all do
+    setup_test_environment
+  end
 
   before do
     @connection = DataObjects::Connection.new(CONFIG.uri)
@@ -34,7 +38,7 @@ describe 'DataObjects::Oracle with String' do
       end
 
       it 'should return the correctly typed result' do
-        @values.first.should.be.kind_of(String)
+        @values.first.should be_kind_of(String)
       end
 
       it 'should return the correct result' do
@@ -58,11 +62,11 @@ describe 'DataObjects::Oracle with String' do
       end
 
       it 'should return the correctly typed result' do
-        @values.first.should.be.kind_of(String)
+        @values.first.should be_kind_of(String)
       end
 
       it 'should return the correct result' do
-        @values.first.to_f.should.be.close(13.4, 0.000001)
+        @values.first.to_f.should be_within(0.000001).of(13.4)
       end
 
     end
@@ -83,7 +87,7 @@ describe 'DataObjects::Oracle with String' do
 
     it 'should return the correct entry' do
       # Some of the drivers starts autoincrementation from 0 not 1
-      @values.first.should.satisfy { |val| val == 1 or val == 2 }
+      @values.first.should satisfy { |val| val == 1 or val == 2 }
     end
 
   end
@@ -92,7 +96,11 @@ end
 
 describe 'DataObjects::Oracle with Text' do
 
-  setup_test_environment
+  include DataObjectsSpecHelpers
+
+  before :all do
+    setup_test_environment
+  end
 
   before do
     @connection = DataObjects::Connection.new(CONFIG.uri)
@@ -117,7 +125,7 @@ describe 'DataObjects::Oracle with Text' do
       end
 
       it 'should return the correctly typed result' do
-        @values.first.should.be.kind_of(String)
+        @values.first.should be_kind_of(String)
       end
 
       it 'should return the correct result' do

data/spec/typecast/time_spec.rb

@@ -1,15 +1,19 @@
 # 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::Oracle with Time' do
-  behaves_like 'supporting Time'
+  it_should_behave_like 'supporting Time'
 end
 
 describe 'DataObjects::Oracle with Time' do
 
-  setup_test_environment
+  include DataObjectsSpecHelpers
+
+  before :all do
+    setup_test_environment
+  end
 
   before do
     @connection = DataObjects::Connection.new(CONFIG.uri)
@@ -34,7 +38,7 @@ describe 'DataObjects::Oracle with Time' do
       end
 
       it 'should return the correctly typed result' do
-        @values.first.should.be.kind_of(Time)
+        @values.first.should be_kind_of(Time)
       end
 
       it 'should return the correct result' do
@@ -49,18 +53,18 @@ end
 
 describe 'DataObjects::Oracle session time zone' do
 
-  after do
-    @connection.close
-  end
-
   describe 'set from environment' do
 
     before do
-      pending "set TZ environment shell variable before running this test" unless ENV['TZ']
       @connection = DataObjects::Connection.new(CONFIG.uri)
     end
 
+    after do
+      @connection.close
+    end
+
     it "should have time zone from environment" do
+      pending "set TZ environment shell variable before running this test" unless ENV['TZ']
       @reader = @connection.create_command("SELECT sessiontimezone FROM dual").execute_reader
       @reader.next!
       @reader.values.first.should == ENV['TZ']
@@ -74,6 +78,10 @@ describe 'DataObjects::Oracle session time zone' do
       @connection = DataObjects::Connection.new(CONFIG.uri+"?time_zone=CET")
     end
 
+    after do
+      @connection.close
+    end
+
     it "should have time zone from connection option" do
       @reader = @connection.create_command("SELECT sessiontimezone FROM dual").execute_reader
       @reader.next!

data/tasks/compile.rake

@@ -3,24 +3,22 @@ begin
   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
+    @clean_gemspec ||= Gem::Specification::load(File.expand_path('../../do_oracle.gemspec', __FILE__))
   end
 
-  Rake::ExtensionTask.new('do_oracle', gemspec) do |ext|
+  unless JRUBY
+    Rake::ExtensionTask.new('do_oracle', gemspec) do |ext|
 
-    ext.lib_dir = "lib/#{gemspec.name}"
+      ext.lib_dir = "lib/#{gemspec.name}"
 
-    # automatically add build options to avoid need of manual input
-    if RUBY_PLATFORM =~ /mswin|mingw/ then
-    else
-      ext.cross_compile = true
-      ext.cross_platform = ['x86-mingw32', 'x86-mswin32-60']
+      # automatically add build options to avoid need of manual input
+      if RUBY_PLATFORM =~ /mswin|mingw/ then
+      else
+        ext.cross_compile = true
+        ext.cross_platform = ['x86-mingw32', 'x86-mswin32-60']
+      end
     end
-
   end
 
   Rake::JavaExtensionTask.new('do_oracle', gemspec) do |ext|
@@ -34,7 +32,7 @@ begin
       #       Gem::Specification API.
       gem.dependencies.delete_if { |d| d.name == 'ruby-oci8'}
 
-      gem.add_dependency "do_jdbc", '0.10.3'
+      gem.add_dependency "do_jdbc", '0.10.4'
     end
   end
 rescue LoadError

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_oracle
 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: 
 - Raimonds Simanovskis
@@ -15,71 +15,70 @@ 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: bacon
-  prerelease: false
   requirement: &id002 !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: *id002
 - !ruby/object:Gem::Dependency 
-  name: rake-compiler
-  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 5
         segments: 
         - 0
         - 7
-        - 0
-        version: 0.7.0
+        version: "0.7"
   type: :development
+  name: rake-compiler
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: do_jdbc
-  prerelease: false
   requirement: &id004 !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: *id004
 description: Implements the DataObjects API for Oracle
 email: raimonds.simanovskis@gmail.com
@@ -88,14 +87,21 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.markdown
 - ChangeLog.markdown
 - INSTALL.markdown
 - LICENSE
+- README.markdown
 files: 
+- ChangeLog.markdown
+- INSTALL.markdown
+- LICENSE
+- README.markdown
+- Rakefile
+- ext/do_oracle/do_oracle.c
+- ext/do_oracle/extconf.rb
+- lib/do_oracle.rb
 - lib/do_oracle/transaction.rb
 - lib/do_oracle/version.rb
-- lib/do_oracle.rb
 - spec/command_spec.rb
 - spec/connection_spec.rb
 - spec/encoding_spec.rb
@@ -120,21 +126,14 @@ files:
 - tasks/release.rake
 - tasks/retrieve.rake
 - tasks/spec.rake
-- ext/do_oracle/extconf.rb
-- ext/do_oracle/do_oracle.c
-- LICENSE
-- Rakefile
-- ChangeLog.markdown
-- INSTALL.markdown
-- README.markdown
 - lib/do_oracle/do_oracle.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