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

* lib/time.rb (Time.force_zone!): New private method.

Browse Source 
(Time.make_time): Use Time.force_zone!.
  (Time.strptime): Ditto.
  (Time.rfc2822): Ditto.
  (Time.xmlschema): Ditto.

* lib/rss/rss.rb (Time.w3cdtf): Use Time.force_zone!.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45807 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2014-05-04 09:01:19 +00:00
parent d64eef156f
commit a18177d5ed
3 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
Sun May 4 17:58:12 2014 Tanaka Akira <akr@fsij.org>
* lib/time.rb (Time.force_zone!): New private method.
(Time.make_time): Use Time.force_zone!.
(Time.strptime): Ditto.
(Time.rfc2822): Ditto.
(Time.xmlschema): Ditto.
* lib/rss/rss.rb (Time.w3cdtf): Use Time.force_zone!.
Sun May 4 10:22:59 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> Sun May 4 10:22:59 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* math.c (math_atan2): return values like as expected by C99 if * math.c (math_atan2): return values like as expected by C99 if

2
lib/rss/rss.rb
View File

@ -28,7 +28,7 @@ class Time
datetime = apply_offset(*(datetime + [off])) datetime = apply_offset(*(datetime + [off]))
datetime << usec datetime << usec
time = Time.utc(*datetime) time = Time.utc(*datetime)
time.localtime(off) unless zone_utc?(zone) force_zone!(time, zone, off)
time time
else else
datetime << usec datetime << usec

23
lib/time.rb
View File

@ -174,6 +174,17 @@ class Time
end end
private :zone_utc? private :zone_utc?
def force_zone!(t, zone, offset=nil)
if zone_utc?(zone)
t.utc
elsif offset ||= zone_offset(zone)
t.localtime(offset)
else
t.localtime
end
end
private :force_zone!
LeapYearMonthDays = [31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31] # :nodoc: LeapYearMonthDays = [31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31] # :nodoc:
CommonYearMonthDays = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31] # :nodoc: CommonYearMonthDays = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31] # :nodoc:
def month_days(y, m) def month_days(y, m)
@ -258,7 +269,7 @@ class Time
year, mon, day, hour, min, sec = year, mon, day, hour, min, sec =
apply_offset(year, mon, day, hour, min, sec, off) apply_offset(year, mon, day, hour, min, sec, off)
t = self.utc(year, mon, day, hour, min, sec, usec) t = self.utc(year, mon, day, hour, min, sec, usec)
t.localtime(off) if !zone_utc?(zone) force_zone!(t, zone, off)
t t
else else
self.local(year, mon, day, hour, min, sec, usec) self.local(year, mon, day, hour, min, sec, usec)
@ -395,11 +406,7 @@ class Time
if seconds = d[:seconds] if seconds = d[:seconds]
t = Time.at(seconds) t = Time.at(seconds)
if zone = d[:zone] if zone = d[:zone]
if zone_utc?(zone) force_zone!(t, zone)
t.utc
elsif offset = zone_offset(zone)
t.localtime(offset)
end
end end
else else
year = d[:year] year = d[:year]
@ -460,7 +467,7 @@ class Time
year, mon, day, hour, min, sec = year, mon, day, hour, min, sec =
apply_offset(year, mon, day, hour, min, sec, off) apply_offset(year, mon, day, hour, min, sec, off)
t = self.utc(year, mon, day, hour, min, sec) t = self.utc(year, mon, day, hour, min, sec)
t.localtime(off) if !zone_utc?(zone) force_zone!(t, zone, off)
t t
else else
raise ArgumentError.new("not RFC 2822 compliant date: #{date.inspect}") raise ArgumentError.new("not RFC 2822 compliant date: #{date.inspect}")
@ -552,7 +559,7 @@ class Time
year, mon, day, hour, min, sec = year, mon, day, hour, min, sec =
apply_offset(year, mon, day, hour, min, sec, off) apply_offset(year, mon, day, hour, min, sec, off)
t = self.utc(year, mon, day, hour, min, sec, usec) t = self.utc(year, mon, day, hour, min, sec, usec)
t.localtime(off) if !zone_utc?(zone) force_zone!(t, zone, off)
t t
else else
self.local(year, mon, day, hour, min, sec, usec) self.local(year, mon, day, hour, min, sec, usec)