kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Timezone at Time.at

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66077 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2018-11-28 14:08:32 +00:00
parent 337b4b6344
commit bdfc701b85
2 changed files with 29 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
test/ruby/test_time_tz.rb
View file

@ -544,6 +544,18 @@ module TestTimeTZ::WithTZ
assert_equal(time_class.utc(2018, 9, 1, 12+h, m, s), t)
end
def subtest_at(time_class, tz, tzarg, tzname, abbr, utc_offset)
h, m = (utc_offset / 60).divmod(60)
utc = time_class.utc(2018, 9, 1, 12, 0, 0)
t = time_class.at(utc, tzarg)
assert_equal([2018, 9, 1, 12+h, m, 0, tz], [t.year, t.mon, t.mday, t.hour, t.min, t.sec, t.zone])
assert_equal(utc.to_i, t.to_i)
utc = utc.to_i
t = time_class.at(utc, tzarg)
assert_equal([2018, 9, 1, 12+h, m, 0, tz], [t.year, t.mon, t.mday, t.hour, t.min, t.sec, t.zone])
assert_equal(utc, t.to_i)
end
def subtest_marshal(time_class, tz, tzarg, tzname, abbr, utc_offset)
t = time_class.new(2018, 9, 1, 12, 0, 0, tzarg)
t2 = Marshal.load(Marshal.dump(t))

19
time.c
View file

@ -2670,6 +2670,14 @@ get_scale(VALUE unit)
* Time.at(seconds, microseconds, :microsecond) -> time
* Time.at(seconds, nanoseconds, :nsec) -> time
* Time.at(seconds, nanoseconds, :nanosecond) -> time
* Time.at(time, in: tz) -> time
* Time.at(seconds_with_frac, in: tz) -> time
* Time.at(seconds, microseconds_with_frac, in: tz) -> time
* Time.at(seconds, milliseconds, :millisecond, in: tz) -> time
* Time.at(seconds, microseconds, :usec, in: tz) -> time
* Time.at(seconds, microseconds, :microsecond, in: tz) -> time
* Time.at(seconds, nanoseconds, :nsec, in: tz) -> time
* Time.at(seconds, nanoseconds, :nanosecond, in: tz) -> time
*
* Creates a new Time object with the value given by +time+,
* the given number of +seconds_with_frac+, or
@ -2678,7 +2686,8 @@ get_scale(VALUE unit)
* can be an Integer, Float, Rational, or other Numeric.
* non-portable feature allows the offset to be negative on some systems.
*
* If a numeric argument is given, the result is in local time.
* If +tz+ argument is given, the result is in that timezone or UTC offset, or
* if a numeric argument is given, the result is in local time.
*
* Time.at(0) #=> 1969-12-31 18:00:00 -0600
* Time.at(Time.at(0)) #=> 1969-12-31 18:00:00 -0600
@ -2692,9 +2701,12 @@ get_scale(VALUE unit)
static VALUE
time_s_at(int argc, VALUE *argv, VALUE klass)
{
VALUE time, t, unit = Qundef;
VALUE time, t, unit = Qundef, zone = Qnil;
wideval_t timew;
if (argc > 1 && rb_obj_respond_to(argv[argc-1], id_utc_to_local, Qfalse)) {
zone = argv[--argc];
}
if (rb_scan_args(argc, argv, "12", &time, &t, &unit) >= 2) {
int scale = argc == 3 ? get_scale(unit) : 1000000;
time = num_exact(time);
@ -2713,6 +2725,9 @@ time_s_at(int argc, VALUE *argv, VALUE klass)
timew = rb_time_magnify(v2w(num_exact(time)));
t = time_new_timew(klass, timew);
}
if (!NIL_P(zone)) {
time_zonelocal(t, zone);
}
return t;
}