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

Fix DateTimeSelect extension to use integers from param values.

Browse Source 
Change extension spec to use string params.
This commit is contained in:
Adam Meehan 2011-09-18 18:01:25 +10:00
parent af9d6cdba4
commit e7b503ae4f
2 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/validates_timeliness/extensions/date_time_select.rb
View File

@ -10,6 +10,7 @@ module ValidatesTimeliness
included do included do
alias_method_chain :datetime_selector, :timeliness alias_method_chain :datetime_selector, :timeliness
alias_method_chain :value, :timeliness
end end
module InstanceMethods module InstanceMethods
@ -55,7 +56,7 @@ module ValidatesTimeliness
values = [nil] * 6 values = [nil] * 6
pairs.map do |(param, value)| pairs.map do |(param, value)|
position = param.scan(/\(([0-9]*).*\)/).first.first position = param.scan(/\((\d+)\w+\)/).first.first
values[position.to_i-1] = value.to_i values[position.to_i-1] = value.to_i
end end

48
spec/validates_timeliness/extensions/date_time_select_spec.rb
View File

@ -14,12 +14,12 @@ describe ValidatesTimeliness::Extensions::DateTimeSelect do
describe "datetime_select" do describe "datetime_select" do
it "should use param values when attribute is nil" do it "should use param values when attribute is nil" do
@params["person"] = { @params["person"] = {
"birth_datetime(1i)" => 2009, "birth_datetime(1i)" => '2009',
"birth_datetime(2i)" => 2, "birth_datetime(2i)" => '2',
"birth_datetime(3i)" => 29, "birth_datetime(3i)" => '29',
"birth_datetime(4i)" => 12, "birth_datetime(4i)" => '12',
"birth_datetime(5i)" => 13, "birth_datetime(5i)" => '13',
"birth_datetime(6i)" => 14, "birth_datetime(6i)" => '14',
} }
person.birth_datetime = nil person.birth_datetime = nil
@output = datetime_select(:person, :birth_datetime, :include_blank => true, :include_seconds => true) @output = datetime_select(:person, :birth_datetime, :include_blank => true, :include_seconds => true)
@ -28,12 +28,12 @@ describe ValidatesTimeliness::Extensions::DateTimeSelect do
it "should override object values and use params if present" do it "should override object values and use params if present" do
@params["person"] = { @params["person"] = {
"birth_datetime(1i)" => 2009, "birth_datetime(1i)" => '2009',
"birth_datetime(2i)" => 2, "birth_datetime(2i)" => '2',
"birth_datetime(3i)" => 29, "birth_datetime(3i)" => '29',
"birth_datetime(4i)" => 12, "birth_datetime(4i)" => '12',
"birth_datetime(5i)" => 13, "birth_datetime(5i)" => '13',
"birth_datetime(6i)" => 14, "birth_datetime(6i)" => '14',
} }
person.birth_datetime = "2010-01-01 15:16:17" person.birth_datetime = "2010-01-01 15:16:17"
@output = datetime_select(:person, :birth_datetime, :include_blank => true, :include_seconds => true) @output = datetime_select(:person, :birth_datetime, :include_blank => true, :include_seconds => true)
@ -63,9 +63,9 @@ describe ValidatesTimeliness::Extensions::DateTimeSelect do
describe "date_select" do describe "date_select" do
it "should use param values when attribute is nil" do it "should use param values when attribute is nil" do
@params["person"] = { @params["person"] = {
"birth_date(1i)" => 2009, "birth_date(1i)" => '2009',
"birth_date(2i)" => 2, "birth_date(2i)" => '2',
"birth_date(3i)" => 29, "birth_date(3i)" => '29',
} }
person.birth_date = nil person.birth_date = nil
@output = date_select(:person, :birth_date, :include_blank => true, :include_seconds => true) @output = date_select(:person, :birth_date, :include_blank => true, :include_seconds => true)
@ -74,9 +74,9 @@ describe ValidatesTimeliness::Extensions::DateTimeSelect do
it "should override object values and use params if present" do it "should override object values and use params if present" do
@params["person"] = { @params["person"] = {
"birth_date(1i)" => 2009, "birth_date(1i)" => '2009',
"birth_date(2i)" => 2, "birth_date(2i)" => '2',
"birth_date(3i)" => 29, "birth_date(3i)" => '29',
} }
person.birth_date = "2009-03-01" person.birth_date = "2009-03-01"
@output = date_select(:person, :birth_date, :include_blank => true, :include_seconds => true) @output = date_select(:person, :birth_date, :include_blank => true, :include_seconds => true)
@ -124,12 +124,12 @@ describe ValidatesTimeliness::Extensions::DateTimeSelect do
it "should use param values when attribute is nil" do it "should use param values when attribute is nil" do
@params["person"] = { @params["person"] = {
"birth_time(1i)" => 2000, "birth_time(1i)" => '2000',
"birth_time(2i)" => 1, "birth_time(2i)" => '1',
"birth_time(3i)" => 1, "birth_time(3i)" => '1',
"birth_time(4i)" => 12, "birth_time(4i)" => '12',
"birth_time(5i)" => 13, "birth_time(5i)" => '13',
"birth_time(6i)" => 14, "birth_time(6i)" => '14',
} }
person.birth_time = nil person.birth_time = nil
@output = time_select(:person, :birth_time, :include_blank => true, :include_seconds => true) @output = time_select(:person, :birth_time, :include_blank => true, :include_seconds => true)