summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2021-01-15 18:17:48 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2021-01-15 19:04:33 +0900
commit5307fab6619e26e05d791d68c35ceef2e923e8d5 (patch)
tree501728e6bcdcdf21c531ec985b83b413e7163991
parent0d57d59933fb7b826bd0e20d84ed7f6d6636ac90 (diff)
[ruby/time] Use Time#strftime to format
https://github.com/ruby/time/commit/6b8cc4799e
-rw-r--r--lib/time.rb28
1 files changed, 2 insertions, 26 deletions
diff --git a/lib/time.rb b/lib/time.rb
index 92d24c8b3e1..a40e2febc63 100644
--- a/lib/time.rb
+++ b/lib/time.rb
@@ -666,30 +666,10 @@ class Time
# You must require 'time' to use this method.
#
def rfc2822
- sprintf('%s, %02d %s %0*d %02d:%02d:%02d ',
- RFC2822_DAY_NAME[wday],
- day, RFC2822_MONTH_NAME[mon-1], year < 0 ? 5 : 4, year,
- hour, min, sec) <<
- if utc?
- '-0000'
- else
- off = utc_offset
- sign = off < 0 ? '-' : '+'
- sprintf('%s%02d%02d', sign, *(off.abs / 60).divmod(60))
- end
+ strftime('%a, %d %b %Y %T ') << (utc? ? '-0000' : strftime('%z'))
end
alias rfc822 rfc2822
-
- RFC2822_DAY_NAME = [ # :nodoc:
- 'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'
- ]
-
- RFC2822_MONTH_NAME = [ # :nodoc:
- 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
- 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'
- ]
-
#
# Returns a string which represents the time as RFC 1123 date of HTTP-date
# defined by RFC 2616:
@@ -706,11 +686,7 @@ class Time
# You must require 'time' to use this method.
#
def httpdate
- t = dup.utc
- sprintf('%s, %02d %s %0*d %02d:%02d:%02d GMT',
- RFC2822_DAY_NAME[t.wday],
- t.day, RFC2822_MONTH_NAME[t.mon-1], t.year < 0 ? 5 : 4, t.year,
- t.hour, t.min, t.sec)
+ getutc.strftime('%a, %d %b %Y %T GMT')
end
#