whyvalidationssuckin96 1.5.2 → 1.5.3

data/VERSION

@@ -1 +1 @@
-1.5.2
+1.5.3

data/lib/whyvalidationssuckin96/macros/validates_exclusion.rb

@@ -2,30 +2,42 @@ require 'whyvalidationssuckin96/skippable_validation'
 require 'whyvalidationssuckin96/attribute_based_validation'
 
 module WhyValidationsSuckIn96
-  
+
   # Checks the validity of an attribute against a collection of excluded values.
   #
   # @example Default usage
   #   setup_validations do
   #     validates_exclusion_of :subdomain, :in => %w[www ftp]
   #   end
-  class ValidatesExclusion < Validation  
+  #
+  # @example Usage when checking a set of values against another set
+  #   setup_validations do
+  #     validates_exclusion_of :colours, :in => %w[red green], :set => true
+  #     # colours can now be an array containing anything except 'red' or 'green'
+  #   end
+  class ValidatesExclusion < Validation
     include WhyValidationsSuckIn96::SkippableValidation
     include WhyValidationsSuckIn96::AttributeBasedValidation
-    
-    DefaultOptions = {:message => "is in the excluded collection"}
-    
-    # @param  [Object] validatable     An object to be validated.
-    # @param  [Hash]   options         The options to set up the validation with.
-    # @option options  [#include?] :in A collection to check against for exclusion.
+
+    DefaultOptions = {:message => "is in the excluded collection",
+                      :set     => false}
+
+    # @param  [Object] validatable        An object to be validated.
+    # @param  [Hash]   options            The options to set up the validation with.
+    # @option options  [#include?]   :in  A collection to check against for exclusion.
+    # @option options  [true, false] :set Whether or not to do a set based comparison
     def initialize(validatable, options = {})
       super
       raise(ArgumentError, "Collection to check for exclusion against should be specified with :in") unless options[:in]
     end
-    
+
     def validate
       super
-      if options[:in].include?(attribute_value)
+      if options[:set]
+        attribute_value.any? do |val|
+          options[:in].include?(val)
+        end ? fail : pass
+      elsif !options[:set] && options[:in].include?(attribute_value)
         fail
       else
         pass

data/lib/whyvalidationssuckin96/macros/validates_inclusion.rb

@@ -2,30 +2,42 @@ require 'whyvalidationssuckin96/skippable_validation'
 require 'whyvalidationssuckin96/attribute_based_validation'
 
 module WhyValidationsSuckIn96
-  
+
   # Checks the validity of an attribute against a list of values for it to be included in.
   #
   # @example Default usage
   #   setup_validations do
   #     validates_inclusion_of :unit_system, :in => %w[imperial metric]
   #   end
-  class ValidatesInclusion < Validation  
+  #
+  # @example Usage when checking a set of values against another set
+  #   setup_validations do
+  #     validates_inclusion_of :colours, :in => %w[red green], :set => true
+  #     # colours can now be an array containing either 'red' or 'green' or both
+  #   end
+  class ValidatesInclusion < Validation
     include WhyValidationsSuckIn96::SkippableValidation
     include WhyValidationsSuckIn96::AttributeBasedValidation
-    
-    DefaultOptions = {:message => "is not in the acceptable collection"}
-    
-    # @param  [Object] validatable     An object to be validated.
-    # @param  [Hash]   options         The options to set up the validation with.
-    # @option options  [#include?] :in A collection to check against for inclusion.
+
+    DefaultOptions = {:message => "is not in the acceptable collection",
+                      :set     => false}
+
+    # @param  [Object] validatable        An object to be validated.
+    # @param  [Hash]   options            The options to set up the validation with.
+    # @option options  [#include?]   :in  A collection to check against for inclusion.
+    # @option options  [true, false] :set Whether or not to do a set based comparison
     def initialize(validatable, options = {})
       super
       raise(ArgumentError, "Collection to check for inclusion against should be specified with :in") unless options[:in]
     end
-    
+
     def validate
       super
-      if options[:in].include?(attribute_value)
+      if options[:set]
+        attribute_value.any? && attribute_value.all? do |val|
+          options[:in].include?(val)
+        end ? pass : fail
+      elsif !options[:set] && options[:in].include?(attribute_value)
         pass
       else
         fail

data/test/macros/validates_exclusion_test.rb

@@ -1,37 +1,57 @@
 require 'teststrap'
 
 context "validates exclusion" do
-  
+
   should "add a validation macro" do
     WhyValidationsSuckIn96::ValidationBuilder.instance_methods
   end.includes('validates_exclusion_of')
-  
+
   should "raise if an :in option is not given" do
-      WhyValidationsSuckIn96::ValidatesExclusion.new(Object.new, :attribute => :colour)    
+      WhyValidationsSuckIn96::ValidatesExclusion.new(Object.new, :attribute => :colour)
   end.raises(ArgumentError, "Collection to check for exclusion against should be specified with :in")
-  
+
   context "with some default options" do
     setup do
       WhyValidationsSuckIn96::ValidatesExclusion.new(Object.new, :attribute => :colour, :in => %w[1 2 3])
     end
-  
+
     should "have a message accessor with a default message" do
       topic.message
     end.equals("is in the excluded collection")
   end # with some default options
-  
+
   context "validating an object" do
-    
+
     should "fail if the attribute is in the excluded set" do
       validation = WhyValidationsSuckIn96::ValidatesExclusion.new(OpenStruct.new(:colour => "red"), :attribute => :colour,
                                                                   :in => %w[red blue])
       validation.validates?
     end.equals(false)
-    
+
     should "pass if the attribute is out of the excluded set" do
       validation = WhyValidationsSuckIn96::ValidatesExclusion.new(OpenStruct.new(:colour => "red"), :attribute => :colour,
                                                                   :in => %w[green blue])
       validation.validates?
     end
   end   # validating an object
+
+  context "validating an object with the :set option given" do
+
+    should "fail if any of the attributes are in the given set" do
+      validation = WhyValidationsSuckIn96::ValidatesExclusion.new(OpenStruct.new(:colours => %w[red blue yellow]),
+                                                                  :attribute => :colours,
+                                                                  :set => true,
+                                                                  :in => %w[blue green])
+      validation.validates?
+    end.equals(false)
+
+    should "pass if all the attributes are not in the given set" do
+      validation = WhyValidationsSuckIn96::ValidatesExclusion.new(OpenStruct.new(:colours => %w[yellow purple]),
+                                                                  :attribute => :colours,
+                                                                  :set => true,
+                                                                  :in => %w[red green blue])
+      validation.validates?
+    end
+  end   # validating an object
+
 end     # validates exclusion

data/test/macros/validates_inclusion_test.rb

@@ -1,37 +1,57 @@
 require 'teststrap'
 
 context "validates inclusion" do
-  
+
   should "add a validation macro" do
     WhyValidationsSuckIn96::ValidationBuilder.instance_methods
   end.includes('validates_inclusion_of')
-  
+
   should "raise if an :in option is not given" do
-      WhyValidationsSuckIn96::ValidatesInclusion.new(Object.new, :attribute => :colour)    
+      WhyValidationsSuckIn96::ValidatesInclusion.new(Object.new, :attribute => :colour)
   end.raises(ArgumentError, "Collection to check for inclusion against should be specified with :in")
-  
+
   context "with some default options" do
     setup do
       WhyValidationsSuckIn96::ValidatesInclusion.new(Object.new, :attribute => :colour, :in => %w[1 2 3])
     end
-  
+
     should "have a message accessor with a default message" do
       topic.message
     end.equals("is not in the acceptable collection")
   end # with some default options
-  
+
   context "validating an object" do
-    
+
     should "fail if the attribute is not in the given set" do
       validation = WhyValidationsSuckIn96::ValidatesInclusion.new(OpenStruct.new(:colour => "red"), :attribute => :colour,
                                                                   :in => %w[blue green])
       validation.validates?
     end.equals(false)
-    
+
     should "pass if the attribute is in the given set" do
       validation = WhyValidationsSuckIn96::ValidatesInclusion.new(OpenStruct.new(:colour => "red"), :attribute => :colour,
                                                                   :in => %w[red green blue])
       validation.validates?
     end
   end   # validating an object
+
+  context "validating an object with the :set option given" do
+
+    should "fail if any of the attributes are not in the given set" do
+      validation = WhyValidationsSuckIn96::ValidatesInclusion.new(OpenStruct.new(:colours => %w[red blue yellow]),
+                                                                  :attribute => :colours,
+                                                                  :set => true,
+                                                                  :in => %w[blue green])
+      validation.validates?
+    end.equals(false)
+
+    should "pass if all the attributes are in the given set" do
+      validation = WhyValidationsSuckIn96::ValidatesInclusion.new(OpenStruct.new(:colours => %w[red green]),
+                                                                  :attribute => :colours,
+                                                                  :set => true,
+                                                                  :in => %w[red green blue])
+      validation.validates?
+    end
+  end   # validating an object
+
 end     # validates inclusion

data/test/validation_test.rb

@@ -5,39 +5,39 @@ context "validation" do
     setup do
       WhyValidationsSuckIn96::Validation.new_subclass(:validates_rockingness, lambda {})
     end
-    
+
     should "have a readable string returned by inspect" do
       topic.new(Object.new).inspect
-    end.equals(/^#<WhyValidationsSuckIn96::Validation subclass for validating 'validates_rockingness'>/)
-    
+    end.matches(/^#<WhyValidationsSuckIn96::Validation subclass for validating 'validates_rockingness'>/)
+
     should "have a name on the new subclass" do
       topic.name
     end.equals(:validates_rockingness)
-    
+
     should "define validate as private on the new subclass" do
       topic.private_instance_methods
-    end.includes("validate")    
+    end.includes("validate")
   end # creating a new subclass
-  
+
   context "an instance of a subclass" do
     setup do
       WhyValidationsSuckIn96::Validation.new_subclass(:validates_rockingness, lambda {})
     end
-    
+
     should "allow accessing the options via an instance method" do
       topic.new(Object.new, :example => "stuff").options
     end.equals(:example => "stuff")
-    
+
     should "return a true by default when pass/fail aren't called in the validation definition" do
       topic.new(Object.new).validates?
     end.equals(true)
-    
+
     should "be passed by default when pass/fail aren't called in the validation definition" do
       validation = topic.new(Object.new)
       validation.validates?
       validation.passed?
     end.equals(true)
-    
+
     should "not be passed if the validation hasn't run yet" do
       topic.new(Object.new).passed?
     end.equals(false)
@@ -45,13 +45,13 @@ context "validation" do
     should "not be failed if the validation hasn't run yet" do
       topic.new(Object.new).failed?
     end.equals(false)
-    
+
     should "not return true for has_run? if the validation hasn't run yet" do
       topic.new(Object.new).has_run?
     end.equals(false)
-    
+
   end # an instance of a subclass
-  
+
   context "an instance of a subclass with an actual validation definition" do
     setup do
       validation = lambda { validatable ? pass : fail }
@@ -62,40 +62,40 @@ context "validation" do
       validation = topic.new(true)
       validation.validates?
     end.equals(true)
-    
+
     should "be passed when run and pass is called" do
       validation = topic.new(true)
       validation.validates?
       validation.passed?
     end
-    
+
     should "have has_run? return true when the validation runs" do
       validation = topic.new(true)
       validation.validates?
       validation.has_run?
     end
-    
+
     should "have validates? return false if the validation fails" do
       validation = topic.new(false)
       validation.validates?
     end.equals(false)
-    
+
     should "be failed when run and fail is called" do
       validation = topic.new(false)
       validation.validates?
       validation.failed?
     end
   end # an instance of a subclass with an actual validation definition
-  
+
   context "an instance of a subclass with a validation definition that raises" do
     setup do
       validation = lambda { raise "hell" }
       WhyValidationsSuckIn96::Validation.new_subclass(:validates_rockingness, validation)
     end
-    
+
     should "raise an exception when validating" do
       topic.new(Object.new).validates?
     end.raises(RuntimeError, "hell")
-    
+
   end # an instance of a subclass with a validation definition that raises
 end   # validation

data/whyvalidationssuckin96.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{whyvalidationssuckin96}
-  s.version = "1.5.2"
+  s.version = "1.5.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["gabrielg", "douglasmeyer"]
-  s.date = %q{2010-02-15}
+  s.date = %q{2010-03-05}
   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.2
+  version: 1.5.3
 platform: ruby
 authors: 
 - gabrielg
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-15 00:00:00 -06:00
+date: 2010-03-05 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency