sequel 3.13.0 → 3.14.0

data/spec/model/associations_spec.rb

@@ -1316,7 +1316,7 @@ describe Sequel::Model, "one_to_many" do
     @c2.one_to_many :attributes, :class => @c1
     n = @c2.new(:id => 1234)
     a = @c1.new(:id => 2345)
-    def a.valid?; false; end
+    def a.valid?(opts); false; end
     proc{n.add_attribute(a)}.should raise_error(Sequel::Error)
     proc{n.remove_attribute(a)}.should raise_error(Sequel::Error)
   end
@@ -1325,7 +1325,7 @@ describe Sequel::Model, "one_to_many" do
     @c2.one_to_many :attributes, :class => @c1, :validate=>false
     n = @c2.new(:id => 1234)
     a = @c1.new(:id => 2345)
-    def a.valid?; false; end
+    def a.valid?(opts); false; end
     n.add_attribute(a).should == a
     n.remove_attribute(a).should == a
   end
@@ -2199,7 +2199,7 @@ describe Sequel::Model, "many_to_many" do
     @c2.many_to_many :attributes, :class => @c1 
     n = @c1.new
     a = @c2.load(:id=>123)
-    def n.valid?; false; end
+    def n.valid?(opts); false; end
     proc{a.add_attribute(n)}.should raise_error(Sequel::ValidationFailed)
   end
 
@@ -2208,7 +2208,7 @@ describe Sequel::Model, "many_to_many" do
     n = @c1.new
     n.raise_on_save_failure = false
     a = @c2.load(:id=>123)
-    def n.valid?; false; end
+    def n.valid?(opts); false; end
     proc{a.add_attribute(n)}.should raise_error(Sequel::Error)
   end
 
@@ -2216,7 +2216,7 @@ describe Sequel::Model, "many_to_many" do
     @c2.many_to_many :attributes, :class => @c1, :validate=>false
     n = @c1.new
     a = @c2.load(:id=>123)
-    def n.valid?; false; end
+    def n.valid?(opts); false; end
     a.add_attribute(n)
     n.new?.should == false
   end

data/spec/model/dataset_methods_spec.rb

@@ -12,6 +12,7 @@ describe Sequel::Model::DatasetMethods, "#destroy"  do
       end
     end
     @d = @c.dataset
+    MODEL_DB.reset
   end
 
   it "should instantiate objects in the dataset and call destroy on each" do
@@ -37,6 +38,18 @@ describe Sequel::Model::DatasetMethods, "#destroy"  do
     end
     @d.destroy.should == 0
   end
+
+  it "should use a transaction if use_transactions is true for the model" do
+    @c.use_transactions = true
+    @d.destroy
+    MODEL_DB.sqls.should == ["BEGIN", "SELECT * FROM items", "COMMIT"]
+  end
+
+  it "should not use a transaction if use_transactions is false for the model" do
+    @c.use_transactions = false
+    @d.destroy
+    MODEL_DB.sqls.should == ["SELECT * FROM items"]
+  end
 end
 
 describe Sequel::Model::DatasetMethods, "#to_hash"  do

data/spec/model/hooks_spec.rb

@@ -89,6 +89,14 @@ describe "Model#before_update && Model#after_update" do
     MODEL_DB.sqls.should == []
   end
 
+  specify "#save should cancel the save and raise an error if before_update returns false and raise_on_failure option is true" do
+    @c.send(:define_method, :before_update){false}
+    @c.raise_on_save_failure = false
+    proc{@c.load(:id => 2233).save(:raise_on_failure => true)}.should_not raise_error(Sequel::ValidationFailed)
+    proc{@c.load(:id => 2233).save(:raise_on_failure => true)}.should raise_error(Sequel::BeforeHookFailed)
+    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.send(:define_method, :before_update){false}
     @c.raise_on_save_failure = false
@@ -137,6 +145,14 @@ describe "Model#before_save && Model#after_save" do
     MODEL_DB.sqls.should == []
   end
 
+  specify "#save should cancel the save and raise an error if before_save returns false and raise_on_failure option is true" do
+    @c.send(:define_method, :before_save){false}
+    @c.raise_on_save_failure = false
+    proc{@c.load(:id => 2233).save(:raise_on_failure => true)}.should_not raise_error(Sequel::ValidationFailed)
+    proc{@c.load(:id => 2233).save(:raise_on_failure => true)}.should raise_error(Sequel::BeforeHookFailed)
+    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.send(:define_method, :before_save){false}
     @c.raise_on_save_failure = false
@@ -176,6 +192,13 @@ describe "Model#before_destroy && Model#after_destroy" do
     MODEL_DB.sqls.should == []
   end
 
+  specify "#destroy should cancel the destroy and raise an error if before_destroy returns false and raise_on_failure option is true" do
+    @c.send(:define_method, :before_destroy){false}
+    @c.raise_on_save_failure = false
+    proc{@c.load(:id => 2233).destroy(:raise_on_failure => true)}.should raise_error(Sequel::BeforeHookFailed)
+    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.send(:define_method, :before_destroy){false}
     @c.raise_on_save_failure = false
@@ -231,6 +254,14 @@ describe "Model#before_validation && Model#after_validation" do
     MODEL_DB.sqls.should == []
   end
 
+  specify "#save should cancel the save and raise an error if before_validation returns false and raise_on_failure option is true" do
+    @c.send(:define_method, :before_validation){false}
+    @c.raise_on_save_failure = false
+    proc{@c.load(:id => 2233).save(:raise_on_failure => true)}.should_not raise_error(Sequel::ValidationFailed)
+    proc{@c.load(:id => 2233).save(:raise_on_failure => true)}.should raise_error(Sequel::BeforeHookFailed)
+    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.send(:define_method, :before_validation){false}
     @c.raise_on_save_failure = false

data/spec/model/record_spec.rb

@@ -243,6 +243,18 @@ describe "Model#save" do
     MODEL_DB.reset
   end
 
+  it "should rollback if before_save returns false and :raise_on_failure option is true" do
+    o = @c.load(:id => 3, :x => 1, :y => nil)
+    o.use_transactions = true
+    o.raise_on_save_failure = false
+    def o.before_save
+      false
+    end
+    proc { o.save(:y, :raise_on_failure => true) }.should raise_error(Sequel::BeforeHookFailed)
+    MODEL_DB.sqls.should == ["BEGIN", "ROLLBACK"]
+    MODEL_DB.reset
+  end
+
   it "should not rollback outer transactions if before_save returns false and raise_on_save_failure = false" do
     o = @c.load(:id => 3, :x => 1, :y => nil)
     o.use_transactions = true
@@ -386,7 +398,7 @@ describe "Model#save_changes" do
 
   it "should take options passed to save" do
     o = @c.new(:x => 1)
-    def o.valid?; false; end
+    def o.before_validation; false; end
     proc{o.save_changes}.should raise_error(Sequel::Error)
     MODEL_DB.sqls.should == []
     o.save_changes(:validate=>false)
@@ -944,17 +956,22 @@ end
 describe Sequel::Model, "#exists?" do
   before(:each) do
     @model = Class.new(Sequel::Model(:items))
-    @m = @model.new
+    @ds = @model.dataset
+    def @ds.fetch_rows(sql)
+      db.execute(sql)
+      yield(:x=>1) if sql =~ /id = 1/
+    end
+    MODEL_DB.reset
   end
 
-  it "should returns true when #this.count > 0" do
-    @m.this.meta_def(:count) {1}
-    @m.exists?.should be_true
+  it "should do a query to check if the record exists" do
+    @model.load(:id=>1).exists?.should be_true
+    MODEL_DB.sqls.should == ['SELECT 1 FROM items WHERE (id = 1) LIMIT 1']
   end
 
   it "should return false when #this.count == 0" do
-    @m.this.meta_def(:count) {0}
-    @m.exists?.should be_false
+    @model.load(:id=>2).exists?.should be_false
+    MODEL_DB.sqls.should == ['SELECT 1 FROM items WHERE (id = 2) LIMIT 1']
   end
 end
 

data/spec/model/validations_spec.rb

@@ -128,7 +128,7 @@ describe "Model#save" do
       columns :id, :x
 
       def validate
-        errors[:id] << 'blah' unless x == 7
+        errors.add(:id, 'blah') unless x == 7
       end
     end
     @m = @c.load(:id => 4, :x=>6)
@@ -153,11 +153,16 @@ describe "Model#save" do
     @m.save(:validate=>false)
     MODEL_DB.sqls.should == ['UPDATE people SET x = 6 WHERE (id = 4)']
   end
-    
+
   specify "should raise error if validations fail and raise_on_save_faiure is true" do
-    proc{@m.save}.should raise_error(Sequel::ValidationFailed){ |e| e.errors.should == @m.errors }
+    proc{@m.save}.should raise_error(Sequel::ValidationFailed){|e| e.errors.should == @m.errors }
   end
-  
+
+  specify "should raise error if validations fail and :raise_on_failure option is true" do
+    @m.raise_on_save_failure = false
+    proc{@m.save(:raise_on_failure => true)}.should raise_error(Sequel::ValidationFailed)
+  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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sequel
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 63
   prerelease: false
   segments: 
   - 3
-  - 13
+  - 14
   - 0
-  version: 3.13.0
+  version: 3.14.0
 platform: ruby
 authors: 
 - Jeremy Evans
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-01 00:00:00 -07:00
+date: 2010-08-02 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -77,6 +77,7 @@ extra_rdoc_files:
 - doc/release_notes/3.11.0.txt
 - doc/release_notes/3.12.0.txt
 - doc/release_notes/3.13.0.txt
+- doc/release_notes/3.14.0.txt
 files: 
 - COPYING
 - CHANGELOG
@@ -121,6 +122,7 @@ files:
 - doc/release_notes/3.11.0.txt
 - doc/release_notes/3.12.0.txt
 - doc/release_notes/3.13.0.txt
+- doc/release_notes/3.14.0.txt
 - doc/sharding.rdoc
 - doc/sql.rdoc
 - doc/virtual_rows.rdoc