data_objects 0.10.3 → 0.10.4.rc1

data/lib/data_objects/spec/{encoding_spec.rb → shared/encoding_spec.rb}

@@ -1,16 +1,16 @@
-shared 'a driver supporting different encodings' do
+shared_examples_for 'a driver supporting different encodings' do
 
-  before do
-    @connection = DataObjects::Connection.new(CONFIG.uri)
-  end
+  describe 'character_set' do
 
-  after do
-    @connection.close
-  end
+    before do
+      @connection = DataObjects::Connection.new(CONFIG.uri)
+    end
 
-  it 'should respond to #character_set' do @connection.should.respond_to(:character_set) end
+    after do
+      @connection.close
+    end
 
-  describe 'character_set' do
+    it { @connection.should respond_to(:character_set) }
 
     it 'uses utf8 by default' do
       @connection.character_set.should == 'UTF-8'
@@ -24,9 +24,7 @@ shared 'a driver supporting different encodings' do
 
       after { @latin1_connection.close }
 
-      it 'the character set should be ISO-8859-1' do
-        @latin1_connection.character_set.should == 'ISO-8859-1'
-      end
+      it { @latin1_connection.character_set.should == 'ISO-8859-1' }
     end
 
     describe 'uses UTF-8 when an invalid encoding is given' do
@@ -36,29 +34,28 @@ shared 'a driver supporting different encodings' do
 
       after { @latin1_connection.close }
 
-      it 'the character set should be UTF-8' do
-        @latin1_connection.character_set.should == 'UTF-8'
-      end
+      it { @latin1_connection.character_set.should == 'UTF-8' }
     end
   end
 end
 
-shared 'returning correctly encoded strings for the default database encoding' do
+shared_examples_for 'returning correctly encoded strings for the default database encoding' do
 
   if defined?(::Encoding)
 
+    before :all do
     setup_test_environment
+  end
 
-    before do
-      @connection.close if @connection
-      @connection = DataObjects::Connection.new(CONFIG.uri)
-    end
+    describe 'with encoded string support' do
 
-    after do
-      @connection.close
-    end
+      before do
+        @connection = DataObjects::Connection.new(CONFIG.uri)
+      end
 
-    describe 'with encoded string support' do
+      after do
+        @connection.close
+      end
 
       describe 'reading a String' do
         before do
@@ -72,9 +69,9 @@ shared 'returning correctly encoded strings for the default database encoding' d
         end
 
         it 'should return UTF-8 encoded String' do
-          @values.first.should.be.kind_of(String)
+          @values.first.should be_kind_of(String)
           @values.first.encoding.name.should == 'UTF-8'
-          @values.last.should.be.kind_of(String)
+          @values.last.should be_kind_of(String)
           @values.last.encoding.name.should == 'UTF-8'
         end
       end
@@ -93,7 +90,7 @@ shared 'returning correctly encoded strings for the default database encoding' d
         end
 
         it 'should return ASCII-8BIT encoded ByteArray' do
-          @values.first.should.be.kind_of(::Extlib::ByteArray)
+          @values.first.should be_kind_of(::Extlib::ByteArray)
           @values.first.encoding.name.should == 'ASCII-8BIT'
         end
       end
@@ -102,25 +99,26 @@ shared 'returning correctly encoded strings for the default database encoding' d
 
 end
 
-shared 'returning correctly encoded strings for the default internal encoding' do
+shared_examples_for 'returning correctly encoded strings for the default internal encoding' do
 
   if defined?(::Encoding)
 
+    before :all do
     setup_test_environment
+  end
 
-    before do
-      @connection.close if @connection
-      @encoding_before = Encoding.default_internal
-      Encoding.default_internal = 'ISO-8859-1'
-      @connection = DataObjects::Connection.new(CONFIG.uri)
-    end
+    describe 'with encoded string support' do
 
-    after do
-      @connection.close
-      Encoding.default_internal = @encoding_before
-    end
+      before do
+        @encoding_before = Encoding.default_internal
+        Encoding.default_internal = 'ISO-8859-1'
+        @connection = DataObjects::Connection.new(CONFIG.uri)
+      end
 
-    describe 'with encoded string support' do
+      after do
+        @connection.close
+        Encoding.default_internal = @encoding_before
+      end
 
       describe 'reading a String' do
         before do
@@ -133,10 +131,10 @@ shared 'returning correctly encoded strings for the default internal encoding' d
           @reader.close
         end
 
-        it 'should return UTF-8 encoded String' do
-          @values.first.should.be.kind_of(String)
+        it 'should return ISO-8859-1 encoded String' do
+          @values.first.should be_kind_of(String)
           @values.first.encoding.name.should == 'ISO-8859-1'
-          @values.last.should.be.kind_of(String)
+          @values.last.should be_kind_of(String)
           @values.last.encoding.name.should == 'ISO-8859-1'
         end
       end
@@ -155,7 +153,7 @@ shared 'returning correctly encoded strings for the default internal encoding' d
         end
 
         it 'should return ASCII-8BIT encoded ByteArray' do
-          @values.first.should.be.kind_of(::Extlib::ByteArray)
+          @values.first.should be_kind_of(::Extlib::ByteArray)
           @values.first.encoding.name.should == 'ASCII-8BIT'
         end
       end

data/lib/data_objects/spec/shared/error/sql_error_spec.rb

@@ -0,0 +1,30 @@
+shared_examples_for 'raising a SQLError' do
+
+  before :all do
+    setup_test_environment
+  end
+
+  describe "an invalid query" do
+
+    it 'should raise an error' do
+      @connection = DataObjects::Connection.new(CONFIG.uri)
+      invalid_query = @connection.create_command("SLCT * FROM widgets WHERE ad_description = ? order by id")
+      expect { invalid_query.execute_reader('Buy this product now!') }.to raise_error(DataObjects::SQLError)
+      @connection.close
+    end
+
+  end
+
+
+  describe "an invalid result set" do
+
+    it 'should raise an error' do
+      @connection = DataObjects::Connection.new(CONFIG.uri)
+      invalid_result = @connection.create_command("SELECT MAX((SELECT 1 UNION SELECT 2))")
+      expect { invalid_result.execute_reader }.to raise_error(DataObjects::SQLError)
+      @connection.close
+    end
+
+  end
+
+end

data/lib/data_objects/spec/{reader_spec.rb → shared/reader_spec.rb}

@@ -1,6 +1,8 @@
-shared 'a Reader' do
+shared_examples_for 'a Reader' do
 
-  setup_test_environment
+  before :all do
+    setup_test_environment
+  end
 
   before do
     @connection = DataObjects::Connection.new(CONFIG.uri)
@@ -14,30 +16,33 @@ shared 'a Reader' do
     @connection.close
   end
 
-  it 'should respond to #fields' do @reader.should.respond_to(:fields) end
+  it { @reader.should respond_to(:fields) }
 
   describe 'fields' do
 
-    def array_case_insensitively_equal_to(arr)
-      lambda { |obj| obj.map { |f| f.downcase } == arr }
-    end
-
     it 'should return the correct fields in the reader' do
       # we downcase the field names as some drivers such as do_derby, do_h2,
       # do_hsqldb, do_oracle return the field names as uppercase
-      @reader.fields.should.be array_case_insensitively_equal_to(['code', 'name'])
+      @reader.fields.should be_array_case_insensitively_equal_to(['code', 'name'])
+    end
+
+    it 'should return the field alias as the name, when the SQL AS keyword is specified' do
+      reader = @connection.create_command("SELECT code AS codigo, name AS nombre FROM widgets WHERE ad_description = ? order by id").execute_reader('Buy this product now!')
+      reader.fields.should_not be_array_case_insensitively_equal_to(['code',   'name'])
+      reader.fields.should     be_array_case_insensitively_equal_to(['codigo', 'nombre'])
+      reader.close
     end
 
   end
 
-  it 'should respond to #values' do @reader.should.respond_to(:values) end
+  it { @reader.should respond_to(:values) }
 
   describe 'values' do
 
     describe 'when the reader is uninitialized' do
 
       it 'should raise an error' do
-        should.raise(DataObjects::DataError) { @reader.values }
+        expect { @reader.values }.to raise_error(DataObjects::DataError)
       end
 
     end
@@ -73,20 +78,20 @@ shared 'a Reader' do
       end
 
       it 'should raise an error again' do
-        should.raise(DataObjects::DataError) { @reader.values }
+        expect { @reader.values }.to raise_error(DataObjects::DataError)
       end
     end
 
   end
 
-  it 'should respond to #close' do @reader.should.respond_to(:close) end
+  it { @reader.should respond_to(:close) }
 
   describe 'close' do
 
     describe 'on an open reader' do
 
       it 'should return true' do
-        @reader.close.should.be.true
+        @reader.close.should be_true
       end
 
     end
@@ -98,21 +103,21 @@ shared 'a Reader' do
       end
 
       it 'should return false' do
-        @reader.close.should.be.false
+        @reader.close.should be_false
       end
 
     end
 
   end
 
-  it 'should respond to #next!' do @reader.should.respond_to(:next!) end
+  it { @reader.should respond_to(:next!) }
 
   describe 'next!' do
 
     describe 'successfully moving the cursor initially' do
 
       it 'should return true' do
-        @reader.next!.should.be.true
+        @reader.next!.should be_true
       end
 
     end
@@ -125,7 +130,7 @@ shared 'a Reader' do
 
       it 'should move the cursor to the next value' do
         @reader.values.should == ["W0000001", "Widget 1"]
-        lambda { @reader.next! }.should.change { @reader.values }
+        lambda { @reader.next! }.should change { @reader.values }
         @reader.values.should == ["W0000002", "Widget 2"]
       end
 
@@ -138,14 +143,14 @@ shared 'a Reader' do
       end
 
       it 'should return false when the end is reached' do
-        @reader.next!.should.be.false
+        @reader.next!.should be_false
       end
 
     end
 
   end
 
-  it 'should respond to #field_count' do @reader.should.respond_to(:field_count) end
+  it { @reader.should respond_to(:field_count) }
 
   describe 'field_count' do
 
@@ -155,21 +160,21 @@ shared 'a Reader' do
 
   end
 
-  it 'should respond to #values' do @reader.should.respond_to(:values) end
+  it { @reader.should respond_to(:values) }
 
   describe 'each' do
 
     it 'should yield each row to the block for multiple columns' do
       rows_yielded = 0
       @reader.each do |row|
-        row.should.respond_to(:[])
+        row.should respond_to(:[])
 
         row.size.should == 2
 
         # 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['name'] || row['NAME']).should.be.kind_of(String)
-        (row['code'] || row['CODE']).should.be.kind_of(String)
+        (row['name'] || row['NAME']).should be_kind_of(String)
+        (row['code'] || row['CODE']).should be_kind_of(String)
 
         rows_yielded += 1
       end
@@ -179,13 +184,13 @@ shared 'a Reader' do
     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.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)
+        (row['code'] || row['CODE']).should be_kind_of(String)
 
         rows_yielded += 1
       end
@@ -193,7 +198,7 @@ shared 'a Reader' do
     end
 
     it 'should return the reader' do
-      @reader.each { |row| }.should.equal(@reader)
+      @reader.each { |row| }.should equal(@reader)
     end
 
   end

data/lib/data_objects/spec/shared/result_spec.rb

@@ -0,0 +1,79 @@
+shared_examples_for 'a Result' do
+
+  before :all do
+    setup_test_environment
+  end
+
+  before do
+    @connection = DataObjects::Connection.new(CONFIG.uri)
+    @result    = @connection.create_command("INSERT INTO users (name) VALUES (?)").execute_non_query("monkey")
+  end
+
+  after do
+    @connection.close
+  end
+
+  it { @result.should respond_to(:affected_rows) }
+
+  describe 'affected_rows' do
+
+    it 'should return the number of affected rows' do
+      @result.affected_rows.should == 1
+    end
+
+  end
+
+end
+
+shared_examples_for 'a Result which returns inserted key with sequences' do
+
+  describe 'insert_id' do
+
+    before do
+      setup_test_environment
+      @connection = DataObjects::Connection.new(CONFIG.uri)
+      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 do
+      @connection.close
+    end
+
+    it { @result.should respond_to(:affected_rows) }
+
+    it 'should return the insert_id' do
+      # This is actually the 2nd record inserted
+      @result.insert_id.should == 2
+    end
+
+  end
+
+end
+
+shared_examples_for 'a Result which returns nil without sequences' do
+
+  describe 'insert_id' 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 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 → shared/typecast}/array_spec.rb

@@ -1,6 +1,8 @@
-shared 'supporting Array' do
+shared_examples_for 'supporting Array' do
 
-  setup_test_environment
+  before :all do
+    setup_test_environment
+  end
 
   before do
     @connection = DataObjects::Connection.new(CONFIG.uri)