evelpidon_validators 0.1.0 → 0.2.0

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Evelpidon Validators changelog
 
+## 0.2.0 / 2011-11-07
+
+* or_equal option to greater and less validators
+* Missing rake development dependency
+
 ## 0.1.0 / 2011-11-01
 
 * Birthday with support for the following validations :

data/README.md

@@ -17,41 +17,31 @@ already loaded.
 
 Add on your Gemfile :
 
-```ruby
-gem 'evelpidon_validators'
-```
+    gem 'evelpidon_validators'
 
 ### By hand
 
 On the console :
 
-```bash
-gem install evelpidon_validators
-```
+    gem install evelpidon_validators
 
 On your code :
 
-```ruby
-require 'evelpidon_validators'
-```
+    require 'evelpidon_validators'
 
 ## Usage
 
 Validators are *not* automatically loaded. You can require the validators you need either explicitly one-by-one
 or all of them. So for example :
 
-```ruby
-# Load only "Greater than" and "Less than" validators :
-require 'evelpidon_validators/greater'
-require 'evelpidon_validators/greater'
-```
+    # Load only "Greater than" and "Less than" validators :
+    require 'evelpidon_validators/greater'
+    require 'evelpidon_validators/greater'
 
 or
 
-```ruby
-# Load everything
-require 'evelpidon_validators/all'
-```
+    # Load everything
+    require 'evelpidon_validators/all'
 
 ### Enable client side validations support
 
@@ -62,10 +52,8 @@ Client-side validations work out of the box with Rails 3.1 (through the asset pi
 
 So for example the following should work :
 
-```
-//= require rails.validations
-//= require evelpidon_validators
-```
+    //= require rails.validations
+    //= require evelpidon_validators
 
 ## TODOs
 

data/evelpidon_validators.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.add_development_dependency "rake"
   s.add_development_dependency "activesupport"
   s.add_development_dependency "evelpidon_test_helpers"
 

data/lib/evelpidon_validators/greater.rb

@@ -6,7 +6,7 @@ module ActiveModel
       end
 
       def validate_each(record, attribute, value)
-        unless self.class.greater? value, record.send(options[:than])
+        unless self.class.greater? value, record.send(options[:than]) or (options[:or_equal] && value.eql?(record.send(options[:than])))
           record.errors.add(attribute, :greater, options)
         end
       end

data/lib/evelpidon_validators/less.rb

@@ -6,7 +6,7 @@ module ActiveModel
       end
 
       def validate_each(record, attribute, value)
-        unless self.class.less? value, record.send(options[:than])
+        unless self.class.less? value, record.send(options[:than]) or (options[:or_equal] && value.eql?(record.send(options[:than])))
           record.errors.add(attribute, :less, options)
         end
       end

data/lib/evelpidon_validators/version.rb

@@ -1,3 +1,3 @@
 module EvelpidonValidators
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/test/greater_test.rb

@@ -5,8 +5,9 @@ class GreaterValidatorTest < ActiveSupport::TestCase
 
   class ModelWithGreaterValidation
     include ActiveModel::Validations
-    attr_accessor :attr1, :attr2
+    attr_accessor :attr1, :attr2, :attr3
     validates :attr1, :greater => { :than => :attr2 }
+    validates :attr3, :greater => { :than => :attr2, :or_equal => true }
   end
 
   setup do
@@ -18,7 +19,6 @@ class GreaterValidatorTest < ActiveSupport::TestCase
     assert_valid_attr1 3
     assert_valid_attr1 4
     assert_invalid_attr1 1
-    assert_invalid_attr1 2
   end
 
   test "greater date" do
@@ -27,7 +27,6 @@ class GreaterValidatorTest < ActiveSupport::TestCase
     assert_valid_attr1 today + 1
     assert_valid_attr1 today + 2
     assert_invalid_attr1 today - 1
-    assert_invalid_attr1 today
   end
 
   test "greater string" do
@@ -35,9 +34,40 @@ class GreaterValidatorTest < ActiveSupport::TestCase
     assert_valid_attr1 'd'
     assert_valid_attr1 'e'
     assert_invalid_attr1 'b'
+  end
+
+  test "equal integer is not valid" do
+    @model.attr2 = 2
+    assert_invalid_attr1 2
+  end
+
+  test "greater date is not valid" do
+    today = Date.today
+    @model.attr2 = today
+    assert_invalid_attr1 today
+  end
+
+  test "greater string is not valid" do
+    @model.attr2 = 'c'
     assert_invalid_attr1 'c'
   end
 
+  test "equal integer is valid if is_equal is true" do
+    @model.attr2 = 2
+    assert_valid_attr3 2
+  end
+
+  test "greater date is valid if is_equal is true" do
+    today = Date.today
+    @model.attr2 = today
+    assert_valid_attr3 today
+  end
+
+  test "greater string is valid if is_equal is true" do
+    @model.attr2 = 'c'
+    assert_valid_attr3 'c'
+  end
+
   #########
   protected
   #########
@@ -51,4 +81,14 @@ class GreaterValidatorTest < ActiveSupport::TestCase
     @model.attr1 = value
     assert_invalid_attribute @model, :attr1
   end
+
+  def assert_valid_attr3(value)
+    @model.attr3 = value
+    assert_valid_attribute(@model, :attr3)
+  end
+
+  def assert_invalid_attr3(value)
+    @model.attr3 = value
+    assert_invalid_attribute @model, :attr3
+  end
 end

data/test/less_test.rb

@@ -5,8 +5,9 @@ class LessValidatorTest < ActiveSupport::TestCase
 
   class ModelWithLessValidation
     include ActiveModel::Validations
-    attr_accessor :attr1, :attr2
+    attr_accessor :attr1, :attr2, :attr3
     validates :attr1, :less => { :than => :attr2 }
+    validates :attr3, :less => { :than => :attr2, :or_equal => true }
   end
 
   setup do
@@ -17,7 +18,6 @@ class LessValidatorTest < ActiveSupport::TestCase
     @model.attr2 = 2
     assert_valid_attr1 0
     assert_valid_attr1 1
-    assert_invalid_attr1 2
     assert_invalid_attr1 3
   end
 
@@ -26,7 +26,6 @@ class LessValidatorTest < ActiveSupport::TestCase
     @model.attr2 = today
     assert_valid_attr1 today - 2
     assert_valid_attr1 today - 1
-    assert_invalid_attr1 today
     assert_invalid_attr1 today + 1
   end
 
@@ -34,10 +33,41 @@ class LessValidatorTest < ActiveSupport::TestCase
     @model.attr2 = 'c'
     assert_valid_attr1 'a'
     assert_valid_attr1 'b'
-    assert_invalid_attr1 'c'
     assert_invalid_attr1 'd'
   end
 
+  test "equal integer is not valid" do
+    @model.attr2 = 2
+    assert_invalid_attr1 2
+  end
+
+  test "greater date is not valid" do
+    today = Date.today
+    @model.attr2 = today
+    assert_invalid_attr1 today
+  end
+
+  test "greater string is not valid" do
+    @model.attr2 = 'c'
+    assert_invalid_attr1 'c'
+  end
+
+  test "equal integer is valid if is_equal is true" do
+    @model.attr2 = 2
+    assert_valid_attr3 2
+  end
+
+  test "greater date is valid if is_equal is true" do
+    today = Date.today
+    @model.attr2 = today
+    assert_valid_attr3 today
+  end
+
+  test "greater string is valid if is_equal is true" do
+    @model.attr2 = 'c'
+    assert_valid_attr3 'c'
+  end
+
   #########
   protected
   #########
@@ -51,4 +81,14 @@ class LessValidatorTest < ActiveSupport::TestCase
     @model.attr1 = value
     assert_invalid_attribute @model, :attr1
   end
+
+  def assert_valid_attr3(value)
+    @model.attr3 = value
+    assert_valid_attribute(@model, :attr3)
+  end
+
+  def assert_invalid_attr3(value)
+    @model.attr3 = value
+    assert_invalid_attribute @model, :attr3
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: evelpidon_validators
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Nikos Dimitrakopoulos
@@ -16,11 +16,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-01 00:00:00 +02:00
-default_executable: 
+date: 2011-11-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: rake
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -34,7 +33,7 @@ dependencies:
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: evelpidon_test_helpers
+  name: activesupport
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -48,7 +47,7 @@ dependencies:
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: activemodel
+  name: evelpidon_test_helpers
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -59,8 +58,22 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  type: :development
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: activemodel
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
 description: Useful ActiveModel validators with ClientSideValidations support.
 email: 
 - n.dimitrakopoulos@pamediakopes.gr
@@ -94,7 +107,6 @@ files:
 - test/greater_test.rb
 - test/less_test.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: ""
 licenses: []
 
@@ -124,12 +136,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: evelpidon_validators
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Useful ActiveModel validators
-test_files: 
-- test/different_test.rb
-- test/greater_test.rb
-- test/less_test.rb
-- test/test_helper.rb
+test_files: []
+
+has_rdoc: