sequel 2.1.0 → 2.2.0

data/spec/hooks_spec.rb

@@ -196,9 +196,16 @@ describe "Model#before_create && Model#after_create" do
     ]
   end
 
-  specify "should cancel the save if before_create returns false" do
+  specify ".create should cancel the save and raise an error if before_create returns false and raise_on_save_failure is true" do
     @c.before_create{false}
-    @c.create(:x => 2).should == false
+    proc{@c.create(:x => 2)}.should raise_error(Sequel::Error)
+    MODEL_DB.sqls.should == []
+  end
+
+  specify ".create should cancel the save and return nil if before_create returns false and raise_on_save_failure is false" do
+    @c.before_create{false}
+    @c.raise_on_save_failure = false
+    @c.create(:x => 2).should == nil
     MODEL_DB.sqls.should == []
   end
 end
@@ -223,9 +230,16 @@ describe "Model#before_update && Model#after_update" do
     ]
   end
 
-  specify "should cancel the save if before_update returns false" do
+  specify "#save should cancel the save and raise an error if before_update returns false and raise_on_save_failure is true" do
     @c.before_update{false}
-    @c.load(:id => 2233).save.should == false
+    proc{@c.load(:id => 2233).save}.should raise_error(Sequel::Error)
+    MODEL_DB.sqls.should == []
+  end
+
+  specify "#save should cancel the save and return nil if before_update returns false and raise_on_save_failure is false" do
+    @c.before_update{false}
+    @c.raise_on_save_failure = false
+    @c.load(:id => 2233).save.should == nil
     MODEL_DB.sqls.should == []
   end
 end
@@ -236,12 +250,12 @@ describe "Model#before_save && Model#after_save" do
 
     @c = Class.new(Sequel::Model(:items)) do
       columns :x
-      before_save {MODEL_DB << "BLAH before"}
       after_save {MODEL_DB << "BLAH after"}
     end
   end
   
   specify "should be called around record update" do
+    @c.before_save {MODEL_DB << "BLAH before"}
     m = @c.load(:id => 2233)
     m.save
     MODEL_DB.sqls.should == [
@@ -252,6 +266,7 @@ describe "Model#before_save && Model#after_save" do
   end
   
   specify "should be called around record creation" do
+    @c.before_save {MODEL_DB << "BLAH before"}
     @c.no_primary_key
     @c.create(:x => 2)
     MODEL_DB.sqls.should == [
@@ -261,10 +276,17 @@ describe "Model#before_save && Model#after_save" do
     ]
   end
 
-  specify "should cancel the save if before_save returns false" do
+  specify "#save should cancel the save and raise an error if before_save returns false and raise_on_save_failure is true" do
+    @c.before_save{false}
+    proc{@c.load(:id => 2233).save}.should raise_error(Sequel::Error)
+    MODEL_DB.sqls.should == []
+  end
+
+  specify "#save should cancel the save and return nil if before_save returns false and raise_on_save_failure is false" do
     @c.before_save{false}
-    @c.load(:id => 2233).save.should == false
-    MODEL_DB.sqls.should == ["BLAH before"]
+    @c.raise_on_save_failure = false
+    @c.load(:id => 2233).save.should == nil
+    MODEL_DB.sqls.should == []
   end
 end
 
@@ -292,9 +314,16 @@ describe "Model#before_destroy && Model#after_destroy" do
     ]
   end
 
-  specify "should cancel the destroy if before_destroy returns false" do
+  specify "#destroy should cancel the destroy and raise an error if before_destroy returns false and raise_on_save_failure is true" do
+    @c.before_destroy{false}
+    proc{@c.load(:id => 2233).destroy}.should raise_error(Sequel::Error)
+    MODEL_DB.sqls.should == []
+  end
+
+  specify "#destroy should cancel the destroy and return nil if before_destroy returns false and raise_on_save_failure is false" do
     @c.before_destroy{false}
-    @c.load(:id => 2233).destroy.should == false
+    @c.raise_on_save_failure = false
+    @c.load(:id => 2233).destroy.should == nil
     MODEL_DB.sqls.should == []
   end
 end
@@ -304,7 +333,6 @@ describe "Model#before_validation && Model#after_validation" do
     MODEL_DB.reset
 
     @c = Class.new(Sequel::Model(:items)) do
-      before_validation{MODEL_DB << "BLAH before"}
       after_validation{MODEL_DB << "BLAH after"}
 
       def self.validate(o)
@@ -320,6 +348,7 @@ describe "Model#before_validation && Model#after_validation" do
   end
   
   specify "should be called around validation" do
+    @c.before_validation{MODEL_DB << "BLAH before"}
     m = @c.new(:id => 2233)
     m.should be_valid
     MODEL_DB.sqls.should == ['BLAH before', 'BLAH after']
@@ -331,20 +360,29 @@ describe "Model#before_validation && Model#after_validation" do
   end
 
   specify "should be called when calling save" do
+    @c.before_validation{MODEL_DB << "BLAH before"}
     m = @c.new(:id => 2233)
     m.save.should == m
     MODEL_DB.sqls.should == ['BLAH before', 'BLAH after', 'CREATE BLAH']
 
     MODEL_DB.sqls.clear
     m = @c.new(:id => 22)
-    m.save.should == false
+    m.raise_on_save_failure = false
+    m.save.should == nil
     MODEL_DB.sqls.should == ['BLAH before', 'BLAH after']
   end
 
-  specify "should cancel the save if before_validation returns false" do
+  specify "#save should cancel the save and raise an error if before_validation returns false and raise_on_save_failure is true" do
     @c.before_validation{false}
-    @c.load(:id => 2233).save.should == false
-    MODEL_DB.sqls.should == ["BLAH before"]
+    proc{@c.load(:id => 2233).save}.should raise_error(Sequel::Error)
+    MODEL_DB.sqls.should == []
+  end
+
+  specify "#save should cancel the save and return nil if before_validation returns false and raise_on_save_failure is false" do
+    @c.before_validation{false}
+    @c.raise_on_save_failure = false
+    @c.load(:id => 2233).save.should == nil
+    MODEL_DB.sqls.should == []
   end
 end
 

data/spec/model_spec.rb

@@ -205,21 +205,21 @@ describe Sequel::Model, ".subset" do
     @c = Class.new(Sequel::Model(:items))
   end
 
-  pt_specify "should create a filter on the underlying dataset" do
+  specify "should create a filter on the underlying dataset" do
     proc {@c.new_only}.should raise_error(NoMethodError)
     
-    @c.subset(:new_only) {:age == 'new'}
+    @c.subset(:new_only) {:age < 'new'}
     
-    @c.new_only.sql.should == "SELECT * FROM items WHERE (age = 'new')"
-    @c.dataset.new_only.sql.should == "SELECT * FROM items WHERE (age = 'new')"
+    @c.new_only.sql.should == "SELECT * FROM items WHERE (age < 'new')"
+    @c.dataset.new_only.sql.should == "SELECT * FROM items WHERE (age < 'new')"
     
     @c.subset(:pricey) {:price > 100}
     
     @c.pricey.sql.should == "SELECT * FROM items WHERE (price > 100)"
     @c.dataset.pricey.sql.should == "SELECT * FROM items WHERE (price > 100)"
     
-    @c.pricey.new_only.sql.should == "SELECT * FROM items WHERE ((price > 100) AND (age = 'new'))"
-    @c.new_only.pricey.sql.should == "SELECT * FROM items WHERE ((age = 'new') AND (price > 100))"
+    @c.pricey.new_only.sql.should == "SELECT * FROM items WHERE ((price > 100) AND (age < 'new'))"
+    @c.new_only.pricey.sql.should == "SELECT * FROM items WHERE ((age < 'new') AND (price > 100))"
   end
 
 end
@@ -250,11 +250,11 @@ describe Sequel::Model, ".find" do
     $sqls.last.should == "SELECT * FROM items WHERE (name LIKE 'abc%') LIMIT 1"
   end
   
-  pt_specify "should accept filter blocks" do
-    @c.find {:id == 1}.should be_a_kind_of(@c)
-    $sqls.last.should == "SELECT * FROM items WHERE (id = 1) LIMIT 1"
+  specify "should accept filter blocks" do
+    @c.find{:id > 1}.should be_a_kind_of(@c)
+    $sqls.last.should == "SELECT * FROM items WHERE (id > 1) LIMIT 1"
 
-    @c.find {:x > 1 && :y < 2}.should be_a_kind_of(@c)
+    @c.find {(:x > 1) & (:y < 2)}.should be_a_kind_of(@c)
     $sqls.last.should == "SELECT * FROM items WHERE ((x > 1) AND (y < 2)) LIMIT 1"
   end
 
@@ -552,7 +552,7 @@ context "Model.db_schema" do
     def @dataset.def_mutation_method(*names);  end
   end
   
-  specify "should use the database's schema_for_table and set the columns" do
+  specify "should use the database's schema_for_table and set the columns and dataset columns" do
     d = @dataset.db
     def d.schema(table, opts = {})
       [[:x, {:type=>:integer}], [:y, {:type=>:string}]]
@@ -560,6 +560,7 @@ context "Model.db_schema" do
     @c.dataset = @dataset
     @c.db_schema.should == {:x=>{:type=>:integer}, :y=>{:type=>:string}}
     @c.columns.should == [:x, :y]
+    @c.dataset.instance_variable_get(:@columns).should == [:x, :y]
   end
 
   specify "should restrict the schema and columns for datasets with a :select option" do

data/spec/spec_helper.rb

@@ -65,10 +65,3 @@ class << Sequel::Model
 end
 
 Sequel::Model.db = MODEL_DB = MockDatabase.new
-
-class Spec::Example::ExampleGroup
-  def self.pt_specify(*args, &block)
-    specify(*args, &block) if defined?(ParseTree)
-  end 
-end
-

data/spec/validations_spec.rb

@@ -66,15 +66,11 @@ describe Sequel::Model do
   
   specify "should acccept validation definitions using validates_each" do
     @c.validates_each(:xx, :yy) {|o, a, v| o.errors[a] << 'too low' if v < 50}
-    
-    @c.validations[:xx].size.should == 1
-    @c.validations[:yy].size.should == 1
-    
     o = @c.new
-    @c.validations[:xx].first.call(o, :aa, 40)
-    @c.validations[:yy].first.call(o, :bb, 60)
-    
-    o.errors.full_messages.should == ['aa too low']
+    o.should_receive(:xx).once.and_return(40)
+    o.should_receive(:yy).once.and_return(60)
+    o.valid?.should == false
+    o.errors.full_messages.should == ['xx too low']
   end
 
   specify "should return true/false for has_validations?" do
@@ -83,18 +79,33 @@ describe Sequel::Model do
     @c.has_validations?.should == true
   end
   
+  specify "should overwrite existing validation with the same tag and attribute" do
+    @c.validates_each(:xx, :xx, :tag=>:low) {|o, a, v| o.xxx; o.errors[a] << 'too low' if v < 50}
+    @c.validates_each(:yy, :yy) {|o, a, v| o.yyy; o.errors[a] << 'too low' if v < 50}
+    @c.validates_presence_of(:zz, :zz)
+    o = @c.new
+    def o.zz
+      @a ||= 0
+      @a += 1
+    end
+    o.should_receive(:xx).once.and_return(40)
+    o.should_receive(:yy).once.and_return(60)
+    o.should_receive(:xxx).once
+    o.should_receive(:yyy).twice
+    o.valid?.should == false
+    o.zz.should == 2
+    o.errors.full_messages.should == ['xx too low']
+  end
+
   specify "should provide a validates method that takes block with validation definitions" do
     @c.validates do
       coolness_of :blah
     end
     @c.validations[:blah].should_not be_empty
-
     o = @c.new
-    @c.validations[:blah].first.call(o, :ttt, 40)
-    o.errors.full_messages.should == ['ttt is not cool']
-    o.errors.clear
-    @c.validations[:blah].first.call(o, :ttt, :cool)
-    o.errors.should be_empty
+    o.should_receive(:blah).once.and_return(nil)
+    o.valid?.should == false
+    o.errors.full_messages.should == ['blah is not cool']
   end
 end
 
@@ -385,6 +396,12 @@ describe Sequel::Model do
     @m.should_not be_valid
     @m.value = 1234
     @m.should be_valid
+    @m.value = nil
+    @m.should_not be_valid
+    @m.value = true
+    @m.should be_valid
+    @m.value = false
+    @m.should be_valid
   end
 
   specify "should validate presence_of with if => true" do
@@ -753,6 +770,7 @@ describe "Model#save" do
   end
 
   specify "should save only if validations pass" do
+    @m.raise_on_save_failure = false
     @m.should_not be_valid
     @m.save
     MODEL_DB.sqls.should be_empty
@@ -763,7 +781,12 @@ describe "Model#save" do
     MODEL_DB.sqls.should == ['UPDATE people SET id = 5 WHERE (id = 5)']
   end
   
-  specify "should return false if validations fail" do
-    @m.save.should == false
+  specify "should raise error if validations fail and raise_on_save_faiure is true" do
+    proc{@m.save}.should raise_error(Sequel::Error)
+  end
+  
+  specify "should return nil if validations fail and raise_on_save_faiure is false" do
+    @m.raise_on_save_failure = false
+    @m.save.should == nil
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sequel
 version: !ruby/object:Gem::Version 
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors: 
 - Jeremy Evans
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-17 00:00:00 -07:00
+date: 2008-07-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.1.0
+        version: 2.2.0
     version: 
 description: "The Database Toolkit for Ruby: Model Classes"
 email: code@jeremyevans.net
@@ -31,10 +31,12 @@ extra_rdoc_files:
 - README
 - CHANGELOG
 - COPYING
+- doc/advanced_associations.rdoc
 files: 
 - COPYING
 - README
 - Rakefile
+- doc/advanced_associations.rdoc
 - spec/associations_spec.rb
 - spec/base_spec.rb
 - spec/caching_spec.rb
@@ -49,8 +51,8 @@ files:
 - spec/spec_helper.rb
 - spec/validations_spec.rb
 - spec/inflector_spec.rb
-- spec/dataset_methods_spec.rb
 - spec/association_reflection_spec.rb
+- spec/dataset_methods_spec.rb
 - lib/sequel.rb
 - lib/sequel_model.rb
 - lib/sequel_model