mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
AS::Duration should serialize empty values correctly. (#25656)
The current implementation serializes zero-length durations incorrectly (it serializes as `"-P"`), and cannot un-serialize itself: ``` [1] pry(main)> ActiveSupport::Duration.parse(0.minutes.iso8601) ActiveSupport::Duration::ISO8601Parser::ParsingError: Invalid ISO 8601 duration: "-P" is empty duration from /Users/rando/.gem/ruby/2.3.1/gems/activesupport-5.0.0/lib/active_support/duration/iso8601_parser.rb:96:in `raise_parsing_error' ``` Postgres empty intervals are serialized as `"PT0S"`, which is also parseable by the Duration deserializer, so I've modified the `ISO8601Serializer` to do the same. Additionally, the `#normalize` function returned a negative sign if `parts` was blank (all zero). Even though this fix does not rely on the sign, I've gone ahead and corrected that, too, in case a future refactoring of `#serialize` uses it.
This commit is contained in:
parent
f3cd032a2c
commit
629dde297c
2 changed files with 4 additions and 1 deletions
|
@ -12,8 +12,10 @@ module ActiveSupport
|
|||
|
||||
# Builds and returns output string.
|
||||
def serialize
|
||||
output = 'P'
|
||||
parts, sign = normalize
|
||||
return "PT0S".freeze if parts.empty?
|
||||
|
||||
output = 'P'
|
||||
output << "#{parts[:years]}Y" if parts.key?(:years)
|
||||
output << "#{parts[:months]}M" if parts.key?(:months)
|
||||
output << "#{parts[:weeks]}W" if parts.key?(:weeks)
|
||||
|
|
|
@ -279,6 +279,7 @@ class DurationTest < ActiveSupport::TestCase
|
|||
['PT1S', 1.second ],
|
||||
['PT1.4S', (1.4).seconds ],
|
||||
['P1Y1M1DT1H', 1.year + 1.month + 1.day + 1.hour],
|
||||
['PT0S', 0.minutes ],
|
||||
]
|
||||
expectations.each do |expected_output, duration|
|
||||
assert_equal expected_output, duration.iso8601, expected_output.inspect
|
||||
|
|
Loading…
Reference in a new issue