1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ruby/json] Drop compatibility for missing Time#tv_nsec (Ruby 1.8)

Browse Source 
https://github.com/ruby/json/commit/b240bde402

Co-authored-by: Jean Boussier <jean.boussier@gmail.com>
This commit is contained in:
Étienne Barrié 2024-10-21 12:02:47 +02:00 committed by Hiroshi SHIBATA
parent 11348c583f
commit 5f97468958
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ext/json/lib/json/add/time.rb
View File

@ -10,11 +10,7 @@ class Time
if usec = object.delete('u') # used to be tv_usec -> tv_nsec if usec = object.delete('u') # used to be tv_usec -> tv_nsec
object['n'] = usec * 1000 object['n'] = usec * 1000
end end
if method_defined?(:tv_nsec) at(object['s'], Rational(object['n'], 1000))
at(object['s'], Rational(object['n'], 1000))
else
at(object['s'], object['n'] / 1000)
end
end end
# Methods <tt>Time#as_json</tt> and +Time.json_create+ may be used # Methods <tt>Time#as_json</tt> and +Time.json_create+ may be used
@ -34,13 +30,10 @@ class Time
# # => 2023-11-25 11:00:56.472846644 -0600 # # => 2023-11-25 11:00:56.472846644 -0600
# #
def as_json(*) def as_json(*)
nanoseconds = [ tv_usec * 1000 ]
respond_to?(:tv_nsec) and nanoseconds << tv_nsec
nanoseconds = nanoseconds.max
{ {
JSON.create_id => self.class.name, JSON.create_id => self.class.name,
's' => tv_sec, 's' => tv_sec,
'n' => nanoseconds, 'n' => tv_nsec,
} }
end end