sequel 0.4.4.1 → 0.4.4.2

data/spec/connection_pool_spec.rb

@@ -283,7 +283,8 @@ context "ConnectionPool#disconnect" do
       sleep 0.2
     end
     stop = true
-    sleep 0.2
+    sleep 1
+    threads.each {|t| t.join}
     
     @pool.size.should == 5
     @pool.available_connections.size.should == 5
@@ -301,7 +302,8 @@ context "ConnectionPool#disconnect" do
       sleep 0.2
     end
     stop = true
-    sleep 0.2
+    sleep 1
+    threads.each {|t| t.join}
     
     @pool.size.should == 5
     @pool.disconnect
@@ -316,7 +318,8 @@ context "ConnectionPool#disconnect" do
       sleep 0.2
     end
     stop = true
-    sleep 0.2
+    sleep 1
+    threads.each {|t| t.join}
     
     @pool.size.should == 5
     

data/spec/database_spec.rb

@@ -29,13 +29,13 @@ context "A new Database" do
 end
 
 context "Database#connect" do
-  specify "should raise NotImplementedError" do
+  specify "should raise Sequel::Error::NotImplemented" do
     proc {Sequel::Database.new.connect}.should raise_error(NotImplementedError)
   end
 end
 
 context "Database#disconnect" do
-  specify "should raise NotImplementedError" do
+  specify "should raise Sequel::Error::NotImplemented" do
     proc {Sequel::Database.new.disconnect}.should raise_error(NotImplementedError)
   end
 end
@@ -102,7 +102,7 @@ context "Database#dataset" do
 end
 
 context "Database#execute" do
-  specify "should raise NotImplementedError" do
+  specify "should raise Sequel::Error::NotImplemented" do
     proc {Sequel::Database.new.execute('blah blah')}.should raise_error(NotImplementedError)
     proc {Sequel::Database.new << 'blah blah'}.should raise_error(NotImplementedError)
   end
@@ -502,7 +502,7 @@ context "A Database adapter with a scheme" do
 
   specify "should be accessible through Sequel.<adapter>" do
     # invalid parameters
-    proc {Sequel.ccc('abc', 'def')}.should raise_error(SequelError)
+    proc {Sequel.ccc('abc', 'def')}.should raise_error(Sequel::Error)
     
     c = Sequel.ccc('mydb')
     c.should be_a_kind_of(CCC)

data/spec/dataset_spec.rb

@@ -48,7 +48,7 @@ context "Dataset" do
     Sequel::Dataset.included_modules.should include(Enumerable)
   end
   
-  specify "should raise NotImplementedError for the dataset interface methods" do
+  specify "should raise ImplementedError for the dataset interface methods" do
     proc {@dataset.fetch_rows('abc')}.should raise_error(NotImplementedError)
     proc {@dataset.insert(1, 2, 3)}.should raise_error(NotImplementedError)
     proc {@dataset.update(:name => 'abc')}.should raise_error(NotImplementedError)
@@ -368,8 +368,8 @@ context "Dataset#where" do
     # the result of erroneous use of comparison not in a block
     # so instead of filter{:x == y} someone writes filter(:x == y)
     
-    proc {@dataset.filter(:a == 1)}.should raise_error(SequelError)
-    proc {@dataset.filter(:a != 1)}.should raise_error(SequelError)
+    proc {@dataset.filter(:a == 1)}.should raise_error(Sequel::Error::InvalidFilter)
+    proc {@dataset.filter(:a != 1)}.should raise_error(Sequel::Error::InvalidFilter)
   end
 end
 
@@ -380,7 +380,7 @@ context "Dataset#or" do
   end
   
   specify "should raise if no filter exists" do
-    proc {@dataset.or(:a => 1)}.should raise_error(SequelError)
+    proc {@dataset.or(:a => 1)}.should raise_error(Sequel::Error)
   end
   
   specify "should add an alternative expression to the where clause" do
@@ -413,7 +413,7 @@ context "Dataset#and" do
   end
   
   specify "should raise if no filter exists" do
-    proc {@dataset.and(:a => 1)}.should raise_error(SequelError)
+    proc {@dataset.and(:a => 1)}.should raise_error(Sequel::Error)
   end
   
   specify "should add an alternative expression to the where clause" do
@@ -642,7 +642,7 @@ context "Dataset#from" do
   end
   
   specify "should raise if no source is given" do
-    proc {@dataset.from(@dataset.from).select_sql}.should raise_error(SequelError)
+    proc {@dataset.from(@dataset.from).select_sql}.should raise_error(Sequel::Error)
   end
 end
 
@@ -1044,7 +1044,7 @@ context "Dataset#join_table" do
   end
   
   specify "should raise if an invalid join type is specified" do
-    proc {@d.join_table(:invalid, :a, :b)}.should raise_error(SequelError)
+    proc {@d.join_table(:invalid, :a, :b)}.should raise_error(Sequel::Error)
   end
   
   specify "should treat aliased tables correctly" do
@@ -1312,8 +1312,8 @@ context "Dataset#last" do
   end
   
   specify "should raise if no order is given" do
-    proc {@d.last}.should raise_error(SequelError)
-    proc {@d.last(2)}.should raise_error(SequelError)
+    proc {@d.last}.should raise_error(Sequel::Error)
+    proc {@d.last(2)}.should raise_error(Sequel::Error)
     proc {@d.order(:a).last}.should_not raise_error
     proc {@d.order(:a).last(2)}.should_not raise_error
   end
@@ -1580,9 +1580,9 @@ context "Dataset#set_model" do
   end
   
   specify "should raise for invalid parameters" do
-    proc {@dataset.set_model('kind')}.should raise_error(SequelError)
-    proc {@dataset.set_model(0)}.should raise_error(SequelError)
-    proc {@dataset.set_model(:kind)}.should raise_error(SequelError) # no hash given
+    proc {@dataset.set_model('kind')}.should raise_error(ArgumentError)
+    proc {@dataset.set_model(0)}.should raise_error(ArgumentError)
+    proc {@dataset.set_model(:kind)}.should raise_error(ArgumentError) # no hash given
   end
 end
 
@@ -1693,10 +1693,10 @@ context "A polymorphic model dataset" do
     #...
   end
   
-  specify "should raise SequelError if no suitable class is found in the polymorphic hash" do
+  specify "should raise Sequel::Error if no suitable class is found in the polymorphic hash" do
     @m2 = Class.new(@m)
     @dataset.set_model(:bit, 1 => @m2)
-    proc {@dataset.all}.should raise_error(SequelError)
+    proc {@dataset.all}.should raise_error(Sequel::Error)
   end
 
   specify "should supply naked records if the naked option is specified" do
@@ -1974,14 +1974,14 @@ context "Dataset#query" do
   end
   
   specify "should raise on non-chainable method calls" do
-    proc {@d.query {count}}.should raise_error(SequelError)
+    proc {@d.query {count}}.should raise_error(Sequel::Error)
   end
   
   specify "should raise on each, insert, update, delete" do
-    proc {@d.query {each}}.should raise_error(SequelError)
-    proc {@d.query {insert(:x => 1)}}.should raise_error(SequelError)
-    proc {@d.query {update(:x => 1)}}.should raise_error(SequelError)
-    proc {@d.query {delete}}.should raise_error(SequelError)
+    proc {@d.query {each}}.should raise_error(Sequel::Error)
+    proc {@d.query {insert(:x => 1)}}.should raise_error(Sequel::Error)
+    proc {@d.query {update(:x => 1)}}.should raise_error(Sequel::Error)
+    proc {@d.query {delete}}.should raise_error(Sequel::Error)
   end
 end
 
@@ -2120,12 +2120,12 @@ context "Dataset#transform" do
     @ds = @c.new(nil).from(:items)
   end
   
-  specify "should raise SequelError for invalid transformations" do
-    proc {@ds.transform(:x => 'mau')}.should raise_error(SequelError)
-    proc {@ds.transform(:x => :mau)}.should raise_error(SequelError)
-    proc {@ds.transform(:x => [])}.should raise_error(SequelError)
-    proc {@ds.transform(:x => ['mau'])}.should raise_error(SequelError)
-    proc {@ds.transform(:x => [proc {|v|}, proc {|v|}])}.should_not raise_error(SequelError)
+  specify "should raise Sequel::Error for invalid transformations" do
+    proc {@ds.transform(:x => 'mau')}.should raise_error(Sequel::Error::InvalidTransform)
+    proc {@ds.transform(:x => :mau)}.should raise_error(Sequel::Error::InvalidTransform)
+    proc {@ds.transform(:x => [])}.should raise_error(Sequel::Error::InvalidTransform)
+    proc {@ds.transform(:x => ['mau'])}.should raise_error(Sequel::Error::InvalidTransform)
+    proc {@ds.transform(:x => [proc {|v|}, proc {|v|}])}.should_not raise_error(Sequel::Error::InvalidTransform)
   end
   
   specify "should support stock YAML transformation" do

data/spec/migration_spec.rb

@@ -35,7 +35,7 @@ context "Migration#apply" do
   end
   
   specify "should raise for an invalid direction" do
-    proc {@migration.apply(@db, :hahaha)}.should raise_error(SequelError)
+    proc {@migration.apply(@db, :hahaha)}.should raise_error(ArgumentError)
   end
   
   specify "should apply the up direction correctly" do

data/spec/model_spec.rb

@@ -54,9 +54,9 @@ describe Sequel::Model, 'w/o primary key' do
     Class.new(Sequel::Model) { no_primary_key }.primary_key.should be_nil
   end
 
-  it "should raise a SequelError on 'this'" do
+  it "should raise a Sequel::Error on 'this'" do
     instance = Class.new(Sequel::Model) { no_primary_key }.new
-    proc { instance.this }.should raise_error(SequelError)
+    proc { instance.this }.should raise_error(Sequel::Error)
   end
 end
 
@@ -418,10 +418,10 @@ context "Model attribute accessors" do
     o = @c.new
     
     proc {o.x}.should_not raise_error
-    proc {o.xx}.should raise_error(SequelError)
+    proc {o.xx}.should raise_error(Sequel::Error)
     
     proc {o.x = 3}.should_not raise_error
-    proc {o.yy = 4}.should raise_error(SequelError)
+    proc {o.yy = 4}.should raise_error(Sequel::Error)
 
     proc {o.yy?}.should raise_error(NoMethodError)
   end
@@ -429,18 +429,18 @@ context "Model attribute accessors" do
   specify "should not raise for a column not in the dataset, but for which there's a value" do
     o = @c.new
     
-    proc {o.xx}.should raise_error(SequelError)
-    proc {o.yy}.should raise_error(SequelError)
+    proc {o.xx}.should raise_error(Sequel::Error)
+    proc {o.yy}.should raise_error(Sequel::Error)
     
     o.values[:xx] = 123
     o.values[:yy] = nil
     
-    proc {o.xx; o.yy}.should_not raise_error(SequelError)
+    proc {o.xx; o.yy}.should_not raise_error(Sequel::Error)
     
     o.xx.should == 123
     o.yy.should == nil
     
-    proc {o.xx = 3}.should raise_error(SequelError)
+    proc {o.xx = 3}.should raise_error(Sequel::Error)
   end
 end
 
@@ -704,8 +704,8 @@ context "Model.[]" do
   
   specify "should raise for boolean argument (mistaken comparison)" do
     # This in order to prevent stuff like Model[:a == 'b']
-    proc {@c[:a == 1]}.should raise_error(SequelError)
-    proc {@c[:a != 1]}.should raise_error(SequelError)
+    proc {@c[:a == 1]}.should raise_error(Sequel::Error)
+    proc {@c[:a != 1]}.should raise_error(Sequel::Error)
   end
   
   specify "should work correctly for custom primary key" do
@@ -829,10 +829,10 @@ context "A cached model" do
   
   specify "should raise error if attempting to generate cache_key and primary key value is null" do
     m = @c.new
-    proc {m.cache_key}.should raise_error(SequelError)
+    proc {m.cache_key}.should raise_error(Sequel::Error)
     
     m.values[:id] = 1
-    proc {m.cache_key}.should_not raise_error(SequelError)
+    proc {m.cache_key}.should_not raise_error(Sequel::Error)
   end
   
   specify "should set the cache when reading from the database" do
@@ -1052,11 +1052,11 @@ context "Model#pk" do
   specify "should raise if no primary key" do
     @m.set_primary_key nil
     m = @m.new(:id => 111, :x => 2, :y => 3)
-    proc {m.pk}.should raise_error(SequelError)
+    proc {m.pk}.should raise_error(Sequel::Error)
 
     @m.no_primary_key
     m = @m.new(:id => 111, :x => 2, :y => 3)
-    proc {m.pk}.should raise_error(SequelError)
+    proc {m.pk}.should raise_error(Sequel::Error)
   end
 end
 
@@ -1085,11 +1085,11 @@ context "Model#pk_hash" do
   specify "should raise if no primary key" do
     @m.set_primary_key nil
     m = @m.new(:id => 111, :x => 2, :y => 3)
-    proc {m.pk_hash}.should raise_error(SequelError)
+    proc {m.pk_hash}.should raise_error(Sequel::Error)
 
     @m.no_primary_key
     m = @m.new(:id => 111, :x => 2, :y => 3)
-    proc {m.pk_hash}.should raise_error(SequelError)
+    proc {m.pk_hash}.should raise_error(Sequel::Error)
   end
 end
 

data/spec/sequelizer_spec.rb

@@ -16,12 +16,12 @@ context "Proc#to_sql" do
   
   def DS.match_expr(l, r)
     case r
-    when String:
+    when String
       "(#{literal(l)} LIKE #{literal(r)})"
-    when Regexp:
+    when Regexp
       "(#{literal(l)} ~ #{literal(r.source)})"
     else
-      raise SequelError, "Unsupported match pattern class (#{r.class})."
+      raise Sequel::Error, "Unsupported match pattern class (#{r.class})."
     end
   end
   
@@ -105,7 +105,7 @@ context "Proc#to_sql" do
   end
   
   specify "should raise on =~ operator for unsupported types" do
-    proc {proc {:x =~ 123}.to_sql}.should raise_error(SequelError)
+    proc {proc {:x =~ 123}.to_sql}.should raise_error(Sequel::Error)
   end
   
   specify "should support != operator" do
@@ -201,9 +201,9 @@ context "Proc#to_sql" do
   end
   
   specify "should complain if someone is crazy" do
-    proc {proc {def x; 1; end}.to_sql}.should raise_error(SequelError)
+    proc {proc {def x; 1; end}.to_sql}.should raise_error(Sequel::Error::InvalidExpression)
     a = 1
-    proc {proc {a = 1}.to_sql}.should raise_error(SequelError)
+    proc {proc {a = 1}.to_sql}.should raise_error(Sequel::Error::InvalidExpression)
   end
   
   specify "should support comparison to Range objects" do
@@ -378,7 +378,7 @@ context "Proc#to_sql stock" do
     ds = db[:items]
 
     p = proc {:x =~ /abc/}
-    proc {ds.proc_to_sql(p)}.should raise_error(SequelError)
+    proc {ds.proc_to_sql(p)}.should raise_error(Sequel::Error)
   end
 end
 

data/spec/spec.opts

@@ -0,0 +1,8 @@
+--colour
+--loadby
+mtime
+--backtrace
+--format
+specdoc
+--diff
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sequel
 version: !ruby/object:Gem::Version 
-  version: 0.4.4.1
+  version: 0.4.4.2
 platform: ruby
 authors: 
 - Sharon Rosner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2007-12-19 00:00:00 +02:00
+date: 2007-12-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,7 +54,6 @@ files:
 - README
 - Rakefile
 - bin/sequel
-- doc/rdoc
 - spec/adapters
 - spec/adapters/informix_spec.rb
 - spec/adapters/mysql_spec.rb
@@ -73,6 +72,7 @@ files:
 - spec/schema_generator_spec.rb
 - spec/schema_spec.rb
 - spec/sequelizer_spec.rb
+- spec/spec.opts
 - spec/spec_helper.rb
 - spec/worker_spec.rb
 - lib/sequel
@@ -103,7 +103,7 @@ files:
 - lib/sequel/dataset.rb
 - lib/sequel/db2.rb
 - lib/sequel/dbi.rb
-- lib/sequel/error.rb
+- lib/sequel/exceptions.rb
 - lib/sequel/informix.rb
 - lib/sequel/migration.rb
 - lib/sequel/model
@@ -142,7 +142,7 @@ rdoc_options:
 - README
 - --inline-source
 - --exclude
-- ^(examples|extras)\/
+- ^(examples|extras)/
 - --exclude
 - lib/sequel.rb
 require_paths: 

data/lib/sequel/error.rb

@@ -1,22 +0,0 @@
-# Represents an error raised in Sequel code.
-class SequelError < StandardError
-end
-
-# SequelRollbackError is a special error used to rollback a transactions.
-# A transaction block will catch this error and wont pass further up the stack.
-class SequelRollbackError < StandardError
-end
-
-# Object extensions
-class Object
-  # Cancels the current transaction without an error:
-  #
-  #   DB.tranaction do
-  #     ...
-  #     rollback! if failed_to_contact_client
-  #     ...
-  #   end
-  def rollback!
-    raise SequelRollbackError
-  end
-end