2003-01-21 11:06:32 -05:00
|
|
|
|
|
|
|
#
|
|
|
|
# == Introduction
|
2008-09-14 11:18:53 -04:00
|
|
|
#
|
2003-01-21 11:06:32 -05:00
|
|
|
# This library extends the Time class:
|
|
|
|
# * conversion between date string and time object.
|
|
|
|
# * date-time defined by RFC 2822
|
|
|
|
# * HTTP-date defined by RFC 2616
|
|
|
|
# * dateTime defined by XML Schema Part 2: Datatypes (ISO 8601)
|
2005-08-28 11:40:28 -04:00
|
|
|
# * various formats handled by Date._parse (string to time only)
|
2008-09-14 11:18:53 -04:00
|
|
|
#
|
2003-01-21 11:06:32 -05:00
|
|
|
# == Design Issues
|
2008-09-14 11:18:53 -04:00
|
|
|
#
|
2003-01-21 11:06:32 -05:00
|
|
|
# === Specialized interface
|
2008-09-14 11:18:53 -04:00
|
|
|
#
|
2004-01-07 06:31:21 -05:00
|
|
|
# This library provides methods dedicated to special purposes:
|
2003-01-21 11:06:32 -05:00
|
|
|
# * RFC 2822, RFC 2616 and XML Schema.
|
|
|
|
# * They makes usual life easier.
|
2008-09-14 11:18:53 -04:00
|
|
|
#
|
2003-01-21 11:06:32 -05:00
|
|
|
# === Doesn't depend on strftime
|
2008-09-14 11:18:53 -04:00
|
|
|
#
|
2003-01-21 11:06:32 -05:00
|
|
|
# This library doesn't use +strftime+. Especially #rfc2822 doesn't depend
|
|
|
|
# on +strftime+ because:
|
2008-09-14 11:18:53 -04:00
|
|
|
#
|
2003-01-21 11:06:32 -05:00
|
|
|
# * %a and %b are locale sensitive
|
2008-09-14 11:18:53 -04:00
|
|
|
#
|
2003-01-21 11:06:32 -05:00
|
|
|
# Since they are locale sensitive, they may be replaced to
|
|
|
|
# invalid weekday/month name in some locales.
|
|
|
|
# Since ruby-1.6 doesn't invoke setlocale by default,
|
|
|
|
# the problem doesn't arise until some external library invokes setlocale.
|
|
|
|
# Ruby/GTK is the example of such library.
|
2008-09-14 11:18:53 -04:00
|
|
|
#
|
2003-01-21 11:06:32 -05:00
|
|
|
# * %z is not portable
|
2008-09-14 11:18:53 -04:00
|
|
|
#
|
2003-01-21 11:06:32 -05:00
|
|
|
# %z is required to generate zone in date-time of RFC 2822
|
|
|
|
# but it is not portable.
|
|
|
|
#
|
|
|
|
# == Revision Information
|
|
|
|
#
|
2001-12-10 01:52:47 -05:00
|
|
|
# $Id$
|
2003-01-21 11:06:32 -05:00
|
|
|
#
|
2001-12-10 01:52:47 -05:00
|
|
|
|
2005-08-28 11:40:28 -04:00
|
|
|
require 'date/format'
|
2001-12-10 01:52:47 -05:00
|
|
|
|
2003-01-21 11:06:32 -05:00
|
|
|
#
|
|
|
|
# Implements the extensions to the Time class that are described in the
|
|
|
|
# documentation for the time.rb library.
|
|
|
|
#
|
2001-12-10 01:52:47 -05:00
|
|
|
class Time
|
|
|
|
class << Time
|
|
|
|
|
|
|
|
ZoneOffset = {
|
|
|
|
'UTC' => 0,
|
|
|
|
# ISO 8601
|
|
|
|
'Z' => 0,
|
|
|
|
# RFC 822
|
|
|
|
'UT' => 0, 'GMT' => 0,
|
|
|
|
'EST' => -5, 'EDT' => -4,
|
|
|
|
'CST' => -6, 'CDT' => -5,
|
|
|
|
'MST' => -7, 'MDT' => -6,
|
|
|
|
'PST' => -8, 'PDT' => -7,
|
|
|
|
# Following definition of military zones is original one.
|
2005-01-05 23:48:31 -05:00
|
|
|
# See RFC 1123 and RFC 2822 for the error in RFC 822.
|
2008-09-14 11:18:53 -04:00
|
|
|
'A' => +1, 'B' => +2, 'C' => +3, 'D' => +4, 'E' => +5, 'F' => +6,
|
2001-12-10 01:52:47 -05:00
|
|
|
'G' => +7, 'H' => +8, 'I' => +9, 'K' => +10, 'L' => +11, 'M' => +12,
|
2008-09-14 11:18:53 -04:00
|
|
|
'N' => -1, 'O' => -2, 'P' => -3, 'Q' => -4, 'R' => -5, 'S' => -6,
|
2001-12-10 01:52:47 -05:00
|
|
|
'T' => -7, 'U' => -8, 'V' => -9, 'W' => -10, 'X' => -11, 'Y' => -12,
|
|
|
|
}
|
2008-01-13 19:27:35 -05:00
|
|
|
def zone_offset(zone, year=self.now.year)
|
2001-12-10 01:52:47 -05:00
|
|
|
off = nil
|
|
|
|
zone = zone.upcase
|
2003-03-29 01:39:50 -05:00
|
|
|
if /\A([+-])(\d\d):?(\d\d)\z/ =~ zone
|
2001-12-10 01:52:47 -05:00
|
|
|
off = ($1 == '-' ? -1 : 1) * ($2.to_i * 60 + $3.to_i) * 60
|
2003-03-29 01:39:50 -05:00
|
|
|
elsif /\A[+-]\d\d\z/ =~ zone
|
2001-12-10 01:52:47 -05:00
|
|
|
off = zone.to_i * 3600
|
|
|
|
elsif ZoneOffset.include?(zone)
|
|
|
|
off = ZoneOffset[zone] * 3600
|
2008-01-13 19:27:35 -05:00
|
|
|
elsif ((t = self.local(year, 1, 1)).zone.upcase == zone rescue false)
|
2001-12-17 02:22:03 -05:00
|
|
|
off = t.utc_offset
|
2008-01-13 19:27:35 -05:00
|
|
|
elsif ((t = self.local(year, 7, 1)).zone.upcase == zone rescue false)
|
2001-12-17 02:22:03 -05:00
|
|
|
off = t.utc_offset
|
2001-12-10 01:52:47 -05:00
|
|
|
end
|
|
|
|
off
|
|
|
|
end
|
|
|
|
|
2005-01-05 23:48:31 -05:00
|
|
|
def zone_utc?(zone)
|
2008-11-26 08:41:59 -05:00
|
|
|
# * +0000
|
|
|
|
# In RFC 2822, +0000 indicate a time zone at Universal Time.
|
|
|
|
# Europe/London is "a time zone at Universal Time" in Winter.
|
|
|
|
# Europe/Lisbon is "a time zone at Universal Time" in Winter.
|
|
|
|
# Atlantic/Reykjavik is "a time zone at Universal Time".
|
|
|
|
# Africa/Dakar is "a time zone at Universal Time".
|
|
|
|
# So +0000 is a local time such as Europe/London, etc.
|
|
|
|
# * GMT
|
|
|
|
# GMT is used as a time zone abbreviation in Europe/London,
|
|
|
|
# Africa/Dakar, etc.
|
|
|
|
# So it is a local time.
|
|
|
|
#
|
|
|
|
# * -0000, -00:00
|
|
|
|
# In RFC 2822, -0000 the date-time contains no information about the
|
|
|
|
# local time zone.
|
|
|
|
# In RFC 3339, -00:00 is used for the time in UTC is known,
|
|
|
|
# but the offset to local time is unknown.
|
|
|
|
# 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.
|
2008-11-24 04:38:00 -05:00
|
|
|
if /\A(?:-00:00|-0000|-00|UTC|Z|UT)\z/i =~ zone
|
2005-01-05 23:48:31 -05:00
|
|
|
true
|
|
|
|
else
|
|
|
|
false
|
|
|
|
end
|
|
|
|
end
|
|
|
|
private :zone_utc?
|
|
|
|
|
2005-06-17 00:04:44 -04:00
|
|
|
LeapYearMonthDays = [31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
|
|
|
|
CommonYearMonthDays = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
|
|
|
|
def month_days(y, m)
|
|
|
|
if ((y % 4 == 0) && (y % 100 != 0)) || (y % 400 == 0)
|
|
|
|
LeapYearMonthDays[m-1]
|
|
|
|
else
|
|
|
|
CommonYearMonthDays[m-1]
|
|
|
|
end
|
|
|
|
end
|
|
|
|
private :month_days
|
|
|
|
|
|
|
|
def apply_offset(year, mon, day, hour, min, sec, off)
|
|
|
|
if off < 0
|
|
|
|
off = -off
|
|
|
|
off, o = off.divmod(60)
|
|
|
|
if o != 0 then sec += o; o, sec = sec.divmod(60); off += o end
|
|
|
|
off, o = off.divmod(60)
|
|
|
|
if o != 0 then min += o; o, min = min.divmod(60); off += o end
|
|
|
|
off, o = off.divmod(24)
|
|
|
|
if o != 0 then hour += o; o, hour = hour.divmod(24); off += o end
|
|
|
|
if off != 0
|
|
|
|
day += off
|
2005-08-19 05:17:20 -04:00
|
|
|
if month_days(year, mon) < day
|
2005-06-17 00:04:44 -04:00
|
|
|
mon += 1
|
|
|
|
if 12 < mon
|
|
|
|
mon = 1
|
|
|
|
year += 1
|
|
|
|
end
|
|
|
|
day = 1
|
|
|
|
end
|
|
|
|
end
|
|
|
|
elsif 0 < off
|
|
|
|
off, o = off.divmod(60)
|
|
|
|
if o != 0 then sec -= o; o, sec = sec.divmod(60); off -= o end
|
|
|
|
off, o = off.divmod(60)
|
|
|
|
if o != 0 then min -= o; o, min = min.divmod(60); off -= o end
|
|
|
|
off, o = off.divmod(24)
|
|
|
|
if o != 0 then hour -= o; o, hour = hour.divmod(24); off -= o end
|
|
|
|
if off != 0 then
|
|
|
|
day -= off
|
|
|
|
if day < 1
|
|
|
|
mon -= 1
|
|
|
|
if mon < 1
|
|
|
|
year -= 1
|
|
|
|
mon = 12
|
|
|
|
end
|
|
|
|
day = month_days(year, mon)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
return year, mon, day, hour, min, sec
|
|
|
|
end
|
|
|
|
private :apply_offset
|
|
|
|
|
2005-08-28 11:40:28 -04:00
|
|
|
def make_time(year, mon, day, hour, min, sec, sec_fraction, zone, now)
|
|
|
|
usec = nil
|
2007-11-19 04:24:28 -05:00
|
|
|
usec = sec_fraction * 1000000 if sec_fraction
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 01:47:45 -05:00
|
|
|
if now
|
|
|
|
begin
|
|
|
|
break if year; year = now.year
|
|
|
|
break if mon; mon = now.mon
|
|
|
|
break if day; day = now.day
|
|
|
|
break if hour; hour = now.hour
|
|
|
|
break if min; min = now.min
|
|
|
|
break if sec; sec = now.sec
|
2005-08-28 11:40:28 -04:00
|
|
|
break if sec_fraction; usec = now.tv_usec
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 01:47:45 -05:00
|
|
|
end until true
|
|
|
|
end
|
|
|
|
|
|
|
|
year ||= 1970
|
|
|
|
mon ||= 1
|
|
|
|
day ||= 1
|
|
|
|
hour ||= 0
|
|
|
|
min ||= 0
|
|
|
|
sec ||= 0
|
2005-08-28 11:40:28 -04:00
|
|
|
usec ||= 0
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 01:47:45 -05:00
|
|
|
|
|
|
|
off = nil
|
|
|
|
off = zone_offset(zone, year) if zone
|
|
|
|
|
|
|
|
if off
|
2005-06-17 00:04:44 -04:00
|
|
|
year, mon, day, hour, min, sec =
|
|
|
|
apply_offset(year, mon, day, hour, min, sec, off)
|
2008-01-13 19:27:35 -05:00
|
|
|
t = self.utc(year, mon, day, hour, min, sec, usec)
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 01:47:45 -05:00
|
|
|
t.localtime if !zone_utc?(zone)
|
|
|
|
t
|
|
|
|
else
|
2006-10-31 03:08:46 -05:00
|
|
|
self.local(year, mon, day, hour, min, sec, usec)
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 01:47:45 -05:00
|
|
|
end
|
|
|
|
end
|
2005-06-16 00:00:01 -04:00
|
|
|
private :make_time
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 01:47:45 -05:00
|
|
|
|
2003-01-21 11:06:32 -05:00
|
|
|
#
|
2005-08-28 11:40:28 -04:00
|
|
|
# Parses +date+ using Date._parse and converts it to a Time object.
|
2003-01-21 11:06:32 -05:00
|
|
|
#
|
|
|
|
# If a block is given, the year described in +date+ is converted by the
|
|
|
|
# block. For example:
|
|
|
|
#
|
|
|
|
# Time.parse(...) {|y| y < 100 ? (y >= 69 ? y + 1900 : y + 2000) : y}
|
|
|
|
#
|
|
|
|
# If the upper components of the given time are broken or missing, they are
|
|
|
|
# supplied with those of +now+. For the lower components, the minimum
|
|
|
|
# values (1 or 0) are assumed if broken or missing. For example:
|
|
|
|
#
|
|
|
|
# # Suppose it is "Thu Nov 29 14:33:20 GMT 2001" now and
|
|
|
|
# # your timezone is GMT:
|
|
|
|
# Time.parse("16:30") #=> Thu Nov 29 16:30:00 GMT 2001
|
|
|
|
# Time.parse("7/23") #=> Mon Jul 23 00:00:00 GMT 2001
|
2003-08-30 21:26:29 -04:00
|
|
|
# Time.parse("Aug 31") #=> Fri Aug 31 00:00:00 GMT 2001
|
2003-01-21 11:06:32 -05:00
|
|
|
#
|
|
|
|
# Since there are numerous conflicts among locally defined timezone
|
|
|
|
# abbreviations all over the world, this method is not made to
|
|
|
|
# understand all of them. For example, the abbreviation "CST" is
|
|
|
|
# used variously as:
|
|
|
|
#
|
|
|
|
# -06:00 in America/Chicago,
|
|
|
|
# -05:00 in America/Havana,
|
|
|
|
# +08:00 in Asia/Harbin,
|
|
|
|
# +09:30 in Australia/Darwin,
|
|
|
|
# +10:30 in Australia/Adelaide,
|
|
|
|
# etc.
|
|
|
|
#
|
|
|
|
# Based on the fact, this method only understands the timezone
|
|
|
|
# abbreviations described in RFC 822 and the system timezone, in the
|
|
|
|
# order named. (i.e. a definition in RFC 822 overrides the system
|
|
|
|
# timezone definition.) The system timezone is taken from
|
|
|
|
# <tt>Time.local(year, 1, 1).zone</tt> and
|
|
|
|
# <tt>Time.local(year, 7, 1).zone</tt>.
|
|
|
|
# If the extracted timezone abbreviation does not match any of them,
|
|
|
|
# it is ignored and the given time is regarded as a local time.
|
|
|
|
#
|
2005-08-28 11:40:28 -04:00
|
|
|
# ArgumentError is raised if Date._parse cannot extract information from
|
2003-01-21 11:06:32 -05:00
|
|
|
# +date+ or Time class cannot represent specified date.
|
|
|
|
#
|
|
|
|
# This method can be used as fail-safe for other parsing methods as:
|
|
|
|
#
|
|
|
|
# Time.rfc2822(date) rescue Time.parse(date)
|
|
|
|
# Time.httpdate(date) rescue Time.parse(date)
|
|
|
|
# Time.xmlschema(date) rescue Time.parse(date)
|
|
|
|
#
|
|
|
|
# A failure for Time.parse should be checked, though.
|
|
|
|
#
|
2008-01-13 19:27:35 -05:00
|
|
|
def parse(date, now=self.now)
|
2005-08-28 11:40:28 -04:00
|
|
|
d = Date._parse(date, false)
|
|
|
|
year = d[:year]
|
2003-10-16 13:47:19 -04:00
|
|
|
year = yield(year) if year && block_given?
|
2005-08-28 11:40:28 -04:00
|
|
|
make_time(year, d[:mon], d[:mday], d[:hour], d[:min], d[:sec], d[:sec_fraction], d[:zone], now)
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 01:47:45 -05:00
|
|
|
end
|
2001-12-10 01:52:47 -05:00
|
|
|
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 01:47:45 -05:00
|
|
|
#
|
2005-08-28 11:40:28 -04:00
|
|
|
# Parses +date+ using Date._strptime and converts it to a Time object.
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 01:47:45 -05:00
|
|
|
#
|
|
|
|
# If a block is given, the year described in +date+ is converted by the
|
|
|
|
# block. For example:
|
|
|
|
#
|
2005-06-16 00:00:01 -04:00
|
|
|
# Time.strptime(...) {|y| y < 100 ? (y >= 69 ? y + 1900 : y + 2000) : y}
|
2008-01-13 19:27:35 -05:00
|
|
|
def strptime(date, format, now=self.now)
|
2005-08-28 11:40:28 -04:00
|
|
|
d = Date._strptime(date, format)
|
|
|
|
raise ArgumentError, "invalid strptime format - `#{format}'" unless d
|
|
|
|
year = d[:year]
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 01:47:45 -05:00
|
|
|
year = yield(year) if year && block_given?
|
2005-08-28 11:40:28 -04:00
|
|
|
make_time(year, d[:mon], d[:mday], d[:hour], d[:min], d[:sec], d[:sec_fraction], d[:zone], now)
|
2001-12-10 01:52:47 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
MonthValue = {
|
|
|
|
'JAN' => 1, 'FEB' => 2, 'MAR' => 3, 'APR' => 4, 'MAY' => 5, 'JUN' => 6,
|
|
|
|
'JUL' => 7, 'AUG' => 8, 'SEP' => 9, 'OCT' =>10, 'NOV' =>11, 'DEC' =>12
|
|
|
|
}
|
|
|
|
|
2003-01-21 11:06:32 -05:00
|
|
|
#
|
|
|
|
# Parses +date+ as date-time defined by RFC 2822 and converts it to a Time
|
|
|
|
# object. The format is identical to the date format defined by RFC 822 and
|
|
|
|
# updated by RFC 1123.
|
|
|
|
#
|
|
|
|
# ArgumentError is raised if +date+ is not compliant with RFC 2822
|
|
|
|
# or Time class cannot represent specified date.
|
|
|
|
#
|
|
|
|
# See #rfc2822 for more information on this format.
|
|
|
|
#
|
2001-12-10 01:52:47 -05:00
|
|
|
def rfc2822(date)
|
|
|
|
if /\A\s*
|
|
|
|
(?:(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun)\s*,\s*)?
|
|
|
|
(\d{1,2})\s+
|
|
|
|
(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s+
|
|
|
|
(\d{2,})\s+
|
|
|
|
(\d{2})\s*
|
|
|
|
:\s*(\d{2})\s*
|
|
|
|
(?::\s*(\d{2}))?\s+
|
2003-03-29 01:39:50 -05:00
|
|
|
([+-]\d{4}|
|
2001-12-10 01:52:47 -05:00
|
|
|
UT|GMT|EST|EDT|CST|CDT|MST|MDT|PST|PDT|[A-IK-Z])/ix =~ date
|
|
|
|
# Since RFC 2822 permit comments, the regexp has no right anchor.
|
|
|
|
day = $1.to_i
|
|
|
|
mon = MonthValue[$2.upcase]
|
|
|
|
year = $3.to_i
|
|
|
|
hour = $4.to_i
|
|
|
|
min = $5.to_i
|
|
|
|
sec = $6 ? $6.to_i : 0
|
|
|
|
zone = $7
|
|
|
|
|
|
|
|
# following year completion is compliant with RFC 2822.
|
|
|
|
year = if year < 50
|
|
|
|
2000 + year
|
|
|
|
elsif year < 1000
|
|
|
|
1900 + year
|
|
|
|
else
|
|
|
|
year
|
|
|
|
end
|
|
|
|
|
2005-06-17 00:04:44 -04:00
|
|
|
year, mon, day, hour, min, sec =
|
|
|
|
apply_offset(year, mon, day, hour, min, sec, zone_offset(zone))
|
2006-10-31 03:08:46 -05:00
|
|
|
t = self.utc(year, mon, day, hour, min, sec)
|
2005-01-05 23:48:31 -05:00
|
|
|
t.localtime if !zone_utc?(zone)
|
2005-06-17 00:04:44 -04:00
|
|
|
t
|
2001-12-10 01:52:47 -05:00
|
|
|
else
|
|
|
|
raise ArgumentError.new("not RFC 2822 compliant date: #{date.inspect}")
|
|
|
|
end
|
|
|
|
end
|
|
|
|
alias rfc822 rfc2822
|
|
|
|
|
2003-01-21 11:06:32 -05:00
|
|
|
#
|
|
|
|
# Parses +date+ as HTTP-date defined by RFC 2616 and converts it to a Time
|
|
|
|
# object.
|
|
|
|
#
|
|
|
|
# ArgumentError is raised if +date+ is not compliant with RFC 2616 or Time
|
|
|
|
# class cannot represent specified date.
|
|
|
|
#
|
|
|
|
# See #httpdate for more information on this format.
|
|
|
|
#
|
2001-12-10 01:52:47 -05:00
|
|
|
def httpdate(date)
|
|
|
|
if /\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
|
2006-10-31 03:08:46 -05:00
|
|
|
self.rfc2822(date)
|
2001-12-10 01:52:47 -05:00
|
|
|
elsif /\A\s*
|
|
|
|
(?:Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday),\x20
|
|
|
|
(\d\d)-(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)-(\d\d)\x20
|
|
|
|
(\d\d):(\d\d):(\d\d)\x20
|
|
|
|
GMT
|
|
|
|
\s*\z/ix =~ date
|
2007-12-23 05:48:54 -05:00
|
|
|
year = $3.to_i
|
|
|
|
if year < 50
|
|
|
|
year += 2000
|
|
|
|
else
|
|
|
|
year += 1900
|
|
|
|
end
|
2008-01-13 19:27:35 -05:00
|
|
|
self.utc(year, $2, $1.to_i, $4.to_i, $5.to_i, $6.to_i)
|
2001-12-10 01:52:47 -05:00
|
|
|
elsif /\A\s*
|
|
|
|
(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun)\x20
|
|
|
|
(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\x20
|
|
|
|
(\d\d|\x20\d)\x20
|
|
|
|
(\d\d):(\d\d):(\d\d)\x20
|
|
|
|
(\d{4})
|
|
|
|
\s*\z/ix =~ date
|
2006-10-31 03:08:46 -05:00
|
|
|
self.utc($6.to_i, MonthValue[$1.upcase], $2.to_i,
|
2001-12-10 01:52:47 -05:00
|
|
|
$3.to_i, $4.to_i, $5.to_i)
|
|
|
|
else
|
|
|
|
raise ArgumentError.new("not RFC 2616 compliant date: #{date.inspect}")
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2003-01-21 11:06:32 -05:00
|
|
|
#
|
|
|
|
# Parses +date+ as dateTime defined by XML Schema and converts it to a Time
|
|
|
|
# object. The format is restricted version of the format defined by ISO
|
|
|
|
# 8601.
|
|
|
|
#
|
|
|
|
# ArgumentError is raised if +date+ is not compliant with the format or Time
|
|
|
|
# class cannot represent specified date.
|
|
|
|
#
|
|
|
|
# See #xmlschema for more information on this format.
|
|
|
|
#
|
2001-12-10 01:52:47 -05:00
|
|
|
def xmlschema(date)
|
|
|
|
if /\A\s*
|
|
|
|
(-?\d+)-(\d\d)-(\d\d)
|
|
|
|
T
|
|
|
|
(\d\d):(\d\d):(\d\d)
|
2008-06-13 05:10:44 -04:00
|
|
|
(\.\d+)?
|
2003-03-29 01:39:50 -05:00
|
|
|
(Z|[+-]\d\d:\d\d)?
|
2001-12-10 01:52:47 -05:00
|
|
|
\s*\z/ix =~ date
|
2005-06-17 00:04:44 -04:00
|
|
|
year = $1.to_i
|
|
|
|
mon = $2.to_i
|
|
|
|
day = $3.to_i
|
|
|
|
hour = $4.to_i
|
|
|
|
min = $5.to_i
|
|
|
|
sec = $6.to_i
|
|
|
|
usec = 0
|
2008-06-05 11:08:12 -04:00
|
|
|
if $7
|
2008-06-13 05:10:44 -04:00
|
|
|
usec = Rational($7) * 1000000
|
2008-06-05 11:08:12 -04:00
|
|
|
end
|
2005-06-17 00:04:44 -04:00
|
|
|
if $8
|
|
|
|
zone = $8
|
|
|
|
year, mon, day, hour, min, sec =
|
|
|
|
apply_offset(year, mon, day, hour, min, sec, zone_offset(zone))
|
2008-01-13 19:27:35 -05:00
|
|
|
self.utc(year, mon, day, hour, min, sec, usec)
|
2005-06-17 00:04:44 -04:00
|
|
|
else
|
2008-01-13 19:27:35 -05:00
|
|
|
self.local(year, mon, day, hour, min, sec, usec)
|
2005-06-17 00:04:44 -04:00
|
|
|
end
|
2001-12-10 01:52:47 -05:00
|
|
|
else
|
|
|
|
raise ArgumentError.new("invalid date: #{date.inspect}")
|
|
|
|
end
|
|
|
|
end
|
|
|
|
alias iso8601 xmlschema
|
2003-01-21 11:06:32 -05:00
|
|
|
end # class << self
|
|
|
|
|
|
|
|
#
|
|
|
|
# Returns a string which represents the time as date-time defined by RFC 2822:
|
|
|
|
#
|
|
|
|
# day-of-week, DD month-name CCYY hh:mm:ss zone
|
|
|
|
#
|
|
|
|
# where zone is [+-]hhmm.
|
|
|
|
#
|
2008-11-24 04:38:00 -05:00
|
|
|
# If +self+ is a UTC time, -0000 is used as zone.
|
2003-01-21 11:06:32 -05:00
|
|
|
#
|
2001-12-10 01:52:47 -05:00
|
|
|
def rfc2822
|
|
|
|
sprintf('%s, %02d %s %d %02d:%02d:%02d ',
|
|
|
|
RFC2822_DAY_NAME[wday],
|
|
|
|
day, RFC2822_MONTH_NAME[mon-1], year,
|
|
|
|
hour, min, sec) +
|
|
|
|
if utc?
|
2008-11-24 04:38:00 -05:00
|
|
|
'-0000'
|
2001-12-10 01:52:47 -05:00
|
|
|
else
|
2001-12-17 02:22:03 -05:00
|
|
|
off = utc_offset
|
|
|
|
sign = off < 0 ? '-' : '+'
|
|
|
|
sprintf('%s%02d%02d', sign, *(off.abs / 60).divmod(60))
|
2001-12-10 01:52:47 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
alias rfc822 rfc2822
|
|
|
|
|
2003-01-21 11:06:32 -05:00
|
|
|
RFC2822_DAY_NAME = [
|
|
|
|
'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'
|
|
|
|
]
|
|
|
|
RFC2822_MONTH_NAME = [
|
|
|
|
'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
|
|
|
|
'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'
|
|
|
|
]
|
2001-12-10 01:52:47 -05:00
|
|
|
|
2003-01-21 11:06:32 -05:00
|
|
|
#
|
|
|
|
# Returns a string which represents the time as rfc1123-date of HTTP-date
|
2008-09-14 11:18:53 -04:00
|
|
|
# defined by RFC 2616:
|
|
|
|
#
|
2003-01-21 11:06:32 -05:00
|
|
|
# day-of-week, DD month-name CCYY hh:mm:ss GMT
|
|
|
|
#
|
|
|
|
# Note that the result is always UTC (GMT).
|
|
|
|
#
|
2001-12-10 01:52:47 -05:00
|
|
|
def httpdate
|
|
|
|
t = dup.utc
|
|
|
|
sprintf('%s, %02d %s %d %02d:%02d:%02d GMT',
|
|
|
|
RFC2822_DAY_NAME[t.wday],
|
|
|
|
t.day, RFC2822_MONTH_NAME[t.mon-1], t.year,
|
|
|
|
t.hour, t.min, t.sec)
|
|
|
|
end
|
|
|
|
|
2003-01-21 11:06:32 -05:00
|
|
|
#
|
|
|
|
# Returns a string which represents the time as dateTime defined by XML
|
|
|
|
# Schema:
|
|
|
|
#
|
|
|
|
# CCYY-MM-DDThh:mm:ssTZD
|
|
|
|
# CCYY-MM-DDThh:mm:ss.sssTZD
|
|
|
|
#
|
|
|
|
# where TZD is Z or [+-]hh:mm.
|
|
|
|
#
|
|
|
|
# If self is a UTC time, Z is used as TZD. [+-]hh:mm is used otherwise.
|
|
|
|
#
|
|
|
|
# +fractional_seconds+ specifies a number of digits of fractional seconds.
|
2004-01-07 06:31:21 -05:00
|
|
|
# Its default value is 0.
|
2003-01-21 11:06:32 -05:00
|
|
|
#
|
2002-01-06 22:56:55 -05:00
|
|
|
def xmlschema(fraction_digits=0)
|
2001-12-10 01:52:47 -05:00
|
|
|
sprintf('%d-%02d-%02dT%02d:%02d:%02d',
|
|
|
|
year, mon, day, hour, min, sec) +
|
2002-01-06 22:56:55 -05:00
|
|
|
if fraction_digits == 0
|
2001-12-10 01:52:47 -05:00
|
|
|
''
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 04:09:38 -05:00
|
|
|
elsif fraction_digits <= 9
|
|
|
|
'.' + sprintf('%09d', nsec)[0, fraction_digits]
|
2001-12-10 01:52:47 -05:00
|
|
|
else
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 04:09:38 -05:00
|
|
|
'.' + sprintf('%09d', nsec) + '0' * (fraction_digits - 9)
|
2001-12-10 01:52:47 -05:00
|
|
|
end +
|
|
|
|
if utc?
|
|
|
|
'Z'
|
|
|
|
else
|
2001-12-17 02:22:03 -05:00
|
|
|
off = utc_offset
|
|
|
|
sign = off < 0 ? '-' : '+'
|
|
|
|
sprintf('%s%02d:%02d', sign, *(off.abs / 60).divmod(60))
|
2001-12-10 01:52:47 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
alias iso8601 xmlschema
|
|
|
|
end
|
|
|
|
|
|
|
|
if __FILE__ == $0
|
2003-01-21 00:51:41 -05:00
|
|
|
require 'test/unit'
|
2001-12-10 01:52:47 -05:00
|
|
|
|
2003-01-21 11:06:32 -05:00
|
|
|
class TimeExtentionTest < Test::Unit::TestCase # :nodoc:
|
2001-12-10 01:52:47 -05:00
|
|
|
def test_rfc822
|
|
|
|
assert_equal(Time.utc(1976, 8, 26, 14, 30) + 4 * 3600,
|
|
|
|
Time.rfc2822("26 Aug 76 14:30 EDT"))
|
|
|
|
assert_equal(Time.utc(1976, 8, 27, 9, 32) + 7 * 3600,
|
|
|
|
Time.rfc2822("27 Aug 76 09:32 PDT"))
|
|
|
|
end
|
|
|
|
|
|
|
|
def test_rfc2822
|
|
|
|
assert_equal(Time.utc(1997, 11, 21, 9, 55, 6) + 6 * 3600,
|
|
|
|
Time.rfc2822("Fri, 21 Nov 1997 09:55:06 -0600"))
|
|
|
|
assert_equal(Time.utc(2003, 7, 1, 10, 52, 37) - 2 * 3600,
|
|
|
|
Time.rfc2822("Tue, 1 Jul 2003 10:52:37 +0200"))
|
|
|
|
assert_equal(Time.utc(1997, 11, 21, 10, 1, 10) + 6 * 3600,
|
|
|
|
Time.rfc2822("Fri, 21 Nov 1997 10:01:10 -0600"))
|
|
|
|
assert_equal(Time.utc(1997, 11, 21, 11, 0, 0) + 6 * 3600,
|
|
|
|
Time.rfc2822("Fri, 21 Nov 1997 11:00:00 -0600"))
|
|
|
|
assert_equal(Time.utc(1997, 11, 24, 14, 22, 1) + 8 * 3600,
|
|
|
|
Time.rfc2822("Mon, 24 Nov 1997 14:22:01 -0800"))
|
2004-01-17 07:51:39 -05:00
|
|
|
begin
|
|
|
|
Time.at(-1)
|
2004-01-17 08:13:42 -05:00
|
|
|
rescue ArgumentError
|
|
|
|
# ignore
|
|
|
|
else
|
2004-01-17 07:51:39 -05:00
|
|
|
assert_equal(Time.utc(1969, 2, 13, 23, 32, 54) + 3 * 3600 + 30 * 60,
|
|
|
|
Time.rfc2822("Thu, 13 Feb 1969 23:32:54 -0330"))
|
|
|
|
assert_equal(Time.utc(1969, 2, 13, 23, 32, 0) + 3 * 3600 + 30 * 60,
|
|
|
|
Time.rfc2822(" Thu,
|
|
|
|
13
|
|
|
|
Feb
|
|
|
|
1969
|
|
|
|
23:32
|
|
|
|
-0330 (Newfoundland Time)"))
|
|
|
|
end
|
2001-12-10 01:52:47 -05:00
|
|
|
assert_equal(Time.utc(1997, 11, 21, 9, 55, 6),
|
|
|
|
Time.rfc2822("21 Nov 97 09:55:06 GMT"))
|
|
|
|
assert_equal(Time.utc(1997, 11, 21, 9, 55, 6) + 6 * 3600,
|
|
|
|
Time.rfc2822("Fri, 21 Nov 1997 09 : 55 : 06 -0600"))
|
2004-02-11 12:36:37 -05:00
|
|
|
assert_raise(ArgumentError) {
|
2001-12-10 01:52:47 -05:00
|
|
|
# inner comment is not supported.
|
|
|
|
Time.rfc2822("Fri, 21 Nov 1997 09(comment): 55 : 06 -0600")
|
|
|
|
}
|
|
|
|
end
|
|
|
|
|
|
|
|
def test_rfc2616
|
|
|
|
t = Time.utc(1994, 11, 6, 8, 49, 37)
|
|
|
|
assert_equal(t, Time.httpdate("Sun, 06 Nov 1994 08:49:37 GMT"))
|
|
|
|
assert_equal(t, Time.httpdate("Sunday, 06-Nov-94 08:49:37 GMT"))
|
|
|
|
assert_equal(t, Time.httpdate("Sun Nov 6 08:49:37 1994"))
|
|
|
|
assert_equal(Time.utc(1995, 11, 15, 6, 25, 24),
|
|
|
|
Time.httpdate("Wed, 15 Nov 1995 06:25:24 GMT"))
|
|
|
|
assert_equal(Time.utc(1995, 11, 15, 4, 58, 8),
|
|
|
|
Time.httpdate("Wed, 15 Nov 1995 04:58:08 GMT"))
|
|
|
|
assert_equal(Time.utc(1994, 11, 15, 8, 12, 31),
|
|
|
|
Time.httpdate("Tue, 15 Nov 1994 08:12:31 GMT"))
|
|
|
|
assert_equal(Time.utc(1994, 12, 1, 16, 0, 0),
|
|
|
|
Time.httpdate("Thu, 01 Dec 1994 16:00:00 GMT"))
|
|
|
|
assert_equal(Time.utc(1994, 10, 29, 19, 43, 31),
|
|
|
|
Time.httpdate("Sat, 29 Oct 1994 19:43:31 GMT"))
|
|
|
|
assert_equal(Time.utc(1994, 11, 15, 12, 45, 26),
|
|
|
|
Time.httpdate("Tue, 15 Nov 1994 12:45:26 GMT"))
|
|
|
|
assert_equal(Time.utc(1999, 12, 31, 23, 59, 59),
|
|
|
|
Time.httpdate("Fri, 31 Dec 1999 23:59:59 GMT"))
|
2007-12-23 05:48:54 -05:00
|
|
|
|
|
|
|
assert_equal(Time.utc(2007, 12, 23, 11, 22, 33),
|
|
|
|
Time.httpdate('Sunday, 23-Dec-07 11:22:33 GMT'))
|
2001-12-10 01:52:47 -05:00
|
|
|
end
|
|
|
|
|
2002-08-24 01:18:08 -04:00
|
|
|
def test_rfc3339
|
|
|
|
t = Time.utc(1985, 4, 12, 23, 20, 50, 520000)
|
|
|
|
s = "1985-04-12T23:20:50.52Z"
|
|
|
|
assert_equal(t, Time.iso8601(s))
|
|
|
|
assert_equal(s, t.iso8601(2))
|
|
|
|
|
|
|
|
t = Time.utc(1996, 12, 20, 0, 39, 57)
|
|
|
|
s = "1996-12-19T16:39:57-08:00"
|
|
|
|
assert_equal(t, Time.iso8601(s))
|
|
|
|
# There is no way to generate time string with arbitrary timezone.
|
|
|
|
s = "1996-12-20T00:39:57Z"
|
|
|
|
assert_equal(t, Time.iso8601(s))
|
|
|
|
assert_equal(s, t.iso8601)
|
|
|
|
|
|
|
|
t = Time.utc(1990, 12, 31, 23, 59, 60)
|
|
|
|
s = "1990-12-31T23:59:60Z"
|
|
|
|
assert_equal(t, Time.iso8601(s))
|
|
|
|
# leap second is representable only if timezone file has it.
|
|
|
|
s = "1990-12-31T15:59:60-08:00"
|
|
|
|
assert_equal(t, Time.iso8601(s))
|
|
|
|
|
2004-01-17 07:51:39 -05:00
|
|
|
begin
|
2004-01-17 08:13:42 -05:00
|
|
|
Time.at(-1)
|
|
|
|
rescue ArgumentError
|
|
|
|
# ignore
|
|
|
|
else
|
2004-01-17 07:51:39 -05:00
|
|
|
t = Time.utc(1937, 1, 1, 11, 40, 27, 870000)
|
|
|
|
s = "1937-01-01T12:00:27.87+00:20"
|
|
|
|
assert_equal(t, Time.iso8601(s))
|
|
|
|
end
|
2002-08-24 01:18:08 -04:00
|
|
|
end
|
|
|
|
|
2001-12-10 01:52:47 -05:00
|
|
|
# http://www.w3.org/TR/xmlschema-2/
|
|
|
|
def test_xmlschema
|
|
|
|
assert_equal(Time.utc(1999, 5, 31, 13, 20, 0) + 5 * 3600,
|
|
|
|
Time.xmlschema("1999-05-31T13:20:00-05:00"))
|
|
|
|
assert_equal(Time.local(2000, 1, 20, 12, 0, 0),
|
|
|
|
Time.xmlschema("2000-01-20T12:00:00"))
|
|
|
|
assert_equal(Time.utc(2000, 1, 20, 12, 0, 0),
|
|
|
|
Time.xmlschema("2000-01-20T12:00:00Z"))
|
|
|
|
assert_equal(Time.utc(2000, 1, 20, 12, 0, 0) - 12 * 3600,
|
|
|
|
Time.xmlschema("2000-01-20T12:00:00+12:00"))
|
|
|
|
assert_equal(Time.utc(2000, 1, 20, 12, 0, 0) + 13 * 3600,
|
|
|
|
Time.xmlschema("2000-01-20T12:00:00-13:00"))
|
|
|
|
assert_equal(Time.utc(2000, 3, 4, 23, 0, 0) - 3 * 3600,
|
|
|
|
Time.xmlschema("2000-03-04T23:00:00+03:00"))
|
|
|
|
assert_equal(Time.utc(2000, 3, 4, 20, 0, 0),
|
|
|
|
Time.xmlschema("2000-03-04T20:00:00Z"))
|
|
|
|
assert_equal(Time.local(2000, 1, 15, 0, 0, 0),
|
|
|
|
Time.xmlschema("2000-01-15T00:00:00"))
|
|
|
|
assert_equal(Time.local(2000, 2, 15, 0, 0, 0),
|
|
|
|
Time.xmlschema("2000-02-15T00:00:00"))
|
|
|
|
assert_equal(Time.local(2000, 1, 15, 12, 0, 0),
|
|
|
|
Time.xmlschema("2000-01-15T12:00:00"))
|
|
|
|
assert_equal(Time.utc(2000, 1, 16, 12, 0, 0),
|
|
|
|
Time.xmlschema("2000-01-16T12:00:00Z"))
|
|
|
|
assert_equal(Time.local(2000, 1, 1, 12, 0, 0),
|
|
|
|
Time.xmlschema("2000-01-01T12:00:00"))
|
|
|
|
assert_equal(Time.utc(1999, 12, 31, 23, 0, 0),
|
|
|
|
Time.xmlschema("1999-12-31T23:00:00Z"))
|
|
|
|
assert_equal(Time.local(2000, 1, 16, 12, 0, 0),
|
|
|
|
Time.xmlschema("2000-01-16T12:00:00"))
|
|
|
|
assert_equal(Time.local(2000, 1, 16, 0, 0, 0),
|
|
|
|
Time.xmlschema("2000-01-16T00:00:00"))
|
|
|
|
assert_equal(Time.utc(2000, 1, 12, 12, 13, 14),
|
|
|
|
Time.xmlschema("2000-01-12T12:13:14Z"))
|
|
|
|
assert_equal(Time.utc(2001, 4, 17, 19, 23, 17, 300000),
|
2005-06-17 00:04:44 -04:00
|
|
|
Time.xmlschema("2001-04-17T19:23:17.3Z"))
|
2008-06-13 05:10:44 -04:00
|
|
|
assert_raise(ArgumentError) { Time.xmlschema("2000-01-01T00:00:00.+00:00") }
|
2001-12-10 01:52:47 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
def test_encode_xmlschema
|
2002-01-06 22:56:55 -05:00
|
|
|
t = Time.utc(2001, 4, 17, 19, 23, 17, 300000)
|
|
|
|
assert_equal("2001-04-17T19:23:17Z", t.xmlschema)
|
|
|
|
assert_equal("2001-04-17T19:23:17.3Z", t.xmlschema(1))
|
|
|
|
assert_equal("2001-04-17T19:23:17.300000Z", t.xmlschema(6))
|
|
|
|
assert_equal("2001-04-17T19:23:17.3000000Z", t.xmlschema(7))
|
|
|
|
|
|
|
|
t = Time.utc(2001, 4, 17, 19, 23, 17, 123456)
|
|
|
|
assert_equal("2001-04-17T19:23:17.1234560Z", t.xmlschema(7))
|
|
|
|
assert_equal("2001-04-17T19:23:17.123456Z", t.xmlschema(6))
|
|
|
|
assert_equal("2001-04-17T19:23:17.12345Z", t.xmlschema(5))
|
|
|
|
assert_equal("2001-04-17T19:23:17.1Z", t.xmlschema(1))
|
|
|
|
|
2004-01-17 07:51:39 -05:00
|
|
|
begin
|
2004-01-17 08:13:42 -05:00
|
|
|
Time.at(-1)
|
|
|
|
rescue ArgumentError
|
|
|
|
# ignore
|
|
|
|
else
|
2004-01-17 07:51:39 -05:00
|
|
|
t = Time.utc(1960, 12, 31, 23, 0, 0, 123456)
|
|
|
|
assert_equal("1960-12-31T23:00:00.123456Z", t.xmlschema(6))
|
|
|
|
end
|
2008-06-05 11:08:12 -04:00
|
|
|
|
|
|
|
assert_equal(249, Time.xmlschema("2008-06-05T23:49:23.000249+09:00").usec)
|
2001-12-10 01:52:47 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
def test_completion
|
|
|
|
now = Time.local(2001,11,29,21,26,35)
|
|
|
|
assert_equal(Time.local( 2001,11,29,21,12),
|
|
|
|
Time.parse("2001/11/29 21:12", now))
|
|
|
|
assert_equal(Time.local( 2001,11,29),
|
|
|
|
Time.parse("2001/11/29", now))
|
|
|
|
assert_equal(Time.local( 2001,11,29),
|
|
|
|
Time.parse( "11/29", now))
|
|
|
|
#assert_equal(Time.local(2001,11,1), Time.parse("Nov", now))
|
|
|
|
assert_equal(Time.local( 2001,11,29,10,22),
|
|
|
|
Time.parse( "10:22", now))
|
|
|
|
end
|
|
|
|
|
|
|
|
def test_invalid
|
|
|
|
# They were actually used in some web sites.
|
2004-02-11 12:36:37 -05:00
|
|
|
assert_raise(ArgumentError) { Time.httpdate("1 Dec 2001 10:23:57 GMT") }
|
|
|
|
assert_raise(ArgumentError) { Time.httpdate("Sat, 1 Dec 2001 10:25:42 GMT") }
|
|
|
|
assert_raise(ArgumentError) { Time.httpdate("Sat, 1-Dec-2001 10:53:55 GMT") }
|
|
|
|
assert_raise(ArgumentError) { Time.httpdate("Saturday, 01-Dec-2001 10:15:34 GMT") }
|
|
|
|
assert_raise(ArgumentError) { Time.httpdate("Saturday, 01-Dec-101 11:10:07 GMT") }
|
|
|
|
assert_raise(ArgumentError) { Time.httpdate("Fri, 30 Nov 2001 21:30:00 JST") }
|
2001-12-10 01:52:47 -05:00
|
|
|
|
|
|
|
# They were actually used in some mails.
|
2004-02-11 12:36:37 -05:00
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("01-5-20") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("7/21/00") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("2001-8-28") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("00-5-6 1:13:06") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("2001-9-27 9:36:49") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("2000-12-13 11:01:11") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("2001/10/17 04:29:55") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("9/4/2001 9:23:19 PM") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("01 Nov 2001 09:04:31") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("13 Feb 2001 16:4 GMT") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("01 Oct 00 5:41:19 PM") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("2 Jul 00 00:51:37 JST") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("01 11 2001 06:55:57 -0500") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("18 \343\366\356\341\370 2000") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("Fri, Oct 2001 18:53:32") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("Fri, 2 Nov 2001 03:47:54") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("Fri, 27 Jul 2001 11.14.14 +0200") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("Thu, 2 Nov 2000 04:13:53 -600") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("Wed, 5 Apr 2000 22:57:09 JST") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("Mon, 11 Sep 2000 19:47:33 00000") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("Fri, 28 Apr 2000 20:40:47 +-900") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("Fri, 19 Jan 2001 8:15:36 AM -0500") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("Thursday, Sep 27 2001 7:42:35 AM EST") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("3/11/2001 1:31:57 PM Pacific Daylight Time") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("Mi, 28 Mrz 2001 11:51:36") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("P, 30 sept 2001 23:03:14") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("fr, 11 aug 2000 18:39:22") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("Fr, 21 Sep 2001 17:44:03 -1000") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("Mo, 18 Jun 2001 19:21:40 -1000") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("l\366, 12 aug 2000 18:53:20") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("l\366, 26 maj 2001 00:15:58") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("Dom, 30 Sep 2001 17:36:30") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("%&, 31 %2/ 2000 15:44:47 -0500") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("dom, 26 ago 2001 03:57:07 -0300") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("ter, 04 set 2001 16:27:58 -0300") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("Wen, 3 oct 2001 23:17:49 -0400") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("Wen, 3 oct 2001 23:17:49 -0400") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("ele, 11 h: 2000 12:42:15 -0500") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("Tue, 14 Aug 2001 3:55:3 +0200") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("Fri, 25 Aug 2000 9:3:48 +0800") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("Fri, 1 Dec 2000 0:57:50 EST") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("Mon, 7 May 2001 9:39:51 +0200") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("Wed, 1 Aug 2001 16:9:15 +0200") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("Wed, 23 Aug 2000 9:17:36 +0800") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("Fri, 11 Aug 2000 10:4:42 +0800") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("Sat, 15 Sep 2001 13:22:2 +0300") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("Wed,16 \276\305\324\302 2001 20:06:25 +0800") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("Wed,7 \312\256\322\273\324\302 2001 23:47:22 +0800") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("=?iso-8859-1?Q?(=C5=DA),?= 10 2 2001 23:32:26 +0900 (JST)") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("\307\341\314\343\332\311, 30 \344\346\335\343\310\321 2001 10:01:06") }
|
|
|
|
assert_raise(ArgumentError) { Time.rfc2822("=?iso-8859-1?Q?(=BF=E5),?= 12 =?iso-8859-1?Q?9=B7=EE?= 2001 14:52:41\n+0900 (JST)") }
|
2001-12-10 01:52:47 -05:00
|
|
|
end
|
2005-01-05 23:48:31 -05:00
|
|
|
|
|
|
|
def test_zone_0000
|
|
|
|
assert_equal(true, Time.parse("2000-01-01T00:00:00Z").utc?)
|
2008-11-24 04:38:00 -05:00
|
|
|
assert_equal(true, Time.parse("2000-01-01T00:00:00-00:00").utc?)
|
|
|
|
assert_equal(false, Time.parse("2000-01-01T00:00:00+00:00").utc?)
|
2005-01-05 23:48:31 -05:00
|
|
|
assert_equal(false, Time.parse("Sat, 01 Jan 2000 00:00:00 GMT").utc?)
|
2008-11-24 04:38:00 -05:00
|
|
|
assert_equal(true, Time.parse("Sat, 01 Jan 2000 00:00:00 -0000").utc?)
|
|
|
|
assert_equal(false, Time.parse("Sat, 01 Jan 2000 00:00:00 +0000").utc?)
|
2005-01-05 23:48:31 -05:00
|
|
|
assert_equal(false, Time.rfc2822("Sat, 01 Jan 2000 00:00:00 GMT").utc?)
|
2008-11-24 04:38:00 -05:00
|
|
|
assert_equal(true, Time.rfc2822("Sat, 01 Jan 2000 00:00:00 -0000").utc?)
|
|
|
|
assert_equal(false, Time.rfc2822("Sat, 01 Jan 2000 00:00:00 +0000").utc?)
|
2005-01-05 23:48:31 -05:00
|
|
|
assert_equal(true, Time.rfc2822("Sat, 01 Jan 2000 00:00:00 UTC").utc?)
|
|
|
|
end
|
2005-06-16 00:00:01 -04:00
|
|
|
|
2008-11-26 08:41:59 -05:00
|
|
|
def test_rfc2822_utc_roundtrip_winter
|
|
|
|
t1 = Time.local(2008,12,1)
|
|
|
|
t2 = Time.rfc2822(t1.rfc2822)
|
|
|
|
assert_equal(t1.utc?, t2.utc?, "[ruby-dev:37126]")
|
|
|
|
end
|
|
|
|
|
|
|
|
def test_rfc2822_utc_roundtrip_summer
|
|
|
|
t1 = Time.local(2008,8,1)
|
|
|
|
t2 = Time.rfc2822(t1.rfc2822)
|
|
|
|
assert_equal(t1.utc?, t2.utc?)
|
|
|
|
end
|
|
|
|
|
2005-06-16 00:00:01 -04:00
|
|
|
def test_parse_leap_second
|
|
|
|
t = Time.utc(1998,12,31,23,59,59)
|
2005-06-17 00:04:44 -04:00
|
|
|
assert_equal(t, Time.parse("Thu Dec 31 23:59:59 UTC 1998"))
|
2008-11-24 04:38:00 -05:00
|
|
|
assert_equal(t, Time.parse("Fri Dec 31 23:59:59 -0000 1998"));t.localtime
|
2005-06-17 00:04:44 -04:00
|
|
|
assert_equal(t, Time.parse("Fri Jan 1 08:59:59 +0900 1999"))
|
|
|
|
assert_equal(t, Time.parse("Fri Jan 1 00:59:59 +0100 1999"))
|
2008-11-24 04:38:00 -05:00
|
|
|
assert_equal(t, Time.parse("Fri Dec 31 23:59:59 +0000 1998"))
|
2005-06-17 00:04:44 -04:00
|
|
|
assert_equal(t, Time.parse("Fri Dec 31 22:59:59 -0100 1998"));t.utc
|
2005-06-16 00:00:01 -04:00
|
|
|
t += 1
|
2005-06-16 13:21:57 -04:00
|
|
|
assert_equal(t, Time.parse("Thu Dec 31 23:59:60 UTC 1998"))
|
2008-11-24 04:38:00 -05:00
|
|
|
assert_equal(t, Time.parse("Fri Dec 31 23:59:60 -0000 1998"));t.localtime
|
2005-06-16 13:21:57 -04:00
|
|
|
assert_equal(t, Time.parse("Fri Jan 1 08:59:60 +0900 1999"))
|
|
|
|
assert_equal(t, Time.parse("Fri Jan 1 00:59:60 +0100 1999"))
|
2008-11-24 04:38:00 -05:00
|
|
|
assert_equal(t, Time.parse("Fri Dec 31 23:59:60 +0000 1998"))
|
2005-06-17 00:04:44 -04:00
|
|
|
assert_equal(t, Time.parse("Fri Dec 31 22:59:60 -0100 1998"));t.utc
|
|
|
|
t += 1 if t.sec == 60
|
|
|
|
assert_equal(t, Time.parse("Thu Jan 1 00:00:00 UTC 1999"))
|
2008-11-24 04:38:00 -05:00
|
|
|
assert_equal(t, Time.parse("Fri Jan 1 00:00:00 -0000 1999"));t.localtime
|
2005-06-17 00:04:44 -04:00
|
|
|
assert_equal(t, Time.parse("Fri Jan 1 09:00:00 +0900 1999"))
|
|
|
|
assert_equal(t, Time.parse("Fri Jan 1 01:00:00 +0100 1999"))
|
2008-11-24 04:38:00 -05:00
|
|
|
assert_equal(t, Time.parse("Fri Jan 1 00:00:00 +0000 1999"))
|
2005-06-17 00:04:44 -04:00
|
|
|
assert_equal(t, Time.parse("Fri Dec 31 23:00:00 -0100 1998"))
|
2005-06-16 00:00:01 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
def test_rfc2822_leap_second
|
|
|
|
t = Time.utc(1998,12,31,23,59,59)
|
2005-06-17 00:04:44 -04:00
|
|
|
assert_equal(t, Time.rfc2822("Thu, 31 Dec 1998 23:59:59 UTC"))
|
2008-11-24 04:38:00 -05:00
|
|
|
assert_equal(t, Time.rfc2822("Fri, 31 Dec 1998 23:59:59 -0000"));t.localtime
|
2005-06-17 00:04:44 -04:00
|
|
|
assert_equal(t, Time.rfc2822("Fri, 1 Jan 1999 08:59:59 +0900"))
|
|
|
|
assert_equal(t, Time.rfc2822("Fri, 1 Jan 1999 00:59:59 +0100"))
|
2008-11-24 04:38:00 -05:00
|
|
|
assert_equal(t, Time.rfc2822("Fri, 31 Dec 1998 23:59:59 +0000"))
|
2008-09-14 11:18:53 -04:00
|
|
|
assert_equal(t, Time.rfc2822("Fri, 31 Dec 1998 22:59:59 -0100"));t.utc
|
2005-06-16 00:00:01 -04:00
|
|
|
t += 1
|
2005-06-16 13:21:57 -04:00
|
|
|
assert_equal(t, Time.rfc2822("Thu, 31 Dec 1998 23:59:60 UTC"))
|
2008-11-24 04:38:00 -05:00
|
|
|
assert_equal(t, Time.rfc2822("Fri, 31 Dec 1998 23:59:60 -0000"));t.localtime
|
2005-06-16 13:21:57 -04:00
|
|
|
assert_equal(t, Time.rfc2822("Fri, 1 Jan 1999 08:59:60 +0900"))
|
|
|
|
assert_equal(t, Time.rfc2822("Fri, 1 Jan 1999 00:59:60 +0100"))
|
2008-11-24 04:38:00 -05:00
|
|
|
assert_equal(t, Time.rfc2822("Fri, 31 Dec 1998 23:59:60 +0000"))
|
2008-09-14 11:18:53 -04:00
|
|
|
assert_equal(t, Time.rfc2822("Fri, 31 Dec 1998 22:59:60 -0100"));t.utc
|
2005-06-17 00:04:44 -04:00
|
|
|
t += 1 if t.sec == 60
|
|
|
|
assert_equal(t, Time.rfc2822("Thu, 1 Jan 1999 00:00:00 UTC"))
|
2008-11-24 04:38:00 -05:00
|
|
|
assert_equal(t, Time.rfc2822("Fri, 1 Jan 1999 00:00:00 -0000"));t.localtime
|
2005-06-17 00:04:44 -04:00
|
|
|
assert_equal(t, Time.rfc2822("Fri, 1 Jan 1999 09:00:00 +0900"))
|
|
|
|
assert_equal(t, Time.rfc2822("Fri, 1 Jan 1999 01:00:00 +0100"))
|
2008-11-24 04:38:00 -05:00
|
|
|
assert_equal(t, Time.rfc2822("Fri, 1 Jan 1999 00:00:00 +0000"))
|
2005-06-17 00:04:44 -04:00
|
|
|
assert_equal(t, Time.rfc2822("Fri, 31 Dec 1998 23:00:00 -0100"))
|
2005-06-16 00:00:01 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
def test_xmlschema_leap_second
|
|
|
|
t = Time.utc(1998,12,31,23,59,59)
|
2005-06-17 00:04:44 -04:00
|
|
|
assert_equal(t, Time.xmlschema("1998-12-31T23:59:59Z"))
|
2008-11-24 04:38:00 -05:00
|
|
|
assert_equal(t, Time.xmlschema("1998-12-31T23:59:59-00:00"));t.localtime
|
2005-06-17 00:04:44 -04:00
|
|
|
assert_equal(t, Time.xmlschema("1999-01-01T08:59:59+09:00"))
|
|
|
|
assert_equal(t, Time.xmlschema("1999-01-01T00:59:59+01:00"))
|
2008-11-24 04:38:00 -05:00
|
|
|
assert_equal(t, Time.xmlschema("1998-12-31T23:59:59+00:00"))
|
2005-06-17 00:04:44 -04:00
|
|
|
assert_equal(t, Time.xmlschema("1998-12-31T22:59:59-01:00"));t.utc
|
2005-06-16 00:00:01 -04:00
|
|
|
t += 1
|
2005-06-16 13:21:57 -04:00
|
|
|
assert_equal(t, Time.xmlschema("1998-12-31T23:59:60Z"))
|
2008-11-24 04:38:00 -05:00
|
|
|
assert_equal(t, Time.xmlschema("1998-12-31T23:59:60-00:00"));t.localtime
|
2005-06-16 13:21:57 -04:00
|
|
|
assert_equal(t, Time.xmlschema("1999-01-01T08:59:60+09:00"))
|
|
|
|
assert_equal(t, Time.xmlschema("1999-01-01T00:59:60+01:00"))
|
2008-11-24 04:38:00 -05:00
|
|
|
assert_equal(t, Time.xmlschema("1998-12-31T23:59:60+00:00"))
|
2005-06-17 00:04:44 -04:00
|
|
|
assert_equal(t, Time.xmlschema("1998-12-31T22:59:60-01:00"));t.utc
|
|
|
|
t += 1 if t.sec == 60
|
|
|
|
assert_equal(t, Time.xmlschema("1999-01-01T00:00:00Z"))
|
2008-11-24 04:38:00 -05:00
|
|
|
assert_equal(t, Time.xmlschema("1999-01-01T00:00:00-00:00"));t.localtime
|
2005-06-17 00:04:44 -04:00
|
|
|
assert_equal(t, Time.xmlschema("1999-01-01T09:00:00+09:00"))
|
|
|
|
assert_equal(t, Time.xmlschema("1999-01-01T01:00:00+01:00"))
|
2008-11-24 04:38:00 -05:00
|
|
|
assert_equal(t, Time.xmlschema("1999-01-01T00:00:00+00:00"))
|
2005-06-17 00:04:44 -04:00
|
|
|
assert_equal(t, Time.xmlschema("1998-12-31T23:00:00-01:00"))
|
2005-06-16 00:00:01 -04:00
|
|
|
end
|
2005-08-19 05:17:20 -04:00
|
|
|
|
2008-06-13 05:10:44 -04:00
|
|
|
def test_xmlschema_fraction
|
|
|
|
assert_equal(500000, Time.xmlschema("2000-01-01T00:00:00.5+00:00").tv_usec)
|
|
|
|
end
|
|
|
|
|
2005-08-19 05:17:20 -04:00
|
|
|
def test_ruby_talk_152866
|
|
|
|
t = Time::xmlschema('2005-08-30T22:48:00-07:00')
|
|
|
|
assert_equal(31, t.day)
|
|
|
|
assert_equal(8, t.mon)
|
|
|
|
end
|
2005-08-28 11:40:28 -04:00
|
|
|
|
|
|
|
def test_parse_fraction
|
|
|
|
assert_equal(500000, Time.parse("2000-01-01T00:00:00.5+00:00").tv_usec)
|
|
|
|
end
|
|
|
|
|
|
|
|
def test_strptime
|
|
|
|
assert_equal(Time.utc(2005, 8, 28, 06, 54, 20), Time.strptime("28/Aug/2005:06:54:20 +0000", "%d/%b/%Y:%T %z"))
|
|
|
|
end
|
2007-11-19 04:24:28 -05:00
|
|
|
|
|
|
|
def test_nsec
|
|
|
|
assert_equal(123456789, Time.xmlschema("2000-01-01T00:00:00.123456789+00:00").tv_nsec)
|
|
|
|
assert_equal(123456789, Time.parse("2000-01-01T00:00:00.123456789+00:00").tv_nsec)
|
|
|
|
end
|
2001-12-10 01:52:47 -05:00
|
|
|
end
|
|
|
|
end
|