ditkrg/validates_timeliness
4
0
Fork 0
mirror of https://github.com/ditkrg/validates_timeliness.git synced 2026-01-23 06:16:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

allow for custom messages in error message checks

Browse Source
This commit is contained in:
Adam Meehan 2008-07-07 15:23:44 +10:00
parent 3f286b9aee
commit f40bf36bc9
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
lib/validates_timeliness/validate_timeliness_matcher.rb
View File

@ -4,37 +4,46 @@ module Spec
class ValidateTimeliness class ValidateTimeliness
def initialize(attribute, options) def initialize(attribute, options)
@expected, @options = attribute, options @expected, @options = attribute, options
messages = ActiveRecord::Base.send(:timeliness_default_error_messages)
messages
@options.reverse_merge!(messages)
end end
def error_messages
messages = ActiveRecord::Base.send(:timeliness_default_error_messages)
messages = messages.inject({}) {|h , (k, v)| h[k] = v.sub('%s', '') }
@options.reverse_merge!(messages)
end
def matches?(record) def matches?(record)
@record = record @record = record
valid = error_matching('2008-02-30', /valid/) && valid = error_matching('2008-02-30', /#{options[:invalid_date_message]}/) &&
error_matching('2008-01-01 25:00:00', /valid/) && error_matching('2008-01-01 25:00:00', /#{options[:invalid_date_message]}/) &&
no_error_matching('2008-01-01 12:12:12', /valid/) no_error_matching('2008-01-01 12:12:12', /#{options[:invalid_date_message]}/)
return false unless valid return false unless valid
if after = options[:after] if after = options[:after]
valid = error_matching(after, /after/) && valid = error_matching(after, /#{options[:after_message]}/) &&
no_error_matching(after + 1, /after/) no_error_matching(after + 1, /#{options[:after_message]}/)
end end
return false unless valid return false unless valid
if before = options[:before] if before = options[:before]
valid = error_matching(before, /before/) && valid = error_matching(before, /#{options[:after_message]}/) &&
no_error_matching(before - 1, /before/) no_error_matching(before - 1, /#{options[:after_message]}/)
end end
return false unless valid return false unless valid
if on_or_after = options[:on_or_after] if on_or_after = options[:on_or_after]
valid = error_matching(on_or_after -1, /after/) && valid = error_matching(on_or_after -1, /#{options[:on_or_after_message]}/) &&
no_error_matching(on_or_after, /after/) no_error_matching(on_or_after, /#{options[:on_or_after_message]}/)
end end
return false unless valid return false unless valid
if on_or_before = options[:on_or_before] if on_or_before = options[:on_or_before]
valid = error_matching(on_or_before + 1, /before/) && valid = error_matching(on_or_before + 1, /#{options[:on_or_before_message]}/) &&
no_error_matching(on_or_before, /before/) no_error_matching(on_or_before, /#{options[:on_or_before_message]}/)
end end
return false unless valid return false unless valid
@ -81,7 +90,11 @@ module Spec
def validate_timeliness_of(attribute, options={}) def validate_timeliness_of(attribute, options={})
ValidateTimeliness.new(attribute, options) ValidateTimeliness.new(attribute, options)
end end
alias validate_date validate_timeliness_of
alias validate_time validate_timeliness_of
alias validate_datetime validate_timeliness_of
end end
end end
end end