sequel 2.0.1 → 2.1.0

data/spec/schema_spec.rb

@@ -33,6 +33,13 @@ describe Sequel::Model, "create_table" do
     MODEL_DB.sqls.should == ['CREATE TABLE items (name text, price float NOT NULL)']
   end
 
+  it "should reload the schema from the database" do
+    schem = {:name=>{:type=>:string}, :price=>{:type=>:float}}
+    @model.db.should_receive(:schema).with(:items, :reload=>true).and_return(schem.to_a.sort_by{|x| x[0].to_s})
+    @model.create_table
+    @model.db_schema.should == schem
+    @model.instance_variable_get(:@columns).should == [:name, :price]
+  end
 end
 
 describe Sequel::Model, "drop_table" do

data/spec/validations_spec.rb

@@ -1,17 +1,15 @@
 require File.join(File.dirname(__FILE__), "spec_helper")
 
-describe "Validation::Errors" do
+describe Sequel::Model::Validation::Errors do
   setup do
-    @errors = Validation::Errors.new
-    class Validation::Errors
-      attr_accessor :errors
-    end
+    @errors = Sequel::Model::Validation::Errors.new
   end
   
   specify "should be clearable using #clear" do
-    @errors.errors = {1 => 2, 3 => 4}
+    @errors.add(:a, 'b')
+    @errors.should == {:a=>['b']}
     @errors.clear
-    @errors.errors.should == {}
+    @errors.should == {}
   end
   
   specify "should be empty if no errors are added" do
@@ -52,22 +50,13 @@ describe "Validation::Errors" do
   end
 end
 
-describe Validation do
+describe Sequel::Model do
   setup do
-    @c = Class.new do
-      include Validation
-      attr_reader :before_validation, :after_validation
-      
+    @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}
       end
     end
-    
-    @d = Class.new do
-      attr_accessor :errors
-      attr_reader :before_validation, :after_validation
-      def initialize; @errors = Validation::Errors.new; end
-    end
   end
   
   specify "should respond to validates, validations, has_validations?" do
@@ -81,7 +70,7 @@ describe Validation do
     @c.validations[:xx].size.should == 1
     @c.validations[:yy].size.should == 1
     
-    o = @d.new
+    o = @c.new
     @c.validations[:xx].first.call(o, :aa, 40)
     @c.validations[:yy].first.call(o, :bb, 60)
     
@@ -100,7 +89,7 @@ describe Validation do
     end
     @c.validations[:blah].should_not be_empty
 
-    o = @d.new
+    o = @c.new
     @c.validations[:blah].first.call(o, :ttt, 40)
     o.errors.full_messages.should == ['ttt is not cool']
     o.errors.clear
@@ -109,14 +98,10 @@ describe Validation do
   end
 end
 
-describe "A Validation instance" do
+describe Sequel::Model do
   setup do
-    @c = Class.new do
-      attr_accessor :score
-      attr_reader :before_validation, :after_validation
-      
-      include Validation
-      
+    @c = Class.new(Sequel::Model) do
+      columns :score
       validates_each :score do |o, a, v|
         o.errors[a] << 'too low' if v < 87
       end
@@ -144,14 +129,11 @@ describe "A Validation instance" do
   end
 end
 
-describe Validation::Generator do
+describe Sequel::Model::Validation::Generator do
   setup do
     $testit = nil
     
-    @c = Class.new do
-      include Validation
-      attr_reader :before_validation, :after_validation
-      
+    @c = Class.new(Sequel::Model) do
       def self.validates_blah
         $testit = 1324
       end
@@ -159,19 +141,26 @@ describe Validation::Generator do
   end
   
   specify "should instance_eval the block, sending everything to its receiver" do
-    Validation::Generator.new(@c) do
+    Sequel::Model::Validation::Generator.new(@c) do
       blah
     end
     $testit.should == 1324
   end
 end
 
-describe "Validations" do
+describe Sequel::Model do
   setup do
-    @c = Class.new do
-      attr_accessor :value
-      attr_reader :before_validation, :after_validation
-      include Validation
+    @c = Class.new(Sequel::Model) do
+      columns :value
+      
+      def self.filter(*args)
+        o = Object.new
+        def o.count; 2; end
+        o
+      end
+
+      def skip; false; end
+      def dont_skip; true; end
     end
     @m = @c.new
   end
@@ -196,6 +185,36 @@ describe "Validations" do
     @m.should_not be_valid
   end
 
+  specify "should validate acceptance_of with if => true" do
+    @c.validates_acceptance_of :value, :if => :dont_skip
+    @m.value = '0'
+    @m.should_not be_valid
+  end
+
+  specify "should validate acceptance_of with if => false" do
+    @c.validates_acceptance_of :value, :if => :skip
+    @m.value = '0'
+    @m.should be_valid
+  end
+
+  specify "should validate acceptance_of with if proc that evaluates to true" do
+    @c.validates_acceptance_of :value, :if => proc{true}
+    @m.value = '0'
+    @m.should_not be_valid
+  end
+
+  specify "should validate acceptance_of with if proc that evaluates to false" do
+    @c.validates_acceptance_of :value, :if => proc{false}
+    @m.value = '0'
+    @m.should be_valid
+  end
+
+  specify "should raise an error if :if option is not a Symbol, Proc, or nil" do
+    @c.validates_acceptance_of :value, :if => 1
+    @m.value = '0'
+    proc{@m.valid?}.should raise_error(Sequel::Error)
+  end
+
   specify "should validate confirmation_of" do
     @c.send(:attr_accessor, :value_confirmation)
     @c.validates_confirmation_of :value
@@ -206,6 +225,22 @@ describe "Validations" do
     @m.value_confirmation = 'blah'
     @m.should be_valid
   end
+  
+  specify "should validate confirmation_of with if => true" do
+    @c.send(:attr_accessor, :value_confirmation)
+    @c.validates_confirmation_of :value, :if => :dont_skip
+
+    @m.value = 'blah'
+    @m.should_not be_valid
+  end
+
+  specify "should validate confirmation_of with if => false" do
+    @c.send(:attr_accessor, :value_confirmation)
+    @c.validates_confirmation_of :value, :if => :skip
+
+    @m.value = 'blah'
+    @m.should be_valid
+  end
 
   specify "should validate format_of" do
     @c.validates_format_of :value, :with => /.+_.+/
@@ -220,6 +255,20 @@ describe "Validations" do
     proc {@c.validates_format_of :value, :with => :blah}.should raise_error(ArgumentError)
   end
   
+  specify "should validate format_of with if => true" do
+    @c.validates_format_of :value, :with => /_/, :if => :dont_skip
+
+    @m.value = 'a'
+    @m.should_not be_valid
+  end
+
+  specify "should validate format_of with if => false" do
+    @c.validates_format_of :value, :with => /_/, :if => :skip
+
+    @m.value = 'a'
+    @m.should be_valid
+  end
+  
   specify "should validate length_of with maximum" do
     @c.validates_length_of :value, :maximum => 5
     @m.should_not be_valid
@@ -265,6 +314,20 @@ describe "Validations" do
     @m.should be_valid
   end
 
+  specify "should validate length_of with if => true" do
+    @c.validates_length_of :value, :is => 3, :if => :dont_skip
+
+    @m.value = 'a'
+    @m.should_not be_valid
+  end
+
+  specify "should validate length_of with if => false" do
+    @c.validates_length_of :value, :is => 3, :if => :skip
+
+    @m.value = 'a'
+    @m.should be_valid
+  end
+
   specify "should validate numericality_of" do
     @c.validates_numericality_of :value
     @m.value = 'blah'
@@ -301,6 +364,20 @@ describe "Validations" do
     @m.should_not be_valid
   end
   
+  specify "should validate numericality_of with if => true" do
+    @c.validates_numericality_of :value, :if => :dont_skip
+
+    @m.value = 'a'
+    @m.should_not be_valid
+  end
+
+  specify "should validate numericality_of with if => false" do
+    @c.validates_numericality_of :value, :if => :skip
+
+    @m.value = 'a'
+    @m.should be_valid
+  end
+
   specify "should validate presence_of" do
     @c.validates_presence_of :value
     @m.should_not be_valid
@@ -309,18 +386,47 @@ describe "Validations" do
     @m.value = 1234
     @m.should be_valid
   end
+
+  specify "should validate presence_of with if => true" do
+    @c.validates_presence_of :value, :if => :dont_skip
+    @m.should_not be_valid
+  end
+
+  specify "should validate presence_of with if => false" do
+    @c.validates_presence_of :value, :if => :skip
+    @m.should be_valid
+  end
+
+  specify "should validate uniqueness_of with if => true" do
+    @c.validates_uniqueness_of :value, :if => :dont_skip
+
+    @m.value = 'a'
+    @m.should_not be_valid
+  end
+
+  specify "should validate uniqueness_of with if => false" do
+    @c.validates_uniqueness_of :value, :if => :skip
+
+    @m.value = 'a'
+    @m.should be_valid
+  end
+  
+  specify "should validate with :if => block" do
+    @c.validates_presence_of :value, :if => proc {false}
+    
+    @m.should be_valid
+  end
 end
 
 context "Superclass validations" do
   setup do
-    @c1 = Class.new do
-      include Validation
-      attr_reader :before_validation, :after_validation
-      attr_accessor :value
+    @c1 = Class.new(Sequel::Model) do
+      columns :value
       validates_length_of :value, :minimum => 5
     end
     
     @c2 = Class.new(@c1) do
+      columns :value
       validates_format_of :value, :with => /^[a-z]+$/
     end
   end
@@ -364,11 +470,8 @@ end
 
 context ".validates with block" do
   specify "should support calling .each" do
-    @c = Class.new do
-      attr_accessor :vvv
-      attr_reader :before_validation, :after_validation
-      
-      include Validation
+    @c = Class.new(Sequel::Model) do
+      columns :vvv
       validates do
         each :vvv do |o, a, v|
           o.errors[a] << "is less than zero" if v.to_i < 0
@@ -545,13 +648,11 @@ describe Sequel::Model, "Validations" do
     @user.should_not be_valid
     @user.errors.full_messages.should == ['username is already taken']
 
-    @user = User.new(:id=>4, :username => "1record", :password => "anothertest")
-    @user.instance_variable_set(:@new, false)
+    @user = User.load(:id=>4, :username => "1record", :password => "anothertest")
     @user.should_not be_valid
     @user.errors.full_messages.should == ['username is already taken']
 
-    @user = User.new(:id=>3, :username => "1record", :password => "anothertest")
-    @user.instance_variable_set(:@new, false)
+    @user = User.load(:id=>3, :username => "1record", :password => "anothertest")
     @user.should be_valid
     @user.errors.full_messages.should == []
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sequel
 version: !ruby/object:Gem::Version 
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors: 
 - Jeremy Evans
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-04 00:00:00 -07:00
+date: 2008-06-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.0.1
+        version: 2.1.0
     version: 
 description: "The Database Toolkit for Ruby: Model Classes"
 email: code@jeremyevans.net
@@ -49,6 +49,7 @@ files:
 - spec/spec_helper.rb
 - spec/validations_spec.rb
 - spec/inflector_spec.rb
+- spec/dataset_methods_spec.rb
 - spec/association_reflection_spec.rb
 - lib/sequel.rb
 - lib/sequel_model.rb
@@ -64,6 +65,7 @@ files:
 - lib/sequel_model/validations.rb
 - lib/sequel_model/inflector.rb
 - lib/sequel_model/association_reflection.rb
+- lib/sequel_model/dataset_methods.rb
 - CHANGELOG
 has_rdoc: true
 homepage: http://sequel.rubyforge.org