assistance 0.1.3 → 0.1.4

data/CHANGELOG

@@ -1,3 +1,7 @@
+=== 0.1.4 (2008-02-08)
+
+* Added inheritance of validations.
+
 === 0.1.3 (2008-02-04)
 
 * Fixed case statement in Inflector to work in Ruby 1.9.

data/Rakefile

@@ -9,7 +9,7 @@ include FileUtils
 # Configuration
 ##############################################################################
 NAME = "assistance"
-VERS = "0.1.3"
+VERS = "0.1.4"
 CLEAN.include ["**/.*.sw?", "pkg/*", ".config", "doc/*", "coverage/*"]
 RDOC_OPTS = [
   "--quiet", 

data/lib/assistance/validation.rb

@@ -115,7 +115,7 @@ module Validation
     def validations
       @validations ||= Hash.new {|h, k| h[k] = []}
     end
-    
+
     # Returns true if validations are defined.
     def has_validations?
       !validations.empty?
@@ -123,12 +123,19 @@ module Validation
 
     # Validates the given instance.
     def validate(o)
+      if superclass.respond_to?(:validate) && !@skip_superclass_validations
+        superclass.validate(o)
+      end
       validations.each do |att, procs|
         v = o.send(att)
         procs.each {|p| p[o, att, v]}
       end
     end
     
+    def skip_superclass_validations
+      @skip_superclass_validations = true
+    end
+    
     # Adds a validation for each of the given attributes using the supplied
     # block. The block must accept three arguments: instance, attribute and 
     # value, e.g.:

data/spec/validation_spec.rb

@@ -289,3 +289,53 @@ describe "Validations" do
     @m.should be_valid
   end
 end
+
+context "Superclass validations" do
+  setup do
+    @c1 = Class.new do
+      include Validation
+      attr_accessor :value
+      validates_length_of :value, :minimum => 5
+    end
+    
+    @c2 = Class.new(@c1) do
+      validates_format_of :value, :with => /^[a-z]+$/
+    end
+  end
+  
+  specify "should be checked when validating" do
+    o = @c2.new
+    o.value = 'ab'
+    o.valid?.should == false
+    o.errors.full_messages.should == [
+      'value is too short'
+    ]
+
+    o.value = '12'
+    o.valid?.should == false
+    o.errors.full_messages.should == [
+      'value is too short',
+      'value is invalid'
+    ]
+
+    o.value = 'abcde'
+    o.valid?.should be_true
+  end
+  
+  specify "should be skipped if skip_superclass_validations is called" do
+    @c2.skip_superclass_validations
+
+    o = @c2.new
+    o.value = 'ab'
+    o.valid?.should be_true
+
+    o.value = '12'
+    o.valid?.should == false
+    o.errors.full_messages.should == [
+      'value is invalid'
+    ]
+
+    o.value = 'abcde'
+    o.valid?.should be_true
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: assistance
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz, Sam Smoot, Sharon Rosner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-04 00:00:00 +02:00
+date: 2008-02-08 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -27,7 +27,6 @@ files:
 - COPYING
 - README
 - Rakefile
-- doc/rdoc
 - spec/blank_spec.rb
 - spec/connection_pool_spec.rb
 - spec/extract_options.rb