ditkrg/validates_timeliness
5
0
Fork 0
mirror of https://github.com/ditkrg/validates_timeliness.git synced 2026-01-25 07:16:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix multiparameter extension to not allow partial dates as per ActiveRecord implementation.

Browse Source
This commit is contained in:
Adam Meehan
2012-03-26 20:22:09 +11:00
parent a6a3dff4d4
commit f11255a7a3
2 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/validates_timeliness/extensions/multiparameter_handler.rb
View File

@@ -21,18 +21,24 @@ module ValidatesTimeliness
end
def instantiate_time_object_with_timeliness(name, values)
if Date.valid_civil?(*values[0..2])
validate_multiparameter_date_values(values) {
instantiate_time_object_without_timeliness(name, values)
else
invalid_multiparameter_date_or_time_as_string(values)
end
}
end
def instantiate_date_object(name, values)
values = values.map { |v| v.nil? ? 1 : v }
Date.new(*values)
rescue ArgumentError => ex
invalid_multiparameter_date_or_time_as_string(values)
validate_multiparameter_date_values(values) {
Date.new(*values)
}
end
# Yield if date values are valid
def validate_multiparameter_date_values(values)
if values[0..2].all?{ |v| v.present? } && Date.valid_civil?(*values[0..2])
yield
else
invalid_multiparameter_date_or_time_as_string(values)
end
end
def read_value_from_parameter_with_timeliness(name, values_from_param)