simple_range_validator 0.2.0 → 0.2.1

data/README.md

@@ -70,6 +70,20 @@ class Search
 end
 ```
 
+## TimeSpan Validator
+
+```ruby
+class Search
+  include Mongoid::Document
+
+  field :period, type: Timespan
+
+  # you can also use in: as the option
+  validates :period, timespan:  {from: 1.day.ago, to: 14.days.from_now }
+end
+```
+
+
 Simple as pie ;)
 
 ## Contributing to range_validator

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/array_validator.rb

@@ -1,14 +1,18 @@
 require 'array_types_validator'
 
 class ArrayValidator < ActiveModel::EachValidator
+  attr_reader :attrib
+
   def validate_each(record, attribute, value)
+    @attrib = attribute
     record.errors[attribute] << "must be in: #{show_list}" unless contains? value
   end
 
   protected
 
   def contains? value
-    raise ArgumentError, "Must be an Array, was: #{value}" unless value.kind_of?(Array)
+    return true if value.nil?
+    raise ArgumentError, "#{attrib} must be an Array, was: #{value}" unless value.kind_of?(Array)
     (value - list).empty?
   end
 

data/lib/simple_range_validator.rb

@@ -1,14 +1,19 @@
 require 'array_validator'
+require 'timespan_validator'
 
 class RangeValidator < ActiveModel::EachValidator
+  attr_reader :attrib
+
   def validate_each(record, attribute, value)
+    @attrib = attribute
     record.errors[attribute] << "must be within: #{show_range}" unless within? value
   end
 
   protected
 
   def within? value
-    raise ArgumentError, "Must be a Range, was: #{value}" unless value.kind_of?(Range)
+    return true if value.nil?
+    raise ArgumentError, "#{attrib} must be a Range, was: #{value}" unless value.kind_of?(Range)
     range.cover?(value.min) && range.cover?(value.max)
   end
 

data/lib/timespan_validator.rb

@@ -0,0 +1,29 @@
+class TimespanValidator < ActiveModel::EachValidator
+  attr_reader :attrib
+
+  def validate_each(record, attribute, value)
+    @attrib = attribute
+    record.errors[attribute] << "must be within: #{show_range}" unless within? value
+  end
+
+  protected
+
+  def within? value
+    return true if value.nil?
+    raise ArgumentError, "#{attrib} must be a Timespan, was: #{value}" unless value.kind_of?(Timespan)
+    # puts "value: #{value} between? #{from} and #{to}"    
+    value.between?(from, to)
+  end
+
+  def from
+    options[:from]
+  end
+
+  def to
+    options[:to]
+  end
+
+  def show_range
+    "#{from} - #{to}"
+  end
+end

data/simple_range_validator.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "simple_range_validator"
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = "2012-11-06"
+  s.date = "2012-11-21"
   s.description = "Range validator for any Range model fields"
   s.email = "kmandrup@gmail.com"
   s.extra_rdoc_files = [
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
     "lib/array_types_validator.rb",
     "lib/array_validator.rb",
     "lib/simple_range_validator.rb",
+    "lib/timespan_validator.rb",
     "simple_range_validator.gemspec",
     "spec/array_types_validator_spec.rb",
     "spec/array_validator_spec.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_range_validator
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-06 00:00:00.000000000 Z
+date: 2012-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -126,6 +126,7 @@ files:
 - lib/array_types_validator.rb
 - lib/array_validator.rb
 - lib/simple_range_validator.rb
+- lib/timespan_validator.rb
 - simple_range_validator.gemspec
 - spec/array_types_validator_spec.rb
 - spec/array_validator_spec.rb
@@ -146,7 +147,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2744261256725048417
+      hash: 3665912120419951902
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: