validation_rules 1.0.2 → 1.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzVjNTIxODFjZDZkNTVjMWMwMzAyYmFiOTIxNGFmN2JhN2UyYmRmYQ==
+    NzQ2NzQ2ZjEwNWIzNTg3MzJhNzIzOTAxMzM2MzhlZDYxNTE1NzcxOA==
   data.tar.gz: !binary |-
-    OTQ2ZDJkYjE5OWJkNmE3MGY1YzZkZmEwOWJhMmViMmMwOGRkNzc0Zg==
+    YmUyZjg3ZWNiYzI5NzIyODM5ZTU2NTRjMDYzOTU0M2JiNTljMzRlZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NDlmMmY0NWU2ZTk5MmZhMGYyNDE2Zjg3OTIwOWQyYzA4MzdlZTI0ZGZhNzFk
-    MTVlYmE2ZGFmZTNmNjMwM2FmMDA1ZTkyZDY0NzM3MjY4OGE3MzExNjcwNWUx
-    OTBjZTUzNDQwOWY1N2YxMTQ3M2YwNzY5ZWZhY2NlNTZiZDBhZDY=
+    YTMzNWU3M2NjYjU5ZDVkZWNlYTM0ZjEyYTBmMWZkZTc1OWRhNjVmYzg1OGRh
+    MzViMzIyNTY2YjIxY2YwODViZWZlZWEwODAwMzI0N2IxZDJmNjRhNDg5OTcy
+    OWJkNjc3ODNlMThmNWQwOTYwYWI1OWQzYzM4M2Y3YmI3MDg2NTc=
   data.tar.gz: !binary |-
-    ZGFiYzYxNDI2ZTYxNzNlMWJmMjE0MDMyMWU4ZjcwYmNlYmE1N2NkZWM2ZTQ1
-    ZDlhNGVjZDM0NGJlN2JkYThkOWIwMDE2MmQ1MzdkNTc1MzM3MmUwZDIzZjM4
-    YjZlZTZhZWJhNjc2MDUyNWEwYTQwNmZlZmE2NDAwZDg0ZGVjYzk=
+    MjcyMjhmODA3YWM0OTBiZWVhYzQ2ZTE2ZjMxMmViZWZiZTFhMWZkNjQxMDQy
+    M2VjMDAyYjU1MzFhMTY3MmE2Mzk2NDVlZjgyOTg0ZmVkZDU1Njc3YWMyYjAz
+    N2QzMTY1MTNhOWE3NjQzNDYxNjkyNTBhNzJlMzRmMTUxYzRkZGM=

data/lib/validation_rules/validation_rules.rb

@@ -1,6 +1,7 @@
 require 'json'
 require 'date'
 require 'time'
+require 'uri'
 
 module ValidationRules
   EMAIL_REGEX = /^(?!(?:(?:\x22?\x5C[\x00-\x7E]\x22?)|(?:\x22?[^\x5C\x22]\x22?)){255,})(?!(?:(?:\x22?\x5C[\x00-\x7E]\x22?)|(?:\x22?[^\x5C\x22]\x22?)){65,}@)(?:(?:[\x21\x23-\x27\x2A\x2B\x2D\x2F-\x39\x3D\x3F\x5E-\x7E]+)|(?:\x22(?:[\x01-\x08\x0B\x0C\x0E-\x1F\x21\x23-\x5B\x5D-\x7F]|(?:\x5C[\x00-\x7F]))*\x22))(?:\.(?:(?:[\x21\x23-\x27\x2A\x2B\x2D\x2F-\x39\x3D\x3F\x5E-\x7E]+)|(?:\x22(?:[\x01-\x08\x0B\x0C\x0E-\x1F\x21\x23-\x5B\x5D-\x7F]|(?:\x5C[\x00-\x7F]))*\x22)))*@(?:(?:(?!.*[^.]{64,})(?:(?:(?:xn--)?[a-z0-9]+(?:-[a-z0-9]+)*\.){1,126}){1,}(?:(?:[a-z][a-z0-9]*)|(?:(?:xn--)[a-z0-9]+))(?:-[a-z0-9]+)*)|(?:\[(?:(?:IPv6:(?:(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){7})|(?:(?!(?:.*[a-f0-9][:\]]){7,})(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,5})?::(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,5})?)))|(?:(?:IPv6:(?:(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){5}:)|(?:(?!(?:.*[a-f0-9]:){5,})(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,3})?::(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,3}:)?)))?(?:(?:25[0-5])|(?:2[0-4][0-9])|(?:1[0-9]{2})|(?:[1-9]?[0-9]))(?:\.(?:(?:25[0-5])|(?:2[0-4][0-9])|(?:1[0-9]{2})|(?:[1-9]?[0-9]))){3}))\]))$/i
@@ -72,6 +73,19 @@ module ValidationRules
     value.to_i >= Time.now.to_i
   end
 
+  def self.past_date(value)
+    value = Time.parse(value) if value.is_a? String 
+    value.to_i <= Time.now.to_i
+  end
+
+  def self.between_dates(value, date1, date2)
+    value = Time.parse(value) if value.is_a? String 
+    date1 = Time.parse(date1) if date1.is_a? String 
+    date2 = Time.parse(date2) if date2.is_a? String 
+
+    value.between?(date1, date2)
+  end
+
   def self.string(value)
     value.is_a? String
   end
@@ -123,6 +137,10 @@ module ValidationRules
     value.to_f > 0
   end
 
+  def self.negative(value)
+    value.to_f < 0
+  end
+
   def self.range(value, min, max)
     value.to_f >= min.to_f and value.to_f <= max.to_f
   end
@@ -134,4 +152,13 @@ module ValidationRules
   def self.any_bool(value)
     [true, false, 0, 1, "0", "1", "true", "false"].include?(value)
   end
+
+  def self.url(value)
+    begin
+      uri = URI.parse(value)
+      uri.kind_of? URI::HTTP
+    rescue URI::InvalidURIError
+      false  
+    end
+  end
 end

data/lib/validation_rules/version.rb

@@ -1,3 +1,3 @@
 module ValidationRules
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

data/spec/validation_rules_spec.rb

@@ -245,6 +245,16 @@ describe ValidationRules do
     ValidationRules.positive(0).should be_false
   end
 
+  it 'validates negative' do
+    ValidationRules.negative('-10.99').should be_true
+    ValidationRules.negative(-10.99).should be_true
+
+    ValidationRules.negative(10).should be_false
+    ValidationRules.negative(10.99).should be_false
+    ValidationRules.negative('10.99').should be_false
+    ValidationRules.negative(0).should be_false
+  end
+
   it 'validates range' do
     ValidationRules.range(5, 1, 10).should be_true
     ValidationRules.range(5.5, 1, 10).should be_true
@@ -289,12 +299,29 @@ describe ValidationRules do
   end
 
   it 'validates future dates' do
-    ValidationRules.future_date('2060-10-25').should be_true
+    ValidationRules.future_date('2100-10-25').should be_true
     ValidationRules.future_date(Time.now).should be_true
 
     ValidationRules.future_date('2010-10-25').should be_false
   end
 
+  it 'validates past dates' do
+    ValidationRules.past_date('1998-10-25').should be_true
+    ValidationRules.past_date(Time.now).should be_true
+
+    ValidationRules.past_date('2100-10-25').should be_false
+  end
+
+  describe '.between_dates' do
+    it 'validates valid between' do
+      ValidationRules.between_dates(Time.now, '2010-10-25', '2100-10-25').should be_true
+
+      ValidationRules.between_dates(Time.now, '2010-10-25', '2011-10-25').should be_false
+      ValidationRules.between_dates(Time.now, '2100-10-25', '2120-10-25').should be_false
+      ValidationRules.between_dates(Time.now, '2100-10-25', '2011-10-25').should be_false
+    end      
+  end
+
   subject do
     ValidationRules
   end
@@ -356,5 +383,24 @@ describe ValidationRules do
       subject.any_bool('abc').should be_false
       subject.any_bool(5).should be_false
     end
+  end # /.any_bool
+
+  describe '.url' do
+    it 'allows valid urls' do
+      subject.url('http://www.example.com').should be_true
+      subject.url('http://www.example.com/path').should be_true
+      subject.url('http://example.com').should be_true
+      subject.url('http://example.com?param=something').should be_true
+      subject.url('http://test:test@example.com').should be_true
+      subject.url('http://example.co.uk').should be_true
+      subject.url('http://example.com:80').should be_true
+      subject.url('http://localhost').should be_true
+      subject.url('example.com/some%20path').should be_false
+    end
+
+    it 'rejects invalid urls' do
+      subject.url('example.com').should be_false
+      subject.url('example.com/some path').should be_false
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validation_rules
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Adam Gotterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-17 00:00:00.000000000 Z
+date: 2013-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec