simple_validation 0.1.3 → 0.1.4

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+v0.1.4
+-------
+
+* Support conditional validations
+
 v0.1.3
 -------
 

data/README.md

@@ -24,6 +24,9 @@ require "simple_validation"
 class AlienNumber
   include SimpleValidation
 
+  validate :digits_are_positive
+  validate :digits_are_less_than_ten, :if => [:digits_count_even?]
+
   def initialize(*digits)
     @digits = digits
   end
@@ -45,6 +48,10 @@ class AlienNumber
 	  add_error("#{digit} is greater than 9") unless digit < 10
 	end
   end
+
+  def digits_count_even?
+    @digits.size.even?
+  end
 end
 
 valid_number = AlienNumber.new(1, 2, 3)
@@ -56,8 +63,14 @@ valid_number.value # 6
 invalid_number = AlienNumber.new(-1, 12)
 invalid_number.valid? # false
 invalid_number.invalid? # true
-invalid_number.errors # ["-1 is negative", "12 is greater than 9"]
+invalid_number.errors # ["-1 is negative"]
 invalid_number.value # 11
+
+another_invalid_number = AlienNumber.new(-10, 12, 15)
+another_invalid_number.valid? # false
+another_invalid_number.invalid? # true
+another_invalid_number.errors # ["-1 is negative", "12 is greater than 9"]
+another_invalid_number.value # 17
 ```
 
 Running tests

data/lib/simple_validation.rb

@@ -64,15 +64,15 @@ module SimpleValidation
     #     include SimpleValidation
     #
     #     validate :digits_are_positive
-    #     validate :digits_are_less_than_ten
+    #     validate :digits_are_less_than_ten, :if => [:digits_count_even?]
     #   end
-    def validate(method_name)
-      validation_methods << method_name
+    def validate(method_name, conditions = {})
+      validation_methods[method_name] = conditions[:if] || []
     end
 
     # The list of all method names that validate the object
     def validation_methods # :nodoc:
-      @validation_methods ||= []
+      @validation_methods ||= {}
     end
   end
 
@@ -80,8 +80,8 @@ module SimpleValidation
   def validate # :nodoc:
     unless @validated
       @validated = true
-      self.class.validation_methods.each do |method_name|
-        send method_name
+      self.class.validation_methods.each do |method_name, conditions|
+        send method_name if conditions.all? { |condition| send condition }
       end
     end
   end

data/lib/simple_validation/version.rb

@@ -6,5 +6,5 @@
 # See LICENSE for license
 
 module SimpleValidation
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/simple_validation_spec.rb

@@ -37,6 +37,44 @@ class TestEntityWithValidation
   end
 end
 
+class TestEntityWithConditionalValidation
+  include SimpleValidation
+
+  attr_reader :statement_one_invoked_count
+  attr_reader :statement_two_invoked_count
+  attr_reader :statement_three_invoked_count
+
+  validate :statement_one, :if => [:condition_one?]
+  validate :statement_two, :if => [:condition_two?]
+  validate :statement_three, :if => [:condition_one?, :condition_two?]
+
+  def initialize
+    @statement_one_invoked_count = 0
+    @statement_two_invoked_count = 0
+    @statement_three_invoked_count = 0
+  end
+
+  def statement_one
+    @statement_one_invoked_count += 1
+  end
+
+  def statement_two
+    @statement_two_invoked_count += 1
+  end
+  
+  def statement_three
+    @statement_three_invoked_count += 1
+  end
+  
+  def condition_one?
+    true
+  end
+  
+  def condition_two?
+    false
+  end
+end
+
 describe "A validatable entity" do
   describe "with an error" do
     before do
@@ -140,6 +178,30 @@ describe "A validatable entity" do
       end
     end
   end
+  
+  describe "with conditional validation" do
+    before do
+      @entity = TestEntityWithConditionalValidation.new
+    end
+
+    describe "#valid?" do
+      before do
+        @entity.valid?
+      end
+
+      it "invokes its validations that passes all conditions" do
+        @entity.statement_one_invoked_count.must_equal 1
+      end
+
+      it "doesn't invoke its validations that fail all conditions" do
+        @entity.statement_two_invoked_count.must_equal 0
+      end
+
+      it "doesn't invoke its validations that fail conditions partially" do
+        @entity.statement_three_invoked_count.must_equal 0
+      end
+    end
+  end
 
   describe "with already existing errors" do
     it "doesn't lose its older errors on validation" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_validation
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-26 00:00:00.000000000 Z
+date: 2012-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest