data_objects 0.10.1 → 0.10.2

data/ChangeLog.markdown

@@ -1,10 +1,14 @@
-## 0.10.1 (unreleased, in git)
+## 0.10.2 2010-05-19
+* Support for Encoding.default_internal
+* Rework logging to adding a callback is possible
+
+## 0.10.1 2010-01-08
 
 * Removal of Extlib dependency: Pooling and Utilities code moved to DataObjects.
 * Switch to Jeweler for Gem building tasks (this change may be temporary).
 * Switch to using Bacon for running specs: This should make specs friendlier to
   new Ruby implementations that are not yet 100% MRI-compatible, and in turn,
-  prepared the road for our own IronRuby and MacRuby support.
+  pave the road for our own IronRuby and MacRuby support.
 * Make DataObjects::Reader Enumerable.
 
 ## 0.10.0 2009-09-15

data/lib/data_objects/connection.rb

@@ -7,6 +7,8 @@ module DataObjects
   # An abstract connection to a DataObjects resource. The physical connection may be broken and re-established from time to time.
   class Connection
 
+    include Logging
+
     # Make a connection to the database using the DataObjects::URI given.
     # Note that the physical connection may be delayed until the first command is issued, so success here doesn't necessarily mean you can connect.
     def self.new(uri_s)
@@ -116,7 +118,16 @@ module DataObjects
       concrete_command.new(self, text)
     end
 
+    def extension
+      driver_namespace.const_get('Extension').new(self)
+    end
+
     private
+
+    def driver_namespace
+      DataObjects::const_get(self.class.name.split('::')[-2])
+    end
+
     def concrete_command
       @concrete_command || begin
 

data/lib/data_objects/extension.rb

@@ -0,0 +1,11 @@
+module DataObjects
+  class Extension
+
+    attr_reader :connection
+
+    def initialize(connection)
+      @connection = connection
+    end
+
+  end
+end

data/lib/data_objects/logger.rb

@@ -2,6 +2,18 @@ require "time" # httpdate
 
 module DataObjects
 
+  module Logging
+
+    def log(message)
+      logger = driver_namespace.logger
+      if logger.level <= DataObjects::Logger::LEVELS[:debug]
+        message = "(%.6f) %s" % [message.duration / 1000000.0, message.query]
+        logger.debug message
+      end
+    end
+
+  end
+
   class << self
     # The global logger for DataObjects
     attr_accessor :logger
@@ -51,6 +63,8 @@ module DataObjects
     # The name of the log file
     attr_reader   :log
 
+    Message = Struct.new(:query, :start, :duration)
+
     #
     # Ruby (standard) logger levels:
     #   off:   absolutely nothing

data/lib/data_objects/spec/connection_spec.rb

@@ -85,7 +85,7 @@ shared 'a Connection' do
               @user,
               @password,
               @host,
-              @port.to_i,
+              @port && @port.to_i,
               @database,
               nil, nil
             )

data/lib/data_objects/spec/encoding_spec.rb

@@ -8,7 +8,6 @@ shared 'a driver supporting different encodings' do
     @connection.close
   end
 
-
   it 'should respond to #character_set' do @connection.should.respond_to(:character_set) end
 
   describe 'character_set' do
@@ -44,25 +43,88 @@ shared 'a driver supporting different encodings' do
   end
 end
 
-shared 'returning correctly encoded strings for the default encoding' do
+shared 'returning correctly encoded strings for the default database encoding' do
 
+  if defined?(::Encoding)
 
-  setup_test_environment
+    setup_test_environment
 
-  before do
-    @connection = DataObjects::Connection.new(CONFIG.uri)
-  end
+    before do
+      @connection.close if @connection
+      @connection = DataObjects::Connection.new(CONFIG.uri)
+    end
 
-  after do
-    @connection.close
+    after do
+      @connection.close
+    end
+
+    describe 'with encoded string support' do
+
+      describe 'reading a String' do
+        before do
+          @reader = @connection.create_command("SELECT name, whitepaper_text FROM widgets WHERE ad_description = ?").execute_reader('Buy this product now!')
+          @reader.next!
+          @values = @reader.values
+        end
+
+        after do
+          @reader.close
+        end
+
+        it 'should return UTF-8 encoded String' do
+          @values.first.should.be.kind_of(String)
+          @values.first.encoding.name.should == 'UTF-8'
+          @values.last.should.be.kind_of(String)
+          @values.last.encoding.name.should == 'UTF-8'
+        end
+      end
+
+      describe 'reading a ByteArray' do
+        before do
+          @command = @connection.create_command("SELECT ad_image FROM widgets WHERE ad_description = ?")
+          @command.set_types(Extlib::ByteArray)
+          @reader = @command.execute_reader('Buy this product now!')
+          @reader.next!
+          @values = @reader.values
+        end
+
+        after do
+          @reader.close
+        end
+
+        it 'should return ASCII-8BIT encoded ByteArray' do
+          @values.first.should.be.kind_of(::Extlib::ByteArray)
+          @values.first.encoding.name.should == 'ASCII-8BIT'
+        end
+      end
+    end
   end
 
+end
+
+shared 'returning correctly encoded strings for the default internal encoding' do
+
   if defined?(::Encoding)
+
+    setup_test_environment
+
+    before do
+      @connection.close if @connection
+      @encoding_before = Encoding.default_internal
+      Encoding.default_internal = 'ISO-8859-1'
+      @connection = DataObjects::Connection.new(CONFIG.uri)
+    end
+
+    after do
+      @connection.close
+      Encoding.default_internal = @encoding_before
+    end
+
     describe 'with encoded string support' do
 
       describe 'reading a String' do
         before do
-          @reader = @connection.create_command("SELECT name FROM widgets WHERE ad_description = ?").execute_reader('Buy this product now!')
+          @reader = @connection.create_command("SELECT name, whitepaper_text FROM widgets WHERE ad_description = ?").execute_reader('Buy this product now!')
           @reader.next!
           @values = @reader.values
         end
@@ -73,7 +135,9 @@ shared 'returning correctly encoded strings for the default encoding' do
 
         it 'should return UTF-8 encoded String' do
           @values.first.should.be.kind_of(String)
-          @values.first.encoding.name.should == 'UTF-8'
+          @values.first.encoding.name.should == 'ISO-8859-1'
+          @values.last.should.be.kind_of(String)
+          @values.last.encoding.name.should == 'ISO-8859-1'
         end
       end
 

data/lib/data_objects/spec/reader_spec.rb

@@ -5,10 +5,12 @@ shared 'a Reader' do
   before do
     @connection = DataObjects::Connection.new(CONFIG.uri)
     @reader     = @connection.create_command("SELECT code, name FROM widgets WHERE ad_description = ? order by id").execute_reader('Buy this product now!')
+    @reader2    = @connection.create_command("SELECT code FROM widgets WHERE ad_description = ? order by id").execute_reader('Buy this product now!')
   end
 
   after do
     @reader.close
+    @reader2.close
     @connection.close
   end
 
@@ -153,7 +155,7 @@ shared 'a Reader' do
 
   describe 'each' do
 
-    it 'should yield each row to the block' do
+    it 'should yield each row to the block for multiple columns' do
       rows_yielded = 0
       @reader.each do |row|
         row.should.respond_to(:[])
@@ -170,6 +172,22 @@ shared 'a Reader' do
       rows_yielded.should == 15
     end
 
+    it 'should yield each row to the block for a single column' do
+      rows_yielded = 0
+      @reader2.each do |row|
+        row.should.respond_to(:[])
+
+        row.size.should == 1
+
+        # the field names need to be case insensitive as some drivers such as
+        # do_derby, do_h2, do_hsqldb return the field names as uppercase
+        (row['code'] || row['CODE']).should.be.kind_of(String)
+
+        rows_yielded += 1
+      end
+      rows_yielded.should == 15
+    end
+
     it 'should return the reader' do
       @reader.each { |row| }.should.equal(@reader)
     end

data/lib/data_objects/spec/result_spec.rb

@@ -23,7 +23,7 @@ shared 'a Result' do
 
 end
 
-shared 'a Result which returns inserted keys' do
+shared 'a Result which returns inserted key with sequences' do
 
   before do
     setup_test_environment
@@ -50,3 +50,30 @@ shared 'a Result which returns inserted keys' do
   end
 
 end
+
+shared 'a Result which returns nil without sequences' do
+
+  before do
+    setup_test_environment
+    @connection = DataObjects::Connection.new(CONFIG.uri)
+    command = @connection.create_command("INSERT INTO invoices (invoice_number) VALUES (?)")
+    # execute the command twice and expose the second result
+    @result = command.execute_non_query("monkey")
+  end
+
+  after do
+    @connection.close
+  end
+
+  it 'should respond to #affected_rows' do @result.should.respond_to(:affected_rows) end
+
+  describe 'insert_id' do
+
+    it 'should return the insert_id' do
+      # This is actually the 2nd record inserted
+      @result.insert_id.should.be.nil
+    end
+
+  end
+
+end

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

@@ -36,6 +36,30 @@ shared 'supporting Boolean' do
 
     end
 
+    describe 'with manual typecasting a true value' do
+
+      before do
+        @command = @connection.create_command("SELECT flags FROM widgets WHERE id = ?")
+        @command.set_types(TrueClass)
+        @reader = @command.execute_reader(2)
+        @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(TrueClass)
+      end
+
+      it 'should return the correct result' do
+       @values.first.should.be.true
+      end
+
+    end
+
     describe 'with manual typecasting a nil value' do
 
       before do

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

@@ -25,9 +25,9 @@ shared 'supporting other (unknown) type' do
   describe 'writing an object of unknown type' do
 
     before do
-      @command = @connection.create_command("SELECT whitepaper_text FROM widgets WHERE whitepaper_text = ?")
+      @command = @connection.create_command("SELECT ad_description FROM widgets WHERE ad_description = ?")
       @command.set_types(::CustomTextType)
-      @reader = @command.execute_reader('String')
+      @reader = @command.execute_reader('Buy this product now!')
       @reader.next!
       @values = @reader.values
     end
@@ -37,7 +37,7 @@ shared 'supporting other (unknown) type' do
     end
 
     it 'should return the correct entry' do
-      @values.first.should == 'String'
+      @values.first.should == 'Buy this product now!'
     end
 
   end

data/lib/data_objects/version.rb

@@ -1,3 +1,3 @@
 module DataObjects
-  VERSION = '0.10.1'.freeze
+  VERSION = '0.10.2'
 end

data/lib/data_objects.rb

@@ -10,6 +10,7 @@ require 'data_objects/command'
 require 'data_objects/result'
 require 'data_objects/reader'
 require 'data_objects/quoting'
+require 'data_objects/extension'
 require 'data_objects/error'
 require 'data_objects/error/sql_error'
 require 'data_objects/error/connection_error'

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: data_objects
 version: !ruby/object:Gem::Version 
-  version: 0.10.1
+  prerelease: false
+  segments: 
+  - 0
+  - 10
+  - 2
+  version: 0.10.2
 platform: ruby
 authors: 
 - Dirkjan Bussink
@@ -9,49 +14,61 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-09 00:00:00 +01:00
+date: 2010-05-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: addressable
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 1
         version: "2.1"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: bacon
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
         version: "1.1"
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: mocha
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
         version: "0.9"
-    version: 
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: yard
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
         version: "0.5"
-    version: 
+  type: :development
+  version_requirements: *id004
 description: Provide a standard and simplified API for communicating with RDBMS from Ruby
 email: d.bussink@gmail.com
 executables: []
@@ -76,6 +93,7 @@ files:
 - lib/data_objects/error/sql_error.rb
 - lib/data_objects/error/syntax_error.rb
 - lib/data_objects/error/transaction_error.rb
+- lib/data_objects/extension.rb
 - lib/data_objects/logger.rb
 - lib/data_objects/pooling.rb
 - lib/data_objects/quoting.rb
@@ -138,18 +156,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: dorb
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: DataObjects basic API and shared driver specifications