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

refacrtored option tests into test_option_method

Browse Source
This commit is contained in:
Adam Meehan 2008-07-26 08:31:36 +10:00
parent 29d61320e8
commit ef51d8c3d6
1 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
lib/validates_timeliness/validate_timeliness_matcher.rb
View File

@ -23,31 +23,13 @@ module Spec
valid_value = parse_and_cast(test_values[type][:pass]) valid_value = parse_and_cast(test_values[type][:pass])
valid = error_matching(invalid_value, /#{options["invalid_#{type}_message".to_sym]}/) && valid = error_matching(invalid_value, /#{options["invalid_#{type}_message".to_sym]}/) &&
no_error_matching(valid_value, /#{options["invalid_#{type}_message".to_sym]}/) no_error_matching(valid_value, /#{options["invalid_#{type}_message".to_sym]}/)
if valid && options[:after] valid = test_option(:before, :-) if options[:before] && valid
after = parse_and_cast(options[:after]) valid = test_option(:after, :+) if options[:after] && valid
valid = error_matching(after, /#{options[:after_message]}/) &&
no_error_matching(after + 1, /#{options[:after_message]}/)
end
if valid && options[:before]
before = parse_and_cast(options[:before])
valid = error_matching(before, /#{options[:before_message]}/) &&
no_error_matching(before - 1, /#{options[:before_message]}/)
end
if valid && options[:on_or_after]
on_or_after = parse_and_cast(options[:on_or_after])
valid = error_matching(on_or_after -1, /#{options[:on_or_after_message]}/) &&
no_error_matching(on_or_after, /#{options[:on_or_after_message]}/)
end
if valid && options[:on_or_before]
on_or_before = parse_and_cast(options[:on_or_before])
valid = error_matching(on_or_before + 1, /#{options[:on_or_before_message]}/) &&
no_error_matching(on_or_before, /#{options[:on_or_before_message]}/)
end
valid = test_option(:on_or_before, :+, :pre) if options[:on_or_before] && valid
valid = test_option(:on_or_after, :-, :pre) if options[:on_or_after] && valid
return valid return valid
end end
@ -64,6 +46,17 @@ module Spec
end end
private private
def test_option(option, modifier, modify_when=:post)
boundary = parse_and_cast(options[option])
valid_value = modify_when == :post ? boundary.send(modifier, 1) : boundary
invalid_value = modify_when == :post ? boundary : boundary.send(modifier, 1)
message = options["#{option}_message".to_sym]
error_matching(invalid_value, /#{message}/) &&
no_error_matching(valid_value, /#{message}/)
end
def parse_and_cast(value) def parse_and_cast(value)
@conversion_method ||= case options[:type] @conversion_method ||= case options[:type]