data_objects 0.10.3 → 0.10.4.rc1

data/spec/reader_spec.rb

@@ -1,23 +1,22 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
 
 describe DataObjects::Reader do
+  subject { command.execute_reader }
 
-  it "should define a standard API" do
-    connection = DataObjects::Connection.new('mock://localhost')
+  let(:connection)  { DataObjects::Connection.new('mock://localhost')     }
+  let(:command)     { connection.create_command('SELECT * FROM example')  }
 
-    command = connection.create_command("SELECT * FROM example")
+  after { connection.close }
 
-    reader = command.execute_reader
+  context 'should define a standard API' do
 
-    reader.should.be.kind_of(Enumerable)
+    it { should be_a(Enumerable)    }
 
-    reader.should.respond_to(:close)
-    reader.should.respond_to(:next!)
-    reader.should.respond_to(:values)
-    reader.should.respond_to(:fields)
-    reader.should.respond_to(:each)
-
-    connection.close
+    it { should respond_to(:close)  }
+    it { should respond_to(:next!)  }
+    it { should respond_to(:values) }
+    it { should respond_to(:fields) }
+    it { should respond_to(:each)   }
   end
 
 end

data/spec/result_spec.rb

@@ -1,21 +1,23 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
 
 describe DataObjects::Result do
+  subject { command.execute_non_query }
 
-  it "should define a standard API" do
-    connection = DataObjects::Connection.new('mock://localhost')
+  let(:connection)  { DataObjects::Connection.new('mock://localhost')     }
+  let(:command)     { connection.create_command('SELECT * FROM example')  }
 
-    command = connection.create_command("SELECT * FROM example")
+  after { connection.close }
 
-    result = command.execute_non_query
+  context 'should define a standard API' do
 
-    # Affected Rows:
-    result.should.respond_to(:to_i)
-    result.to_i.should == 0
+    it 'should provide the number of affected rows' do
+      should respond_to(:to_i)
+      subject.to_i.should == 0
+    end
 
-    # The id of the inserted row.
-    result.should.respond_to(:insert_id)
-    connection.close
-  end
+    it 'should provide the id of the inserted row' do
+      should respond_to(:insert_id)
+    end
 
+  end
 end

data/spec/spec_helper.rb

@@ -1,9 +1,6 @@
 require 'rubygems'
 require 'data_objects'
-require 'data_objects/spec/bacon'
-require 'mocha/api'
-require 'mocha/object'
-require 'win32console' if RUBY_PLATFORM =~ /mingw|mswin/
+require 'rspec'
 
 module DataObjects::Pooling
   class << self
@@ -14,17 +11,5 @@ module DataObjects::Pooling
   end
 end
 
-# see http://gnufied.org/2008/06/12/making-ruby-bacon-play-with-mocha/
-class Bacon::Context
-  include Mocha::API
-  alias_method :old_it,:it
-  def it description,&block
-    mocha_setup
-    old_it(description,&block)
-    mocha_verify
-    mocha_teardown
-  end
-end
-
 require File.expand_path(File.join(File.dirname(__FILE__), 'do_mock'))
 require File.expand_path(File.join(File.dirname(__FILE__), 'do_mock2'))

data/spec/transaction_spec.rb

@@ -2,14 +2,14 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
 
 describe DataObjects::Transaction do
 
-  before do
+  before :each do
     @connection = mock("connection")
-    DataObjects::Connection.expects(:new).with("mock://mock/mock").once.returns(@connection)
+    DataObjects::Connection.should_receive(:new).with("mock://mock/mock").once.and_return(@connection)
     @transaction = DataObjects::Transaction.new("mock://mock/mock")
   end
 
   it "should have a HOST constant" do
-    DataObjects::Transaction::HOST.should.not == nil?
+    DataObjects::Transaction::HOST.should_not == nil?
   end
 
   describe "#initialize" do
@@ -17,24 +17,22 @@ describe DataObjects::Transaction do
       @transaction.connection.should == @connection
     end
     it "should provide an id" do
-      @transaction.id.should.not == nil
+      @transaction.id.should_not == nil
     end
     it "should provide a unique id" do
-      DataObjects::Connection.expects(:new).with("mock://mock/mock2").once.returns(@connection)
-      @transaction.id.should.not == DataObjects::Transaction.new("mock://mock/mock2").id
+      DataObjects::Connection.should_receive(:new).with("mock://mock/mock2").once.and_return(@connection)
+      @transaction.id.should_not == DataObjects::Transaction.new("mock://mock/mock2").id
     end
   end
-
   describe "#close" do
     it "should close its connection" do
-      @connection.expects(:close).once
-      should.not.raise(DataObjects::TransactionError) { @transaction.close }
+      @connection.should_receive(:close).once
+      lambda { @transaction.close }.should_not raise_error(DataObjects::TransactionError)
     end
   end
-
   [:prepare, :commit_prepared, :rollback_prepared].each do |meth|
     it "should raise NotImplementedError on #{meth}" do
-      should.raise(NotImplementedError) { @transaction.send(meth) }
+      lambda { @transaction.send(meth) }.should raise_error(NotImplementedError)
     end
   end
 

data/spec/uri_spec.rb

@@ -1,44 +1,52 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
 
 describe DataObjects::URI do
-  before do
-    @uri = DataObjects::URI.parse('mock://username:password@localhost:12345/path?encoding=utf8#fragment')
-  end
+  subject { described_class.parse(uri) }
 
-  it "should parse the scheme part" do
-    @uri.scheme.should == "mock"
-  end
+  context 'parsing parts' do
+    let(:uri) { 'mock://username:password@localhost:12345/path?encoding=utf8#fragment'  }
 
-  it "should parse the user part" do
-    @uri.user.should == "username"
-  end
+    its(:scheme)    { should == 'mock'      }
+    its(:user)      { should == 'username'  }
+    its(:password)  { should == 'password'  }
+    its(:host)      { should == 'localhost' }
+    its(:port)      { should == 12345       }
+    its(:path)      { should == '/path'     }
+    its(:query)     { should == { 'encoding' => 'utf8' } }
+    its(:fragment)  { should == 'fragment'  }
 
-  it "should parse the password part" do
-    @uri.password.should == "password"
+    it 'should provide a correct string representation' do
+      subject.to_s.should == 'mock://username:password@localhost:12345/path?encoding=utf8#fragment'
+    end
   end
 
-  it "should parse the host part" do
-    @uri.host.should == "localhost"
-  end
+  context 'parsing JDBC URL parts' do
+    let(:uri) { 'jdbc:mock://username:password@localhost:12345/path?encoding=utf8#fragment'  }
 
-  it "should parse the port part" do
-    @uri.port.should == 12345
-  end
+    its(:scheme)    { should == 'jdbc'      }
+    its(:subscheme) { should == 'mock'      }
+    its(:user)      { should == 'username'  }
+    its(:password)  { should == 'password'  }
+    its(:host)      { should == 'localhost' }
+    its(:port)      { should == 12345       }
+    its(:path)      { should == '/path'     }
+    its(:query)     { should == { 'encoding' => 'utf8' } }
+    its(:fragment)  { should == 'fragment'  }
 
-  it "should parse the path part" do
-    @uri.path.should == "/path"
+    it 'should provide a correct string representation' do
+      subject.to_s.should == 'jdbc:mock://username:password@localhost:12345/path?encoding=utf8#fragment'
+    end
   end
 
-  it "should parse the query part" do
-    @uri.query.should == { "encoding" => "utf8" }
-  end
+  context 'parsing parts' do
+    let(:uri) { 'java:comp/env/jdbc/TestDataSource'  }
 
-  it "should parse the fragment part" do
-    @uri.fragment.should == "fragment"
-  end
+    its(:scheme)    { should == 'java' }
+    its(:path)      { should == 'comp/env/jdbc/TestDataSource'     }
 
-  it "should provide a correct string representation" do
-    @uri.to_s.should == 'mock://username:password@localhost:12345/path?encoding=utf8#fragment'
+    it 'should provide a correct string representation' do
+      subject.to_s.should == 'java:comp/env/jdbc/TestDataSource'
+    end
   end
 
 end

data/tasks/spec.rake

@@ -1,21 +1,12 @@
-# Specs
+require 'rspec/core/rake_task'
 
-require 'rake/testtask'
-Rake::TestTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.verbose = true
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern      = './spec/**/*_spec.rb'
+  spec.skip_bundler = true
 end
 
-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: sudo gem install spicycode-rcov"
-  end
+RSpec::Core::RakeTask.new(:rcov) 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,14 @@
 --- !ruby/object:Gem::Specification 
 name: data_objects
 version: !ruby/object:Gem::Version 
-  hash: 49
-  prerelease: false
+  hash: 977940494
+  prerelease: true
   segments: 
   - 0
   - 10
-  - 3
-  version: 0.10.3
+  - 4
+  - rc1
+  version: 0.10.4.rc1
 platform: ruby
 authors: 
 - Dirkjan Bussink
@@ -15,7 +16,7 @@ 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 
@@ -34,39 +35,24 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: bacon
+  name: rspec
   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
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mocha
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 9
-        version: "0.9"
-  type: :development
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: yard
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -77,7 +63,7 @@ dependencies:
         - 5
         version: "0.5"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id003
 description: Provide a standard and simplified API for communicating with RDBMS from Ruby
 email: d.bussink@gmail.com
 executables: []
@@ -108,32 +94,31 @@ files:
 - lib/data_objects/quoting.rb
 - lib/data_objects/reader.rb
 - lib/data_objects/result.rb
-- lib/data_objects/spec/bacon.rb
-- lib/data_objects/spec/command_spec.rb
-- lib/data_objects/spec/connection_spec.rb
-- lib/data_objects/spec/encoding_spec.rb
-- lib/data_objects/spec/error/sql_error_spec.rb
-- lib/data_objects/spec/helpers/immediate_red_green_output.rb
-- lib/data_objects/spec/helpers/pending.rb
-- lib/data_objects/spec/helpers/ssl.rb
-- lib/data_objects/spec/quoting_spec.rb
-- lib/data_objects/spec/reader_spec.rb
-- lib/data_objects/spec/result_spec.rb
-- lib/data_objects/spec/typecast/array_spec.rb
-- lib/data_objects/spec/typecast/bigdecimal_spec.rb
-- lib/data_objects/spec/typecast/boolean_spec.rb
-- lib/data_objects/spec/typecast/byte_array_spec.rb
-- lib/data_objects/spec/typecast/class_spec.rb
-- lib/data_objects/spec/typecast/date_spec.rb
-- lib/data_objects/spec/typecast/datetime_spec.rb
-- lib/data_objects/spec/typecast/float_spec.rb
-- lib/data_objects/spec/typecast/integer_spec.rb
-- lib/data_objects/spec/typecast/ipaddr_spec.rb
-- lib/data_objects/spec/typecast/nil_spec.rb
-- lib/data_objects/spec/typecast/other_spec.rb
-- lib/data_objects/spec/typecast/range_spec.rb
-- lib/data_objects/spec/typecast/string_spec.rb
-- lib/data_objects/spec/typecast/time_spec.rb
+- lib/data_objects/spec/lib/pending_helpers.rb
+- lib/data_objects/spec/lib/ssl.rb
+- lib/data_objects/spec/setup.rb
+- lib/data_objects/spec/shared/command_spec.rb
+- lib/data_objects/spec/shared/connection_spec.rb
+- lib/data_objects/spec/shared/encoding_spec.rb
+- lib/data_objects/spec/shared/error/sql_error_spec.rb
+- lib/data_objects/spec/shared/quoting_spec.rb
+- lib/data_objects/spec/shared/reader_spec.rb
+- lib/data_objects/spec/shared/result_spec.rb
+- lib/data_objects/spec/shared/typecast/array_spec.rb
+- lib/data_objects/spec/shared/typecast/bigdecimal_spec.rb
+- lib/data_objects/spec/shared/typecast/boolean_spec.rb
+- lib/data_objects/spec/shared/typecast/byte_array_spec.rb
+- lib/data_objects/spec/shared/typecast/class_spec.rb
+- lib/data_objects/spec/shared/typecast/date_spec.rb
+- lib/data_objects/spec/shared/typecast/datetime_spec.rb
+- lib/data_objects/spec/shared/typecast/float_spec.rb
+- lib/data_objects/spec/shared/typecast/integer_spec.rb
+- lib/data_objects/spec/shared/typecast/ipaddr_spec.rb
+- lib/data_objects/spec/shared/typecast/nil_spec.rb
+- lib/data_objects/spec/shared/typecast/other_spec.rb
+- lib/data_objects/spec/shared/typecast/range_spec.rb
+- lib/data_objects/spec/shared/typecast/string_spec.rb
+- lib/data_objects/spec/shared/typecast/time_spec.rb
 - lib/data_objects/transaction.rb
 - lib/data_objects/uri.rb
 - lib/data_objects/utilities.rb
@@ -148,7 +133,6 @@ files:
 - spec/spec_helper.rb
 - spec/transaction_spec.rb
 - spec/uri_spec.rb
-- tasks/metrics.rake
 - tasks/release.rake
 - tasks/spec.rake
 - tasks/yard.rake
@@ -158,8 +142,8 @@ homepage: http://github.com/datamapper/do
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/lib/data_objects/spec/bacon.rb

@@ -1,9 +0,0 @@
-#
-# Standard Bacon configuration for DataObjects spec suite
-#
-require 'bacon'
-require 'data_objects/spec/helpers/immediate_red_green_output'
-require 'data_objects/spec/helpers/pending'
-
-Bacon.extend Bacon::ImmediateRedGreenOutput
-Bacon.summary_on_exit

data/lib/data_objects/spec/connection_spec.rb

@@ -1,217 +0,0 @@
-shared 'a Connection' do
-
-  setup_test_environment
-
-  before do
-    @connection = DataObjects::Connection.new(CONFIG.uri)
-  end
-
-  after do
-    @connection.close
-  end
-
-  it 'should be a kind of Connection' do @connection.should.be.kind_of(::DataObjects::Connection) end
-  it 'should be a kind of Pooling'    do @connection.should.be.kind_of(::DataObjects::Pooling)    end
-
-  it 'should respond to #dispose'     do @connection.should.respond_to(:dispose) end
-
-  describe 'dispose' do
-
-    describe 'on open connection' do
-
-      before do
-        @open_connection = DataObjects::Connection.new("#{@driver}://#{@user}:#{@password}@#{@host}:#{@port}#{@database}")
-        @open_connection.detach
-      end
-
-      after do
-        @open_connection.close
-      end
-
-      it 'dispose should be true' do
-        @open_connection.dispose.should.be.true
-      end
-
-    end
-
-    describe 'on closed connection' do
-
-      before do
-        @closed_connection = DataObjects::Connection.new("#{@driver}://#{@user}:#{@password}@#{@host}:#{@port}#{@database}")
-        @closed_connection.detach
-        @closed_connection.dispose
-      end
-
-      after do
-        @closed_connection.close
-      end
-
-      it 'dispose should be false' do
-        @closed_connection.dispose.should.be.false
-      end
-
-      it 'should raise an error on creating a command' do
-        should.raise(DataObjects::ConnectionError) {
-          @closed_connection.create_command("INSERT INTO non_existent_table (tester) VALUES (1)").execute_non_query
-        }
-      end
-    end
-
-  end
-
-  it 'should respond to #create_command' do @connection.should.respond_to(:create_command) end
-
-  describe 'create_command' do
-    it 'should be a kind of Command' do
-      @connection.create_command('This is a dummy command').should.be.kind_of(DataObjects::Command)
-    end
-  end
-
-  describe 'various connection URIs' do
-
-    def test_connection(conn)
-      reader = conn.create_command(CONFIG.testsql || "SELECT 1").execute_reader
-      reader.next!
-      reader.values[0]
-    end
-
-    after do
-      @open_connection.close if @open_connection
-    end
-
-    it 'should open with an uri object' do
-      uri = DataObjects::URI.new(
-              @driver,
-              @user,
-              @password,
-              @host,
-              @port && @port.to_i,
-              @database,
-              nil, nil
-            )
-      test_connection(DataObjects::Connection.new(uri)).should == 1
-    end
-
-    it 'should work with non-JDBC URLs' do
-      conn = DataObjects::Connection.new("#{CONFIG.uri.sub(/jdbc:/, '')}")
-      test_connection(conn).should == 1
-    end
-
-  end
-end
-
-shared 'a Connection with authentication support' do
-
-  %w[ @driver @user @password @host @port @database ].each do |ivar|
-    raise "+#{ivar}+ should be defined in before block" unless instance_variable_get(ivar)
-  end
-
-  describe 'with an invalid URI' do
-
-    # FIXME JRuby (and MRI): Should these be ArgumentError or DataObjects::SQLError?
-
-    def connecting_with(uri)
-      lambda { DataObjects::Connection.new(uri) }
-    end
-
-    it 'should raise an error if no database specified' do
-      connecting_with("#{@driver}://#{@user}:#{@password}@#{@host}:#{@port}").should.raise(ArgumentError, DataObjects::Error)
-    end
-
-    it 'should raise an error if bad username is given' do
-      connecting_with("#{@driver}://thisreallyshouldntexist:#{@password}@#{@host}:#{@port}#{@database}").should.raise(ArgumentError, DataObjects::Error)
-    end
-
-    it 'should raise an error if bad password is given' do
-      connecting_with("#{@driver}://#{@user}:completelyincorrectpassword:#{@host}:#{@port}#{@database}").should.raise(ArgumentError, DataObjects::Error)
-    end
-
-    it 'should raise an error if an invalid port is given' do
-      connecting_with("#{@driver}://#{@user}:#{@password}:#{@host}:648646543#{@database}").should.raise(ArgumentError, DataObjects::Error)
-    end
-
-    it 'should raise an error if an invalid database is given' do
-      connecting_with("#{@driver}://#{@user}:#{@password}:#{@host}:#{@port}/someweirddatabase").should.raise(ArgumentError, DataObjects::Error)
-    end
-
-    it 'should raise an error with a meaningless URI' do
-      connecting_with("#{@driver}://peekaboo$2!@#4543").should.raise(Addressable::URI::InvalidURIError)
-    end
-
-  end
-
-end
-
-shared 'a Connection with JDBC URL support' do
-
-  def test_connection(conn)
-    reader = conn.create_command(CONFIG.testsql || "SELECT 1").execute_reader
-    reader.next!
-    reader.values[0]
-  end
-
-  it 'should work with JDBC URLs' do
-    conn = DataObjects::Connection.new(CONFIG.jdbc_uri || "jdbc:#{CONFIG.uri.sub(/jdbc:/, '')}")
-    test_connection(conn).should == 1
-  end
-
-end if JRUBY
-
-shared 'a Connection with SSL support' do
-
-  if DataObjectsSpecHelpers.test_environment_supports_ssl?
-    describe 'connecting with SSL' do
-
-      it 'should connect securely' do
-        DataObjects::Connection.new("#{CONFIG.uri}?#{CONFIG.ssl}").secure?.should.be.true
-      end
-
-    end
-  end
-
-  describe 'connecting without SSL' do
-
-    it 'should not connect securely' do
-      DataObjects::Connection.new(CONFIG.uri).secure?.should.be.false
-    end
-
-  end
-
-end
-
-shared 'a Connection via JDNI' do
-
-  if JRUBY
-    describe 'connecting with JNDI' do
-
-      before do
-        begin
-          @jndi = Java::data_objects.JNDITestSetup.new("jdbc:#{CONFIG.uri}".gsub(/:sqlite3:/, ':sqlite:'), CONFIG.jdbc_driver, 'mydb')
-          @jndi.setup()
-        rescue
-          puts "use (after installation of maven) to test JNDI:"
-          puts "mvn rails:spec -Drails.fork=false"
-        end
-      end
-
-      after do
-        @jndi.teardown() unless @jndi.nil?
-      end
-
-      unless @jndi.nil?
-        it 'should connect' do
-          begin
-            c = DataObjects::Connection.new("java:comp/env/jdbc/mydb?scheme=#{CONFIG.scheme}")
-            c.should_not be_nil
-          rescue => e
-            if e.message =~ /java.naming.factory.initial/
-              puts "use (after installation of maven) to test JNDI:"
-              puts "mvn rails:spec -Drails.fork=false"
-            end
-          end
-        end
-      end
-
-    end
-  end
-end