whyvalidationssuckin96 1.5.5 → 1.6.0

data/VERSION

@@ -1 +1 @@
-1.5.5
+1.6.0

data/lib/whyvalidationssuckin96/attribute_based_validation.rb

@@ -1,44 +1,79 @@
 module WhyValidationsSuckIn96
-  # A mixin to help handle the most common case of validating a single attribute on an object. This module has a 
+  # A mixin to help handle the most common case of validating a single attribute on an object. This module has a
   # dependency on SkippableValidation that will most likely be removed in future releases, but is something to be
   # aware of currently.
   module AttributeBasedValidation
-    
+
     # An initializer for a validation that checks to see if the required options have been passed for
     # attribute based validation to work as expected.
     # @param  [Object] validatable                An object to be validated
     # @param  [Hash]   options                    The options to set up the validation with
     # @option options  [Symbol]      :attribute   The attribute on the validatable object to validate against
+    # @option options  [true, false] :array       Specifies the attribute is an array of values to validate individually
     # @option options  [true, false] :allow_nil   If true, skips validation of the value of the attribute is #nil?
     # @option options  [true, false] :allow_blank If true, skips validation of the value of the attribute is #blank?
+    # @option options  [true, false] :allow_empty If true, along with :array, skips validation if the array is empty
     def initialize(validatable, options = {})
       raise(ArgumentError, "The attribute to validate must be specified as :attribute") unless options[:attribute]
+      @pos = 0 if options[:array]
       super
     end
-    
+
     # The attribute to validate against
     def attribute
       options[:attribute]
     end
-    
+
     # The value of the attribute to validate against
     def attribute_value
-      validatable.send(options[:attribute])
+      if options[:array]
+        validatable.send(options[:attribute])[@pos]
+      else
+        validatable.send(options[:attribute])
+      end
     end
-    
+
     # A default validate implementation that skips on #nil?/#blank? attribute values if :allow_nil or :allow_blank
     # have been set.
     def validate
-      skip if skip_on_blank? || skip_on_nil?
+      skip if skip_on_empty? || skip_on_blank? || skip_on_nil?
       super
     end
-    
+
+    # Performs the validation, returning true or false if the validation passes or fails,
+    # or nil if the validation will not run.
+    # @return [true, false, nil]
+    def validates?
+      if options[:array]
+        return @passed = nil if skip_on_empty?
+        reset
+        @pos = 0
+        statuses = []
+        while validating?
+          status = super
+          @pos += 1
+          statuses << status
+        end
+        @passed = statuses.all?
+      else
+        super
+      end
+    end
+
   private
 
+    def validating?
+      (@pos + 1) <= Array(validatable.send(options[:attribute])).size
+    end
+
+    def skip_on_empty?
+      options[:array] && options[:allow_empty] && Array(validatable.send(options[:attribute])).empty?
+    end
+
     def skip_on_nil?
       options[:allow_nil] && attribute_value.nil?
     end
-    
+
     def skip_on_blank?
       options[:allow_blank] && attribute_value.blank?
     end

data/lib/whyvalidationssuckin96/validation.rb

@@ -1,41 +1,41 @@
 module WhyValidationsSuckIn96
-  
+
   # Base class to use when implementing validations.
   class Validation
-    
+
     # A hash of default options for the validation to use.
     DefaultOptions = {}
-    
+
     # The options the validation was initialized with
     attr_accessor :options
-    
+
     # The object the validation is validating
     attr_reader :validatable
-    
+
     class << self
       attr_accessor :name
     end
-    
+
     # @param  [Object] validatable                An object to be validated
     # @param  [Hash]   options                    The options to set up the validation with
     def initialize(validatable, options = {})
       @validatable = validatable
       @options = self.class::DefaultOptions.merge(options)
     end
-    
+
     # Creates a new subclass of this class, used when defining custom validations with a block
     def self.new_subclass(name, def_block)
       Class.new(self) do
         self.name = name.to_sym
         define_method(:validate, &def_block)
         private :validate
-    
+
         def inspect
           "#<WhyValidationsSuckIn96::Validation subclass for validating '#{self.class.name}'> #{super}"
         end
       end
     end
-    
+
     # Has this validation passed?
     # @return [true, false]
     def passed?
@@ -47,13 +47,13 @@ module WhyValidationsSuckIn96
     def failed?
       @passed == false
     end
-    
+
     # Has this validation run?
     # @return [true, false]
     def has_run?
       @passed != nil
     end
-    
+
     # Performs the validation, returning true or false if the validation passes or fails,
     # or nil if the validation will not run.
     # @return [true, false, nil]
@@ -64,25 +64,25 @@ module WhyValidationsSuckIn96
         pass
       end
     end
-    
+
     # The failure message for this validation.
     def message
       @options[:message] || "failed validation"
     end
-    
+
   private
-    
+
     def reset
       @passed = nil
     end
-    
+
     def pass
       throw :validation_done, true
     end
-    
+
     def fail
       throw :validation_done, false
     end
-    
+
   end # Validation
 end   # WhyValidationsSuckIn96

data/test/attribute_based_validation_test.rb

@@ -3,56 +3,102 @@ require 'whyvalidationssuckin96/attribute_based_validation'
 
 context "attribute based validation mixin" do
   context "when mixed into a class" do
-    
+
     setup do
       Class.new(WhyValidationsSuckIn96::Validation) do
         include WhyValidationsSuckIn96::SkippableValidation
         include WhyValidationsSuckIn96::AttributeBasedValidation
-        
+
         def validate
           super
           pass
         end
-        
+
       end # Class.new
     end   # setup
-    
+
     should "fail if no attribute is specified during construction" do
       topic.new(Object.new)
     end.raises(ArgumentError, "The attribute to validate must be specified as :attribute")
-    
+
     should "add an attribute accessor" do
       topic.new(Object.new, :attribute => :foo).attribute
     end.equals(:foo)
-    
+
     context "when using :allow_nil" do
-      
+
       should "skip validation if the validatable object is #nil?" do
         inst = topic.new(OpenStruct.new(:test => nil), :allow_nil => true, :attribute => :test)
         inst.validates?
         inst.has_run?
       end.equals(false)
-      
+
       should "not skip validation of the validatable object is non-#nil?" do
         inst = topic.new(OpenStruct.new(:test => Object.new), :allow_nil => true, :attribute => :test)
         inst.validates?
         inst.has_run?
       end
     end # when using :allow_nil
-    
+
     context "when using :allow_blank" do
       should "skip validation if the validatable object is #blank?" do
         inst = topic.new(OpenStruct.new(:test => ""), :allow_blank => true, :attribute => :test)
         inst.validates?
         inst.has_run?
       end.equals(false)
-      
+
       should "not skip validation if the validatable object is non-#blank?" do
         inst = topic.new(OpenStruct.new(:test => "bzzt"), :allow_blank => true, :attribute => :test)
         inst.validates?
         inst.has_run?
       end
     end # when using :allow_blank
-    
+
+    context "when using :array" do
+      setup do
+        Class.new(WhyValidationsSuckIn96::Validation) do
+          include WhyValidationsSuckIn96::SkippableValidation
+          include WhyValidationsSuckIn96::AttributeBasedValidation
+
+          def validate
+            super
+            attribute_value.even? ? pass : fail
+          end
+
+        end # Class.new
+      end
+
+      should "fail if any item doesnt validate" do
+        inst = topic.new(OpenStruct.new(:test => [2,4,1,6]), :attribute => :test, :array => true)
+        inst.validates?
+      end.equals(false)
+
+      should "pass if all items validate" do
+        inst = topic.new(OpenStruct.new(:test => [2,4,6]), :attribute => :test, :array => true)
+        inst.validates?
+      end
+
+      should "still pass if the collection state changes between validation calls" do
+        validatable = OpenStruct.new(:test => [1,2,4,6])
+        inst = topic.new(validatable, :allow_empty => true, :attribute => :test, :array => true)
+        first_failed = !inst.validates?
+        validatable.test = [2,4,6]
+        first_failed && inst.validates?
+      end
+
+      context "with :allow_empty" do
+        should "skip validation if the array is empty" do
+          inst = topic.new(OpenStruct.new(:test => []), :allow_empty => true, :attribute => :test, :array => true)
+          inst.validates?
+          inst.has_run?
+        end.equals(false)
+
+        should "not skip validation of the validatable object is non-#empty?" do
+          inst = topic.new(OpenStruct.new(:test => [0]), :allow_empty => true, :attribute => :test, :array => true)
+          inst.validates?
+          inst.has_run?
+        end
+      end # with :allow_empty
+    end   # when using :array
   end     # when mixed into a class
 end       # skippable validation mixin

data/whyvalidationssuckin96.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{whyvalidationssuckin96}
-  s.version = "1.5.5"
+  s.version = "1.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["gabrielg", "douglasmeyer"]
-  s.date = %q{2010-03-08}
+  s.date = %q{2010-03-09}
   s.description = %q{A library for setting up model validations, such as in ActiveRecord.}
   s.email = %q{gabriel.gironda@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: whyvalidationssuckin96
 version: !ruby/object:Gem::Version 
-  version: 1.5.5
+  version: 1.6.0
 platform: ruby
 authors: 
 - gabrielg
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-08 00:00:00 -06:00
+date: 2010-03-09 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency