sequel 2.10.0 → 2.11.0

data/spec/sequel_model/record_spec.rb

@@ -968,7 +968,7 @@ describe Sequel::Model, "typecasting" do
 
   specify "should raise an error if invalid data is used in an integer field" do
     @c.instance_variable_set(:@db_schema, {:x=>{:type=>:integer}})
-    proc{@c.new.x = 'a'}.should raise_error
+    proc{@c.new.x = 'a'}.should raise_error(Sequel::Error::InvalidValue)
   end
 
   specify "should assign value if raise_on_typecast_failure is off and assigning invalid integer" do
@@ -992,7 +992,7 @@ describe Sequel::Model, "typecasting" do
 
   specify "should raise an error if invalid data is used in an float field" do
     @c.instance_variable_set(:@db_schema, {:x=>{:type=>:float}})
-    proc{@c.new.x = 'a'}.should raise_error
+    proc{@c.new.x = 'a'}.should raise_error(Sequel::Error::InvalidValue)
   end
 
   specify "should assign value if raise_on_typecast_failure is off and assigning invalid float" do
@@ -1019,7 +1019,7 @@ describe Sequel::Model, "typecasting" do
 
   specify "should raise an error if invalid data is used in an decimal field" do
     @c.instance_variable_set(:@db_schema, {:x=>{:type=>:decimal}})
-    proc{@c.new.x = Date.today}.should raise_error
+    proc{@c.new.x = Date.today}.should raise_error(Sequel::Error::InvalidValue)
   end
 
   specify "should assign value if raise_on_typecast_failure is off and assigning invalid decimal" do
@@ -1095,8 +1095,8 @@ describe Sequel::Model, "typecasting" do
 
   specify "should raise an error if invalid data is used in a date field" do
     @c.instance_variable_set(:@db_schema, {:x=>{:type=>:date}})
-    proc{@c.new.x = 'a'}.should raise_error
-    proc{@c.new.x = 100}.should raise_error
+    proc{@c.new.x = 'a'}.should raise_error(Sequel::Error::InvalidValue)
+    proc{@c.new.x = 100}.should raise_error(Sequel::Error::InvalidValue)
   end
 
   specify "should assign value if raise_on_typecast_failure is off and assigning invalid date" do
@@ -1122,8 +1122,8 @@ describe Sequel::Model, "typecasting" do
     @c.instance_variable_set(:@db_schema, {:x=>{:type=>:time}})
     proc{@c.new.x = '0000'}.should raise_error
     proc{@c.new.x = 'a'}.should_not raise_error # Valid Time
-    proc{@c.new.x = '2008-10-21'.to_date}.should raise_error
-    proc{@c.new.x = '2008-10-21'.to_datetime}.should raise_error
+    proc{@c.new.x = '2008-10-21'.to_date}.should raise_error(Sequel::Error::InvalidValue)
+    proc{@c.new.x = '2008-10-21'.to_datetime}.should raise_error(Sequel::Error::InvalidValue)
   end
 
   specify "should assign value if raise_on_typecast_failure is off and assigning invalid time" do
@@ -1164,8 +1164,8 @@ describe Sequel::Model, "typecasting" do
     proc{@c.new.x = '0000'}.should raise_error(Sequel::Error::InvalidValue)
     proc{@c.new.x = 'a'}.should_not raise_error # Valid Time
     Sequel.datetime_class = DateTime
-    proc{@c.new.x = '0000'}.should raise_error
-    proc{@c.new.x = 'a'}.should raise_error
+    proc{@c.new.x = '0000'}.should raise_error(Sequel::Error::InvalidValue)
+    proc{@c.new.x = 'a'}.should raise_error(Sequel::Error::InvalidValue)
   end
 
   specify "should assign value if raise_on_typecast_failure is off and assigning invalid datetime" do

data/spec/sequel_model/spec_helper.rb

@@ -73,6 +73,9 @@ class << Sequel::Model
     @db_schema = {}
     cols.each{|c| @db_schema[c] = {}}
   end
+  def simple_table
+    nil
+  end
 end
 
 Sequel::Model.db = MODEL_DB = MockDatabase.new

data/spec/sequel_model/validations_spec.rb

@@ -540,6 +540,50 @@ describe Sequel::Model do
     @m.value = false
     @m.should be_valid
   end
+  
+  specify "should validate inclusion_of with an array" do
+    @c.validates_inclusion_of :value, :in => [1,2]
+    @m.should_not be_valid
+    @m.value = 1
+    @m.should be_valid
+    @m.value = 1.5
+    @m.should_not be_valid
+    @m.value = 2
+    @m.should be_valid    
+    @m.value = 3
+    @m.should_not be_valid 
+  end
+  
+  specify "should validate inclusion_of with a range" do
+    @c.validates_inclusion_of :value, :in => 1..4
+    @m.should_not be_valid
+    @m.value = 1
+    @m.should be_valid
+    @m.value = 1.5
+    @m.should be_valid
+    @m.value = 0
+    @m.should_not be_valid
+    @m.value = 5
+    @m.should_not be_valid    
+  end
+  
+  specify "should raise an error if inclusion_of doesn't receive a valid :in option" do
+    lambda {
+      @c.validates_inclusion_of :value
+    }.should raise_error(ArgumentError)
+    
+    lambda {
+      @c.validates_inclusion_of :value, :in => 1
+    }.should raise_error(ArgumentError)
+  end
+  
+  specify "should raise an error if inclusion_of handles :allow_nil too" do
+    @c.validates_inclusion_of :value, :in => 1..4, :allow_nil => true
+    @m.value = nil
+    @m.should be_valid
+    @m.value = 0
+    @m.should_not be_valid
+  end
 
   specify "should validate presence_of with if => true" do
     @c.validates_presence_of :value, :if => :dont_skip
@@ -750,21 +794,37 @@ describe Sequel::Model, "Validations" do
   it "should validate that a column doesn't have a string value" do
     p = Class.new(Sequel::Model)
     p.class_eval do
-      columns :age
+      columns :age, :price, :confirmed
       self.raise_on_typecast_failure = false
       validates_not_string :age
+      validates_not_string :confirmed
+      validates_not_string :price, :message=>'is not valid'
       @db_schema = {:age=>{:type=>:integer}}
     end
     
-    @person = p.new :age => "a"
+    @person = p.new
+    @person.should be_valid
+
+    @person.confirmed = 't'
+    @person.should_not be_valid
+    @person.errors.full_messages.should == ['confirmed is a string']
+    @person.confirmed = true
+    @person.should be_valid
+
+    @person.age = 'a'
     @person.should_not be_valid
     @person.errors.full_messages.should == ['age is not a valid integer']
     @person.db_schema[:age][:type] = :datetime
     @person.should_not be_valid
     @person.errors.full_messages.should == ['age is not a valid datetime']
-    
     @person.age = 20
     @person.should be_valid
+
+    @person.price = 'a'
+    @person.should_not be_valid
+    @person.errors.full_messages.should == ['price is not valid']
+    @person.price = 20
+    @person.should be_valid
   end
   
   it "should validate numericality of column" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sequel
 version: !ruby/object:Gem::Version 
-  version: 2.10.0
+  version: 2.11.0
 platform: ruby
 authors: 
 - Jeremy Evans
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-03 00:00:00 -08:00
+date: 2009-03-02 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -29,6 +29,23 @@ extra_rdoc_files:
 - doc/prepared_statements.rdoc
 - doc/schema.rdoc
 - doc/sharding.rdoc
+- doc/release_notes/2.10.0.txt
+- doc/release_notes/2.9.0.txt
+- doc/release_notes/2.8.0.txt
+- doc/release_notes/2.7.0.txt
+- doc/release_notes/2.6.0.txt
+- doc/release_notes/2.5.0.txt
+- doc/release_notes/2.4.0.txt
+- doc/release_notes/2.3.0.txt
+- doc/release_notes/2.2.0.txt
+- doc/release_notes/2.1.0.txt
+- doc/release_notes/2.0.0.txt
+- doc/release_notes/1.5.0.txt
+- doc/release_notes/1.4.0.txt
+- doc/release_notes/1.1.txt
+- doc/release_notes/1.3.txt
+- doc/release_notes/1.0.txt
+- doc/release_notes/2.11.0.txt
 files: 
 - COPYING
 - CHANGELOG
@@ -41,6 +58,24 @@ files:
 - doc/prepared_statements.rdoc
 - doc/schema.rdoc
 - doc/sharding.rdoc
+- doc/release_notes
+- doc/release_notes/2.10.0.txt
+- doc/release_notes/2.9.0.txt
+- doc/release_notes/2.8.0.txt
+- doc/release_notes/2.7.0.txt
+- doc/release_notes/2.6.0.txt
+- doc/release_notes/2.5.0.txt
+- doc/release_notes/2.4.0.txt
+- doc/release_notes/2.3.0.txt
+- doc/release_notes/2.2.0.txt
+- doc/release_notes/2.1.0.txt
+- doc/release_notes/2.0.0.txt
+- doc/release_notes/1.5.0.txt
+- doc/release_notes/1.4.0.txt
+- doc/release_notes/1.1.txt
+- doc/release_notes/1.3.txt
+- doc/release_notes/1.0.txt
+- doc/release_notes/2.11.0.txt
 - spec/adapters
 - spec/adapters/ado_spec.rb
 - spec/adapters/informix_spec.rb
@@ -124,6 +159,10 @@ files:
 - lib/sequel_core/adapters/do/postgres.rb
 - lib/sequel_core/adapters/do/sqlite.rb
 - lib/sequel_core/adapters/firebird.rb
+- lib/sequel_core/adapters/utils
+- lib/sequel_core/adapters/utils/date_format.rb
+- lib/sequel_core/adapters/utils/stored_procedures.rb
+- lib/sequel_core/adapters/utils/unsupported.rb
 - lib/sequel_core/connection_pool.rb
 - lib/sequel_core/core_ext.rb
 - lib/sequel_core/core_sql.rb
@@ -139,8 +178,6 @@ files:
 - lib/sequel_core/dataset/query.rb
 - lib/sequel_core/dataset/schema.rb
 - lib/sequel_core/dataset/sql.rb
-- lib/sequel_core/dataset/unsupported.rb
-- lib/sequel_core/dataset/stored_procedures.rb
 - lib/sequel_core/deprecated.rb
 - lib/sequel_core/exceptions.rb
 - lib/sequel_core/migration.rb