data_objects 0.9.12 → 0.10.0

data/Manifest.txt

@@ -1,8 +1,8 @@
 .gitignore
-History.txt
+HISTORY.markdown
 LICENSE
 Manifest.txt
-README.txt
+README.markdown
 Rakefile
 lib/data_objects.rb
 lib/data_objects/command.rb

data/{README.txt → README.markdown}

@@ -1,3 +1,4 @@
-= data_objects
+data_objects
+============
 
 A unified Ruby API for popular databases.

data/Rakefile

@@ -8,8 +8,8 @@ require 'lib/data_objects/version'
 ROOT    = Pathname(__FILE__).dirname.expand_path
 JRUBY   = RUBY_PLATFORM =~ /java/
 WINDOWS = Gem.win_platform?
-SUDO    = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS'])
+SUDO    = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS'])
 
-Dir['tasks/*.rake'].each { |f| import f }
+Dir['tasks/*.rake'].sort.each { |f| import f }
 
 CLEAN.include(%w[ pkg/ **/*.rbc ])

data/lib/data_objects.rb

@@ -1,19 +1,18 @@
-require 'rubygems'
-
-gem 'extlib', '~>0.9.11'
 require 'extlib'
 
-require File.expand_path(File.join(File.dirname(__FILE__), 'data_objects', 'version'))
-require File.expand_path(File.join(File.dirname(__FILE__), 'data_objects', 'logger'))
-require File.expand_path(File.join(File.dirname(__FILE__), 'data_objects', 'connection'))
-require File.expand_path(File.join(File.dirname(__FILE__), 'data_objects', 'uri'))
-require File.expand_path(File.join(File.dirname(__FILE__), 'data_objects', 'transaction'))
-require File.expand_path(File.join(File.dirname(__FILE__), 'data_objects', 'command'))
-require File.expand_path(File.join(File.dirname(__FILE__), 'data_objects', 'result'))
-require File.expand_path(File.join(File.dirname(__FILE__), 'data_objects', 'reader'))
-require File.expand_path(File.join(File.dirname(__FILE__), 'data_objects', 'quoting'))
-
-
-module DataObjects
-  class LengthMismatchError < StandardError; end
-end
+require 'data_objects/version'
+require 'data_objects/logger'
+require 'data_objects/connection'
+require 'data_objects/uri'
+require 'data_objects/transaction'
+require 'data_objects/command'
+require 'data_objects/result'
+require 'data_objects/reader'
+require 'data_objects/quoting'
+require 'data_objects/error'
+require 'data_objects/error/sql_error'
+require 'data_objects/error/connection_error'
+require 'data_objects/error/data_error'
+require 'data_objects/error/integrity_error'
+require 'data_objects/error/syntax_error'
+require 'data_objects/error/transaction_error'

data/lib/data_objects/command.rb

@@ -58,7 +58,8 @@ module DataObjects
       replacements = 0
       mismatch     = false
 
-      sql.gsub!(/\?/) do |x|
+      sql.gsub!(/'[^']*'|"[^"]*"|`[^`]*`|\?/) do |x|
+        next x unless x == '?'
         replacements += 1
         if vars.empty?
           mismatch = true

data/lib/data_objects/connection.rb

@@ -1,5 +1,3 @@
-require 'set'
-
 begin
   require 'fastthread'
 rescue LoadError
@@ -40,7 +38,14 @@ module DataObjects
         conn_uri = uri
       end
 
-      DataObjects.const_get(driver_name.capitalize)::Connection.new(conn_uri)
+      # Exceptions to how a driver class is determined for a given URI
+      driver_class = if driver_name == 'sqlserver'
+        'SqlServer'
+      else
+        driver_name.capitalize
+      end
+
+      DataObjects.const_get(driver_class)::Connection.new(conn_uri)
     end
 
     # Ensure that all Connection subclasses handle pooling and logging uniformly.

data/lib/data_objects/error.rb

@@ -0,0 +1,4 @@
+module DataObjects
+  class Error < StandardError
+  end
+end

data/lib/data_objects/error/connection_error.rb

@@ -0,0 +1,4 @@
+module DataObjects
+  class ConnectionError < SQLError
+  end
+end

data/lib/data_objects/error/data_error.rb

@@ -0,0 +1,4 @@
+module DataObjects
+  class DataError < SQLError
+  end
+end

data/lib/data_objects/error/integrity_error.rb

@@ -0,0 +1,4 @@
+module DataObjects
+  class IntegrityError < SQLError
+  end
+end

data/lib/data_objects/error/sql_error.rb

@@ -0,0 +1,22 @@
+module DataObjects
+  class SQLError < Error
+
+    attr_reader :message
+    attr_reader :code
+    attr_reader :sqlstate
+    attr_reader :query
+    attr_reader :uri
+
+    def initialize(message, code = nil, sqlstate = nil, query = nil, uri = nil)
+      @message = message
+      @code = code
+      @sqlstate = sqlstate
+      @query = query
+      @uri = uri
+    end
+
+    def to_s
+      "#{message} (code: #{code}, sql state: #{sqlstate}, query: #{query}, uri: #{uri})"
+    end
+  end
+end

data/lib/data_objects/error/syntax_error.rb

@@ -0,0 +1,4 @@
+module DataObjects
+  class SyntaxError < SQLError
+  end
+end

data/lib/data_objects/error/transaction_error.rb

@@ -0,0 +1,4 @@
+module DataObjects
+  class TransactionError < SQLError
+  end
+end

data/lib/data_objects/logger.rb

@@ -187,7 +187,7 @@ module DataObjects
     #
     def flush
       return unless @buffer.size > 0
-      @log.write_method(@buffer.slice!(0..-1).to_s)
+      @log.write_method(@buffer.slice!(0..-1).join)
     end
 
     # Close and remove the current log object.

data/lib/data_objects/quoting.rb

@@ -8,6 +8,7 @@ module DataObjects
 
       case value
         when Numeric then quote_numeric(value)
+        when ::Extlib::ByteArray then quote_byte_array(value)
         when String then quote_string(value)
         when Time then quote_time(value)
         when DateTime then quote_datetime(value)
@@ -17,7 +18,6 @@ module DataObjects
         when Range then quote_range(value)
         when Symbol then quote_symbol(value)
         when Regexp then quote_regexp(value)
-        when ::Extlib::ByteArray then quote_byte_array(value)
         when Class then quote_class(value)
         else
           if value.respond_to?(:to_sql)
@@ -91,7 +91,7 @@ module DataObjects
     end
 
     def quote_byte_array(value)
-      quote_string(value.source)
+      quote_string(value)
     end
 
   end

data/lib/data_objects/spec/command_spec.rb

@@ -52,6 +52,18 @@ share_examples_for 'a Command' do
 
     end
 
+    describe 'with a valid statement and ? inside quotes' do
+
+      before :each do
+        @command_with_quotes = @connection.create_command("INSERT INTO users (name) VALUES ('will it work? ')")
+      end
+
+      it 'should not raise an error' do
+        lambda { @command_with_quotes.execute_non_query }.should_not raise_error
+      end
+
+    end
+
   end
 
   it { @command.should respond_to(:execute_reader) }
@@ -86,6 +98,19 @@ share_examples_for 'a Command' do
 
     end
 
+    describe 'with a valid reader and ? inside column alias' do
+
+      before :each do
+        @reader_with_quotes = @connection.create_command("SELECT code AS \"code?\", name FROM widgets WHERE ad_description = ?")
+      end
+
+      it 'should not raise an error' do
+        lambda { @reader_with_quotes.execute_reader(nil) }.should_not raise_error
+      end
+
+    end
+
+
   end
 
   it { @command.should respond_to(:set_types) }
@@ -168,7 +193,13 @@ share_examples_for 'a Command with async' do
         threads << Thread.new do
           connection = DataObjects::Connection.new(CONFIG.uri)
           command = connection.create_command(CONFIG.sleep)
-          result = command.execute_non_query
+          if CONFIG.sleep =~ /^SELECT/i
+            reader = command.execute_reader
+            reader.next!
+            reader.close
+          else
+            result = command.execute_non_query
+          end
           connection.close
         end
       end

data/lib/data_objects/spec/connection_spec.rb

@@ -104,3 +104,25 @@ share_examples_for 'a Connection with authentication support' do
   end
 
 end
+
+share_examples_for '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

data/lib/data_objects/spec/encoding_spec.rb

@@ -14,18 +14,30 @@ share_examples_for 'a driver supporting encodings' do
   describe 'character_set' do
 
     it 'uses utf8 by default' do
-      @connection.character_set.should == 'utf8'
+      @connection.character_set.should == 'UTF-8'
     end
 
     describe 'sets the character set through the URI' do
       before do
-        @latin1_connection = DataObjects::Connection.new("#{CONFIG.scheme}://#{CONFIG.user}:#{CONFIG.pass}@#{CONFIG.host}:#{CONFIG.port}#{CONFIG.database}?encoding=latin1")
+        # @latin1_connection = DataObjects::Connection.new("#{CONFIG.uri}?encoding=latin1")
+        @latin1_connection = DataObjects::Connection.new("#{CONFIG.scheme}://#{CONFIG.user}:#{CONFIG.pass}@#{CONFIG.host}:#{CONFIG.port}#{CONFIG.database}?encoding=ISO-8859-1")
       end
 
       after { @latin1_connection.close }
 
-      it { @latin1_connection.character_set.should == 'latin1' }
+      it { @latin1_connection.character_set.should == 'ISO-8859-1' }
     end
 
+    describe 'uses UTF-8 when an invalid encoding is given' do
+      before do
+        @latin1_connection = DataObjects::Connection.new("#{CONFIG.scheme}://#{CONFIG.user}:#{CONFIG.pass}@#{CONFIG.host}:#{CONFIG.port}#{CONFIG.database}?encoding=ISO-INVALID")
+      end
+
+      after { @latin1_connection.close }
+
+      it { @latin1_connection.character_set.should == 'UTF-8' }
+    end
+
+
   end
 end

data/lib/data_objects/spec/result_spec.rb

@@ -37,7 +37,10 @@ share_examples_for 'a Result which returns inserted keys' do
 
   before :each do
     @connection = DataObjects::Connection.new(CONFIG.uri)
-    @result    = @connection.create_command("INSERT INTO users (name) VALUES (?)").execute_non_query("monkey")
+    command = @connection.create_command("INSERT INTO users (name) VALUES (?)")
+    # execute the command twice and expose the second result
+    command.execute_non_query("monkey")
+    @result = command.execute_non_query("monkey")
   end
 
   after :each do

data/lib/data_objects/spec/typecast/bigdecimal_spec.rb

@@ -35,7 +35,32 @@ share_examples_for 'supporting BigDecimal' do
       end
 
       it 'should return the correct result' do
-        @values.first.should == 10.23
+        # rounding seems necessary for the jruby do_derby driver
+        @values.first.round(2).should == 10.23
+      end
+
+    end
+
+    describe 'with manual typecasting a nil value' do
+
+      before  do
+        @command = @connection.create_command("SELECT cost2 FROM widgets WHERE id = ?")
+        @command.set_types(BigDecimal)
+        @reader = @command.execute_reader(6)
+        @reader.next!
+        @values = @reader.values
+      end
+
+      after do
+        @reader.close
+      end
+
+      it 'should return the correctly typed result' do
+        @values.first.should be_kind_of(NilClass)
+      end
+
+      it 'should return the correct result' do
+       @values.first.should be_nil
       end
 
     end

data/lib/data_objects/spec/typecast/boolean_spec.rb

@@ -40,6 +40,30 @@ share_examples_for 'supporting Boolean' do
 
     end
 
+    describe 'with manual typecasting a nil value' do
+
+      before  do
+        @command = @connection.create_command("SELECT flags FROM widgets WHERE id = ?")
+        @command.set_types(TrueClass)
+        @reader = @command.execute_reader(4)
+        @reader.next!
+        @values = @reader.values
+      end
+
+      after do
+        @reader.close
+      end
+
+      it 'should return the correctly typed result' do
+        @values.first.should be_kind_of(NilClass)
+      end
+
+      it 'should return the correct result' do
+       @values.first.should be_nil
+      end
+
+    end
+
   end
 
   describe 'writing an Boolean' do

data/lib/data_objects/spec/typecast/date_spec.rb

@@ -40,12 +40,36 @@ share_examples_for 'supporting Date' do
 
     end
 
+    describe 'with manual typecasting a nil value' do
+
+      before  do
+        @command = @connection.create_command("SELECT release_date FROM widgets WHERE id = ?")
+        @command.set_types(Date)
+        @reader = @command.execute_reader(7)
+        @reader.next!
+        @values = @reader.values
+      end
+
+      after do
+        @reader.close
+      end
+
+      it 'should return a nil class' do
+        @values.first.should be_kind_of(NilClass)
+      end
+
+      it 'should return nil' do
+       @values.first.should be_nil
+      end
+
+    end
+
   end
 
   describe 'writing an Date' do
 
     before  do
-      @reader = @connection.create_command("SELECT id FROM widgets WHERE release_date = ?").execute_reader(Date.civil(2008, 2, 14))
+      @reader = @connection.create_command("SELECT id FROM widgets WHERE release_date = ? ORDER BY id").execute_reader(Date.civil(2008, 2, 14))
       @reader.next!
       @values = @reader.values
     end

data/lib/data_objects/spec/typecast/datetime_spec.rb

@@ -1,3 +1,5 @@
+JRUBY = RUBY_PLATFORM =~ /java/ unless defined?(JRUBY)
+
 share_examples_for 'supporting DateTime' do
 
   include DataObjectsSpecHelpers
@@ -41,12 +43,37 @@ share_examples_for 'supporting DateTime' do
 
     end
 
+    describe 'with manual typecasting a nil value' do
+
+      before  do
+        @command = @connection.create_command("SELECT release_datetime FROM widgets WHERE id = ?")
+        @command.set_types(DateTime)
+        @reader = @command.execute_reader(8)
+        @reader.next!
+        @values = @reader.values
+      end
+
+      after do
+        @reader.close
+      end
+
+      it 'should return a nil class' do
+        @values.first.should be_kind_of(NilClass)
+      end
+
+      it 'should return nil' do
+       @values.first.should be_nil
+      end
+
+    end
+
   end
 
   describe 'writing an DateTime' do
 
     before  do
-      @reader = @connection.create_command("SELECT id FROM widgets WHERE release_datetime = ?").execute_reader(DateTime.civil(2008, 2, 14, 00, 31, 12, 0))
+      local_offset = Rational(Time.local(2008, 2, 14).utc_offset, 86400)
+      @reader = @connection.create_command("SELECT id FROM widgets WHERE release_datetime = ? ORDER BY id").execute_reader(DateTime.civil(2008, 2, 14, 00, 31, 12, local_offset))
       @reader.next!
       @values = @reader.values
     end

data/lib/data_objects/spec/typecast/float_spec.rb

@@ -41,6 +41,29 @@ share_examples_for 'supporting Float' do
 
     end
 
+    describe 'with manual typecasting a nil' do
+
+      before  do
+        @command = @connection.create_command("SELECT cost1 FROM widgets WHERE id = ?")
+        @command.set_types(Float)
+        @reader = @command.execute_reader(5)
+        @reader.next!
+        @values = @reader.values
+      end
+
+      after do
+        @reader.close
+      end
+
+      it 'should return the correctly typed result' do
+        @values.first.should be_kind_of(NilClass)
+      end
+
+      it 'should return the correct result' do
+       @values.first.should be_nil
+      end
+
+    end
   end
 
   describe 'writing an Float' do
@@ -101,7 +124,7 @@ share_examples_for 'supporting Float autocasting' do
 
       it 'should return the correct result' do
         @values.first.should == 13.4
-        @values.last.should == 10.23
+        BigDecimal.new(@values.last.to_s).round(2).should == 10.23
       end
 
     end

data/lib/data_objects/spec/typecast/nil_spec.rb

@@ -46,23 +46,38 @@ end
 
 share_examples_for 'supporting writing an Nil' do
 
-  describe 'supporting writing an Nil' do
+  include DataObjectsSpecHelpers
+
+  before :all do
+    setup_test_environment
+  end
+
+  before :each do
+    @connection = DataObjects::Connection.new(CONFIG.uri)
+  end
+
+  after :each do
+    @connection.close
+  end
+
+
+   describe 'supporting writing an Nil' do
+    # see as an example oracle
+    # http://download.oracle.com/docs/cd/B19306_01/server.102/b14200/sql_elements005.htm#sthref487
+    # http://download.oracle.com/docs/cd/B19306_01/server.102/b14200/conditions013.htm#i1050801
 
     describe 'as a parameter' do
 
         before  do
-          @reader = @connection.create_command("SELECT id FROM widgets WHERE ad_description IS ?").execute_reader(nil)
-          @reader.next!
-          @values = @reader.values
-        end
+          @reader = @connection.create_command("SELECT id FROM widgets WHERE ad_description IN (?) ORDER BY id").execute_reader(nil)
+      end
 
         after do
           @reader.close
         end
 
         it 'should return the correct entry' do
-          #Some of the drivers starts autoincrementation from 0 not 1
-          @values.first.should satisfy { |val| val == 3 or val == 2 }
+          @reader.next!.should be_false
         end
 
     end

data/lib/data_objects/spec/typecast/time_spec.rb

@@ -40,12 +40,36 @@ share_examples_for 'supporting Time' do
 
     end
 
+    describe 'with manual typecasting a nil value' do
+
+      before  do
+        @command = @connection.create_command("SELECT release_timestamp FROM widgets WHERE id = ?")
+        @command.set_types(Time)
+        @reader = @command.execute_reader(9)
+        @reader.next!
+        @values = @reader.values
+      end
+
+      after do
+        @reader.close
+      end
+
+      it 'should return a nil class' do
+        @values.first.should be_kind_of(NilClass)
+      end
+
+      it 'should return nil' do
+        @values.first.should be_nil
+      end
+
+    end
+
   end
 
   describe 'writing an Time' do
 
     before  do
-      @reader = @connection.create_command("SELECT id FROM widgets WHERE release_datetime = ?").execute_reader(Time.utc(2008, 2, 14, 00, 31, 12))
+      @reader = @connection.create_command("SELECT id FROM widgets WHERE release_datetime = ? ORDER BY id").execute_reader(Time.local(2008, 2, 14, 00, 31, 12))
       @reader.next!
       @values = @reader.values
     end

data/lib/data_objects/transaction.rb

@@ -33,16 +33,26 @@ module DataObjects
       @connection.close
     end
 
-    # Begin the Transaction
-    def begin; not_implemented; end
-    # Commit changes made in this Transaction
-    def commit; not_implemented; end
-    # Rollback changes made in this Transaction
-    def rollback; not_implemented; end;
-    # Prepare this Transaction for the second phase of a two-phase commit
+    def begin
+      cmd = "BEGIN"
+      connection.create_command(cmd).execute_non_query
+    end
+
+    def commit
+      cmd = "COMMIT"
+      connection.create_command(cmd).execute_non_query
+    end
+
+    def rollback
+      cmd = "ROLLBACK"
+      connection.create_command(cmd).execute_non_query
+    end
+
     def prepare; not_implemented; end;
-    # Abandon the second phase of a two-phase commit and roll back the changes
+    def begin_prepared; not_implemented; end;
+    def commit_prepared; not_implemented; end;
     def rollback_prepared; not_implemented; end;
+    def prepare; not_implemented; end;
 
   private
     def not_implemented

data/lib/data_objects/uri.rb

@@ -1,4 +1,3 @@
-gem 'addressable', '~>2.0'
 require 'addressable/uri'
 
 module DataObjects

data/lib/data_objects/version.rb

@@ -1,4 +1,4 @@
 module DataObjects
   # Current DataObjects Gem version
-  VERSION = "0.9.12" unless defined?(DataObjects::VERSION)
+  VERSION = "0.10.0" unless defined?(DataObjects::VERSION)
 end

data/spec/lib/ssl_helpers.rb

@@ -0,0 +1,20 @@
+require 'cgi'
+
+module SSLHelpers
+
+  CERTS_DIR = Pathname(__FILE__).dirname.join('ssl_certs').to_s
+
+  CONFIG = OpenStruct.new
+  CONFIG.ca_cert     = CERTS_DIR / 'ca-cert.pem'
+  CONFIG.ca_key      = CERTS_DIR / 'ca-key.pem'
+  CONFIG.server_cert = CERTS_DIR / 'server-cert.pem'
+  CONFIG.server_key  = CERTS_DIR / 'server-key.pem'
+  CONFIG.client_cert = CERTS_DIR / 'client-cert.pem'
+  CONFIG.client_key  = CERTS_DIR / 'client-key.pem'
+  CONFIG.cipher      = 'AES128-SHA'
+
+  def self.query(*keys)
+    keys.map { |key| "ssl[#{key}]=#{CGI::escape(CONFIG.send(key))}" }.join('&')
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,5 +1,9 @@
 require 'rubygems'
 require 'spec'
 
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'data_objects'))
+dir = File.dirname(__FILE__)
+lib_path = File.expand_path("#{dir}/../lib")
+$LOAD_PATH.unshift lib_path unless $LOAD_PATH.include?(lib_path)
+require 'data_objects'
+
 require File.expand_path(File.join(File.dirname(__FILE__), 'do_mock'))

data/spec/transaction_spec.rb

@@ -30,7 +30,7 @@ describe DataObjects::Transaction do
       @transaction.close
     end
   end
-  [:begin, :commit, :rollback, :rollback_prepared, :prepare].each do |meth|
+  [:prepare, :commit_prepared, :rollback_prepared].each do |meth|
     it "should raise NotImplementedError on #{meth}" do
       lambda do @transaction.send(meth) end.should raise_error(NotImplementedError)
     end

data/tasks/gem.rake

@@ -1,49 +1,8 @@
 require 'rubygems/package_task'
 
-GEM_SPEC = Gem::Specification.new do |s|
-  # basic information
-  s.name        = "data_objects"
-  s.version     = DataObjects::VERSION
-  s.platform    = Gem::Platform::RUBY
-
-  # description and details
-  s.summary     = 'DataObjects basic API and shared driver specifications'
-  s.description = "Provide a standard and simplified API for communicating with RDBMS from Ruby"
-
-  # dependencies
-  s.add_dependency "addressable", "~>2.0.0"
-  s.add_dependency "extlib", "~>0.9.12"
-
-  # development dependencies
-  s.add_development_dependency 'rspec', '~>1.2.0'
-
-  # components, files and paths
-  s.files = FileList["lib/**/*.rb", "spec/**/*.rb", "tasks/**/*.rake",
-                      "LICENSE", "Rakefile", "*.{rdoc,txt,yml}"]
-
-  s.require_path = 'lib'
-
-  # documentation
-  s.has_rdoc = false
-
-  # project information
-  s.homepage          = 'http://github.com/datamapper/do'
-  s.rubyforge_project = 'dorb'
-
-  # author and contributors
-  s.author      = 'Dirkjan Bussink'
-  s.email       = 'd.bussink@gmail.com'
-end
+GEM_SPEC = eval(File.read('data_objects.gemspec'))
 
 gem_package = Gem::PackageTask.new(GEM_SPEC) do |pkg|
   pkg.need_tar = false
   pkg.need_zip = false
 end
-
-file "#{GEM_SPEC.name}.gemspec" => ['Rakefile', 'tasks/gem.rake'] do |t|
-  puts "Generating #{t.name}"
-  File.open(t.name, 'w') { |f| f.puts GEM_SPEC.to_yaml }
-end
-
-desc "Generate or update the standalone gemspec file for the project"
-task :gemspec => ["#{GEM_SPEC.name}.gemspec"]

data/tasks/release.rake

@@ -26,19 +26,19 @@ if defined?(RubyForge) then
 
       # read project info and overview
       notes = begin
-                r = File.read("README.rdoc")
-                r.split(/^(=+ .*)/)[1..4].join.strip
+                r = File.read("README.markdown")
+                r.split(/^(.*\n\-+)/)[1..4].join.strip
               rescue
-                warn "Missing README.rdoc"
+                warn "Missing README.markdown"
                 ''
               end
 
       # read changes
       changes = begin
-                  h = File.read("History.txt")
-                  h.split(/^(==+ .*)/)[1..2].join.strip
+                  h = File.read("HISTORY.markdown")
+                  h.split(/^(##+ .*)/)[1..2].join.strip
                 rescue
-                  warn "Missing History.txt"
+                  warn "Missing HISTORY.markdown"
                   ''
                 end
 

data/tasks/spec.rake

@@ -5,6 +5,7 @@ desc 'Run specifications'
 Spec::Rake::SpecTask.new(:spec) do |t|
   t.spec_opts << '--options' << ROOT + 'spec/spec.opts'
   t.spec_files = Pathname.glob(ENV['FILES'] || 'spec/**/*_spec.rb').map { |f| f.to_s }
+  t.libs << 'lib'
 
   begin
     # RCov is run by default, except on the JRuby platform

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: data_objects
 version: !ruby/object:Gem::Version 
-  version: 0.9.12
+  version: 0.10.0
 platform: ruby
 authors: 
 - Dirkjan Bussink
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-17 00:00:00 +02:00
+date: 2009-09-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.0.0
+        version: "2.0"
     version: 
 - !ruby/object:Gem::Dependency 
   name: extlib
@@ -53,6 +53,13 @@ extra_rdoc_files: []
 files: 
 - lib/data_objects/command.rb
 - lib/data_objects/connection.rb
+- lib/data_objects/error/connection_error.rb
+- lib/data_objects/error/data_error.rb
+- lib/data_objects/error/integrity_error.rb
+- lib/data_objects/error/sql_error.rb
+- lib/data_objects/error/syntax_error.rb
+- lib/data_objects/error/transaction_error.rb
+- lib/data_objects/error.rb
 - lib/data_objects/logger.rb
 - lib/data_objects/quoting.rb
 - lib/data_objects/reader.rb
@@ -86,6 +93,7 @@ files:
 - spec/do_mock.rb
 - spec/lib/pending_helpers.rb
 - spec/lib/rspec_immediate_feedback_formatter.rb
+- spec/lib/ssl_helpers.rb
 - spec/reader_spec.rb
 - spec/result_spec.rb
 - spec/spec_helper.rb
@@ -97,9 +105,9 @@ files:
 - tasks/spec.rake
 - LICENSE
 - Rakefile
-- History.txt
+- HISTORY.markdown
+- README.markdown
 - Manifest.txt
-- README.txt
 has_rdoc: true
 homepage: http://github.com/datamapper/do
 licenses: []
@@ -124,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: dorb
-rubygems_version: 1.3.3
+rubygems_version: 1.3.4
 signing_key: 
 specification_version: 3
 summary: DataObjects basic API and shared driver specifications