Permalink
Browse files

cleanup date/format.rb and add httpdate to Date/DateTime

  • Loading branch information...
1 parent 42f475b commit 37b22814c1317b56340dfac87fdfa96dd5500835 @timfel timfel committed Aug 19, 2012
Showing with 695 additions and 671 deletions.
  1. +695 −671 lib/ruby/1.8/date/format.rb
View
1,366 lib/ruby/1.8/date/format.rb
@@ -10,132 +10,134 @@ class Date
module Format # :nodoc:
MONTHS = {
- 'january' => 1, 'february' => 2, 'march' => 3, 'april' => 4,
- 'may' => 5, 'june' => 6, 'july' => 7, 'august' => 8,
- 'september'=> 9, 'october' =>10, 'november' =>11, 'december' =>12
- }.freeze
+ 'january' => 1, 'february' => 2, 'march' => 3, 'april' => 4,
+ 'may' => 5, 'june' => 6, 'july' => 7, 'august' => 8,
+ 'september'=> 9, 'october' =>10, 'november' =>11, 'december' =>12
+ }.freeze
MONTHS_keys_or = MONTHS.keys.join('|').freeze
DAYS = {
- 'sunday' => 0, 'monday' => 1, 'tuesday' => 2, 'wednesday'=> 3,
- 'thursday' => 4, 'friday' => 5, 'saturday' => 6
- }.freeze
+ 'sunday' => 0, 'monday' => 1, 'tuesday' => 2, 'wednesday'=> 3,
+ 'thursday' => 4, 'friday' => 5, 'saturday' => 6
+ }.freeze
DAYS_keys_or = DAYS.keys.join('|').freeze
ABBR_MONTHS = {
- 'jan' => 1, 'feb' => 2, 'mar' => 3, 'apr' => 4,
- 'may' => 5, 'jun' => 6, 'jul' => 7, 'aug' => 8,
- 'sep' => 9, 'oct' =>10, 'nov' =>11, 'dec' =>12
- }.freeze
+ 'jan' => 1, 'feb' => 2, 'mar' => 3, 'apr' => 4,
+ 'may' => 5, 'jun' => 6, 'jul' => 7, 'aug' => 8,
+ 'sep' => 9, 'oct' =>10, 'nov' =>11, 'dec' =>12
+ }.freeze
ABBR_MONTHS_keys_or = ABBR_MONTHS.keys.join('|').freeze
ABBR_DAYS = {
- 'sun' => 0, 'mon' => 1, 'tue' => 2, 'wed' => 3,
- 'thu' => 4, 'fri' => 5, 'sat' => 6
- }.freeze
+ 'sun' => 0, 'mon' => 1, 'tue' => 2, 'wed' => 3,
+ 'thu' => 4, 'fri' => 5, 'sat' => 6
+ }.freeze
ABBR_DAYS_keys_or = ABBR_DAYS.keys.join('|').freeze
ZONES = {
- 'ut' => 0*3600, 'gmt' => 0*3600, 'est' => -5*3600, 'edt' => -4*3600,
- 'cst' => -6*3600, 'cdt' => -5*3600, 'mst' => -7*3600, 'mdt' => -6*3600,
- 'pst' => -8*3600, 'pdt' => -7*3600,
- 'a' => 1*3600, 'b' => 2*3600, 'c' => 3*3600, 'd' => 4*3600,
- 'e' => 5*3600, 'f' => 6*3600, 'g' => 7*3600, 'h' => 8*3600,
- 'i' => 9*3600, 'k' => 10*3600, 'l' => 11*3600, 'm' => 12*3600,
- 'n' => -1*3600, 'o' => -2*3600, 'p' => -3*3600, 'q' => -4*3600,
- 'r' => -5*3600, 's' => -6*3600, 't' => -7*3600, 'u' => -8*3600,
- 'v' => -9*3600, 'w' =>-10*3600, 'x' =>-11*3600, 'y' =>-12*3600,
- 'z' => 0*3600,
-
- 'utc' => 0*3600, 'wet' => 0*3600,
- 'at' => -2*3600, 'brst'=> -2*3600, 'ndt' => -(2*3600+1800),
- 'art' => -3*3600, 'adt' => -3*3600, 'brt' => -3*3600, 'clst'=> -3*3600,
- 'nst' => -(3*3600+1800),
- 'ast' => -4*3600, 'clt' => -4*3600,
- 'akdt'=> -8*3600, 'ydt' => -8*3600,
- 'akst'=> -9*3600, 'hadt'=> -9*3600, 'hdt' => -9*3600, 'yst' => -9*3600,
- 'ahst'=>-10*3600, 'cat' =>-10*3600, 'hast'=>-10*3600, 'hst' =>-10*3600,
- 'nt' =>-11*3600,
- 'idlw'=>-12*3600,
- 'bst' => 1*3600, 'cet' => 1*3600, 'fwt' => 1*3600, 'met' => 1*3600,
- 'mewt'=> 1*3600, 'mez' => 1*3600, 'swt' => 1*3600, 'wat' => 1*3600,
- 'west'=> 1*3600,
- 'cest'=> 2*3600, 'eet' => 2*3600, 'fst' => 2*3600, 'mest'=> 2*3600,
- 'mesz'=> 2*3600, 'sast'=> 2*3600, 'sst' => 2*3600,
- 'bt' => 3*3600, 'eat' => 3*3600, 'eest'=> 3*3600, 'msk' => 3*3600,
- 'msd' => 4*3600, 'zp4' => 4*3600,
- 'zp5' => 5*3600, 'ist' => (5*3600+1800),
- 'zp6' => 6*3600,
- 'wast'=> 7*3600,
- 'cct' => 8*3600, 'sgt' => 8*3600, 'wadt'=> 8*3600,
- 'jst' => 9*3600, 'kst' => 9*3600,
- 'east'=> 10*3600, 'gst' => 10*3600,
- 'eadt'=> 11*3600,
- 'idle'=> 12*3600, 'nzst'=> 12*3600, 'nzt' => 12*3600,
- 'nzdt'=> 13*3600,
-
- 'afghanistan' => 16200, 'alaskan' => -32400,
- 'arab' => 10800, 'arabian' => 14400,
- 'arabic' => 10800, 'atlantic' => -14400,
- 'aus central' => 34200, 'aus eastern' => 36000,
- 'azores' => -3600, 'canada central' => -21600,
- 'cape verde' => -3600, 'caucasus' => 14400,
- 'cen. australia' => 34200, 'central america' => -21600,
- 'central asia' => 21600, 'central europe' => 3600,
- 'central european' => 3600, 'central pacific' => 39600,
- 'central' => -21600, 'china' => 28800,
- 'dateline' => -43200, 'e. africa' => 10800,
- 'e. australia' => 36000, 'e. europe' => 7200,
- 'e. south america' => -10800, 'eastern' => -18000,
- 'egypt' => 7200, 'ekaterinburg' => 18000,
- 'fiji' => 43200, 'fle' => 7200,
- 'greenland' => -10800, 'greenwich' => 0,
- 'gtb' => 7200, 'hawaiian' => -36000,
- 'india' => 19800, 'iran' => 12600,
- 'jerusalem' => 7200, 'korea' => 32400,
- 'mexico' => -21600, 'mid-atlantic' => -7200,
- 'mountain' => -25200, 'myanmar' => 23400,
- 'n. central asia' => 21600, 'nepal' => 20700,
- 'new zealand' => 43200, 'newfoundland' => -12600,
- 'north asia east' => 28800, 'north asia' => 25200,
- 'pacific sa' => -14400, 'pacific' => -28800,
- 'romance' => 3600, 'russian' => 10800,
- 'sa eastern' => -10800, 'sa pacific' => -18000,
- 'sa western' => -14400, 'samoa' => -39600,
- 'se asia' => 25200, 'malay peninsula' => 28800,
- 'south africa' => 7200, 'sri lanka' => 21600,
- 'taipei' => 28800, 'tasmania' => 36000,
- 'tokyo' => 32400, 'tonga' => 46800,
- 'us eastern' => -18000, 'us mountain' => -25200,
- 'vladivostok' => 36000, 'w. australia' => 28800,
- 'w. central africa' => 3600, 'w. europe' => 3600,
- 'west asia' => 18000, 'west pacific' => 36000,
- 'yakutsk' => 32400
- }.freeze
+ 'ut' => 0*3600, 'gmt' => 0*3600, 'est' => -5*3600, 'edt' => -4*3600,
+ 'cst' => -6*3600, 'cdt' => -5*3600, 'mst' => -7*3600, 'mdt' => -6*3600,
+ 'pst' => -8*3600, 'pdt' => -7*3600,
+ 'a' => 1*3600, 'b' => 2*3600, 'c' => 3*3600, 'd' => 4*3600,
+ 'e' => 5*3600, 'f' => 6*3600, 'g' => 7*3600, 'h' => 8*3600,
+ 'i' => 9*3600, 'k' => 10*3600, 'l' => 11*3600, 'm' => 12*3600,
+ 'n' => -1*3600, 'o' => -2*3600, 'p' => -3*3600, 'q' => -4*3600,
+ 'r' => -5*3600, 's' => -6*3600, 't' => -7*3600, 'u' => -8*3600,
+ 'v' => -9*3600, 'w' =>-10*3600, 'x' =>-11*3600, 'y' =>-12*3600,
+ 'z' => 0*3600,
+
+ 'utc' => 0*3600, 'wet' => 0*3600,
+ 'at' => -2*3600, 'brst'=> -2*3600, 'ndt' => -(2*3600+1800),
+ 'art' => -3*3600, 'adt' => -3*3600, 'brt' => -3*3600, 'clst'=> -3*3600,
+ 'nst' => -(3*3600+1800),
+ 'ast' => -4*3600, 'clt' => -4*3600,
+ 'akdt'=> -8*3600, 'ydt' => -8*3600,
+ 'akst'=> -9*3600, 'hadt'=> -9*3600, 'hdt' => -9*3600, 'yst' => -9*3600,
+ 'ahst'=>-10*3600, 'cat' =>-10*3600, 'hast'=>-10*3600, 'hst' =>-10*3600,
+ 'nt' =>-11*3600,
+ 'idlw'=>-12*3600,
+ 'bst' => 1*3600, 'cet' => 1*3600, 'fwt' => 1*3600, 'met' => 1*3600,
+ 'mewt'=> 1*3600, 'mez' => 1*3600, 'swt' => 1*3600, 'wat' => 1*3600,
+ 'west'=> 1*3600,
+ 'cest'=> 2*3600, 'eet' => 2*3600, 'fst' => 2*3600, 'mest'=> 2*3600,
+ 'mesz'=> 2*3600, 'sast'=> 2*3600, 'sst' => 2*3600,
+ 'bt' => 3*3600, 'eat' => 3*3600, 'eest'=> 3*3600, 'msk' => 3*3600,
+ 'msd' => 4*3600, 'zp4' => 4*3600,
+ 'zp5' => 5*3600, 'ist' => (5*3600+1800),
+ 'zp6' => 6*3600,
+ 'wast'=> 7*3600,
+ 'cct' => 8*3600, 'sgt' => 8*3600, 'wadt'=> 8*3600,
+ 'jst' => 9*3600, 'kst' => 9*3600,
+ 'east'=> 10*3600, 'gst' => 10*3600,
+ 'eadt'=> 11*3600,
+ 'idle'=> 12*3600, 'nzst'=> 12*3600, 'nzt' => 12*3600,
+ 'nzdt'=> 13*3600,
+
+ 'afghanistan' => 16200, 'alaskan' => -32400,
+ 'arab' => 10800, 'arabian' => 14400,
+ 'arabic' => 10800, 'atlantic' => -14400,
+ 'aus central' => 34200, 'aus eastern' => 36000,
+ 'azores' => -3600, 'canada central' => -21600,
+ 'cape verde' => -3600, 'caucasus' => 14400,
+ 'cen. australia' => 34200, 'central america' => -21600,
+ 'central asia' => 21600, 'central europe' => 3600,
+ 'central european' => 3600, 'central pacific' => 39600,
+ 'central' => -21600, 'china' => 28800,
+ 'dateline' => -43200, 'e. africa' => 10800,
+ 'e. australia' => 36000, 'e. europe' => 7200,
+ 'e. south america' => -10800, 'eastern' => -18000,
+ 'egypt' => 7200, 'ekaterinburg' => 18000,
+ 'fiji' => 43200, 'fle' => 7200,
+ 'greenland' => -10800, 'greenwich' => 0,
+ 'gtb' => 7200, 'hawaiian' => -36000,
+ 'india' => 19800, 'iran' => 12600,
+ 'jerusalem' => 7200, 'korea' => 32400,
+ 'mexico' => -21600, 'mid-atlantic' => -7200,
+ 'mountain' => -25200, 'myanmar' => 23400,
+ 'n. central asia' => 21600, 'nepal' => 20700,
+ 'new zealand' => 43200, 'newfoundland' => -12600,
+ 'north asia east' => 28800, 'north asia' => 25200,
+ 'pacific sa' => -14400, 'pacific' => -28800,
+ 'romance' => 3600, 'russian' => 10800,
+ 'sa eastern' => -10800, 'sa pacific' => -18000,
+ 'sa western' => -14400, 'samoa' => -39600,
+ 'se asia' => 25200, 'malay peninsula' => 28800,
+ 'south africa' => 7200, 'sri lanka' => 21600,
+ 'taipei' => 28800, 'tasmania' => 36000,
+ 'tokyo' => 32400, 'tonga' => 46800,
+ 'us eastern' => -18000, 'us mountain' => -25200,
+ 'vladivostok' => 36000, 'w. australia' => 28800,
+ 'w. central africa' => 3600, 'w. europe' => 3600,
+ 'west asia' => 18000, 'west pacific' => 36000,
+ 'yakutsk' => 32400
+ }.freeze
class Bag # :nodoc:
def initialize
- @elem = {}
+ @elem = {}
end
def method_missing(t, *args, &block)
- t = t.to_s
- set = t.chomp!('=')
- t = t.intern
- if set
- @elem[t] = args[0]
- else
- @elem[t]
- end
+ t = t.to_s
+ set = t.chomp!('=')
+ t = t.intern
+ if set
+ @elem[t] = args[0]
+ else
+ @elem[t]
+ end
end
def to_hash
- @elem.reject{|k, v| /\A_/ =~ k.to_s || v.nil?}
+ @elem.reject do |k, v|
+ /\A_/ =~ k.to_s || v.nil?
+ end
end
end
@@ -218,26 +220,26 @@ def emit_au(e, w, f) # :nodoc:
end
private :emit, :emit_w, :emit_n, :emit_sn, :emit_z,
- :emit_a, :emit_ad, :emit_au
+ :emit_a, :emit_ad, :emit_au
def strftime(fmt='%F')
fmt.gsub(/%([-_0^#]+)?(\d+)?([EO]?(?::{1,3}z|.))/m) do |m|
f = {}
a = $&
s, w, c = $1, $2, $3
if s
- s.scan(/./) do |k|
- case k
- when '-'; f[:p] = '-'
- when '_'; f[:p] = "\s"
- when '0'; f[:p] = '0'
- when '^'; f[:u] = true
- when '#'; f[:x] = true
- end
- end
+ s.scan(/./) do |k|
+ case k
+ when '-'; f[:p] = '-'
+ when '_'; f[:p] = "\s"
+ when '0'; f[:p] = '0'
+ when '^'; f[:u] = true
+ when '#'; f[:x] = true
+ end
+ end
end
if w
- f[:w] = w.to_i
+ f[:w] = w.to_i
end
case c
when 'A'; emit_ad(DAYNAMES[wday], 0, f)
@@ -250,11 +252,11 @@ def strftime(fmt='%F')
when 'd', 'Od'; emit_n(mday, 2, f)
when 'e', 'Oe'; emit_a(mday, 2, f)
when 'F'
- if m == '%F'
- format('%.4d-%02d-%02d', year, mon, mday) # 4p
- else
- emit_a(strftime('%Y-%m-%d'), 0, f)
- end
+ if m == '%F'
+ format('%.4d-%02d-%02d', year, mon, mday) # 4p
+ else
+ emit_a(strftime('%Y-%m-%d'), 0, f)
+ end
when 'G'; emit_sn(cwyear, 4, f)
when 'g'; emit_n(cwyear % 100, 2, f)
when 'H', 'OH'; emit_n(hour, 2, f)
@@ -263,33 +265,33 @@ def strftime(fmt='%F')
when 'j'; emit_n(yday, 3, f)
when 'k'; emit_a(hour, 2, f)
when 'L'
- emit_n((sec_fraction / MILLISECONDS_IN_DAY).floor, 3, f)
+ emit_n((sec_fraction / MILLISECONDS_IN_DAY).floor, 3, f)
when 'l'; emit_a((hour % 12).nonzero? || 12, 2, f)
when 'M', 'OM'; emit_n(min, 2, f)
when 'm', 'Om'; emit_n(mon, 2, f)
when 'N'
- emit_n((sec_fraction / NANOSECONDS_IN_DAY).floor, 9, f)
+ emit_n((sec_fraction / NANOSECONDS_IN_DAY).floor, 9, f)
when 'n'; "\n"
when 'P'; emit_ad(strftime('%p').downcase, 0, f)
when 'p'; emit_au(if hour < 12 then 'AM' else 'PM' end, 0, f)
when 'Q'
- s = ((ajd - UNIX_EPOCH_IN_AJD) / MILLISECONDS_IN_DAY).round
- emit_sn(s, 1, f)
+ s = ((ajd - UNIX_EPOCH_IN_AJD) / MILLISECONDS_IN_DAY).round
+ emit_sn(s, 1, f)
when 'R'; emit_a(strftime('%H:%M'), 0, f)
when 'r'; emit_a(strftime('%I:%M:%S %p'), 0, f)
when 'S', 'OS'; emit_n(sec, 2, f)
when 's'
- s = ((ajd - UNIX_EPOCH_IN_AJD) / SECONDS_IN_DAY).round
- emit_sn(s, 1, f)
+ s = ((ajd - UNIX_EPOCH_IN_AJD) / SECONDS_IN_DAY).round
+ emit_sn(s, 1, f)
when 'T'
- if m == '%T'
- format('%02d:%02d:%02d', hour, min, sec) # 4p
- else
- emit_a(strftime('%H:%M:%S'), 0, f)
- end
+ if m == '%T'
+ format('%02d:%02d:%02d', hour, min, sec) # 4p
+ else
+ emit_a(strftime('%H:%M:%S'), 0, f)
+ end
when 't'; "\t"
when 'U', 'W', 'OU', 'OW'
- emit_n(if c[-1,1] == 'U' then wnum0 else wnum1 end, 2, f)
+ emit_n(if c[-1,1] == 'U' then wnum0 else wnum1 end, 2, f)
when 'u', 'Ou'; emit_n(cwday, 1, f)
when 'V', 'OV'; emit_n(cweek, 2, f)
when 'v'; emit_a(strftime('%e-%b-%Y'), 0, f)
@@ -300,102 +302,100 @@ def strftime(fmt='%F')
when 'y', 'Ey', 'Oy'; emit_n(year % 100, 2, f)
when 'Z'; emit_au(strftime('%:z'), 0, f)
when /\A(:{0,3})z/
- t = $1.size
- sign = if offset < 0 then -1 else +1 end
- fr = offset.abs
- ss = fr.div(SECONDS_IN_DAY) # 4p
- hh, ss = ss.divmod(3600)
- mm, ss = ss.divmod(60)
- if t == 3
- if ss.nonzero? then t = 2
- elsif mm.nonzero? then t = 1
- else t = -1
- end
- end
- case t
- when -1
- tail = []
- sep = ''
- when 0
- f[:w] -= 2 if f[:w]
- tail = ['%02d' % mm]
- sep = ''
- when 1
- f[:w] -= 3 if f[:w]
- tail = ['%02d' % mm]
- sep = ':'
- when 2
- f[:w] -= 6 if f[:w]
- tail = ['%02d' % mm, '%02d' % ss]
- sep = ':'
- end
- ([emit_z(sign * hh, 2, f)] + tail).join(sep)
+ t = $1.size
+ sign = if offset < 0 then -1 else +1 end
+ fr = offset.abs
+ ss = fr.div(SECONDS_IN_DAY) # 4p
+ hh, ss = ss.divmod(3600)
+ mm, ss = ss.divmod(60)
+ if t == 3
+ if ss.nonzero? then t = 2
+ elsif mm.nonzero? then t = 1
+ else t = -1
+ end
+ end
+ case t
+ when -1
+ tail = []
+ sep = ''
+ when 0
+ f[:w] -= 2 if f[:w]
+ tail = ['%02d' % mm]
+ sep = ''
+ when 1
+ f[:w] -= 3 if f[:w]
+ tail = ['%02d' % mm]
+ sep = ':'
+ when 2
+ f[:w] -= 6 if f[:w]
+ tail = ['%02d' % mm, '%02d' % ss]
+ sep = ':'
+ end
+ ([emit_z(sign * hh, 2, f)] + tail).join(sep)
when '%'; emit_a('%', 0, f)
when '+'; emit_a(strftime('%a %b %e %H:%M:%S %Z %Y'), 0, f)
when '1'
- if $VERBOSE
- warn("warning: strftime: %1 is deprecated; forget this")
- end
- emit_n(jd, 1, f)
+ if $VERBOSE
+ warn("warning: strftime: %1 is deprecated; forget this")
+ end
+ emit_n(jd, 1, f)
when '2'
- if $VERBOSE
- warn("warning: strftime: %2 is deprecated; use '%Y-%j'")
- end
- emit_a(strftime('%Y-%j'), 0, f)
+ if $VERBOSE
+ warn("warning: strftime: %2 is deprecated; use '%Y-%j'")
+ end
+ emit_a(strftime('%Y-%j'), 0, f)
when '3'
- if $VERBOSE
- warn("warning: strftime: %3 is deprecated; use '%F'")
- end
- emit_a(strftime('%F'), 0, f)
+ if $VERBOSE
+ warn("warning: strftime: %3 is deprecated; use '%F'")
+ end
+ emit_a(strftime('%F'), 0, f)
else
- a
+ a
end
end
end
-# alias_method :format, :strftime
+ # alias_method :format, :strftime
def asctime() strftime('%c') end
alias_method :ctime, :asctime
-=begin
-# def iso8601() strftime('%F') end
-
-# def rfc3339() iso8601 end
-
-# def rfc2822() strftime('%a, %-d %b %Y %T %z') end
-
-# alias_method :rfc822, :rfc2822
-
-# def jisx0301
-# if jd < 2405160
-# iso8601
-# else
-# case jd
-# when 2405160...2419614
-# g = 'M%02d' % (year - 1867)
-# when 2419614...2424875
-# g = 'T%02d' % (year - 1911)
-# when 2424875...2447535
-# g = 'S%02d' % (year - 1925)
-# else
-# g = 'H%02d' % (year - 1988)
-# end
-# g + strftime('.%m.%d')
-# end
-# end
-
-# def beat(n=0)
-# i, f = (new_offset(HOURS_IN_DAY).day_fraction * 1000).divmod(1)
-# ('@%03d' % i) +
-# if n < 1
-# ''
-# else
-# '.%0*d' % [n, (f / Rational(1, 10**n)).round]
-# end
-# end
-=end
+ # def iso8601() strftime('%F') end
+
+ # def rfc3339() iso8601 end
+
+ # def rfc2822() strftime('%a, %-d %b %Y %T %z') end
+
+ # alias_method :rfc822, :rfc2822
+
+ # def jisx0301
+ # if jd < 2405160
+ # iso8601
+ # else
+ # case jd
+ # when 2405160...2419614
+ # g = 'M%02d' % (year - 1867)
+ # when 2419614...2424875
+ # g = 'T%02d' % (year - 1911)
+ # when 2424875...2447535
+ # g = 'S%02d' % (year - 1925)
+ # else
+ # g = 'H%02d' % (year - 1988)
+ # end
+ # g + strftime('.%m.%d')
+ # end
+ # end
+
+ # def beat(n=0)
+ # i, f = (new_offset(HOURS_IN_DAY).day_fraction * 1000).divmod(1)
+ # ('@%03d' % i) +
+ # if n < 1
+ # ''
+ # else
+ # '.%0*d' % [n, (f / Rational(1, 10**n)).round]
+ # end
+ # end
def self.num_pattern? (s) # :nodoc:
/\A%[EO]?[CDdeFGgHIjkLlMmNQRrSsTUuVvWwXxYy\d]/ =~ s || /\A\d/ =~ s
@@ -404,7 +404,7 @@ def self.num_pattern? (s) # :nodoc:
private_class_method :num_pattern?
DAYS_keys_strptime = ( /\A(#{Format::DAYS_keys_or})/io ).freeze
-
+
ABBR_DAYS_keys_strptime = ( /\A(#{Format::ABBR_DAYS_keys_or})/io ).freeze
MONTHS_keys_strptime = ( /\A(#{Format::MONTHS_keys_or})/io ).freeze
@@ -415,194 +415,194 @@ def self._strptime_i(str, fmt, e) # :nodoc:
fmt.scan(/%([EO]?(?::{1,3}z|.))|(.)/m) do |s, c|
a = $&
if s
- case s
- when 'A', 'a'
- return unless str.sub!( Format::DAYS_keys_strptime, '') ||
- str.sub!( Format::ABBR_DAYS_keys_strptime, '')
- val = Format::DAYS[$1.downcase] || Format::ABBR_DAYS[$1.downcase]
- return unless val
- e.wday = val
- when 'B', 'b', 'h'
- return unless str.sub!( MONTHS_keys_strptime, '') ||
- str.sub!( ABBR_MONTHS_keys_strptime, '')
- val = Format::MONTHS[$1.downcase] || Format::ABBR_MONTHS[$1.downcase]
- return unless val
- e.mon = val
- when 'C', 'EC'
- return unless str.sub!(if num_pattern?($')
- then /\A([-+]?\d{1,2})/
- else /\A([-+]?\d{1,})/
- end, '')
- val = $1.to_i
- e._cent = val
- when 'c', 'Ec'
- return unless _strptime_i(str, '%a %b %e %H:%M:%S %Y', e)
- when 'D'
- return unless _strptime_i(str, '%m/%d/%y', e)
- when 'd', 'e', 'Od', 'Oe'
- return unless str.sub!(/\A( \d|\d{1,2})/, '')
- val = $1.to_i
- return unless (1..31) === val
- e.mday = val
- when 'F'
- return unless _strptime_i(str, '%Y-%m-%d', e)
- when 'G'
- return unless str.sub!(if num_pattern?($')
- then /\A([-+]?\d{1,4})/
- else /\A([-+]?\d{1,})/
- end, '')
- val = $1.to_i
- e.cwyear = val
- when 'g'
- return unless str.sub!(/\A(\d{1,2})/, '')
- val = $1.to_i
- return unless (0..99) === val
- e.cwyear = val
- e._cent ||= if val >= 69 then 19 else 20 end
- when 'H', 'k', 'OH'
- return unless str.sub!(/\A( \d|\d{1,2})/, '')
- val = $1.to_i
- return unless (0..24) === val
- e.hour = val
- when 'I', 'l', 'OI'
- return unless str.sub!(/\A( \d|\d{1,2})/, '')
- val = $1.to_i
- return unless (1..12) === val
- e.hour = val
- when 'j'
- return unless str.sub!(/\A(\d{1,3})/, '')
- val = $1.to_i
- return unless (1..366) === val
- e.yday = val
- when 'L'
- return unless str.sub!(if num_pattern?($')
- then /\A([-+]?\d{1,3})/
- else /\A([-+]?\d{1,})/
- end, '')
-# val = Rational($1.to_i, 10**3)
- val = Rational($1.to_i, 10**$1.size)
- e.sec_fraction = val
- when 'M', 'OM'
- return unless str.sub!(/\A(\d{1,2})/, '')
- val = $1.to_i
- return unless (0..59) === val
- e.min = val
- when 'm', 'Om'
- return unless str.sub!(/\A(\d{1,2})/, '')
- val = $1.to_i
- return unless (1..12) === val
- e.mon = val
- when 'N'
- return unless str.sub!(if num_pattern?($')
- then /\A([-+]?\d{1,9})/
- else /\A([-+]?\d{1,})/
- end, '')
-# val = Rational($1.to_i, 10**9)
- val = Rational($1.to_i, 10**$1.size)
- e.sec_fraction = val
- when 'n', 't'
- return unless _strptime_i(str, "\s", e)
- when 'P', 'p'
- return unless str.sub!(/\A([ap])(?:m\b|\.m\.)/i, '')
- e._merid = if $1.downcase == 'a' then 0 else 12 end
- when 'Q'
- return unless str.sub!(/\A(-?\d{1,})/, '')
- val = Rational($1.to_i, 10**3)
- e.seconds = val
- when 'R'
- return unless _strptime_i(str, '%H:%M', e)
- when 'r'
- return unless _strptime_i(str, '%I:%M:%S %p', e)
- when 'S', 'OS'
- return unless str.sub!(/\A(\d{1,2})/, '')
- val = $1.to_i
- return unless (0..60) === val
- e.sec = val
- when 's'
- return unless str.sub!(/\A(-?\d{1,})/, '')
- val = $1.to_i
- e.seconds = val
- when 'T'
- return unless _strptime_i(str, '%H:%M:%S', e)
- when 'U', 'W', 'OU', 'OW'
- return unless str.sub!(/\A(\d{1,2})/, '')
- val = $1.to_i
- return unless (0..53) === val
- e.__send__(if s[-1,1] == 'U' then :wnum0= else :wnum1= end, val)
- when 'u', 'Ou'
- return unless str.sub!(/\A(\d{1})/, '')
- val = $1.to_i
- return unless (1..7) === val
- e.cwday = val
- when 'V', 'OV'
- return unless str.sub!(/\A(\d{1,2})/, '')
- val = $1.to_i
- return unless (1..53) === val
- e.cweek = val
- when 'v'
- return unless _strptime_i(str, '%e-%b-%Y', e)
- when 'w'
- return unless str.sub!(/\A(\d{1})/, '')
- val = $1.to_i
- return unless (0..6) === val
- e.wday = val
- when 'X', 'EX'
- return unless _strptime_i(str, '%H:%M:%S', e)
- when 'x', 'Ex'
- return unless _strptime_i(str, '%m/%d/%y', e)
- when 'Y', 'EY'
- return unless str.sub!(if num_pattern?($')
- then /\A([-+]?\d{1,4})/
- else /\A([-+]?\d{1,})/
- end, '')
- val = $1.to_i
- e.year = val
- when 'y', 'Ey', 'Oy'
- return unless str.sub!(/\A(\d{1,2})/, '')
- val = $1.to_i
- return unless (0..99) === val
- e.year = val
- e._cent ||= if val >= 69 then 19 else 20 end
- when 'Z', /\A:{0,3}z/
- return unless str.sub!(/\A((?:gmt|utc?)?[-+]\d+(?:[,.:]\d+(?::\d+)?)?
- |[[:alpha:].\s]+(?:standard|daylight)\s+time\b
- |[[:alpha:]]+(?:\s+dst)?\b
- )/ix, '')
- val = $1
- e.zone = val
- offset = zone_to_diff(val)
- e.offset = offset
- when '%'
- return unless str.sub!(/\A%/, '')
- when '+'
- return unless _strptime_i(str, '%a %b %e %H:%M:%S %Z %Y', e)
- when '1'
- if $VERBOSE
- warn("warning: strptime: %1 is deprecated; forget this")
- end
- return unless str.sub!(/\A(\d+)/, '')
- val = $1.to_i
- e.jd = val
- when '2'
- if $VERBOSE
- warn("warning: strptime: %2 is deprecated; use '%Y-%j'")
- end
- return unless _strptime_i(str, '%Y-%j', e)
- when '3'
- if $VERBOSE
- warn("warning: strptime: %3 is deprecated; use '%F'")
- end
- return unless _strptime_i(str, '%F', e)
- else
- return unless str.sub!(Regexp.new('\\A' + Regexp.quote(a)), '')
- end
+ case s
+ when 'A', 'a'
+ return unless str.sub!( Format::DAYS_keys_strptime, '') ||
+ str.sub!( Format::ABBR_DAYS_keys_strptime, '')
+ val = Format::DAYS[$1.downcase] || Format::ABBR_DAYS[$1.downcase]
+ return unless val
+ e.wday = val
+ when 'B', 'b', 'h'
+ return unless str.sub!( MONTHS_keys_strptime, '') ||
+ str.sub!( ABBR_MONTHS_keys_strptime, '')
+ val = Format::MONTHS[$1.downcase] || Format::ABBR_MONTHS[$1.downcase]
+ return unless val
+ e.mon = val
+ when 'C', 'EC'
+ return unless str.sub!(if num_pattern?($')
+ then /\A([-+]?\d{1,2})/
+ else /\A([-+]?\d{1,})/
+ end, '')
+ val = $1.to_i
+ e._cent = val
+ when 'c', 'Ec'
+ return unless _strptime_i(str, '%a %b %e %H:%M:%S %Y', e)
+ when 'D'
+ return unless _strptime_i(str, '%m/%d/%y', e)
+ when 'd', 'e', 'Od', 'Oe'
+ return unless str.sub!(/\A( \d|\d{1,2})/, '')
+ val = $1.to_i
+ return unless (1..31) === val
+ e.mday = val
+ when 'F'
+ return unless _strptime_i(str, '%Y-%m-%d', e)
+ when 'G'
+ return unless str.sub!(if num_pattern?($')
+ then /\A([-+]?\d{1,4})/
+ else /\A([-+]?\d{1,})/
+ end, '')
+ val = $1.to_i
+ e.cwyear = val
+ when 'g'
+ return unless str.sub!(/\A(\d{1,2})/, '')
+ val = $1.to_i
+ return unless (0..99) === val
+ e.cwyear = val
+ e._cent ||= if val >= 69 then 19 else 20 end
+ when 'H', 'k', 'OH'
+ return unless str.sub!(/\A( \d|\d{1,2})/, '')
+ val = $1.to_i
+ return unless (0..24) === val
+ e.hour = val
+ when 'I', 'l', 'OI'
+ return unless str.sub!(/\A( \d|\d{1,2})/, '')
+ val = $1.to_i
+ return unless (1..12) === val
+ e.hour = val
+ when 'j'
+ return unless str.sub!(/\A(\d{1,3})/, '')
+ val = $1.to_i
+ return unless (1..366) === val
+ e.yday = val
+ when 'L'
+ return unless str.sub!(if num_pattern?($')
+ then /\A([-+]?\d{1,3})/
+ else /\A([-+]?\d{1,})/
+ end, '')
+ # val = Rational($1.to_i, 10**3)
+ val = Rational($1.to_i, 10**$1.size)
+ e.sec_fraction = val
+ when 'M', 'OM'
+ return unless str.sub!(/\A(\d{1,2})/, '')
+ val = $1.to_i
+ return unless (0..59) === val
+ e.min = val
+ when 'm', 'Om'
+ return unless str.sub!(/\A(\d{1,2})/, '')
+ val = $1.to_i
+ return unless (1..12) === val
+ e.mon = val
+ when 'N'
+ return unless str.sub!(if num_pattern?($')
+ then /\A([-+]?\d{1,9})/
+ else /\A([-+]?\d{1,})/
+ end, '')
+ # val = Rational($1.to_i, 10**9)
+ val = Rational($1.to_i, 10**$1.size)
+ e.sec_fraction = val
+ when 'n', 't'
+ return unless _strptime_i(str, "\s", e)
+ when 'P', 'p'
+ return unless str.sub!(/\A([ap])(?:m\b|\.m\.)/i, '')
+ e._merid = if $1.downcase == 'a' then 0 else 12 end
+ when 'Q'
+ return unless str.sub!(/\A(-?\d{1,})/, '')
+ val = Rational($1.to_i, 10**3)
+ e.seconds = val
+ when 'R'
+ return unless _strptime_i(str, '%H:%M', e)
+ when 'r'
+ return unless _strptime_i(str, '%I:%M:%S %p', e)
+ when 'S', 'OS'
+ return unless str.sub!(/\A(\d{1,2})/, '')
+ val = $1.to_i
+ return unless (0..60) === val
+ e.sec = val
+ when 's'
+ return unless str.sub!(/\A(-?\d{1,})/, '')
+ val = $1.to_i
+ e.seconds = val
+ when 'T'
+ return unless _strptime_i(str, '%H:%M:%S', e)
+ when 'U', 'W', 'OU', 'OW'
+ return unless str.sub!(/\A(\d{1,2})/, '')
+ val = $1.to_i
+ return unless (0..53) === val
+ e.__send__(if s[-1,1] == 'U' then :wnum0= else :wnum1= end, val)
+ when 'u', 'Ou'
+ return unless str.sub!(/\A(\d{1})/, '')
+ val = $1.to_i
+ return unless (1..7) === val
+ e.cwday = val
+ when 'V', 'OV'
+ return unless str.sub!(/\A(\d{1,2})/, '')
+ val = $1.to_i
+ return unless (1..53) === val
+ e.cweek = val
+ when 'v'
+ return unless _strptime_i(str, '%e-%b-%Y', e)
+ when 'w'
+ return unless str.sub!(/\A(\d{1})/, '')
+ val = $1.to_i
+ return unless (0..6) === val
+ e.wday = val
+ when 'X', 'EX'
+ return unless _strptime_i(str, '%H:%M:%S', e)
+ when 'x', 'Ex'
+ return unless _strptime_i(str, '%m/%d/%y', e)
+ when 'Y', 'EY'
+ return unless str.sub!(if num_pattern?($')
+ then /\A([-+]?\d{1,4})/
+ else /\A([-+]?\d{1,})/
+ end, '')
+ val = $1.to_i
+ e.year = val
+ when 'y', 'Ey', 'Oy'
+ return unless str.sub!(/\A(\d{1,2})/, '')
+ val = $1.to_i
+ return unless (0..99) === val
+ e.year = val
+ e._cent ||= if val >= 69 then 19 else 20 end
+ when 'Z', /\A:{0,3}z/
+ return unless str.sub!(/\A((?:gmt|utc?)?[-+]\d+(?:[,.:]\d+(?::\d+)?)?
+ |[[:alpha:].\s]+(?:standard|daylight)\s+time\b
+ |[[:alpha:]]+(?:\s+dst)?\b
+ )/ix, '')
+ val = $1
+ e.zone = val
+ offset = zone_to_diff(val)
+ e.offset = offset
+ when '%'
+ return unless str.sub!(/\A%/, '')
+ when '+'
+ return unless _strptime_i(str, '%a %b %e %H:%M:%S %Z %Y', e)
+ when '1'
+ if $VERBOSE
+ warn("warning: strptime: %1 is deprecated; forget this")
+ end
+ return unless str.sub!(/\A(\d+)/, '')
+ val = $1.to_i
+ e.jd = val
+ when '2'
+ if $VERBOSE
+ warn("warning: strptime: %2 is deprecated; use '%Y-%j'")
+ end
+ return unless _strptime_i(str, '%Y-%j', e)
+ when '3'
+ if $VERBOSE
+ warn("warning: strptime: %3 is deprecated; use '%F'")
+ end
+ return unless _strptime_i(str, '%F', e)
+ else
+ return unless str.sub!(Regexp.new('\\A' + Regexp.quote(a)), '')
+ end
else
- case c
- when /\A[\s\v]/
- str.sub!(/\A[\s\v]+/, '')
- else
- return unless str.sub!(Regexp.new('\\A' + Regexp.quote(a)), '')
- end
+ case c
+ when /\A[\s\v]/
+ str.sub!(/\A[\s\v]+/, '')
+ else
+ return unless str.sub!(Regexp.new('\\A' + Regexp.quote(a)), '')
+ end
end
end
end
@@ -616,17 +616,17 @@ def self._strptime(str, fmt='%F')
if e._cent
if e.cwyear
- e.cwyear += e._cent * 100
+ e.cwyear += e._cent * 100
end
if e.year
- e. year += e._cent * 100
+ e. year += e._cent * 100
end
end
if e._merid
if e.hour
- e.hour %= 12
- e.hour += e._merid
+ e.hour %= 12
+ e.hour += e._merid
end
end
@@ -648,42 +648,42 @@ def self.s3e(e, y, m, d, bc=false)
if y == nil
if d && d.size > 2
- y = d
- d = nil
+ y = d
+ d = nil
end
if d && d[0,1] == "'"
- y = d
- d = nil
+ y = d
+ d = nil
end
end
if y
y.scan(/(\d+)(.+)?/)
if $2
- y, d = d, $1
+ y, d = d, $1
end
end
if m
if m[0,1] == "'" || m.size > 2
- y, m, d = m, d, y # us -> be
+ y, m, d = m, d, y # us -> be
end
end
if d
if d[0,1] == "'" || d.size > 2
- y, d = d, y
+ y, d = d, y
end
end
if y
y =~ /([-+])?(\d+)/
if $1 || $2.size > 2
- c = false
+ c = false
end
iy = $&.to_i
if bc
- iy = -iy + 1
+ iy = -iy + 1
end
e.year = iy
end
@@ -712,122 +712,118 @@ def self._parse_day(str, e) # :nodoc:
if str.sub!( ABBR_DAYS_keys_parse_day , ' ')
e.wday = Format::ABBR_DAYS[$1.downcase]
true
-=begin
-# elsif str.sub!(/\b(?!\dth)(su|mo|tu|we|th|fr|sa)\b/in, ' ')
-# e.wday = %w(su mo tu we th fr sa).index($1.downcase)
-# true
-=end
+ # elsif str.sub!(/\b(?!\dth)(su|mo|tu|we|th|fr|sa)\b/in, ' ')
+ # e.wday = %w(su mo tu we th fr sa).index($1.downcase)
+ # true
end
end
def self._parse_time(str, e) # :nodoc:
if str.sub!(
- /(
- (?:
- \d+\s*:\s*\d+
- (?:
- \s*:\s*\d+(?:[,.]\d*)?
- )?
- |
- \d+\s*h(?:\s*\d+m?(?:\s*\d+s?)?)?
- )
- (?:
- \s*
- [ap](?:m\b|\.m\.)
- )?
- |
- \d+\s*[ap](?:m\b|\.m\.)
- )
- (?:
- \s*
- (
- (?:gmt|utc?)?[-+]\d+(?:[,.:]\d+(?::\d+)?)?
- |
- [[:alpha:].\s]+(?:standard|daylight)\stime\b
- |
- [[:alpha:]]+(?:\sdst)?\b
- )
- )?
- /inx,
- ' ')
+ /(
+ (?:
+ \d+\s*:\s*\d+
+ (?:
+ \s*:\s*\d+(?:[,.]\d*)?
+ )?
+ |
+ \d+\s*h(?:\s*\d+m?(?:\s*\d+s?)?)?
+ )
+ (?:
+ \s*
+ [ap](?:m\b|\.m\.)
+ )?
+ |
+ \d+\s*[ap](?:m\b|\.m\.)
+ )
+ (?:
+ \s*
+ (
+ (?:gmt|utc?)?[-+]\d+(?:[,.:]\d+(?::\d+)?)?
+ |
+ [[:alpha:].\s]+(?:standard|daylight)\stime\b
+ |
+ [[:alpha:]]+(?:\sdst)?\b
+ )
+ )?
+ /inx,
+ ' ')
t = $1
e.zone = $2 if $2
t =~ /\A(\d+)h?
- (?:\s*:?\s*(\d+)m?
- (?:
- \s*:?\s*(\d+)(?:[,.](\d+))?s?
- )?
- )?
- (?:\s*([ap])(?:m\b|\.m\.))?/inx
+ (?:\s*:?\s*(\d+)m?
+ (?:
+ \s*:?\s*(\d+)(?:[,.](\d+))?s?
+ )?
+ )?
+ (?:\s*([ap])(?:m\b|\.m\.))?/inx
e.hour = $1.to_i
e.min = $2.to_i if $2
e.sec = $3.to_i if $3
e.sec_fraction = Rational($4.to_i, 10**$4.size) if $4
if $5
- e.hour %= 12
- if $5.downcase == 'p'
- e.hour += 12
- end
+ e.hour %= 12
+ if $5.downcase == 'p'
+ e.hour += 12
+ end
end
true
end
end
-=begin
-# def self._parse_beat(str, e) # :nodoc:
-# if str.sub!(/@\s*(\d+)(?:[,.](\d*))?/, ' ')
-# beat = Rational($1.to_i)
-# beat += Rational($2.to_i, 10**$2.size) if $2
-# secs = Rational(beat, 1000)
-# h, min, s, fr = self.day_fraction_to_time(secs)
-# e.hour = h
-# e.min = min
-# e.sec = s
-# e.sec_fraction = fr * 86400
-# e.zone = '+01:00'
-# true
-# end
-# end
-=end
+ # def self._parse_beat(str, e) # :nodoc:
+ # if str.sub!(/@\s*(\d+)(?:[,.](\d*))?/, ' ')
+ # beat = Rational($1.to_i)
+ # beat += Rational($2.to_i, 10**$2.size) if $2
+ # secs = Rational(beat, 1000)
+ # h, min, s, fr = self.day_fraction_to_time(secs)
+ # e.hour = h
+ # e.min = min
+ # e.sec = s
+ # e.sec_fraction = fr * 86400
+ # e.zone = '+01:00'
+ # true
+ # end
+ # end
ABBR_MONTHS_keys_eu = ( /'?(\d+)[^-\d\s]*
- \s*
- (#{Format::ABBR_MONTHS_keys_or})[^-\d\s']*
- (?:
- \s*
- (c(?:e|\.e\.)|b(?:ce|\.c\.e\.)|a(?:d|\.d\.)|b(?:c|\.c\.))?
- \s*
- ('?-?\d+(?:(?:st|nd|rd|th)\b)?)
- )?
- /inox ).freeze
+ \s*
+ (#{Format::ABBR_MONTHS_keys_or})[^-\d\s']*
+ (?:
+ \s*
+ (c(?:e|\.e\.)|b(?:ce|\.c\.e\.)|a(?:d|\.d\.)|b(?:c|\.c\.))?
+ \s*
+ ('?-?\d+(?:(?:st|nd|rd|th)\b)?)
+ )?
+ /inox ).freeze
def self._parse_eu(str, e) # :nodoc:
- if str.sub!( ABBR_MONTHS_keys_eu , ' ')
+ if str.sub!( ABBR_MONTHS_keys_eu , ' ')
s3e(e, $4, Format::ABBR_MONTHS[$2.downcase], $1,
- $3 && $3[0,1].downcase == 'b')
+ $3 && $3[0,1].downcase == 'b')
true
end
end
ABBR_MONTHS_keys_us = ( /\b(#{Format::ABBR_MONTHS_keys_or})[^-\d\s']*
- \s*
- ('?\d+)[^-\d\s']*
- (?:
- \s*
- (c(?:e|\.e\.)|b(?:ce|\.c\.e\.)|a(?:d|\.d\.)|b(?:c|\.c\.))?
- \s*
- ('?-?\d+)
- )?
- /inox ).freeze
+ \s*
+ ('?\d+)[^-\d\s']*
+ (?:
+ \s*
+ (c(?:e|\.e\.)|b(?:ce|\.c\.e\.)|a(?:d|\.d\.)|b(?:c|\.c\.))?
+ \s*
+ ('?-?\d+)
+ )?
+ /inox ).freeze
def self._parse_us(str, e) # :nodoc:
- if str.sub!( ABBR_MONTHS_keys_us , ' ')
+ if str.sub!( ABBR_MONTHS_keys_us , ' ')
s3e(e, $4, Format::ABBR_MONTHS[$1.downcase], $2,
- $3 && $3[0,1].downcase == 'b')
+ $3 && $3[0,1].downcase == 'b')
true
end
end
@@ -857,12 +853,12 @@ def self._parse_iso2(str, e) # :nodoc:
e.mday = $2.to_i if $2
true
elsif /[,.](\d{2}|\d{4})-\d{3}\b/n !~ str &&
- str.sub!(/\b(\d{2}|\d{4})-(\d{3})\b/n, ' ')
+ str.sub!(/\b(\d{2}|\d{4})-(\d{3})\b/n, ' ')
e.year = $1.to_i
e.yday = $2.to_i
true
elsif /\d-\d{3}\b/n !~ str &&
- str.sub!(/\b-(\d{3})\b/n, ' ')
+ str.sub!(/\b-(\d{3})\b/n, ' ')
e.yday = $1.to_i
true
end
@@ -881,10 +877,10 @@ def self._parse_jis(str, e) # :nodoc:
end
ABBR_MONTHS_keys_vms = ( /('?-?\d+)-(#{Format::ABBR_MONTHS_keys_or})[^-]*
- -('?-?\d+)/inox ).freeze
+ -('?-?\d+)/inox ).freeze
ABBR_MONTHS_keys_vms_B = ( /\b(#{Format::ABBR_MONTHS_keys_or})[^-]*
- -('?-?\d+)(?:-('?-?\d+))?/inox ).freeze
+ -('?-?\d+)(?:-('?-?\d+))?/inox ).freeze
def self._parse_vms(str, e) # :nodoc:
if str.sub!( ABBR_MONTHS_keys_vms, ' ')
@@ -935,141 +931,141 @@ def self._parse_mday(str, e) # :nodoc:
def self._parse_ddd(str, e) # :nodoc:
if str.sub!(
- /([-+]?)(\d{2,14})
- (?:
- \s*
- t?
- \s*
- (\d{2,6})?(?:[,.](\d*))?
- )?
- (?:
- \s*
- (
- z\b
- |
- [-+]\d{1,4}\b
- |
- \[[-+]?\d[^\]]*\]
- )
- )?
- /inx,
- ' ')
+ /([-+]?)(\d{2,14})
+ (?:
+ \s*
+ t?
+ \s*
+ (\d{2,6})?(?:[,.](\d*))?
+ )?
+ (?:
+ \s*
+ (
+ z\b
+ |
+ [-+]\d{1,4}\b
+ |
+ \[[-+]?\d[^\]]*\]
+ )
+ )?
+ /inx,
+ ' ')
case $2.size # [
when 2
- if $3.nil? && $4
- e.sec = $2[-2, 2].to_i
- else
- e.mday = $2[ 0, 2].to_i
- end
+ if $3.nil? && $4
+ e.sec = $2[-2, 2].to_i
+ else
+ e.mday = $2[ 0, 2].to_i
+ end
when 4
- if $3.nil? && $4
- e.sec = $2[-2, 2].to_i
- e.min = $2[-4, 2].to_i
- else
- e.mon = $2[ 0, 2].to_i
- e.mday = $2[ 2, 2].to_i
- end
+ if $3.nil? && $4
+ e.sec = $2[-2, 2].to_i
+ e.min = $2[-4, 2].to_i
+ else
+ e.mon = $2[ 0, 2].to_i
+ e.mday = $2[ 2, 2].to_i
+ end
when 6
- if $3.nil? && $4
- e.sec = $2[-2, 2].to_i
- e.min = $2[-4, 2].to_i
- e.hour = $2[-6, 2].to_i
- else
- e.year = ($1 + $2[ 0, 2]).to_i
- e.mon = $2[ 2, 2].to_i
- e.mday = $2[ 4, 2].to_i
- end
+ if $3.nil? && $4
+ e.sec = $2[-2, 2].to_i
+ e.min = $2[-4, 2].to_i
+ e.hour = $2[-6, 2].to_i
+ else
+ e.year = ($1 + $2[ 0, 2]).to_i
+ e.mon = $2[ 2, 2].to_i
+ e.mday = $2[ 4, 2].to_i
+ end
when 8, 10, 12, 14
- if $3.nil? && $4
- e.sec = $2[-2, 2].to_i
- e.min = $2[-4, 2].to_i
- e.hour = $2[-6, 2].to_i
- e.mday = $2[-8, 2].to_i
- if $2.size >= 10
- e.mon = $2[-10, 2].to_i
- end
- if $2.size == 12
- e.year = ($1 + $2[-12, 2]).to_i
- end
- if $2.size == 14
- e.year = ($1 + $2[-14, 4]).to_i
- e._comp = false
- end
- else
- e.year = ($1 + $2[ 0, 4]).to_i
- e.mon = $2[ 4, 2].to_i
- e.mday = $2[ 6, 2].to_i
- e.hour = $2[ 8, 2].to_i if $2.size >= 10
- e.min = $2[10, 2].to_i if $2.size >= 12
- e.sec = $2[12, 2].to_i if $2.size >= 14
- e._comp = false
- end
+ if $3.nil? && $4
+ e.sec = $2[-2, 2].to_i
+ e.min = $2[-4, 2].to_i
+ e.hour = $2[-6, 2].to_i
+ e.mday = $2[-8, 2].to_i
+ if $2.size >= 10
+ e.mon = $2[-10, 2].to_i
+ end
+ if $2.size == 12
+ e.year = ($1 + $2[-12, 2]).to_i
+ end
+ if $2.size == 14
+ e.year = ($1 + $2[-14, 4]).to_i
+ e._comp = false
+ end
+ else
+ e.year = ($1 + $2[ 0, 4]).to_i
+ e.mon = $2[ 4, 2].to_i
+ e.mday = $2[ 6, 2].to_i
+ e.hour = $2[ 8, 2].to_i if $2.size >= 10
+ e.min = $2[10, 2].to_i if $2.size >= 12
+ e.sec = $2[12, 2].to_i if $2.size >= 14
+ e._comp = false
+ end
when 3
- if $3.nil? && $4
- e.sec = $2[-2, 2].to_i
- e.min = $2[-3, 1].to_i
- else
- e.yday = $2[ 0, 3].to_i
- end
+ if $3.nil? && $4
+ e.sec = $2[-2, 2].to_i
+ e.min = $2[-3, 1].to_i
+ else
+ e.yday = $2[ 0, 3].to_i
+ end
when 5
- if $3.nil? && $4
- e.sec = $2[-2, 2].to_i
- e.min = $2[-4, 2].to_i
- e.hour = $2[-5, 1].to_i
- else
- e.year = ($1 + $2[ 0, 2]).to_i
- e.yday = $2[ 2, 3].to_i
- end
+ if $3.nil? && $4
+ e.sec = $2[-2, 2].to_i
+ e.min = $2[-4, 2].to_i
+ e.hour = $2[-5, 1].to_i
+ else
+ e.year = ($1 + $2[ 0, 2]).to_i
+ e.yday = $2[ 2, 3].to_i
+ end
when 7
- if $3.nil? && $4
- e.sec = $2[-2, 2].to_i
- e.min = $2[-4, 2].to_i
- e.hour = $2[-6, 2].to_i
- e.mday = $2[-7, 1].to_i
- else
- e.year = ($1 + $2[ 0, 4]).to_i
- e.yday = $2[ 4, 3].to_i
- end
- end # ]
+ if $3.nil? && $4
+ e.sec = $2[-2, 2].to_i
+ e.min = $2[-4, 2].to_i
+ e.hour = $2[-6, 2].to_i
+ e.mday = $2[-7, 1].to_i
+ else
+ e.year = ($1 + $2[ 0, 4]).to_i
+ e.yday = $2[ 4, 3].to_i
+ end
+ end # ]
if $3 # [
- if $4
- case $3.size
- when 2, 4, 6
- e.sec = $3[-2, 2].to_i
- e.min = $3[-4, 2].to_i if $3.size >= 4
- e.hour = $3[-6, 2].to_i if $3.size >= 6
- end
- else
- case $3.size
- when 2, 4, 6
- e.hour = $3[ 0, 2].to_i
- e.min = $3[ 2, 2].to_i if $3.size >= 4
- e.sec = $3[ 4, 2].to_i if $3.size >= 6
- end
- end
+ if $4
+ case $3.size
+ when 2, 4, 6
+ e.sec = $3[-2, 2].to_i
+ e.min = $3[-4, 2].to_i if $3.size >= 4
+ e.hour = $3[-6, 2].to_i if $3.size >= 6
+ end
+ else
+ case $3.size
+ when 2, 4, 6
+ e.hour = $3[ 0, 2].to_i
+ e.min = $3[ 2, 2].to_i if $3.size >= 4
+ e.sec = $3[ 4, 2].to_i if $3.size >= 6
+ end
+ end
end # ]
if $4
- e.sec_fraction = Rational($4.to_i, 10**$4.size)
+ e.sec_fraction = Rational($4.to_i, 10**$4.size)
end
if $5
- e.zone = $5
- if e.zone[0,1] == '['
- o, n, = e.zone[1..-2].split(':')
- e.zone = n || o
- if /\A\d/ =~ o
- o = format('+%s', o)
- end
- e.offset = zone_to_diff(o)
- end
+ e.zone = $5
+ if e.zone[0,1] == '['
+ o, n, = e.zone[1..-2].split(':')
+ e.zone = n || o
+ if /\A\d/ =~ o
+ o = format('+%s', o)
+ end
+ e.offset = zone_to_diff(o)
+ end
end
true
end
end
private_class_method :_parse_day, :_parse_time, # :_parse_beat,
- :_parse_eu, :_parse_us, :_parse_iso, :_parse_iso2,
- :_parse_jis, :_parse_vms, :_parse_sla, :_parse_dot,
- :_parse_year, :_parse_mon, :_parse_mday, :_parse_ddd
+ :_parse_eu, :_parse_us, :_parse_iso, :_parse_iso2,
+ :_parse_jis, :_parse_vms, :_parse_sla, :_parse_dot,
+ :_parse_year, :_parse_mon, :_parse_mday, :_parse_ddd
def self._parse(str, comp=false)
str = str.dup
@@ -1084,51 +1080,51 @@ def self._parse(str, comp=false)
_parse_day(str, e)
_parse_eu(str, e) ||
- _parse_us(str, e) ||
- _parse_iso(str, e) ||
- _parse_jis(str, e) ||
- _parse_vms(str, e) ||
- _parse_sla(str, e) ||
- _parse_dot(str, e) ||
- _parse_iso2(str, e) ||
- _parse_year(str, e) ||
- _parse_mon(str, e) ||
- _parse_mday(str, e) ||
- _parse_ddd(str, e)
+ _parse_us(str, e) ||
+ _parse_iso(str, e) ||
+ _parse_jis(str, e) ||
+ _parse_vms(str, e) ||
+ _parse_sla(str, e) ||
+ _parse_dot(str, e) ||
+ _parse_iso2(str, e) ||
+ _parse_year(str, e) ||
+ _parse_mon(str, e) ||
+ _parse_mday(str, e) ||
+ _parse_ddd(str, e)
if str.sub!(/\b(bc\b|bce\b|b\.c\.|b\.c\.e\.)/in, ' ')
if e.year
- e.year = -e.year + 1
+ e.year = -e.year + 1
end
end
if str.sub!(/\A\s*(\d{1,2})\s*\z/n, ' ')
if e.hour && !e.mday
- v = $1.to_i
- if (1..31) === v
- e.mday = v
- end
+ v = $1.to_i
+ if (1..31) === v
+ e.mday = v
+ end
end
if e.mday && !e.hour
- v = $1.to_i
- if (0..24) === v
- e.hour = v
- end
+ v = $1.to_i
+ if (0..24) === v
+ e.hour = v
+ end
end
end
if e._comp
if e.cwyear
- if e.cwyear >= 0 && e.cwyear <= 99
- e.cwyear += if e.cwyear >= 69
- then 1900 else 2000 end
- end
+ if e.cwyear >= 0 && e.cwyear <= 99
+ e.cwyear += if e.cwyear >= 69
+ then 1900 else 2000 end
+ end
end
if e.year
- if e.year >= 0 && e.year <= 99
- e.year += if e.year >= 69
- then 1900 else 2000 end
- end
+ if e.year >= 0 && e.year <= 99
+ e.year += if e.year >= 69
+ then 1900 else 2000 end
+ end
end
end
@@ -1151,31 +1147,54 @@ def self.zone_to_diff(zone) # :nodoc:
elsif zone.sub!(/\A(?:gmt|utc?)?([-+])/, '')
sign = $1
if zone.include?(':')
- hour, min, sec, = zone.split(':')
+ hour, min, sec, = zone.split(':')
elsif zone.include?(',') || zone.include?('.')
- hour, fr, = zone.split(/[,.]/)
- min = Rational(fr.to_i, 10**fr.size) * 60
+ hour, fr, = zone.split(/[,.]/)
+ min = Rational(fr.to_i, 10**fr.size) * 60
else
- case zone.size
- when 3
- hour = zone[0,1]
- min = zone[1,2]
- else
- hour = zone[0,2]
- min = zone[2,2]
- sec = zone[4,2]
- end
+ case zone.size
+ when 3
+ hour = zone[0,1]
+ min = zone[1,2]
+ else
+ hour = zone[0,2]
+ min = zone[2,2]
+ sec = zone[4,2]
+ end
end
offset = hour.to_i * 3600 + min.to_i * 60 + sec.to_i
offset *= -1 if sign == '-'
end
offset
end
+ def httpdate() new_offset(0).strftime('%a, %d %b %Y %T GMT') end # :nodoc:
+
+ def self._parse_httpdate(str)
+ unless str =~ /(\w\w\w), (\d\d?) (\w\w\w) (-?\d\d\d?\d?) (\d\d):(\d\d):(\d\d) GMT/
+ return []
+ end
+ wday = Format::ABBR_DAYS[$1.downcase]
+ day = $2.to_i
+ mon = Format::ABBR_MONTHS[$3.downcase]
+ year = $4.to_i
+ hour = $5.to_i
+ min = $6.to_i
+ sec = $7.to_i
+ return [wday, day, mon, year, hour, min, sec]
+ end
+ private :_parse_httpdate
+
+ def self.httpdate(str='Mon, 01 Jan -4712 00:00:00 GMT')
+ wday, day, mon, year, hour, min, sec = _parse_httpdate(str)
+ unless day && mon && year
+ raise ArgumentError, "invalid date"
+ end
+ Date.new(year, mon, day)
+ end
end
class DateTime < Date
-
def strftime(fmt='%FT%T%:z')
super(fmt)
end
@@ -1184,28 +1203,33 @@ def self._strptime(str, fmt='%FT%T%z')
super(str, fmt)
end
-=begin
-# def iso8601_timediv(n) # :nodoc:
-# strftime('T%T' +
-# if n < 1
-# ''
-# else
-# '.%0*d' % [n, (sec_fraction / SECONDS_IN_DAY / (10**n)).round]
-# end +
-# '%:z')
-# end
+ def self.httpdate(str='Mon, 01 Jan -4712 00:00:00 GMT')
+ wday, day, mon, year, hour, min, sec = _parse_httpdate(str)
+ unless day && mon && year && hour && min && sec
+ raise ArgumentError, "invalid date"
+ end
+ DateTime.new(year, mon, day, hour, min, sec)
+ end
-# private :iso8601_timediv
+ # def iso8601_timediv(n) # :nodoc:
+ # strftime('T%T' +
+ # if n < 1
+ # ''
+ # else
+ # '.%0*d' % [n, (sec_fraction / SECONDS_IN_DAY / (10**n)).round]
+ # end +
+ # '%:z')
+ # end
-# def iso8601(n=0)
-# super() + iso8601_timediv(n)
-# end
+ # private :iso8601_timediv
-# def rfc3339(n=0) iso8601(n) end
+ # def iso8601(n=0)
+ # super() + iso8601_timediv(n)
+ # end
-# def jisx0301(n=0)
-# super() + iso8601_timediv(n)
-# end
-=end
+ # def rfc3339(n=0) iso8601(n) end
+ # def jisx0301(n=0)
+ # super() + iso8601_timediv(n)
+ # end
end

0 comments on commit 37b2281

Please sign in to comment.