data_objects 0.10.0 → 0.10.1

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

@@ -1,16 +1,12 @@
-share_examples_for 'supporting BigDecimal' do
+shared 'supporting BigDecimal' 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 BigDecimal' do
 
     describe 'with manual typecasting' do
 
-      before  do
+      before do
         @command = @connection.create_command("SELECT cost1 FROM widgets WHERE ad_description = ?")
         @command.set_types(BigDecimal)
         @reader = @command.execute_reader('Buy this product now!')
@@ -31,7 +27,7 @@ share_examples_for 'supporting BigDecimal' do
       end
 
       it 'should return the correctly typed result' do
-        @values.first.should be_kind_of(BigDecimal)
+        @values.first.should.be.kind_of(BigDecimal)
       end
 
       it 'should return the correct result' do
@@ -43,7 +39,7 @@ share_examples_for 'supporting BigDecimal' do
 
     describe 'with manual typecasting a nil value' do
 
-      before  do
+      before do
         @command = @connection.create_command("SELECT cost2 FROM widgets WHERE id = ?")
         @command.set_types(BigDecimal)
         @reader = @command.execute_reader(6)
@@ -56,11 +52,11 @@ share_examples_for 'supporting BigDecimal' do
       end
 
       it 'should return the correctly typed result' do
-        @values.first.should be_kind_of(NilClass)
+        @values.first.should.be.kind_of(NilClass)
       end
 
       it 'should return the correct result' do
-       @values.first.should be_nil
+       @values.first.should.be.nil
       end
 
     end
@@ -69,7 +65,7 @@ share_examples_for 'supporting BigDecimal' do
 
   describe 'writing an Integer' do
 
-    before  do
+    before do
       @reader = @connection.create_command("SELECT id FROM widgets WHERE id = ?").execute_reader(BigDecimal("2.0"))
       @reader.next!
       @values = @reader.values
@@ -87,19 +83,15 @@ share_examples_for 'supporting BigDecimal' do
 
 end
 
-share_examples_for 'supporting BigDecimal autocasting' do
+shared 'supporting BigDecimal autocasting' do
 
-  include DataObjectsSpecHelpers
-
-  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
 
@@ -107,7 +99,7 @@ share_examples_for 'supporting BigDecimal autocasting' do
 
     describe 'with automatic typecasting' do
 
-      before  do
+      before do
         @reader = @connection.create_command("SELECT cost2 FROM widgets WHERE ad_description = ?").execute_reader('Buy this product now!')
         @reader.next!
         @values = @reader.values
@@ -118,7 +110,7 @@ share_examples_for 'supporting BigDecimal autocasting' do
       end
 
       it 'should return the correctly typed result' do
-        @values.first.should be_kind_of(BigDecimal)
+        @values.first.should.be.kind_of(BigDecimal)
       end
 
       it 'should return the correct result' do

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

@@ -1,16 +1,12 @@
-share_examples_for 'supporting Boolean' do
+shared 'supporting Boolean' 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 Boolean' do
 
     describe 'with manual typecasting' do
 
-      before  do
+      before do
         @command = @connection.create_command("SELECT flags FROM widgets WHERE ad_description = ?")
         @command.set_types(TrueClass)
         @reader = @command.execute_reader('Buy this product now!')
@@ -31,7 +27,7 @@ share_examples_for 'supporting Boolean' do
       end
 
       it 'should return the correctly typed result' do
-        @values.first.should be_kind_of(FalseClass)
+        @values.first.should.be.kind_of(FalseClass)
       end
 
       it 'should return the correct result' do
@@ -42,7 +38,7 @@ share_examples_for 'supporting Boolean' do
 
     describe 'with manual typecasting a nil value' do
 
-      before  do
+      before do
         @command = @connection.create_command("SELECT flags FROM widgets WHERE id = ?")
         @command.set_types(TrueClass)
         @reader = @command.execute_reader(4)
@@ -55,11 +51,11 @@ share_examples_for 'supporting Boolean' do
       end
 
       it 'should return the correctly typed result' do
-        @values.first.should be_kind_of(NilClass)
+        @values.first.should.be.kind_of(NilClass)
       end
 
       it 'should return the correct result' do
-       @values.first.should be_nil
+       @values.first.should.be.nil
       end
 
     end
@@ -68,7 +64,7 @@ share_examples_for 'supporting Boolean' do
 
   describe 'writing an Boolean' do
 
-    before  do
+    before do
       @reader = @connection.create_command("SELECT id FROM widgets WHERE flags = ?").execute_reader(true)
       @reader.next!
       @values = @reader.values
@@ -86,19 +82,15 @@ share_examples_for 'supporting Boolean' do
 
 end
 
-share_examples_for 'supporting Boolean autocasting' do
+shared 'supporting Boolean autocasting' do
 
-  include DataObjectsSpecHelpers
-
-  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
 
@@ -106,7 +98,7 @@ share_examples_for 'supporting Boolean autocasting' do
 
     describe 'with automatic typecasting' do
 
-      before  do
+      before do
         @reader = @connection.create_command("SELECT flags FROM widgets WHERE ad_description = ?").execute_reader('Buy this product now!')
         @reader.next!
         @values = @reader.values
@@ -117,7 +109,7 @@ share_examples_for 'supporting Boolean autocasting' do
       end
 
       it 'should return the correctly typed result' do
-        @values.first.should be_kind_of(FalseClass)
+        @values.first.should.be.kind_of(FalseClass)
       end
 
       it 'should return the correct result' do

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

@@ -1,16 +1,12 @@
-share_examples_for 'supporting ByteArray' do
+shared 'supporting ByteArray' 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 ByteArray' do
 
     describe 'with automatic typecasting' do
 
-      before  do
+      before do
         @reader = @connection.create_command("SELECT cad_drawing FROM widgets WHERE ad_description = ?").execute_reader('Buy this product now!')
         @reader.next!
         @values = @reader.values
@@ -29,7 +25,7 @@ share_examples_for 'supporting ByteArray' do
       end
 
       it 'should return the correctly typed result' do
-        @values.first.should be_kind_of(::Extlib::ByteArray)
+        @values.first.should.be.kind_of(::Extlib::ByteArray)
       end
 
       it 'should return the correct result' do
@@ -40,7 +36,7 @@ share_examples_for 'supporting ByteArray' do
 
     describe 'with manual typecasting' do
 
-      before  do
+      before do
         @command = @connection.create_command("SELECT cad_drawing FROM widgets WHERE ad_description = ?")
         @command.set_types(::Extlib::ByteArray)
         @reader = @command.execute_reader('Buy this product now!')
@@ -53,7 +49,7 @@ share_examples_for 'supporting ByteArray' do
       end
 
       it 'should return the correctly typed result' do
-        @values.first.should be_kind_of(::Extlib::ByteArray)
+        @values.first.should.be.kind_of(::Extlib::ByteArray)
       end
 
       it 'should return the correct result' do
@@ -66,8 +62,8 @@ share_examples_for 'supporting ByteArray' do
 
   describe 'writing a ByteArray' do
 
-    before  do
-      @reader = @connection.create_command("SELECT id FROM widgets WHERE id = ?").execute_reader(::Extlib::ByteArray.new("2"))
+    before do
+      @reader = @connection.create_command("SELECT ad_description FROM widgets WHERE cad_drawing = ?").execute_reader(::Extlib::ByteArray.new("CAD \001 \000 DRAWING"))
       @reader.next!
       @values = @reader.values
     end
@@ -78,7 +74,7 @@ share_examples_for 'supporting ByteArray' do
 
     it 'should return the correct entry' do
       #Some of the drivers starts autoincrementation from 0 not 1
-      @values.first.should satisfy { |val| val == 2 or val == 1 }
+      @values.first.should == 'Buy this product now!'
     end
 
   end

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

@@ -1,16 +1,12 @@
-share_examples_for 'supporting Class' do
+shared 'supporting Class' 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 Class' do
 
     describe 'with manual typecasting' do
 
-      before  do
+      before do
         @command = @connection.create_command("SELECT whitepaper_text FROM widgets WHERE ad_description = ?")
         @command.set_types(Class)
         @reader = @command.execute_reader('Buy this product now!')
@@ -31,7 +27,7 @@ share_examples_for 'supporting Class' do
       end
 
       it 'should return the correctly typed result' do
-        @values.first.should be_kind_of(Class)
+        @values.first.should.be.kind_of(Class)
       end
 
       it 'should return the correct result' do
@@ -44,7 +40,7 @@ share_examples_for 'supporting Class' do
 
   describe 'writing a Class' do
 
-    before  do
+    before do
       @reader = @connection.create_command("SELECT whitepaper_text FROM widgets WHERE whitepaper_text = ?").execute_reader(String)
       @reader.next!
       @values = @reader.values

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

@@ -1,16 +1,12 @@
-share_examples_for 'supporting Date' do
+shared 'supporting Date' 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 Date' do
 
     describe 'with manual typecasting' do
 
-      before  do
+      before do
         @command = @connection.create_command("SELECT release_datetime FROM widgets WHERE ad_description = ?")
         @command.set_types(Date)
         @reader = @command.execute_reader('Buy this product now!')
@@ -31,7 +27,7 @@ share_examples_for 'supporting Date' do
       end
 
       it 'should return the correctly typed result' do
-        @values.first.should be_kind_of(Date)
+        @values.first.should.be.kind_of(Date)
       end
 
       it 'should return the correct result' do
@@ -42,7 +38,7 @@ share_examples_for 'supporting Date' do
 
     describe 'with manual typecasting a nil value' do
 
-      before  do
+      before do
         @command = @connection.create_command("SELECT release_date FROM widgets WHERE id = ?")
         @command.set_types(Date)
         @reader = @command.execute_reader(7)
@@ -55,11 +51,11 @@ share_examples_for 'supporting Date' 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 Date' do
 
   describe 'writing an Date' do
 
-    before  do
+    before do
       @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
@@ -80,26 +76,22 @@ share_examples_for 'supporting Date' 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
 
 end
 
-share_examples_for 'supporting Date autocasting' do
+shared 'supporting Date autocasting' do
 
-  include DataObjectsSpecHelpers
-
-  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
 
@@ -107,7 +99,7 @@ share_examples_for 'supporting Date autocasting' do
 
     describe 'with automatic typecasting' do
 
-      before  do
+      before do
         @reader = @connection.create_command("SELECT release_date FROM widgets WHERE ad_description = ?").execute_reader('Buy this product now!')
         @reader.next!
         @values = @reader.values
@@ -118,7 +110,7 @@ share_examples_for 'supporting Date autocasting' do
       end
 
       it 'should return the correctly typed result' do
-        @values.first.should be_kind_of(Date)
+        @values.first.should.be.kind_of(Date)
       end
 
       it 'should return the correct result' do