sequel 2.11.0 → 2.12.0

data/spec/{sequel_model → extensions}/spec_helper.rb

@@ -1,13 +1,21 @@
 require 'rubygems'
 unless Object.const_defined?('Sequel')
   $:.unshift(File.join(File.dirname(__FILE__), "../../lib/"))
-  require 'sequel_core'
+  require 'sequel/core'
 end
 unless Sequel.const_defined?('Model')
   $:.unshift(File.join(File.dirname(__FILE__), "../../lib/"))
-  require 'sequel_model'
+  require 'sequel/model'
 end
 
+Sequel.virtual_row_instance_eval = true
+
+extensions = %w'string_date_time inflector pagination query pretty_table blank migration'
+plugins = {:hook_class_methods=>[], :schema=>[], :validation_class_methods=>[]}
+
+extensions.each{|e| require "sequel/extensions/#{e}"}
+plugins.each{|p, opts| Sequel::Model.plugin(p, *opts)}
+
 class MockDataset < Sequel::Dataset
   def insert(*args)
     @db.execute insert_sql(*args)
@@ -55,9 +63,9 @@ class MockDatabase < Sequel::Database
     end
   end
 
-  def transaction; yield; end
+  def transaction(opts={}); yield; end
   
-  def dataset; MockDataset.new(self); end
+  def dataset(opts=nil); MockDataset.new(self, opts); end
 end
 
 class << Sequel::Model
@@ -79,3 +87,4 @@ class << Sequel::Model
 end
 
 Sequel::Model.db = MODEL_DB = MockDatabase.new
+Sequel::Model.use_transactions = false

data/spec/extensions/string_date_time_spec.rb

@@ -0,0 +1,93 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+context "String#to_time" do
+  specify "should convert the string into a Time object" do
+    "2007-07-11".to_time.should == Time.parse("2007-07-11")
+    "06:30".to_time.should == Time.parse("06:30")
+  end
+  
+  specify "should raise InvalidValue for an invalid time" do
+    proc {'0000-00-00'.to_time}.should raise_error(Sequel::InvalidValue)
+  end
+end
+
+context "String#to_date" do
+  after do
+    Sequel.convert_two_digit_years = true
+  end
+
+  specify "should convert the string into a Date object" do
+    "2007-07-11".to_date.should == Date.parse("2007-07-11")
+  end
+  
+  specify "should convert 2 digit years by default" do
+    "July 11, 07".to_date.should == Date.parse("2007-07-11")
+  end
+
+  specify "should not convert 2 digit years if set not to" do
+    Sequel.convert_two_digit_years = false
+    "July 11, 07".to_date.should == Date.parse("0007-07-11")
+  end
+
+  specify "should raise InvalidValue for an invalid date" do
+    proc {'0000-00-00'.to_date}.should raise_error(Sequel::InvalidValue)
+  end
+end
+
+context "String#to_datetime" do
+  after do
+    Sequel.convert_two_digit_years = true
+  end
+
+  specify "should convert the string into a DateTime object" do
+    "2007-07-11 10:11:12a".to_datetime.should == DateTime.parse("2007-07-11 10:11:12a")
+  end
+  
+  specify "should convert 2 digit years by default" do
+    "July 11, 07 10:11:12a".to_datetime.should == DateTime.parse("2007-07-11 10:11:12a")
+  end
+
+  specify "should not convert 2 digit years if set not to" do
+    Sequel.convert_two_digit_years = false
+    "July 11, 07 10:11:12a".to_datetime.should == DateTime.parse("0007-07-11 10:11:12a")
+  end
+
+  specify "should raise InvalidValue for an invalid date" do
+    proc {'0000-00-00'.to_datetime}.should raise_error(Sequel::InvalidValue)
+  end
+end
+
+context "String#to_sequel_time" do
+  after do
+    Sequel.datetime_class = Time
+    Sequel.convert_two_digit_years = true
+  end
+
+  specify "should convert the string into a Time object by default" do
+    "2007-07-11 10:11:12a".to_sequel_time.class.should == Time
+    "2007-07-11 10:11:12a".to_sequel_time.should == Time.parse("2007-07-11 10:11:12a")
+  end
+  
+  specify "should convert the string into a DateTime object if that is set" do
+    Sequel.datetime_class = DateTime
+    "2007-07-11 10:11:12a".to_sequel_time.class.should == DateTime
+    "2007-07-11 10:11:12a".to_sequel_time.should == DateTime.parse("2007-07-11 10:11:12a")
+  end
+  
+  specify "should convert 2 digit years by default if using DateTime class" do
+    Sequel.datetime_class = DateTime
+    "July 11, 07 10:11:12a".to_sequel_time.should == DateTime.parse("2007-07-11 10:11:12a")
+  end
+
+  specify "should not convert 2 digit years if set not to when using DateTime class" do
+    Sequel.datetime_class = DateTime
+    Sequel.convert_two_digit_years = false
+    "July 11, 07 10:11:12a".to_sequel_time.should == DateTime.parse("0007-07-11 10:11:12a")
+  end
+
+  specify "should raise InvalidValue for an invalid time" do
+    proc {'0000-00-00'.to_sequel_time}.should raise_error(Sequel::InvalidValue)
+    Sequel.datetime_class = DateTime
+    proc {'0000-00-00'.to_sequel_time}.should raise_error(Sequel::InvalidValue)
+  end
+end

data/spec/{sequel_model/validations_spec.rb → extensions/validation_class_methods_spec.rb}

@@ -1,82 +1,7 @@
 require File.join(File.dirname(__FILE__), "spec_helper")
 
-describe Sequel::Model::Validation::Errors do
-  setup do
-    @errors = Sequel::Model::Validation::Errors.new
-  end
-  
-  specify "should be clearable using #clear" do
-    @errors.add(:a, 'b')
-    @errors.should == {:a=>['b']}
-    @errors.clear
-    @errors.should == {}
-  end
-  
-  specify "should be empty if no errors are added" do
-    @errors.should be_empty
-    @errors[:blah] << "blah"
-    @errors.should_not be_empty
-  end
-  
-  specify "should return errors for a specific attribute using #on or #[]" do
-    @errors[:blah].should == []
-    @errors.on(:blah).should == []
-
-    @errors[:blah] << 'blah'
-    @errors[:blah].should == ['blah']
-    @errors.on(:blah).should == ['blah']
-
-    @errors[:bleu].should == []
-    @errors.on(:bleu).should == []
-  end
-  
-  specify "should accept errors using #[] << or #add" do
-    @errors[:blah] << 'blah'
-    @errors[:blah].should == ['blah']
-    
-    @errors.add :blah, 'zzzz'
-    @errors[:blah].should == ['blah', 'zzzz']
-  end
-  
-  specify "should return full messages using #full_messages" do
-    @errors.full_messages.should == []
-    
-    @errors[:blow] << 'blieuh'
-    @errors[:blow] << 'blich'
-    @errors[:blay] << 'bliu'
-    msgs = @errors.full_messages
-    msgs.size.should == 3
-    msgs.should include('blow blieuh', 'blow blich', 'blay bliu')
-  end
-
-  specify "should return the number of error messages using #count" do
-    @errors.count.should == 0
-    @errors.add(:a, 'b')
-    @errors.count.should == 1
-    @errors.add(:a, 'c')
-    @errors.count.should == 2
-    @errors.add(:b, 'c')
-    @errors.count.should == 3
-  end
-
-  specify "should return the array of error messages for a given attribute using #on" do
-    @errors.add(:a, 'b')
-    @errors.on(:a).should == ['b']
-    @errors.add(:a, 'c')
-    @errors.on(:a).should == ['b', 'c']
-    @errors.add(:b, 'c')
-    @errors.on(:a).should == ['b', 'c']
-  end
-
-  specify "should return nil if there are no error messages for a given attribute using #on" do
-    @errors.on(:a).should == nil
-    @errors.add(:b, 'b')
-    @errors.on(:a).should == nil
-  end
-end
-
 describe Sequel::Model do
-  setup do
+  before do
     @c = Class.new(Sequel::Model) do
       def self.validates_coolness_of(attr)
         validates_each(attr) {|o, a, v| o.errors[a] << 'is not cool' if v != :cool}
@@ -190,7 +115,7 @@ describe Sequel::Model do
 end
 
 describe Sequel::Model do
-  setup do
+  before do
     @c = Class.new(Sequel::Model) do
       columns :score
       validates_each :score do |o, a, v|
@@ -220,8 +145,8 @@ describe Sequel::Model do
   end
 end
 
-describe Sequel::Model::Validation::Generator do
-  setup do
+describe Sequel::Plugins::ValidationClassMethods::ClassMethods::Generator do
+  before do
     $testit = nil
     
     @c = Class.new(Sequel::Model) do
@@ -232,7 +157,7 @@ describe Sequel::Model::Validation::Generator do
   end
   
   specify "should instance_eval the block, sending everything to its receiver" do
-    Sequel::Model::Validation::Generator.new(@c) do
+    @c.validates do
       blah
     end
     $testit.should == 1324
@@ -240,7 +165,7 @@ describe Sequel::Model::Validation::Generator do
 end
 
 describe Sequel::Model do
-  setup do
+  before do
     @c = Class.new(Sequel::Model) do
       columns :value
       
@@ -625,7 +550,7 @@ describe Sequel::Model do
 end
 
 context "Superclass validations" do
-  setup do
+  before do
     @c1 = Class.new(Sequel::Model) do
       columns :value
       validates_length_of :value, :minimum => 5
@@ -1011,28 +936,8 @@ describe Sequel::Model, "Validations" do
   
 end
 
-describe "Model#save!" do
-  setup do
-    @c = Class.new(Sequel::Model(:people)) do
-      def columns; [:id]; end
-      
-      validates_each :id do |o, a, v|
-        o.errors[a] << 'blah' unless v == 5
-      end
-    end
-    @m = @c.load(:id => 4)
-    MODEL_DB.reset
-  end
-  
-  specify "should save regardless of validations" do
-    @m.should_not be_valid
-    @m.save!
-    MODEL_DB.sqls.should == ['UPDATE people SET id = 4 WHERE (id = 4)']
-  end
-end
-
 describe "Model#save" do
-  setup do
+  before do
     @c = Class.new(Sequel::Model(:people)) do
       columns :id
 
@@ -1056,6 +961,13 @@ describe "Model#save" do
     MODEL_DB.sqls.should == ['UPDATE people SET id = 5 WHERE (id = 5)']
   end
   
+  specify "should skip validations if the :validate=>false option is used" do
+    @m.raise_on_save_failure = false
+    @m.should_not be_valid
+    @m.save(:validate=>false)
+    MODEL_DB.sqls.should == ['UPDATE people SET id = 4 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)
   end

data/spec/extensions/validation_helpers_spec.rb

@@ -0,0 +1,291 @@
+require File.join(File.dirname(__FILE__), "spec_helper")
+
+describe "Sequel::Plugins::ValidationHelpers" do
+  before do
+    @c = Class.new(Sequel::Model) do
+      def self.set_validations(&block)
+        define_method(:validate, &block)
+      end
+      columns :value
+    end
+    @c.plugin :validation_helpers
+    @m = @c.new
+  end
+
+  specify "should take an :allow_blank option" do
+    @c.set_validations{validates_format(/.+_.+/, :value, :allow_blank=>true)}
+    @m.value = 'abc_'
+    @m.should_not be_valid
+    @m.value = '1_1'
+    @m.should be_valid
+    o = Object.new
+    @m.value = o
+    @m.should_not be_valid
+    def o.blank?
+      true
+    end
+    @m.should be_valid
+  end
+
+  specify "should take an :allow_missing option" do
+    @c.set_validations{validates_format(/.+_.+/, :value, :allow_missing=>true)}
+    @m.values.clear
+    @m.should be_valid
+    @m.value = nil
+    @m.should_not be_valid
+    @m.value = '1_1'
+    @m.should be_valid
+  end
+
+  specify "should take an :allow_nil option" do
+    @c.set_validations{validates_format(/.+_.+/, :value, :allow_nil=>true)}
+    @m.value = 'abc_'
+    @m.should_not be_valid
+    @m.value = '1_1'
+    @m.should be_valid
+    @m.value = nil
+    @m.should be_valid
+  end
+
+  specify "should take a :message option" do
+    @c.set_validations{validates_format(/.+_.+/, :value, :message=>"is so blah")}
+    @m.value = 'abc_'
+    @m.should_not be_valid
+    @m.errors.full_messages.should == ['value is so blah']
+    @m.value = '1_1'
+    @m.should be_valid
+  end
+
+  specify "should take multiple attributes in the same call" do
+    @c.columns :value, :value2
+    @c.set_validations{validates_presence([:value, :value2])}
+    @m.should_not be_valid
+    @m.value = 1
+    @m.should_not be_valid
+    @m.value2 = 1
+    @m.should be_valid
+  end
+
+  specify "should support validates_exact_length" do
+    @c.set_validations{validates_exact_length(3, :value)}
+    @m.should_not be_valid
+    @m.value = '123'
+    @m.should be_valid
+    @m.value = '12'
+    @m.should_not be_valid
+    @m.value = '1234'
+    @m.should_not be_valid
+  end
+  
+  specify "should support validate_format" do
+    @c.set_validations{validates_format(/.+_.+/, :value)}
+    @m.value = 'abc_'
+    @m.should_not be_valid
+    @m.value = 'abc_def'
+    @m.should be_valid
+  end
+  
+  specify "should support validates_includes with an array" do
+    @c.set_validations{validates_includes([1,2], :value)}
+    @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 support validates_includes with a range" do
+    @c.set_validations{validates_includes(1..4, :value)}
+    @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 supports validates_integer" do
+    @c.set_validations{validates_integer(:value)}
+    @m.value = 'blah'
+    @m.should_not be_valid
+    @m.value = '123'
+    @m.should be_valid
+    @m.value = '123.1231'
+    @m.should_not be_valid
+  end
+  
+  specify "should support validates_length_range" do
+    @c.set_validations{validates_length_range(2..5, :value)}
+    @m.should_not be_valid
+    @m.value = '12345'
+    @m.should be_valid
+    @m.value = '1'
+    @m.should_not be_valid
+    @m.value = '123456'
+    @m.should_not be_valid
+  end
+
+  specify "should support validates_max_length" do
+    @c.set_validations{validates_max_length(5, :value)}
+    @m.should_not be_valid
+    @m.value = '12345'
+    @m.should be_valid
+    @m.value = '123456'
+    @m.should_not be_valid
+  end
+
+  specify "should support validates_min_length" do
+    @c.set_validations{validates_min_length(5, :value)}
+    @m.should_not be_valid
+    @m.value = '12345'
+    @m.should be_valid
+    @m.value = '1234'
+    @m.should_not be_valid
+  end
+
+  specify "should support validates_not_string" do
+    @c.set_validations{validates_not_string(:value)}
+    @m.value = 123
+    @m.should be_valid
+    @m.value = '123'
+    @m.should_not be_valid
+    @m.errors.full_messages.should == ['value is a string']
+    @m.meta_def(:db_schema){{:value=>{:type=>:integer}}}
+    @m.should_not be_valid
+    @m.errors.full_messages.should == ['value is not a valid integer']
+  end
+
+  specify "should support validates_numeric" do
+    @c.set_validations{validates_numeric(:value)}
+    @m.value = 'blah'
+    @m.should_not be_valid
+    @m.value = '123'
+    @m.should be_valid
+    @m.value = '123.1231'
+    @m.should be_valid
+    @m.value = '+1'
+    @m.should be_valid
+    @m.value = '-1'
+    @m.should be_valid
+    @m.value = '+1.123'
+    @m.should be_valid
+    @m.value = '-0.123'
+    @m.should be_valid
+    @m.value = '-0.123E10'
+    @m.should be_valid
+    @m.value = '32.123e10'
+    @m.should be_valid
+    @m.value = '+32.123E10'
+    @m.should be_valid
+    @m.should be_valid
+    @m.value = '.0123'
+  end
+
+  specify "should support validates_presence" do
+    @c.set_validations{validates_presence(:value)}
+    @m.should_not be_valid
+    @m.value = ''
+    @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
+    @m.value = Time.now
+    @m.should be_valid
+  end
+  
+  it "should support validates_unique with a single attribute" do
+    @c.columns(:id, :username, :password)
+    @c.set_dataset MODEL_DB[:items]
+    @c.set_validations{validates_unique(:username)}
+    @c.dataset.extend(Module.new {
+      def fetch_rows(sql)
+        @db << sql
+        
+        case sql
+        when /COUNT.*username = '0records'/
+          yield({:v => 0})
+        when /COUNT.*username = '1record'/
+          yield({:v => 1})
+        end
+      end
+    })
+    
+    @user = @c.new(:username => "0records", :password => "anothertest")
+    @user.should be_valid
+    @user = @c.load(:id=>3, :username => "0records", :password => "anothertest")
+    @user.should be_valid
+
+    @user = @c.new(:username => "1record", :password => "anothertest")
+    @user.should_not be_valid
+    @user.errors.full_messages.should == ['username is already taken']
+    @user = @c.load(:id=>4, :username => "1record", :password => "anothertest")
+    @user.should_not be_valid
+    @user.errors.full_messages.should == ['username is already taken']
+
+    ds1 = @c.dataset.filter([[:username, '0records']])
+    ds2 = ds1.exclude(:id=>1)
+    @c.dataset.should_receive(:filter).with([[:username, '0records']]).twice.and_return(ds1)
+    ds1.should_receive(:exclude).with(:id=>1).once.and_return(ds2)
+
+    @user = @c.load(:id=>1, :username => "0records", :password => "anothertest")
+    @user.should be_valid
+    MODEL_DB.sqls.last.should == "SELECT COUNT(*) FROM items WHERE ((username = '0records') AND (id != 1)) LIMIT 1"
+    @user = @c.new(:username => "0records", :password => "anothertest")
+    @user.should be_valid
+    MODEL_DB.sqls.last.should == "SELECT COUNT(*) FROM items WHERE (username = '0records') LIMIT 1"
+  end
+  
+  it "should support validates_unique with multiple attributes" do
+    @c.columns(:id, :username, :password)
+    @c.set_dataset MODEL_DB[:items]
+    @c.set_validations{validates_unique([:username, :password])}
+    @c.dataset.extend(Module.new {
+      def fetch_rows(sql)
+        @db << sql
+        
+        case sql
+        when /COUNT.*username = '0records'/
+          yield({:v => 0})
+        when /COUNT.*username = '1record'/
+          yield({:v => 1})
+        end
+      end
+    })
+    
+    @user = @c.new(:username => "0records", :password => "anothertest")
+    @user.should be_valid
+    @user = @c.load(:id=>3, :username => "0records", :password => "anothertest")
+    @user.should be_valid
+
+    @user = @c.new(:username => "1record", :password => "anothertest")
+    @user.should_not be_valid
+    @user.errors.full_messages.should == ['username and password is already taken']
+    @user = @c.load(:id=>4, :username => "1record", :password => "anothertest")
+    @user.should_not be_valid
+    @user.errors.full_messages.should == ['username and password is already taken']
+
+    ds1 = @c.dataset.filter([[:username, '0records'], [:password, 'anothertest']])
+    ds2 = ds1.exclude(:id=>1)
+    @c.dataset.should_receive(:filter).with([[:username, '0records'], [:password, 'anothertest']]).twice.and_return(ds1)
+    ds1.should_receive(:exclude).with(:id=>1).once.and_return(ds2)
+
+    @user = @c.load(:id=>1, :username => "0records", :password => "anothertest")
+    @user.should be_valid
+    MODEL_DB.sqls.last.should == "SELECT COUNT(*) FROM items WHERE (((username = '0records') AND (password = 'anothertest')) AND (id != 1)) LIMIT 1"
+    @user = @c.new(:username => "0records", :password => "anothertest")
+    @user.should be_valid
+    MODEL_DB.sqls.last.should == "SELECT COUNT(*) FROM items WHERE ((username = '0records') AND (password = 'anothertest')) LIMIT 1"
+  end
+end