do_postgres 0.10.3-java → 0.10.4-java

data/lib/do_postgres.rb

@@ -3,9 +3,14 @@ if RUBY_PLATFORM =~ /java/
   require 'do_jdbc'
   require 'java'
 
-  driver = 'org.postgresql.Driver'
+  module DataObjects
+    module Postgres
+      JDBC_DRIVER = 'org.postgresql.Driver'
+    end
+  end
+
   begin
-    java.lang.Thread.currentThread.getContextClassLoader().loadClass(driver, true)
+    java.lang.Thread.currentThread.getContextClassLoader().loadClass(DataObjects::Postgres::JDBC_DRIVER, true)
   rescue
     require 'jdbc/postgres' # the JDBC driver, packaged as a gem
   end
@@ -13,7 +18,7 @@ if RUBY_PLATFORM =~ /java/
   # 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::Postgres::JDBC_DRIVER
 
 end
 

data/lib/do_postgres/version.rb

@@ -1,5 +1,5 @@
 module DataObjects
   module Postgres
-    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::Postgres::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,24 +1,33 @@
 # 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::Postgres::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
+  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
 
   describe 'byte array quoting' do
+
+    before do
+      @connection = DataObjects::Connection.new(CONFIG.uri)
+    end
+
+    after do
+      @connection.close
+    end
+
     # There are two possible byte array quotings available: hex or escape.
     # The default changed from escape to hex in version 9, so these specs
     # check for either.
@@ -26,15 +35,15 @@ describe DataObjects::Postgres::Connection do
     # http://developer.postgresql.org/pgdocs/postgres/datatype-binary.html
     # http://developer.postgresql.org/pgdocs/postgres/release-9-0.html (E.3.2.3.)
     it 'should properly escape non-printable ASCII characters' do
-      ["'\\001'", "'\\x01'"].should.include @connection.quote_byte_array("\001")
+      ["'\\001'", "'\\x01'"].should include @connection.quote_byte_array("\001")
     end
 
     it 'should properly escape bytes with the high bit set' do
-      ["'\\210'", "'\\x88'"].should.include @connection.quote_byte_array("\210")
+      ["'\\210'", "'\\x88'"].should include @connection.quote_byte_array("\210")
     end
 
     it 'should not escape printable ASCII characters' do
-      ["'a'", "'\\x61'"].should.include @connection.quote_byte_array("a")
+      ["'a'", "'\\x61'"].should include @connection.quote_byte_array("a")
     end
   end
 end

data/spec/encoding_spec.rb

@@ -1,7 +1,7 @@
 # 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::Postgres::Connection do
   unless JRUBY
@@ -14,8 +14,8 @@ describe DataObjects::Postgres::Connection do
     #   handles setting the internal client_encoding setting appropriately. It
     #   can be overridden -- but for now, we won't support doing this.
     #
-    behaves_like 'a driver supporting different encodings'
-    behaves_like 'returning correctly encoded strings for the default database encoding'
-    behaves_like 'returning correctly encoded strings for the default internal encoding'
+    it_should_behave_like 'a driver supporting different encodings'
+    it_should_behave_like 'returning correctly encoded strings for the default database encoding'
+    it_should_behave_like 'returning correctly encoded strings for the default internal encoding'
   end
 end

data/spec/error/sql_error_spec.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
-require 'data_objects/spec/error/sql_error_spec'
+require 'data_objects/spec/shared/error/sql_error_spec'
 
 describe 'DataObjects::Postgres raising SQLError' do
-  behaves_like 'raising a SQLError'
+  it_should_behave_like 'raising a SQLError'
 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::Postgres::Reader do
-  behaves_like 'a Reader'
+  it_should_behave_like 'a Reader'
 end

data/spec/result_spec.rb

@@ -1,12 +1,12 @@
 # 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::Postgres::Result do
-  behaves_like 'a Result'
+  it_should_behave_like 'a Result'
 
-  after do
+  before do
     setup_test_environment
   end
 
@@ -21,7 +21,7 @@ describe DataObjects::Postgres::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
 
@@ -31,18 +31,19 @@ describe DataObjects::Postgres::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 curr_val' do
+        # This is actually the 4th record inserted
         reader = @connection.create_command("SELECT currval('users_id_seq')").execute_reader
         reader.next!
-        reader.values.first.should == 2
+        reader.values.first.should == 1
       end
 
     end
@@ -60,7 +61,7 @@ describe DataObjects::Postgres::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
 
@@ -70,12 +71,12 @@ describe DataObjects::Postgres::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 the generated key value' do
-        @result.insert_id.should == 2
+        @result.insert_id.should == 1
       end
 
     end

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'
@@ -19,12 +20,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_postgres'
 
 DataObjects::Postgres.logger = DataObjects::Logger.new(STDOUT, :off)
 at_exit { DataObjects.logger.flush }
 
+
 CONFIG = OpenStruct.new
 CONFIG.scheme    = 'postgres'
 CONFIG.user      = ENV['DO_POSTGRES_USER'] || 'postgres'
@@ -38,9 +41,11 @@ CONFIG.host      = ENV['DO_POSTGRES_HOST'] || 'localhost'
 CONFIG.port      = ENV['DO_POSTGRES_PORT'] || '5432'
 CONFIG.database  = ENV['DO_POSTGRES_DATABASE'] || '/do_test'
 
-CONFIG.uri = ENV["DO_POSTGRES_SPEC_URI"] ||"#{CONFIG.scheme}://#{CONFIG.user_info}#{CONFIG.host}:#{CONFIG.port}#{CONFIG.database}"
-CONFIG.jdbc_uri = CONFIG.uri.sub(/postgres/,"jdbc:postgresql")
-CONFIG.sleep = "SELECT pg_sleep(1)"
+CONFIG.driver       = 'postgres'
+CONFIG.jdbc_driver  = DataObjects::Postgres.const_get('JDBC_DRIVER') rescue nil
+CONFIG.uri          = ENV["DO_POSTGRES_SPEC_URI"] ||"#{CONFIG.scheme}://#{CONFIG.user_info}#{CONFIG.host}:#{CONFIG.port}#{CONFIG.database}"
+CONFIG.jdbc_uri     = CONFIG.uri.sub(/postgres/,"jdbc:postgresql")
+CONFIG.sleep        = "SELECT pg_sleep(1)"
 
 module DataObjectsSpecHelpers
 
@@ -149,4 +154,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::Postgres 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::Postgres 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::Postgres 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,8 +1,8 @@
 # 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::Postgres with ByteArray' do
-  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::Postgres 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::Postgres 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::Postgres 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::Postgres 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::Postgres 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::Postgres 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::Postgres 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::Postgres with String' do
-  behaves_like 'supporting String'
+  it_should_behave_like 'supporting String'
 end