kotovalexarian-likes-github
/
rails--rails
mirror of https://github.com/rails/rails.git
1
0
Fork 0
Code Releases Activity

Merge pull request #39676 from kamipo/allow_iso8601_datetime 

Allow ISO 8601 formatted string for `fast_string_to_time`
This commit is contained in:
Ryuta Kamizono 2020-06-20 13:14:43 +09:00 committed by GitHub
parent 091164d24f f870537c47
commit 596d4dbb33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
activemodel/lib/active_model/type/helpers/time_value.rb
View File

@ -52,7 +52,7 @@ module ActiveModel
time = ::Time.utc(year, mon, mday, hour, min, sec, microsec) rescue nil
return unless time
time -= offset
time -= offset unless offset == 0
is_utc? ? time : time.getlocal
elsif is_utc?
::Time.utc(year, mon, mday, hour, min, sec, microsec) rescue nil
@ -61,9 +61,14 @@ module ActiveModel
end
end
ISO_DATETIME = /\A(\d{4})-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)(?:\.(\d{1,6})\d*)?\z/
ISO_DATETIME = /
\A
(\d{4})-(\d\d)-(\d\d)(?:T|\s) # 2020-06-20T
(\d\d):(\d\d):(\d\d)(?:\.(\d{1,6})\d*)? # 10:20:30.123456
(?:(Z(?=\z)|[+-]\d\d)(?::?(\d\d))?)? # +09:00
\z
/x
# Doesn't handle time zones.
def fast_string_to_time(string)
return unless ISO_DATETIME =~ string
@ -73,7 +78,11 @@ module ActiveModel
usec *= 10 ** (6 - usec_len)
end
new_time($1.to_i, $2.to_i, $3.to_i, $4.to_i, $5.to_i, $6.to_i, usec)
if $8
offset = $8 == "Z" ? 0 : $8.to_i * 3600 + $9.to_i * 60
end
new_time($1.to_i, $2.to_i, $3.to_i, $4.to_i, $5.to_i, $6.to_i, usec, offset)
end
end
end