sequel 4.22.0 → 4.23.0

data/spec/extensions/input_transformer_spec.rb

@@ -10,45 +10,45 @@ describe "Sequel::Plugins::InputTransformer" do
 
   it "should apply transformation to input" do
     @o.name = ' name '
-    @o.name.should == ' eman '
+    @o.name.must_equal ' eman '
     @o.name = [1, 2, 3]
-    @o.name.should == [1, 2, 3]
+    @o.name.must_equal [1, 2, 3]
   end
 
   it "should not apply any transformers by default" do
     c = Class.new(Sequel::Model)
     c.columns :name, :b
     c.plugin :input_transformer
-    c.new(:name => ' name ').name.should == ' name '
+    c.new(:name => ' name ').name.must_equal ' name '
   end
 
   it "should allow skipping of columns using .skip_input_transformer" do
     @c.skip_input_transformer :reverser, :name
     v = ' name '
     @o.name = v
-    @o.name.should equal(v)
+    @o.name.must_be_same_as(v)
   end
 
   it "should work correctly in subclasses" do
     o = Class.new(@c).new
     o.name = ' name '
-    o.name.should == ' eman '
+    o.name.must_equal ' eman '
   end
 
   it "should raise an error if adding input filter without name" do
-    proc{@c.add_input_transformer(nil){}}.should raise_error(Sequel::Error)
-    proc{@c.plugin(:input_transformer){}}.should raise_error(Sequel::Error)
+    proc{@c.add_input_transformer(nil){}}.must_raise(Sequel::Error)
+    proc{@c.plugin(:input_transformer){}}.must_raise(Sequel::Error)
   end
 
   it "should raise an error if adding input filter without block" do
-    proc{@c.add_input_transformer(:foo)}.should raise_error(Sequel::Error)
-    proc{@c.plugin(:input_transformer, :foo)}.should raise_error(Sequel::Error)
+    proc{@c.add_input_transformer(:foo)}.must_raise(Sequel::Error)
+    proc{@c.plugin(:input_transformer, :foo)}.must_raise(Sequel::Error)
   end
 
   it "should apply multiple input transformers in reverse order of their call" do
     @c.add_input_transformer(:add_bar){|v| v << 'bar'}
     @c.add_input_transformer(:add_foo){|v| v << 'foo'}
     @o.name = ' name '
-    @o.name.should == 'raboof eman '
+    @o.name.must_equal 'raboof eman '
   end
 end

data/spec/extensions/insert_returning_select_spec.rb

@@ -14,23 +14,23 @@ describe "Sequel::Plugins::InsertReturningSelect" do
 
   it "should add a returning clause when inserting using selected columns" do
     @Album.plugin :insert_returning_select
-    @Album.create(:x=>2).should == @Album.load(:id=>1, :x=>2)
-    @db.sqls.should == ['INSERT INTO albums (x) VALUES (2) RETURNING id, x']
+    @Album.create(:x=>2).must_equal @Album.load(:id=>1, :x=>2)
+    @db.sqls.must_equal ['INSERT INTO albums (x) VALUES (2) RETURNING id, x']
   end
 
   it "should not add a returning clause if selection does not consist of just columns" do
     @Album.dataset = @Album.dataset.select_append(Sequel.as(1, :b))
     @Album.plugin :insert_returning_select
     @db.sqls.clear
-    @Album.create(:x=>2).should == @Album.load(:id=>1, :x=>2)
-    @db.sqls.should == ['INSERT INTO albums (x) VALUES (2)', 'SELECT id, x, 1 AS b FROM albums WHERE (id = 1) LIMIT 1']
+    @Album.create(:x=>2).must_equal @Album.load(:id=>1, :x=>2)
+    @db.sqls.must_equal ['INSERT INTO albums (x) VALUES (2)', 'SELECT id, x, 1 AS b FROM albums WHERE (id = 1) LIMIT 1']
   end
 
   it "should not add a returning clause if database doesn't support it" do
     @db.extend_datasets{def supports_returning?(_) false end}
     @Album.plugin :insert_returning_select
-    @Album.create(:x=>2).should == @Album.load(:id=>1, :x=>2)
-    @db.sqls.should == ['INSERT INTO albums (x) VALUES (2)', 'SELECT id, x FROM albums WHERE (id = 1) LIMIT 1']
+    @Album.create(:x=>2).must_equal @Album.load(:id=>1, :x=>2)
+    @db.sqls.must_equal ['INSERT INTO albums (x) VALUES (2)', 'SELECT id, x FROM albums WHERE (id = 1) LIMIT 1']
   end
 
   it "should work correctly with subclasses" do
@@ -40,7 +40,7 @@ describe "Sequel::Plugins::InsertReturningSelect" do
     b.columns :id, :x
     b.dataset = @db[:albums].select(:id, :x)
     @db.sqls.clear
-    b.create(:x=>2).should == b.load(:id=>1, :x=>2)
-    @db.sqls.should == ['INSERT INTO albums (x) VALUES (2) RETURNING id, x']
+    b.create(:x=>2).must_equal b.load(:id=>1, :x=>2)
+    @db.sqls.must_equal ['INSERT INTO albums (x) VALUES (2) RETURNING id, x']
   end
 end

data/spec/extensions/instance_filters_spec.rb

@@ -10,70 +10,70 @@ describe "instance_filters plugin" do
     DB.sqls
   end
 
-  specify "should raise an error when updating a stale record" do
+  it "should raise an error when updating a stale record" do
     @p.update(:name=>'Bob')
-    DB.sqls.should == ["UPDATE people SET name = 'Bob' WHERE (id = 1)"]
+    DB.sqls.must_equal ["UPDATE people SET name = 'Bob' WHERE (id = 1)"]
     @p.instance_filter(:name=>'Jim')
     @p.this.numrows = 0
-    proc{@p.update(:name=>'Joe')}.should raise_error(Sequel::Plugins::InstanceFilters::Error)
-    DB.sqls.should == ["UPDATE people SET name = 'Joe' WHERE ((id = 1) AND (name = 'Jim'))"]
+    proc{@p.update(:name=>'Joe')}.must_raise(Sequel::Plugins::InstanceFilters::Error)
+    DB.sqls.must_equal ["UPDATE people SET name = 'Joe' WHERE ((id = 1) AND (name = 'Jim'))"]
   end 
 
-  specify "should raise an error when destroying a stale record" do
+  it "should raise an error when destroying a stale record" do
     @p.destroy
-    DB.sqls.should == ["DELETE FROM people WHERE id = 1"]
+    DB.sqls.must_equal ["DELETE FROM people WHERE id = 1"]
     @p.instance_filter(:name=>'Jim')
     @p.this.numrows = 0
-    proc{@p.destroy}.should raise_error(Sequel::Plugins::InstanceFilters::Error)
-    DB.sqls.should == ["DELETE FROM people WHERE ((id = 1) AND (name = 'Jim'))"]
+    proc{@p.destroy}.must_raise(Sequel::Plugins::InstanceFilters::Error)
+    DB.sqls.must_equal ["DELETE FROM people WHERE ((id = 1) AND (name = 'Jim'))"]
   end 
   
-  specify "should work when using the prepared_statements plugin" do
+  it "should work when using the prepared_statements plugin" do
     @c.plugin :prepared_statements
 
     @p.update(:name=>'Bob')
-    DB.sqls.should == ["UPDATE people SET name = 'Bob' WHERE (id = 1)"]
+    DB.sqls.must_equal ["UPDATE people SET name = 'Bob' WHERE (id = 1)"]
     @p.instance_filter(:name=>'Jim')
     @p.this.numrows = 0
-    proc{@p.update(:name=>'Joe')}.should raise_error(Sequel::Plugins::InstanceFilters::Error)
-    DB.sqls.should == ["UPDATE people SET name = 'Joe' WHERE ((id = 1) AND (name = 'Jim'))"]
+    proc{@p.update(:name=>'Joe')}.must_raise(Sequel::Plugins::InstanceFilters::Error)
+    DB.sqls.must_equal ["UPDATE people SET name = 'Joe' WHERE ((id = 1) AND (name = 'Jim'))"]
 
     @p = @c.load(:id=>1, :name=>'John', :num=>1)
     @p.this.numrows = 1
     @p.destroy
-    DB.sqls.should == ["DELETE FROM people WHERE (id = 1)"]
+    DB.sqls.must_equal ["DELETE FROM people WHERE (id = 1)"]
     @p.instance_filter(:name=>'Jim')
     @p.this.numrows = 0
-    proc{@p.destroy}.should raise_error(Sequel::Plugins::InstanceFilters::Error)
-    DB.sqls.should == ["DELETE FROM people WHERE ((id = 1) AND (name = 'Jim'))"]
+    proc{@p.destroy}.must_raise(Sequel::Plugins::InstanceFilters::Error)
+    DB.sqls.must_equal ["DELETE FROM people WHERE ((id = 1) AND (name = 'Jim'))"]
     
-    @c.create.should be_a_kind_of(@c)
+    @c.create.must_be_kind_of(@c)
   end 
   
-  specify "should apply all instance filters" do
+  it "should apply all instance filters" do
     @p.instance_filter(:name=>'Jim')
     @p.instance_filter{num > 2}
     @p.update(:name=>'Bob')
-    DB.sqls.should == ["UPDATE people SET name = 'Bob' WHERE ((id = 1) AND (name = 'Jim') AND (num > 2))"]
+    DB.sqls.must_equal ["UPDATE people SET name = 'Bob' WHERE ((id = 1) AND (name = 'Jim') AND (num > 2))"]
   end 
 
-  specify "should drop instance filters after updating" do
+  it "should drop instance filters after updating" do
     @p.instance_filter(:name=>'Joe')
     @p.update(:name=>'Joe')
-    DB.sqls.should == ["UPDATE people SET name = 'Joe' WHERE ((id = 1) AND (name = 'Joe'))"]
+    DB.sqls.must_equal ["UPDATE people SET name = 'Joe' WHERE ((id = 1) AND (name = 'Joe'))"]
     @p.update(:name=>'Bob')
-    DB.sqls.should == ["UPDATE people SET name = 'Bob' WHERE (id = 1)"]
+    DB.sqls.must_equal ["UPDATE people SET name = 'Bob' WHERE (id = 1)"]
   end
 
-  specify "shouldn't allow instance filters on frozen objects" do
+  it "shouldn't allow instance filters on frozen objects" do
     @p.instance_filter(:name=>'Joe')
     @p.freeze
-    proc{@p.instance_filter(:name=>'Jim')}.should raise_error
+    proc{@p.instance_filter(:name=>'Jim')}.must_raise
   end 
 
-  specify "should have dup duplicate internal structures" do
+  it "should have dup duplicate internal structures" do
     @p.instance_filter(:name=>'Joe')
-    @p.dup.send(:instance_filters).should == @p.send(:instance_filters)
-    @p.dup.send(:instance_filters).should_not equal(@p.send(:instance_filters))
+    @p.dup.send(:instance_filters).must_equal @p.send(:instance_filters)
+    @p.dup.send(:instance_filters).wont_be_same_as(@p.send(:instance_filters))
   end 
 end

data/spec/extensions/instance_hooks_spec.rb

@@ -20,19 +20,19 @@ describe "InstanceHooks plugin" do
     @o.before_create_hook{r 2}
     @o.after_create_hook{r 3}
     @o.before_create_hook{r 4}
-    @o.save.should_not == nil
-    @r.should == [4, 2, 1, 3]
+    @o.save.wont_equal nil
+    @r.must_equal [4, 2, 1, 3]
   end
 
   it "should cancel the save if before_create_hook block returns false" do
     @o.after_create_hook{r 1}
     @o.before_create_hook{r false}
     @o.before_create_hook{r 4}
-    @o.save.should == nil
-    @r.should == [4, false]
+    @o.save.must_equal nil
+    @r.must_equal [4, false]
     @r.clear
-    @o.save.should == nil
-    @r.should == [4, false]
+    @o.save.must_equal nil
+    @r.must_equal [4, false]
   end
 
   it "should support before_update_hook and after_update_hook" do
@@ -40,21 +40,21 @@ describe "InstanceHooks plugin" do
     @x.before_update_hook{r 2}
     @x.after_update_hook{r 3}
     @x.before_update_hook{r 4}
-    @x.save.should_not == nil
-    @r.should == [4, 2, 1, 3]
-    @x.save.should_not == nil
-    @r.should == [4, 2, 1, 3]
+    @x.save.wont_equal nil
+    @r.must_equal [4, 2, 1, 3]
+    @x.save.wont_equal nil
+    @r.must_equal [4, 2, 1, 3]
   end
 
   it "should cancel the save if before_update_hook block returns false" do
     @x.after_update_hook{r 1}
     @x.before_update_hook{r false}
     @x.before_update_hook{r 4}
-    @x.save.should == nil
-    @r.should == [4, false]
+    @x.save.must_equal nil
+    @r.must_equal [4, false]
     @r.clear
-    @x.save.should == nil
-    @r.should == [4, false]
+    @x.save.must_equal nil
+    @r.must_equal [4, false]
   end
 
   it "should support before_save_hook and after_save_hook" do
@@ -62,36 +62,36 @@ describe "InstanceHooks plugin" do
     @o.before_save_hook{r 2}
     @o.after_save_hook{r 3}
     @o.before_save_hook{r 4}
-    @o.save.should_not == nil
-    @r.should == [4, 2, 1, 3]
+    @o.save.wont_equal nil
+    @r.must_equal [4, 2, 1, 3]
     @r.clear
     
     @x.after_save_hook{r 1}
     @x.before_save_hook{r 2}
     @x.after_save_hook{r 3}
     @x.before_save_hook{r 4}
-    @x.save.should_not == nil
-    @r.should == [4, 2, 1, 3]
-    @x.save.should_not == nil
-    @r.should == [4, 2, 1, 3]
+    @x.save.wont_equal nil
+    @r.must_equal [4, 2, 1, 3]
+    @x.save.wont_equal nil
+    @r.must_equal [4, 2, 1, 3]
   end
 
   it "should cancel the save if before_save_hook block returns false" do
     @x.after_save_hook{r 1}
     @x.before_save_hook{r false}
     @x.before_save_hook{r 4}
-    @x.save.should == nil
-    @r.should == [4, false]
+    @x.save.must_equal nil
+    @r.must_equal [4, false]
     @r.clear
     
     @x.after_save_hook{r 1}
     @x.before_save_hook{r false}
     @x.before_save_hook{r 4}
-    @x.save.should == nil
-    @r.should == [4, false]
+    @x.save.must_equal nil
+    @r.must_equal [4, false]
     @r.clear
-    @x.save.should == nil
-    @r.should == [4, false]
+    @x.save.must_equal nil
+    @r.must_equal [4, false]
   end
 
   it "should support before_destroy_hook and after_destroy_hook" do
@@ -99,16 +99,16 @@ describe "InstanceHooks plugin" do
     @x.before_destroy_hook{r 2}
     @x.after_destroy_hook{r 3}
     @x.before_destroy_hook{r 4}
-    @x.destroy.should_not == nil
-    @r.should == [4, 2, 1, 3]
+    @x.destroy.wont_equal nil
+    @r.must_equal [4, 2, 1, 3]
   end
 
   it "should cancel the destroy if before_destroy_hook block returns false" do
     @x.after_destroy_hook{r 1}
     @x.before_destroy_hook{r false}
     @x.before_destroy_hook{r 4}
-    @x.destroy.should == nil
-    @r.should == [4, false]
+    @x.destroy.must_equal nil
+    @r.must_equal [4, false]
   end
 
   it "should support before_validation_hook and after_validation_hook" do
@@ -116,19 +116,19 @@ describe "InstanceHooks plugin" do
     @o.before_validation_hook{r 2}
     @o.after_validation_hook{r 3}
     @o.before_validation_hook{r 4}
-    @o.valid?.should == true
-    @r.should == [4, 2, 1, 3]
+    @o.valid?.must_equal true
+    @r.must_equal [4, 2, 1, 3]
   end
 
   it "should cancel the save if before_validation_hook block returns false" do
     @o.after_validation_hook{r 1}
     @o.before_validation_hook{r false}
     @o.before_validation_hook{r 4}
-    @o.valid?.should == false
-    @r.should == [4, false]
+    @o.valid?.must_equal false
+    @r.must_equal [4, false]
     @r.clear
-    @o.valid?.should == false
-    @r.should == [4, false]
+    @o.valid?.must_equal false
+    @r.must_equal [4, false]
   end
 
   it "should clear only related hooks on successful create" do
@@ -140,15 +140,15 @@ describe "InstanceHooks plugin" do
     @o.after_save_hook{r 6}
     @o.before_create_hook{r 7}
     @o.after_create_hook{r 8}
-    @o.save.should_not == nil
-    @r.should == [5, 7, 8, 6]
+    @o.save.wont_equal nil
+    @r.must_equal [5, 7, 8, 6]
     @o.instance_variable_set(:@new, false)
-    @o.save.should_not == nil
-    @r.should == [5, 7, 8, 6, 4, 3]
-    @o.save.should_not == nil
-    @r.should == [5, 7, 8, 6, 4, 3]
+    @o.save.wont_equal nil
+    @r.must_equal [5, 7, 8, 6, 4, 3]
+    @o.save.wont_equal nil
+    @r.must_equal [5, 7, 8, 6, 4, 3]
     @o.destroy
-    @r.should == [5, 7, 8, 6, 4, 3, 2, 1]
+    @r.must_equal [5, 7, 8, 6, 4, 3, 2, 1]
   end
 
   it "should clear only related hooks on successful update" do
@@ -158,12 +158,12 @@ describe "InstanceHooks plugin" do
     @x.after_update_hook{r 4}
     @x.before_save_hook{r 5}
     @x.after_save_hook{r 6}
-    @x.save.should_not == nil
-    @r.should == [5, 3, 4, 6]
-    @x.save.should_not == nil
-    @r.should == [5, 3, 4, 6]
+    @x.save.wont_equal nil
+    @r.must_equal [5, 3, 4, 6]
+    @x.save.wont_equal nil
+    @r.must_equal [5, 3, 4, 6]
     @x.destroy
-    @r.should == [5, 3, 4, 6, 2, 1]
+    @r.must_equal [5, 3, 4, 6, 2, 1]
   end
 
   it "should clear only related hooks on successful destroy" do
@@ -172,23 +172,23 @@ describe "InstanceHooks plugin" do
     @x.before_update_hook{r 3}
     @x.before_save_hook{r 4}
     @x.destroy
-    @r.should == [2, 1]
-    @x.save.should_not == nil
-    @r.should == [2, 1, 4, 3]
+    @r.must_equal [2, 1]
+    @x.save.wont_equal nil
+    @r.must_equal [2, 1, 4, 3]
   end
 
   it "should not clear validations hooks on successful save" do
     @x.after_validation_hook{@x.errors.add(:id, 'a') if @x.id == 1; r 1}
     @x.before_validation_hook{r 2}
-    @x.save.should == nil
-    @r.should == [2, 1]
-    @x.save.should == nil
-    @r.should == [2, 1, 2, 1]
+    @x.save.must_equal nil
+    @r.must_equal [2, 1]
+    @x.save.must_equal nil
+    @r.must_equal [2, 1, 2, 1]
     @x.id = 2
-    @x.save.should == @x
-    @r.should == [2, 1, 2, 1, 2, 1]
-    @x.save.should == @x
-    @r.should == [2, 1, 2, 1, 2, 1]
+    @x.save.must_equal @x
+    @r.must_equal [2, 1, 2, 1, 2, 1]
+    @x.save.must_equal @x
+    @r.must_equal [2, 1, 2, 1, 2, 1]
   end
 
   it "should not allow addition of instance hooks to frozen instances" do
@@ -197,10 +197,10 @@ describe "InstanceHooks plugin" do
     @x.before_update_hook{r 3}
     @x.before_save_hook{r 4}
     @x.freeze
-    proc{@x.after_destroy_hook{r 1}}.should raise_error(Sequel::Error)
-    proc{@x.before_destroy_hook{r 2}}.should raise_error(Sequel::Error)
-    proc{@x.before_update_hook{r 3}}.should raise_error(Sequel::Error)
-    proc{@x.before_save_hook{r 4}}.should raise_error(Sequel::Error)
+    proc{@x.after_destroy_hook{r 1}}.must_raise(Sequel::Error)
+    proc{@x.before_destroy_hook{r 2}}.must_raise(Sequel::Error)
+    proc{@x.before_update_hook{r 3}}.must_raise(Sequel::Error)
+    proc{@x.before_save_hook{r 4}}.must_raise(Sequel::Error)
   end
 end
 
@@ -230,47 +230,47 @@ describe "InstanceHooks plugin with transactions" do
   it "should support after_commit_hook" do
     @o.after_commit_hook{@db.execute('ac1')}
     @o.after_commit_hook{@db.execute('ac2')}
-    @o.save.should_not be_nil
-    @db.sqls.should == ['BEGIN', 'as', 'COMMIT', 'ac1', 'ac2']
+    @o.save.wont_equal nil
+    @db.sqls.must_equal ['BEGIN', 'as', 'COMMIT', 'ac1', 'ac2']
   end
   
   it "should support after_rollback_hook" do
     @or.after_rollback_hook{@db.execute('ar1')}
     @or.after_rollback_hook{@db.execute('ar2')}
-    @or.save.should be_nil
-    @db.sqls.should == ['BEGIN', 'as', 'ROLLBACK', 'ar1', 'ar2']
+    @or.save.must_equal nil
+    @db.sqls.must_equal ['BEGIN', 'as', 'ROLLBACK', 'ar1', 'ar2']
   end
   
   it "should support after_commit_hook" do
     @o.after_destroy_commit_hook{@db.execute('adc1')}
     @o.after_destroy_commit_hook{@db.execute('adc2')}
-    @o.destroy.should_not be_nil
-    @db.sqls.should == ['BEGIN', "DELETE FROM items WHERE (id = 1)", 'ad', 'COMMIT', 'adc1', 'adc2']
+    @o.destroy.wont_equal nil
+    @db.sqls.must_equal ['BEGIN', "DELETE FROM items WHERE (id = 1)", 'ad', 'COMMIT', 'adc1', 'adc2']
   end
   
   it "should support after_rollback_hook" do
     @or.after_destroy_rollback_hook{@db.execute('adr1')}
     @or.after_destroy_rollback_hook{@db.execute('adr2')}
-    @or.destroy.should be_nil
-    @db.sqls.should == ['BEGIN', "DELETE FROM items WHERE (id = 1)", 'ad', 'ROLLBACK', 'adr1', 'adr2']
+    @or.destroy.must_equal nil
+    @db.sqls.must_equal ['BEGIN', "DELETE FROM items WHERE (id = 1)", 'ad', 'ROLLBACK', 'adr1', 'adr2']
   end
 
   it "should have *_hook methods return self "do
-    @o.before_destroy_hook{r 1}.should equal(@o)
-    @o.before_validation_hook{r 1}.should equal(@o)
-    @o.before_save_hook{r 1}.should equal(@o)
-    @o.before_update_hook{r 1}.should equal(@o)
-    @o.before_create_hook{r 1}.should equal(@o)
+    @o.before_destroy_hook{r 1}.must_be_same_as(@o)
+    @o.before_validation_hook{r 1}.must_be_same_as(@o)
+    @o.before_save_hook{r 1}.must_be_same_as(@o)
+    @o.before_update_hook{r 1}.must_be_same_as(@o)
+    @o.before_create_hook{r 1}.must_be_same_as(@o)
 
-    @o.after_destroy_hook{r 1}.should equal(@o)
-    @o.after_validation_hook{r 1}.should equal(@o)
-    @o.after_save_hook{r 1}.should equal(@o)
-    @o.after_update_hook{r 1}.should equal(@o)
-    @o.after_create_hook{r 1}.should equal(@o)
-    @o.after_commit_hook{r 1}.should equal(@o)
-    @o.after_rollback_hook{r 1}.should equal(@o)
-    @o.after_destroy_commit_hook{r 1}.should equal(@o)
-    @o.after_destroy_rollback_hook{r 1}.should equal(@o)
+    @o.after_destroy_hook{r 1}.must_be_same_as(@o)
+    @o.after_validation_hook{r 1}.must_be_same_as(@o)
+    @o.after_save_hook{r 1}.must_be_same_as(@o)
+    @o.after_update_hook{r 1}.must_be_same_as(@o)
+    @o.after_create_hook{r 1}.must_be_same_as(@o)
+    @o.after_commit_hook{r 1}.must_be_same_as(@o)
+    @o.after_rollback_hook{r 1}.must_be_same_as(@o)
+    @o.after_destroy_commit_hook{r 1}.must_be_same_as(@o)
+    @o.after_destroy_rollback_hook{r 1}.must_be_same_as(@o)
   end
 
 end