simple_validation 0.1.2 → 0.1.3

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+v0.1.3
+-------
+
+* Don't run validations if the object is already validated
+* #errors validates the object
+
 v0.1.2
 ------
 

data/README.md

@@ -24,9 +24,6 @@ require "simple_validation"
 class AlienNumber
   include SimpleValidation
 
-  validate :digits_are_positive
-  validate :digits_are_less_than_ten
-
   def initialize(*digits)
     @digits = digits
   end

data/lib/simple_validation/version.rb

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

data/lib/simple_validation.rb

@@ -13,9 +13,6 @@
 #   class AlienNumber
 #     include SimpleValidation
 #
-#     validate :digits_are_positive
-#     validate :digits_are_less_than_ten
-#
 #     def initialize(*digits)
 #       @digits = digits
 #     end
@@ -79,12 +76,19 @@ module SimpleValidation
     end
   end
 
-  # Runs all validations and returns _true_ if the object is valid
-  def valid?
-    self.class.validation_methods.each do |method_name|
-      send method_name
+  # Run all validations associated with the object
+  def validate # :nodoc:
+    unless @validated
+      @validated = true
+      self.class.validation_methods.each do |method_name|
+        send method_name
+      end
     end
+  end
 
+  # Runs all validations and returns _true_ if the object is valid
+  def valid?
+    validate
     errors.empty?
   end
 
@@ -95,7 +99,7 @@ module SimpleValidation
 
   # Adds an error to the errors collection
   def add_error(error)
-    errors << error unless errors.include?(error)
+    errors << error
   end
 
   # Adds an array of errors to the errors collection
@@ -105,6 +109,7 @@ module SimpleValidation
 
   # Returns an array of the current errors
   def errors
+    validate
     @errors ||= []
   end
 end

data/spec/simple_validation_spec.rb

@@ -16,29 +16,29 @@ end
 class TestEntityWithValidation
   include SimpleValidation
 
-  attr_reader :always_valid_invoked
-  attr_reader :always_invalid_invoked
+  attr_reader :always_valid_invoked_count
+  attr_reader :always_invalid_invoked_count
 
   validate :always_valid
   validate :always_invalid
 
   def initialize
-    @always_valid_invoked = false
-    @always_invalid_invoked = false
+    @always_valid_invoked_count = 0
+    @always_invalid_invoked_count = 0
   end
 
   def always_valid
-    @always_valid_invoked = true
+    @always_valid_invoked_count += 1
   end
 
   def always_invalid
-    @always_invalid_invoked = true
+    @always_invalid_invoked_count += 1
     add_error "Always invalid"
   end
 end
 
-describe "An entity that can be validated" do
-  describe "when it has errors" do
+describe "A validatable entity" do
+  describe "with an error" do
     before do
       @entity = TestEntity.new
       @entity.add_error("An error")
@@ -55,13 +55,9 @@ describe "An entity that can be validated" do
     it "exposes its errors" do
       @entity.errors.must_equal ["An error"]
     end
-
-    it "allows custom validation" do
-      @entity.errors.must_equal ["An error"]
-    end
   end
 
-  describe "when it doesn't have any error" do
+  describe "whithout any errors" do
     before do
       @entity = TestEntity.new
     end
@@ -79,48 +75,83 @@ describe "An entity that can be validated" do
     end
   end
 
-  describe "when it has a custom validation" do
+  describe "with custom validation" do
     before do
       @entity = TestEntityWithValidation.new
     end
 
-    describe "on validation" do
+    describe "#valid?" do
       before do
         @entity.valid?
       end
 
-      it "invokes the validations" do
-        @entity.always_valid_invoked.must_equal true
-        @entity.always_invalid_invoked.must_equal true
+      it "invokes its validations" do
+        @entity.always_valid_invoked_count.must_equal 1
+        @entity.always_invalid_invoked_count.must_equal 1
       end
 
       it "has errors added during validation" do
         @entity.errors.must_equal ["Always invalid"]
       end
-    end
 
-    describe "with already existing errors" do
-      it "doesn't lose its older errors on validation" do
-        @entity = TestEntityWithValidation.new
-        @entity.add_errors(["An error", "Another error"])
-        @entity.valid?
-        @entity.errors.must_equal ["An error", "Another error", "Always invalid"]
+      describe "on another #valid?" do
+        before do
+          @entity.valid?
+        end
+
+        it "doesn't duplicate its errors" do
+          @entity.errors.must_equal ["Always invalid"]
+        end
+
+        it "doesn't re-run validation" do
+          @entity.always_valid_invoked_count.must_equal 1
+          @entity.always_invalid_invoked_count.must_equal 1
+        end
       end
     end
 
-    describe "when double validated" do
-      it "doesn't duplicate its errors" do
-        @entity = TestEntityWithValidation.new
-        @entity.valid?
-        @entity.valid?
+    describe "#errors" do
+      before do
+        @entity.errors
+      end
+
+      it "invokes its validations" do
+        @entity.always_valid_invoked_count.must_equal 1
+        @entity.always_invalid_invoked_count.must_equal 1
+      end
+
+      it "has errors added during validation" do
         @entity.errors.must_equal ["Always invalid"]
       end
+
+      describe "on another #error" do
+        before do
+          @entity.errors
+        end
+
+        it "doesn't duplicate its errors" do
+          @entity.errors.must_equal ["Always invalid"]
+        end
+
+        it "doesn't re-run validation" do
+          @entity.always_valid_invoked_count.must_equal 1
+          @entity.always_invalid_invoked_count.must_equal 1
+        end
+      end
+    end
+  end
+
+  describe "with already existing errors" do
+    it "doesn't lose its older errors on validation" do
+      entity = TestEntityWithValidation.new
+      entity.add_errors(["An error", "Another error"])
+      entity.errors.sort.must_equal ["An error", "Another error", "Always invalid"].sort
     end
   end
 
-  it "can be added an array of errors" do
-    @entity = TestEntity.new
-    @entity.add_errors(["An error", "Another error"])
-    @entity.errors.must_equal ["An error", "Another error"]
+  it "can accept multiple errors" do
+    entity = TestEntity.new
+    entity.add_errors(["An error", "Another error"])
+    entity.errors.must_equal ["An error", "Another error"]
   end
 end

metadata

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