data_objects 0.10.0 → 0.10.1

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

@@ -1,36 +1,32 @@
-share_examples_for 'supporting Range' do
+shared 'supporting Range' do
 
-  include DataObjectsSpecHelpers
+  setup_test_environment
 
-  before :all do
-    setup_test_environment
-  end
-
-  before :each do
+  before do
     @connection = DataObjects::Connection.new(CONFIG.uri)
   end
 
-  after :each do
+  after do
     @connection.close
   end
 
   describe 'passing a Range as a parameter in execute_reader' do
 
-      before  do
-        @reader = @connection.create_command("SELECT * FROM widgets WHERE id between ?").execute_reader(2..5)
-      end
+    before do
+      @reader = @connection.create_command("SELECT * FROM widgets WHERE id between ?").execute_reader(2..5)
+    end
 
-      after do
-        @reader.close
-      end
+    after do
+      @reader.close
+    end
 
-      it 'should return correct number of rows' do
-        counter  = 0
-        while(@reader.next!) do
-          counter += 1
-        end
-        counter.should == 4
+    it 'should return correct number of rows' do
+      counter  = 0
+      while(@reader.next!) do
+        counter += 1
       end
+      counter.should == 4
+    end
 
   end
 end

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

@@ -1,16 +1,14 @@
-share_examples_for 'supporting String' do
+# encoding: utf-8
 
-  include DataObjectsSpecHelpers
+shared 'supporting String' do
 
-  before :all do
-    setup_test_environment
-  end
+  setup_test_environment
 
-  before :each do
+  before do
     @connection = DataObjects::Connection.new(CONFIG.uri)
   end
 
-  after :each do
+  after do
     @connection.close
   end
 
@@ -18,7 +16,7 @@ share_examples_for 'supporting String' do
 
     describe 'with automatic typecasting' do
 
-      before  do
+      before do
         @reader = @connection.create_command("SELECT code FROM widgets WHERE ad_description = ?").execute_reader('Buy this product now!')
         @reader.next!
         @values = @reader.values
@@ -29,7 +27,7 @@ share_examples_for 'supporting 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
@@ -40,7 +38,7 @@ share_examples_for 'supporting String' do
 
     describe 'with manual typecasting' do
 
-      before  do
+      before do
         @command = @connection.create_command("SELECT weight FROM widgets WHERE ad_description = ?")
         @command.set_types(String)
         @reader = @command.execute_reader('Buy this product now!')
@@ -53,7 +51,7 @@ share_examples_for 'supporting 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
@@ -66,7 +64,7 @@ share_examples_for 'supporting String' do
 
   describe 'writing a String' do
 
-    before  do
+    before do
       @reader = @connection.create_command("SELECT id FROM widgets WHERE id = ?").execute_reader("2")
       @reader.next!
       @values = @reader.values
@@ -78,7 +76,68 @@ share_examples_for 'supporting 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
+
+  describe 'writing and reading a multibyte String' do
+
+    ['Aslak Hellesøy',
+     'Пётр Алексе́евич Рома́нов',
+     '歐陽龍'].each do |name|
+
+       before do
+         # SQL Server Unicode String Literals
+         @n = 'N' if defined?(DataObjects::SqlServer::Connection) && @connection.kind_of?(DataObjects::SqlServer::Connection)
+       end
+
+      it 'should write a multibyte String' do
+        @command = @connection.create_command('INSERT INTO users (name) VALUES(?)')
+        should.not.raise(DataObjects::DataError) { @command.execute_non_query(name) }
+      end
+
+      it 'should read back the multibyte String' do
+        @command = @connection.create_command('SELECT name FROM users WHERE name = ?')
+        @reader = @command.execute_reader(name)
+        @reader.next!
+        @reader.values.first.should == name
+        @reader.close
+      end
+
+      it 'should write a multibyte String (without query parameters)' do
+        @command = @connection.create_command("INSERT INTO users (name) VALUES(#{@n}\'#{name}\')")
+        should.not.raise(DataObjects::DataError) { @command.execute_non_query }
+      end
+
+      it 'should read back the multibyte String (without query parameters)' do
+        @command = @connection.create_command("SELECT name FROM users WHERE name = #{@n}\'#{name}\'")
+        @reader = @command.execute_reader
+        @reader.next!
+        @reader.values.first.should == name
+        @reader.close
+      end
+
+    end
+  end
+
+  class ::StringWithExtraPowers < String; end
+
+  describe 'writing a kind of (subclass of) String' do
+
+    before do
+      @reader = @connection.create_command("SELECT id FROM widgets WHERE id = ?").execute_reader(::StringWithExtraPowers.new("2"))
+      @reader.next!
+      @values = @reader.values
+    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 == 1 or val == 2 }
     end
 
   end

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

@@ -1,16 +1,12 @@
-share_examples_for 'supporting Time' do
+shared 'supporting Time' do
 
-  include DataObjectsSpecHelpers
+  setup_test_environment
 
-  before :all do
-    setup_test_environment
-  end
-
-  before :each do
+  before do
     @connection = DataObjects::Connection.new(CONFIG.uri)
   end
 
-  after :each do
+  after do
     @connection.close
   end
 
@@ -18,7 +14,7 @@ share_examples_for 'supporting Time' do
 
     describe 'with manual typecasting' do
 
-      before  do
+      before do
         @command = @connection.create_command("SELECT release_date FROM widgets WHERE ad_description = ?")
         @command.set_types(Time)
         @reader = @command.execute_reader('Buy this product now!')
@@ -31,7 +27,7 @@ share_examples_for 'supporting 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
@@ -42,7 +38,7 @@ share_examples_for 'supporting Time' do
 
     describe 'with manual typecasting a nil value' do
 
-      before  do
+      before do
         @command = @connection.create_command("SELECT release_timestamp FROM widgets WHERE id = ?")
         @command.set_types(Time)
         @reader = @command.execute_reader(9)
@@ -55,11 +51,11 @@ share_examples_for 'supporting Time' do
       end
 
       it 'should return a nil class' do
-        @values.first.should be_kind_of(NilClass)
+        @values.first.should.be.kind_of(NilClass)
       end
 
       it 'should return nil' do
-        @values.first.should be_nil
+        @values.first.should.be.nil
       end
 
     end
@@ -68,7 +64,7 @@ share_examples_for 'supporting Time' do
 
   describe 'writing an Time' do
 
-    before  do
+    before do
       @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
@@ -80,7 +76,7 @@ share_examples_for 'supporting Time' 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 == 0 }
+       @values.first.should.satisfy { |val| val == 1 or val == 0 }
     end
 
   end

data/lib/data_objects/utilities.rb

@@ -0,0 +1,18 @@
+# This is here to remove DataObject's dependency on Extlib.
+
+module DataObjects
+  # @param name<String> The name of the constant to get, e.g. "Merb::Router".
+  #
+  # @return <Object> The constant corresponding to the name.
+  def self.full_const_get(name)
+    list = name.split("::")
+    list.shift if list.first.nil? || list.first.strip.empty?
+    obj = ::Object
+    list.each do |x|
+      # This is required because const_get tries to look for constants in the
+      # ancestor chain, but we only want constants that are HERE
+      obj = obj.const_defined?(x) ? obj.const_get(x) : obj.const_missing(x)
+    end
+    obj
+  end
+end

data/lib/data_objects/version.rb

@@ -1,4 +1,3 @@
 module DataObjects
-  # Current DataObjects Gem version
-  VERSION = "0.10.0" unless defined?(DataObjects::VERSION)
+  VERSION = '0.10.1'.freeze
 end

data/spec/command_spec.rb

@@ -12,13 +12,13 @@ describe DataObjects::Command do
 
   %w{connection execute_non_query execute_reader set_types}.each do |meth|
     it "should respond to ##{meth}" do
-      @command.should respond_to(meth.intern)
+      @command.should.respond_to(meth.intern)
     end
   end
 
   %w{execute_non_query execute_reader set_types}.each do |meth|
     it "should raise NotImplementedError on ##{meth}" do
-      lambda { @command.send(meth.intern, nil) }.should raise_error(NotImplementedError)
+      should.raise(NotImplementedError) { @command.send(meth.intern, nil) }
     end
   end
 

data/spec/connection_spec.rb

@@ -11,7 +11,7 @@ describe DataObjects::Connection do
 
   %w{dispose create_command}.each do |meth|
     it "should respond to ##{meth}" do
-      @connection.should respond_to(meth.intern)
+      @connection.should.respond_to(meth.intern)
     end
   end
 
@@ -29,11 +29,13 @@ describe DataObjects::Connection do
 
     it "should return the Connection specified by the scheme" do
       c = DataObjects::Connection.new(Addressable::URI.parse('mock://localhost/database'))
-      c.should be_kind_of(DataObjects::Mock::Connection)
-
-      c = DataObjects::Connection.new(Addressable::URI.parse('mock:jndi://jdbc/database'))
-      c.should be_kind_of(DataObjects::Mock::Connection)
+      c.should.be.kind_of(DataObjects::Mock::Connection)
+      c.should.be.kind_of(DataObjects::Pooling)
     end
 
+    it "should return the Connection specified by the scheme without pooling" do
+      c = DataObjects::Connection.new(Addressable::URI.parse('java://jdbc/database?scheme=mock2'))
+      c.should.not.be.kind_of(DataObjects::Pooling)
+    end
   end
 end

data/spec/do_mock2.rb

@@ -0,0 +1,31 @@
+module DataObjects
+
+  module Mock2
+    class Connection < DataObjects::Connection
+      def initialize(uri)
+        @uri = uri
+      end
+
+      def dispose
+        nil
+      end
+    end
+
+    class Command < DataObjects::Command
+      def execute_non_query(*args)
+        Result.new(self, 0, nil)
+      end
+
+      def execute_reader(*args)
+        Reader.new
+      end
+    end
+
+    class Result < DataObjects::Result
+    end
+
+    class Reader < DataObjects::Reader
+    end
+  end
+
+end

data/spec/pooling_spec.rb

@@ -0,0 +1,162 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+require 'timeout'
+
+describe "DataObjects::Pooling" do
+  before do
+
+    Object.send(:remove_const, :Person) if defined?(Person)
+    class ::Person
+      include DataObjects::Pooling
+
+      attr_accessor :name
+
+      def initialize(name)
+        @name = name
+      end
+
+      def dispose
+        @name = nil
+      end
+    end
+
+    Object.send(:remove_const, :Overwriter) if defined?(Overwriter)
+    class ::Overwriter
+
+      def self.new(*args)
+        instance = allocate
+        instance.send(:initialize, *args)
+        instance.overwritten = true
+        instance
+      end
+
+      include DataObjects::Pooling
+
+      attr_accessor :name
+
+      def initialize(name)
+        @name = name
+        @overwritten = false
+      end
+
+      def overwritten?
+        @overwritten
+      end
+
+      def overwritten=(value)
+        @overwritten = value
+      end
+
+      class << self
+        remove_method :pool_size if instance_methods(false).any? { |m| m.to_sym == :pool_size }
+        def pool_size
+          pool_size = if RUBY_PLATFORM =~ /java/
+            20
+          else
+            2
+          end
+          pool_size
+        end
+      end
+
+      def dispose
+        @name = nil
+      end
+    end
+  end
+
+  after do
+    DataObjects::Pooling.lock.synchronize do
+      DataObjects::Pooling.pools.each do |pool|
+        pool.lock.synchronize do
+          pool.dispose
+        end
+      end
+    end
+  end
+
+  it "should maintain a size of 1" do
+    bob = Person.new('Bob')
+    fred = Person.new('Fred')
+    ted = Person.new('Ted')
+
+    Person.__pools.each do |args, pool|
+      pool.size.should == 1
+    end
+
+    bob.release
+    fred.release
+    ted.release
+
+    Person.__pools.each do |args, pool|
+      pool.size.should == 1
+    end
+  end
+
+  it "should track the initialized pools" do
+    bob = Person.new('Bob') # Ensure the pool is "primed"
+    bob.name.should == 'Bob'
+    bob.instance_variable_get(:@__pool).should.not.be.nil
+    Person.__pools.size.should == 1
+    bob.release
+    Person.__pools.size.should == 1
+
+    DataObjects::Pooling::pools.should.not.be.empty
+
+    sleep(1.2)
+
+    # NOTE: This assertion is commented out, as our MockConnection objects are
+    #       currently in the pool.
+    DataObjects::Pooling::pools.should.be.empty
+    bob.name.should == nil
+  end
+
+  it "should allow you to overwrite Class#new" do
+    bob = Overwriter.new('Bob')
+    bob.should.be.overwritten
+    bob.release
+  end
+
+  it "should allow multiple threads to access the pool" do
+    t1 = Thread.new do
+      bob = Person.new('Bob')
+      sleep(1)
+      bob.release
+    end
+
+    lambda do
+      bob = Person.new('Bob')
+      t1.join
+      bob.release
+    end.should.not.raise(DataObjects::Pooling::InvalidResourceError)
+  end
+
+  it "should allow you to flush a pool" do
+    bob = Overwriter.new('Bob')
+    Overwriter.new('Bob').release
+    bob.release
+
+    bob.name.should == 'Bob'
+
+    Overwriter.__pools[['Bob']].size.should == 2
+    Overwriter.__pools[['Bob']].flush!
+    Overwriter.__pools[['Bob']].size.should == 0
+
+    bob.name.should.be.nil
+  end
+
+  it "should wake up the scavenger thread when exiting" do
+    bob = Person.new('Bob')
+    bob.release
+    DataObjects.exiting = true
+    sleep(0.1)
+    DataObjects::Pooling.scavenger?.should.be.false
+  end
+
+  it "should be able to detach an instance from the pool" do
+    bob = Person.new('Bob')
+    Person.__pools[['Bob']].size.should == 1
+    bob.detach
+    Person.__pools[['Bob']].size.should == 0
+  end
+
+end