whyvalidationssuckin96 1.5.1 → 1.5.2

data/VERSION

@@ -1 +1 @@
-1.5.1
+1.5.2

data/lib/whyvalidationssuckin96/macros/validates_date.rb

@@ -10,6 +10,8 @@ module WhyValidationsSuckIn96
   #     validates_as_date :start_date
   #   end
   class ValidatesDate < Validation
+    attr_reader :date
+
     include WhyValidationsSuckIn96::SkippableValidation
     include WhyValidationsSuckIn96::AttributeBasedValidation
     DefaultDelimiters = %r{[-/]}
@@ -45,7 +47,7 @@ module WhyValidationsSuckIn96
 
     def parse_date
       parsed = options[:parser].call(attribute_value.to_s)
-      Date.civil(parsed[:year].to_i, parsed[:month].to_i, parsed[:day].to_i)
+      @date = Date.civil(parsed[:year].to_i, parsed[:month].to_i, parsed[:day].to_i)
     end
   end # Validation
 

data/lib/whyvalidationssuckin96/validation_support.rb

@@ -3,35 +3,35 @@ require 'whyvalidationssuckin96/validation_collection'
 
 module WhyValidationsSuckIn96
   module ValidationSupport
-    
+
     def self.included(klass_or_mod)
       klass_or_mod.module_eval do
         extend WhyValidationsSuckIn96::ValidationSupport::ClassMethods
         include WhyValidationsSuckIn96::ValidationSupport::InstanceMethods
       end
     end
-    
+
     # Instance methods added to any class or module that mixes in ValidationSupport
     module InstanceMethods
-      
+
       def self.included(klass)
         klass.module_eval do
 
         end
       end
-      
+
       # Is this object invalid?
       # @return [true, false]
       def invalid?
         !valid?
       end
-      
+
       def valid?
         self.class.run_with_generic_callbacks? ? valid_with_generic_callbacks? : valid_without_generic_callbacks?
       end
-      
+
       # Is this object valid?
-      # Also runs any callbacks if the class has callback support as defined by the 
+      # Also runs any callbacks if the class has callback support as defined by the
       # instance method run_callbacks being present.
       # @return [true, false]
       def valid_with_generic_callbacks?
@@ -40,7 +40,7 @@ module WhyValidationsSuckIn96
       ensure
         run_callbacks(:after_validation)
       end
-      
+
       # Is this object valid?
       # @return [true, false]
       def valid_without_generic_callbacks?
@@ -49,19 +49,19 @@ module WhyValidationsSuckIn96
           (validation.validates? == false) ? false : true
         end.all?
       end
-      
+
       # An array of instances of failed validations
       # @return [Array]
       def failed_validations
         all_validations.select { |validation| validation.failed? }
       end
-      
+
       # An array of instances of passed validations
       # @return [Array]
       def passed_validations
         all_validations.select { |validation| validation.passed? }
       end
-      
+
       # An array of instances of all validations for this object
       # @return [Array]
       def all_validations
@@ -70,12 +70,18 @@ module WhyValidationsSuckIn96
           vc
         end
       end
-      
+
+      def validations_for(attribute)
+        all_validations.select do |validation|
+          validation.respond_to?(:attribute) && validation.attribute == attribute.to_sym
+        end
+      end
+
     end # InstanceMethods
-    
+
     module ClassMethods
-      
-      # If the class or module has a public 'run_callbacks' instance method, we run validations and fire 
+
+      # If the class or module has a public 'run_callbacks' instance method, we run validations and fire
       # appropriate callbacks
       # @return [true, false]
       def run_with_generic_callbacks?
@@ -85,7 +91,7 @@ module WhyValidationsSuckIn96
           @run_with_generic_callbacks = public_instance_methods.include?('run_callbacks')
         end
       end
-      
+
       # An array of arrays, the first element of each being the validation subclass that will be instantiated
       # when validation is performed, the last element being the options the validation will be instantiated
       # with.
@@ -96,14 +102,14 @@ module WhyValidationsSuckIn96
           ancestor_with_validations ? ancestor_with_validations.validation_collection.dup : []
         end
       end
-      
+
       # Sets up validations for the class or module this module has been mixed into
       def setup_validations(&definition_block)
         self.validation_collection ||= ancestors.detect{|anc| !anc.validation_collection.nil?}.validation_collection.dup
         builder = ValidationBuilder.new(self, definition_block)
         builder.create_validations!
       end
-      
+
     end # ClassMethods
   end   # ValidationSupport
 end     # WhyValidationsSuckIn96

data/test/macros/validates_date_test.rb

@@ -32,5 +32,17 @@ context "validates date" do
       validation = WhyValidationsSuckIn96::ValidatesDate.new(OpenStruct.new(:start_date => "4-20-1969"), :attribute => :start_date)
       validation.validates?
     end
+
+    should "have an accessor for the parsed date string" do
+      validation = WhyValidationsSuckIn96::ValidatesDate.new(OpenStruct.new(:start_date => "4-20-1969"), :attribute => :start_date)
+      validation.validates?
+      validation.date
+    end.equals(Date.civil(1969, 4, 20))
+
+    should "#date returns nil if validation does not pass" do
+      validation = WhyValidationsSuckIn96::ValidatesDate.new(OpenStruct.new(:start_date => "34-393"), :attribute => :start_date)
+      validation.validates?
+      validation.date
+    end.not!
   end   # validating an object
 end     # validates format

data/test/validation_support_test.rb

@@ -4,71 +4,71 @@ context "validation_support" do
 
   context "when mixed into a class supporting callbacks" do
     setup do
-      Class.new do 
+      Class.new do
         attr_reader :callbacks_run
-        
+
         def initialize
           @callbacks_run = []
         end
-        
+
         def run_callbacks(callback_name)
           @callbacks_run << callback_name
         end
-        
+
         include WhyValidationsSuckIn96::ValidationSupport
         setup_validations do
           validate(:foo) { pass }
         end
       end.new
     end
-    
+
     should "run the before_validation callback when calling valid?" do
       topic.callbacks_run.clear
       topic.valid?
       topic.callbacks_run
     end.includes(:before_validation)
-    
+
     should "run the after_validation callback when calling valid?" do
       topic.callbacks_run.clear
       topic.valid?
       topic.callbacks_run
     end.includes(:after_validation)
-    
+
   end # when mixed into a class supporting callbacks
-  
+
   context "when mixed into a class" do
     setup do
       Class.new { include WhyValidationsSuckIn96::ValidationSupport }
     end
-    
+
     should "add a 'validation_collection' method" do
       topic
     end.respond_to(:validation_collection)
-    
+
     should "add a 'setup_validations' method" do
       topic
     end.respond_to(:setup_validations)
-    
+
     should "add a 'valid?' instance method" do
       topic.new
     end.respond_to(:valid?)
-    
+
     should "add a 'invalid?' instance method" do
       topic.new
     end.respond_to(:invalid?)
-    
+
     should "add a 'failed_validations' instance method" do
       topic.new
     end.respond_to(:failed_validations)
-    
+
     should "add a 'passed_validations' instance method" do
       topic.new
     end.respond_to(:passed_validations)
-    
+
     should "add a 'all_validations' instance method" do
       topic.new
     end.respond_to(:all_validations)
-    
+
     should "have a ValidationCollection for all_validations" do
       topic.new.all_validations.instance_of?(WhyValidationsSuckIn96::ValidationCollection)
     end
@@ -76,16 +76,16 @@ context "validation_support" do
     should "have an empty validation collection" do
       topic.validation_collection.size
     end.equals(0)
-    
+
     should "be valid when no validations have been defined" do
       topic.new.valid?
     end
-    
+
     should "not be invalid when no validations have been defined" do
       !topic.new.invalid?
     end
   end # mixed into a class
-  
+
   context "when mixed into a class and used to add a simple validation" do
     setup do
       Class.new do
@@ -99,46 +99,46 @@ context "validation_support" do
         end # setup_validations
       end   # Class.new
     end     # setup
-    
+
     should "have one validation in the validation_collection" do
       topic.validation_collection.size
     end.equals(1)
-    
+
     should "be able to reflect on the validation and find its name" do
       topic.validation_collection.first.first.name
     end.equals(:title_is_present)
-    
+
     should "be able to reflect on the validation and find its options" do
       topic.validation_collection.first.last
     end.equals(:example => "the number song", :message => "title must be present")
-    
+
     context "given an instance of the class" do
       setup { topic.new }
-      
+
       should "have one entry for all validations" do
         topic.all_validations.size
       end.equals(1)
-    
+
       should "have all the entries for all validations be validation instances" do
         topic.all_validations.all? { |validation| validation.kind_of?(WhyValidationsSuckIn96::Validation) }
       end
-    
+
       should "not be valid without a title" do
         topic.title = nil
         !topic.valid?
       end
-    
+
       should "be valid with a title" do
         topic.title = "building steam with a grain of salt"
         topic.valid?
       end
-    
+
       should "have one passed validation with a title" do
         topic.title = "building steam with a grain of salt"
         topic.valid?
         topic.passed_validations.size
       end.equals(1)
-      
+
       should "have one failed validation without a title" do
         topic.title = nil
         topic.valid?
@@ -146,10 +146,10 @@ context "validation_support" do
       end.equals(1)
     end # given an instance of the class
   end   # when mixed into a class and used to add a simple validation
-  
+
   context "when extending a class with existing validations and adding new validations" do
     parent_class = child_class = nil
-    
+
     setup do
       parent_class = Class.new do
         attr_accessor :artist
@@ -161,7 +161,7 @@ context "validation_support" do
           end
         end # setup_validations
       end   # parent_class
-      
+
       child_class = Class.new(parent_class) do
         attr_accessor :title
         setup_validations do
@@ -172,32 +172,32 @@ context "validation_support" do
         end # setup_validations
       end   # child_class
     end     # setup
-    
+
     should "have only one validation in the collection for the base class" do
       parent_class.validation_collection.size
     end.equals(1)
-    
+
     should "have a validation for the artist in the base class" do
       parent_class.validation_collection.detect {|(validation, opts)| validation.name == :artist_is_present }
     end
-    
+
     should "have two validations in the collection for the child class" do
       child_class.validation_collection.size
     end.equals(2)
-    
+
     should "have a validation for the artist in the child class" do
       child_class.validation_collection.detect {|(validation, opts)| validation.name == :artist_is_present }
     end
-    
+
     should "have a validation for the title in the child class" do
       child_class.validation_collection.detect {|(validation, opts)| validation.name == :title_is_present }
     end
-    
+
   end   # when extending a class with existing validations
-  
+
   context "when extending a class with existing validations and not adding new validations" do
     parent_class = child_class = nil
-    
+
     setup do
       parent_class = Class.new do
         attr_accessor :artist
@@ -209,16 +209,16 @@ context "validation_support" do
           end
         end # setup_validations
       end   # parent_class
-      
+
       child_class = Class.new(parent_class)
     end     # setup
-    
+
     should "have the parent class' validations by default" do
       child_class.validation_collection.size
     end.equals(1)
-  
+
   end # when extending a class with existing validations and not adding new validations
-  
+
   context "when calling setup_validations twice in a class" do
     setup do
       Class.new do
@@ -231,18 +231,38 @@ context "validation_support" do
         end
       end   # Class.new
     end     # setup
-    
+
     should "add two validations to the class" do
       topic.validation_collection.size
     end.equals(2)
-    
+
     should "have the first validation" do
       topic.validation_collection.detect { |(validation, opts)| validation.name == :first_validation }
     end
-    
+
     should "have the second validation" do
       topic.validation_collection.detect { |(validation, opts)| validation.name == :second_validation }
     end
-    
+
   end # when calling setup_validations twice in a class
+
+  context "when asking for validations on a specific attribute" do
+    setup do
+      Class.new do
+        include WhyValidationsSuckIn96::ValidationSupport
+        setup_validations do
+          validates_presence_of :foo
+        end
+      end   # Class.new
+    end
+
+    should "return validations on an instance" do
+      topic.new.validations_for(:foo).size
+    end
+
+    should "return validations an empty array if no validations on attribute" do
+      topic.new.validations_for(:bar).size
+    end.equals(0)
+  end
+
 end   # validation_support

data/whyvalidationssuckin96.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{whyvalidationssuckin96}
-  s.version = "1.5.1"
+  s.version = "1.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["gabrielg", "douglasmeyer"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: whyvalidationssuckin96
 version: !ruby/object:Gem::Version 
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors: 
 - gabrielg