simple_validation 0.1.4 → 0.1.5

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+v0.1.5
+-------
+
+* Don't duplicate errors
+
 v0.1.4
 -------
 

data/README.md

@@ -6,7 +6,7 @@ This is very simple gem to allow custom validations in a ruby object. You are su
 Dependencies
 ------------
 
-These are no dependencies for this gem. You need minitest to run the tests for this gem.
+These are no runtime dependencies for this gem. You need minitest to run the tests for this gem.
 
 Installation
 ------------
@@ -63,13 +63,13 @@ valid_number.value # 6
 invalid_number = AlienNumber.new(-1, 12)
 invalid_number.valid? # false
 invalid_number.invalid? # true
-invalid_number.errors # ["-1 is negative"]
+invalid_number.errors # ["-1 is negative", "12 is greater than 9"]
 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.errors # ["-10 is negative"]
 another_invalid_number.value # 17
 ```
 

data/lib/simple_validation/version.rb

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

data/lib/simple_validation.rb

@@ -57,7 +57,8 @@ module SimpleValidation
 
   module ClassMethods
     # Add a validation method
-    # The object to validate be able to invoke the method supplied
+    # The object to validate should be able to invoke the method supplied
+    # You can pass a list of conditions that the object must satisfy for the validations to run
     #
     # Example:
     #   class AlienNumber
@@ -89,7 +90,7 @@ module SimpleValidation
   # Runs all validations and returns _true_ if the object is valid
   def valid?
     validate
-    errors.empty?
+    all_errors.empty?
   end
 
   # Runs all validations and returns _true_ if the object is invalid
@@ -99,17 +100,24 @@ module SimpleValidation
 
   # Adds an error to the errors collection
   def add_error(error)
-    errors << error
+    all_errors << error
   end
 
   # Adds an array of errors to the errors collection
   def add_errors(more_errors)
-    errors.concat(more_errors)
+    all_errors.concat(more_errors)
   end
 
   # Returns an array of the current errors
   def errors
     validate
+    all_errors
+  end
+
+  def all_errors # :nodoc:
     @errors ||= []
+    @errors.uniq!
+    @errors
   end
+  private :all_errors
 end

data/simple_validation.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |s|
   s.description              = <<-EOS
 A simple way to validate custom ruby objects using validation defined in the class.
 EOS
+  s.license                  = "MIT"
   s.rubyforge_project        = "simple_validation"
   s.files                    = `git ls-files`.split("\n")
   s.test_files               = `git ls-files -- {test}/*`.split("\n")

data/spec/simple_validation_spec.rb

@@ -61,15 +61,15 @@ class TestEntityWithConditionalValidation
   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
@@ -178,7 +178,7 @@ describe "A validatable entity" do
       end
     end
   end
-  
+
   describe "with conditional validation" do
     before do
       @entity = TestEntityWithConditionalValidation.new
@@ -206,14 +206,30 @@ describe "A validatable entity" do
   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
+      entity.add_error("An error")
+      entity.errors.sort.must_equal ["An error", "Always invalid"].sort
+    end
+
+    it "doesn't duplicate errors" do
+      entity = TestEntityWithValidation.new
+      entity.add_error("An error")
+      entity.add_error("An error")
+      entity.errors.sort.must_equal ["Always invalid", "An error"].sort
     end
   end
 
-  it "can accept multiple errors" do
-    entity = TestEntity.new
-    entity.add_errors(["An error", "Another error"])
-    entity.errors.must_equal ["An error", "Another error"]
+  describe "#add_error" do
+    it "can accept multiple errors" do
+      entity = TestEntity.new
+      entity.add_errors(["An error", "Another error"])
+      entity.errors.sort.must_equal ["An error", "Another error"].sort
+    end
+
+    it "doesn't duplicate errors" do
+      entity = TestEntity.new
+      entity.add_errors(["An error", "Another error"])
+      entity.add_errors(["An error", "Another error"])
+      entity.errors.sort.must_equal ["An error", "Another error"].sort
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_validation
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-27 00:00:00.000000000 Z
+date: 2012-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -60,7 +60,8 @@ files:
 - !binary |-
   c3BlYy9zcGVjX2hlbHBlci5yYg==
 homepage: https://github.com/chiku/simple_validation
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths: