diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-03-28 10:22:57 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-03-28 10:22:57 +0000 |
| commit | 1b91e1ce32081324df82ef1314d468916c237879 (patch) | |
| tree | 4d5eefe08afd38e9bbee584bf5a3b91680b9bac5 /lib/time.rb | |
| parent | d02b7bd864706fc2a40d83fb6014772ad3cc3b80 (diff) | |
Use Regexp#match? in time.rb for conditionals
[Fix GH-1852]
From: Bart <bartdewater@gmail.com>
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62993 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/time.rb')
| -rw-r--r-- | lib/time.rb | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/lib/time.rb b/lib/time.rb index bb5d0aac38..e2e878d731 100644 --- a/lib/time.rb +++ b/lib/time.rb @@ -136,7 +136,7 @@ class Time zone = zone.upcase if /\A([+-])(\d\d)(:?)(\d\d)(?:\3(\d\d))?\z/ =~ zone off = ($1 == '-' ? -1 : 1) * (($2.to_i * 60 + $4.to_i) * 60 + $5.to_i) - elsif /\A[+-]\d\d\z/ =~ zone + elsif zone.match?(/\A[+-]\d\d\z/) off = zone.to_i * 3600 elsif ZoneOffset.include?(zone) off = ZoneOffset[zone] * 3600 @@ -168,11 +168,7 @@ class Time # They are not appropriate for specific time zone such as # Europe/London because time zone neutral, # So -00:00 and -0000 are treated as UTC. - if /\A(?:-00:00|-0000|-00|UTC|Z|UT)\z/i =~ zone - true - else - false - end + zone.match?(/\A(?:-00:00|-0000|-00|UTC|Z|UT)\z/i) end private :zone_utc? @@ -521,14 +517,14 @@ class Time # You must require 'time' to use this method. # def httpdate(date) - if /\A\s* + if date.match?(/\A\s* (?:Mon|Tue|Wed|Thu|Fri|Sat|Sun),\x20 (\d{2})\x20 (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\x20 (\d{4})\x20 (\d{2}):(\d{2}):(\d{2})\x20 GMT - \s*\z/ix =~ date + \s*\z/ix) self.rfc2822(date).utc elsif /\A\s* (?:Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday),\x20 |