kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #1756 from shtirlic/xmlschema_fix

Browse source 
Fix xmlschema output with fraction_digits >0
This commit is contained in:
José Valim 2011-07-11 10:00:28 -07:00
commit 133a20354e
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
activesupport/lib/active_support/time_with_zone.rb
View file

@ -109,7 +109,7 @@ module ActiveSupport
def xmlschema(fraction_digits = 0) def xmlschema(fraction_digits = 0)
fraction = if fraction_digits > 0 fraction = if fraction_digits > 0
".%i" % time.usec.to_s[0, fraction_digits] (".%06i" % time.usec)[0, fraction_digits + 1]
end end
"#{time.strftime("%Y-%m-%dT%H:%M:%S")}#{fraction}#{formatted_offset(true, 'Z')}" "#{time.strftime("%Y-%m-%dT%H:%M:%S")}#{fraction}#{formatted_offset(true, 'Z')}"

7
activesupport/test/core_ext/time_with_zone_test.rb
View file

@ -111,6 +111,13 @@ class TimeWithZoneTest < Test::Unit::TestCase
assert_equal "1999-12-31T19:00:00.123456-05:00", @twz.xmlschema(12) assert_equal "1999-12-31T19:00:00.123456-05:00", @twz.xmlschema(12)
end end
def test_xmlschema_with_fractional_seconds_lower_than_hundred_thousand
@twz += 0.001234 # advance the time by a fraction
assert_equal "1999-12-31T19:00:00.001-05:00", @twz.xmlschema(3)
assert_equal "1999-12-31T19:00:00.001234-05:00", @twz.xmlschema(6)
assert_equal "1999-12-31T19:00:00.001234-05:00", @twz.xmlschema(12)
end
def test_to_yaml def test_to_yaml
assert_match(/^--- 2000-01-01 00:00:00(\.0+)?\s*Z\n/, @twz.to_yaml) assert_match(/^--- 2000-01-01 00:00:00(\.0+)?\s*Z\n/, @twz.to_yaml)
end end