diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | lib/date.rb | 300 | ||||
| -rw-r--r-- | lib/date/format.rb | 1318 | ||||
| -rw-r--r-- | lib/parsedate.rb | 8 |
4 files changed, 1097 insertions, 533 deletions
@@ -1,3 +1,7 @@ +Sat Aug 26 08:03:03 2006 Tadayoshi Funaba <tadf@dotrb.org> + + * lib/date.rb, lib/date/format.rb: updated based on date2 3.8.2. + Fri Aug 25 21:15:22 2006 K.Kosako <sndgk393 AT ybb.ne.jp> * common.mk: add regint.h and oniguruma.h to dependence. diff --git a/lib/date.rb b/lib/date.rb index 6037d911bb..28de8f670f 100644 --- a/lib/date.rb +++ b/lib/date.rb @@ -6,7 +6,7 @@ # Documentation: William Webber <william@williamwebber.com> # #-- -# $Id: date.rb,v 2.15 2005-02-06 11:09:53+09 tadf Exp $ +# $Id: date.rb,v 2.21 2006-08-19 22:38:12+09 tadf Exp $ #++ # # == Overview @@ -249,6 +249,50 @@ class Date # Abbreviated day names, in English. ABBR_DAYNAMES = %w(Sun Mon Tue Wed Thu Fri Sat) + class Infinity < Numeric # :nodoc: + + include Comparable + + def initialize(d=1) @d = d <=> 0 end + + def d() @d end + + protected :d + + def zero? () false end + def finite? () false end + def infinite? () d.nonzero? end + def nan? () d.zero? end + + def abs() self.class.new end + + def -@ () self.class.new(-d) end + def +@ () self.class.new(+d) end + + def <=> (other) + case other + when Infinity; d <=> other.d + when Numeric; d + else + begin + l, r = other.coerce(self) + return l <=> r + rescue NoMethodError + end + end + nil + end + + def coerce(other) + case other + when Numeric; return -d, d + else + super + end + end + + end + # The Julian Day Number of the Day of Calendar Reform for Italy # and the Catholic countries. ITALY = 2299161 # 1582-10-15 @@ -259,11 +303,11 @@ class Date # A constant used to indicate that a Date should always use the # Julian calendar. - JULIAN = false + JULIAN = Infinity.new # A constant used to indicate that a Date should always use the # Gregorian calendar. - GREGORIAN = true + GREGORIAN = -Infinity.new # Does a given Julian Day Number fall inside the old-style (Julian) # calendar? @@ -273,10 +317,16 @@ class Date # the answer is true; or it may a number representing the Day of # Calendar Reform. Date::ENGLAND and Date::ITALY are two possible such # days. - def self.os? (jd, sg) + def self.julian? (jd, sg) case sg - when Numeric; jd < sg - else; not sg + when Numeric + jd < sg + else + if $VERBOSE + warn("#{caller.shift.sub(/:in .*/, '')}: " \ +"warning: do not use non-numerical object as julian day number anymore") + end + not sg end end @@ -285,7 +335,15 @@ class Date # # The reverse of self.os? See the documentation for that method for # more details. - def self.ns? (jd, sg) not os?(jd, sg) end + def self.gregorian? (jd, sg) not julian?(jd, sg) end + + def self.fix_style(jd, sg) # :nodoc: + if julian?(jd, sg) + then JULIAN + else GREGORIAN end + end + + private_class_method :fix_style # Convert a Civil Date to a Julian Day Number. # +y+, +m+, and +d+ are the year, month, and day of the @@ -302,7 +360,7 @@ class Date jd = (365.25 * (y + 4716)).floor + (30.6001 * (m + 1)).floor + d + b - 1524 - if os?(jd, sg) + if julian?(jd, sg) jd -= b end jd @@ -315,7 +373,7 @@ class Date # Returns the corresponding [year, month, day_of_month] # as a three-element array. def self.jd_to_civil(jd, sg=GREGORIAN) - if os?(jd, sg) + if julian?(jd, sg) a = jd else x = ((jd - 1867216.25) / 36524.25).floor @@ -355,7 +413,7 @@ class Date # [year, day_of_year] def self.jd_to_ordinal(jd, sg=GREGORIAN) y = jd_to_civil(jd, sg)[0] - doy = jd - civil_to_jd(y - 1, 12, 31, ns?(jd, sg)) + doy = jd - civil_to_jd(y - 1, 12, 31, fix_style(jd, sg)) return y, doy end @@ -367,7 +425,7 @@ class Date # Returns the corresponding Commercial Date as # [commercial_year, week_of_year, day_of_week] def self.jd_to_commercial(jd, sg=GREGORIAN) - ns = ns?(jd, sg) + ns = fix_style(jd, sg) a = jd_to_civil(jd - 3, ns)[0] y = if jd >= commercial_to_jd(a + 1, 1, 1, ns) then a + 1 else a end w = 1 + ((jd - commercial_to_jd(y, 1, 1, ns)) / 7).floor @@ -388,6 +446,18 @@ class Date (d - 1) end + def self.jd_to_weeknum(jd, k=0, sg=GREGORIAN) # :nodoc: + y, m, d = jd_to_civil(jd, sg) + a = civil_to_jd(y, 1, 1, sg) + 6 + w, d = clfloor(jd - (a - ((a - k) + 1) % 7) + 7, 7) + return y, w, d + end + + def self.weeknum_to_jd(y, w, d, k=0, sg=GREGORIAN) # :nodoc: + a = civil_to_jd(y, 1, 1, sg) + 6 + (a - ((a - k) + 1) % 7 - 7) + 7 * w + d + end + %w(self.clfloor clfloor).each do |name| module_eval <<-"end;" def #{name}(x, y=1) @@ -514,7 +584,7 @@ class Date if d < 0 ny, = clfloor(y + 1, 1) jd = ordinal_to_jd(ny, d + 1, sg) - ns = ns?(jd, sg) + ns = fix_style(jd, sg) return unless [y] == jd_to_ordinal(jd, sg)[0..0] return unless [ny, 1] == jd_to_ordinal(jd - d, ns) else @@ -561,7 +631,7 @@ class Date ny, nm = clfloor(y * 12 + m, 12) nm, = clfloor(nm + 1, 1) jd = civil_to_jd(ny, nm, d + 1, sg) - ns = ns?(jd, sg) + ns = fix_style(jd, sg) return unless [y, m] == jd_to_civil(jd, sg)[0..1] return unless [ny, nm, 1] == jd_to_civil(jd - d, ns) else @@ -617,7 +687,7 @@ class Date w = jd_to_commercial(commercial_to_jd(y + 1, 1, 1) + w * 7)[1] end jd = commercial_to_jd(y, w, d) - return unless ns?(jd, sg) + return unless gregorian?(jd, sg) return unless [y, w, d] == jd_to_commercial(jd) jd end @@ -643,17 +713,104 @@ class Date new0(jd_to_ajd(jd, 0, 0), 0, sg) end - def self.new_with_hash(elem, sg) + def self.valid_weeknum? (y, w, d, k, sg=ITALY) # :nodoc: + if d < 0 + d += 7 + end + if w < 0 + w = jd_to_weeknum(weeknum_to_jd(y + 1, 1, k, k) + w * 7, k)[1] + end + jd = weeknum_to_jd(y, w, d, k) + return unless [y, w, d] == jd_to_weeknum(jd, k) + jd + end + + private_class_method :valid_weeknum? + + def self.rewrite_hash(elem) # :nodoc: elem ||= {} - y, m, d = elem.values_at(:year, :mon, :mday) - if [y, m, d].include? nil - raise ArgumentError, '3 elements of civil date are necessary' - else - civil(y, m, d, sg) + if seconds = elem[:seconds] + d, fr = clfloor(seconds, 86400) + h, fr = clfloor(fr, 3600) + min, fr = clfloor(fr, 60) + s, fr = clfloor(fr, 1) + elem[:jd] = civil_to_jd(1970, 1, 1) + d + elem[:hour] = h + elem[:min] = min + elem[:sec] = s + elem.delete(:seconds) + elem.delete(:offset) end + elem end - private_class_method :new_with_hash + def self.valid_date_with_hash?(elem, sg) # :nodoc: + catch :jd do + a = elem.values_at(:jd) + if a.all? + if jd = valid_jd?(*(a << sg)) + throw :jd, jd + end + end + + a = elem.values_at(:year, :yday) + if a.all? + if jd = valid_ordinal?(*(a << sg)) + throw :jd, jd + end + end + + a = elem.values_at(:year, :mon, :mday) + if a.all? + if jd = valid_civil?(*(a << sg)) + throw :jd, jd + end + end + + a = elem.values_at(:cwyear, :cweek, :cwday) + if a[2].nil? && elem[:wday] + a[2] = elem[:wday].nonzero? || 7 + end + if a.all? + if jd = valid_commercial?(*(a << sg)) + throw :jd, jd + end + end + + a = elem.values_at(:year, :wnum0, :wday) + if a[2].nil? && elem[:cwday] + a[2] = elem[:cwday] % 7 + end + if a.all? + if jd = valid_weeknum?(*(a << 0 << sg)) + throw :jd, jd + end + end + + a = elem.values_at(:year, :wnum1, :wday) + if a[2] + a[2] = (a[2] - 1) % 7 + end + if a[2].nil? && elem[:cwday] + a[2] = (elem[:cwday] - 1) % 7 + end + if a.all? + if jd = valid_weeknum?(*(a << 1 << sg)) + throw :jd, jd + end + end + end + end + + def self.new_with_hash(elem, sg) # :nodoc: + elem = rewrite_hash(elem) + unless jd = valid_date_with_hash?(elem, sg) + raise ArgumentError, 'invalid date' + end + new0(jd_to_ajd(jd, 0, 0), 0, sg) + end + + private_class_method :rewrite_hash, :valid_date_with_hash?, :new_with_hash # Create a new Date object by parsing from a String # according to a specified format. @@ -703,13 +860,7 @@ class Date alias_method :__#{id.to_i}__, :#{id.to_s} private :__#{id.to_i}__ def #{id.to_s}(*args, &block) - if defined? @__#{id.to_i}__ - @__#{id.to_i}__ - elsif ! self.frozen? - @__#{id.to_i}__ ||= __#{id.to_i}__(*args, &block) - else - __#{id.to_i}__(*args, &block) - end + (@__#{id.to_i}__ ||= [__#{id.to_i}__(*args, &block)])[0] end end; end @@ -764,13 +915,13 @@ class Date once :jd, :day_fraction, :mjd, :ld # Get the date as a Civil Date, [year, month, day_of_month] - def civil() self.class.jd_to_civil(jd, @sg) end + def civil() self.class.jd_to_civil(jd, @sg) end # :nodoc: # Get the date as an Ordinal Date, [year, day_of_year] - def ordinal() self.class.jd_to_ordinal(jd, @sg) end + def ordinal() self.class.jd_to_ordinal(jd, @sg) end # :nodoc: # Get the date as a Commercial Date, [year, week_of_year, day_of_week] - def commercial() self.class.jd_to_commercial(jd, @sg) end + def commercial() self.class.jd_to_commercial(jd, @sg) end # :nodoc: once :civil, :ordinal, :commercial private :civil, :ordinal, :commercial @@ -796,7 +947,7 @@ class Date # Get the time of this date as [hours, minutes, seconds, # fraction_of_a_second] - def time() self.class.day_fraction_to_time(day_fraction) end + def time() self.class.day_fraction_to_time(day_fraction) end # :nodoc: once :time private :time @@ -841,17 +992,25 @@ class Date end # Is the current date old-style (Julian Calendar)? - def os? () self.class.os?(jd, @sg) end + def julian? () self.class.julian?(jd, @sg) end # Is the current date new-style (Gregorian Calendar)? - def ns? () self.class.ns?(jd, @sg) end + def gregorian? () self.class.gregorian?(jd, @sg) end + + once :julian?, :gregorian? - once :os?, :ns? + def fix_style # :nodoc: + if julian? + then Date::JULIAN + else Date::GREGORIAN end + end + + private :fix_style # Is this a leap year? def leap? - self.class.jd_to_civil(self.class.civil_to_jd(year, 3, 1, ns?) - 1, - ns?)[-1] == 29 + self.class.jd_to_civil(self.class.civil_to_jd(year, 3, 1, fix_style) - 1, + fix_style)[-1] == 29 end once :leap? @@ -948,6 +1107,14 @@ class Date false end + def next_day(n=1) self + n end + def prev_day(n=1) self - n end + + # Return a new Date one day after this one. + def next() next_day end + + alias_method :succ, :next + # Return a new Date object that is +n+ months later than # the current one. # @@ -958,7 +1125,7 @@ class Date y, m = clfloor(year * 12 + (mon - 1) + n, 12) m, = clfloor(m + 1, 1) d = mday - d -= 1 until jd2 = self.class.valid_civil?(y, m, d, ns?) + d -= 1 until jd2 = self.class.valid_civil?(y, m, d, fix_style) self + (jd2 - jd) end @@ -973,11 +1140,14 @@ class Date def next_month(n=1) self >> n end def prev_month(n=1) self << n end + def next_year(n=1) self >> n * 12 end + def prev_year(n=1) self << n * 12 end + # Step the current date forward +step+ days at a # time (or backward, if +step+ is negative) until # we reach +limit+ (inclusive), yielding the resultant # date at each step. - def step(limit, step) # :yield: date + def step(limit, step=1) # :yield: date da = self op = [:-,:<=,:>=][step<=>0] while da.__send__(op, limit) @@ -990,20 +1160,15 @@ class Date # Step forward one day at a time until we reach +max+ # (inclusive), yielding each date as we go. def upto(max, &block) # :yield: date - step(max, +1, &block) + step(max, +1, &block) end # Step backward one day at a time until we reach +min+ # (inclusive), yielding each date as we go. def downto(min, &block) # :yield: date - step(min, -1, &block) + step(min, -1, &block) end - # Return a new Date one day after this one. - def succ() self + 1 end - - alias_method :next, :succ - # Is this Date equal to +other+? # # +other+ must both be a Date object, and represent the same date. @@ -1109,6 +1274,15 @@ class DateTime < Date time_to_day_fraction(h, min, s) end + def self.valid_time_with_hash? (elem) # :nodoc: + h, min, s = elem.values_at(:hour, :min, :sec) + h ||= 0 + min ||= 0 + s ||= 0 + s = [s, 59].min + valid_time?(h, min, s) + end + # Create a new DateTime object corresponding to the specified # Julian Day Number +jd+ and hour +h+, minute +min+, second +s+. # @@ -1199,21 +1373,17 @@ class DateTime < Date new0(jd_to_ajd(jd, fr, of), of, sg) end - def self.new_with_hash(elem, sg) - elem ||= {} - y, m, d, h, min, s, fr, of = - elem.values_at(:year, :mon, :mday, - :hour, :min, :sec, :sec_fraction, :offset) - h ||= 0 - min ||= 0 - s ||= 0 - fr ||= 0 - of ||= 0 - if [y, m, d].include? nil - raise ArgumentError, '3 elements of civil date are necessary' - else - civil(y, m, d, h, min, s, of.to_r/86400, sg) + (fr/86400) + def self.new_with_hash(elem, sg) # :nodoc: + elem = rewrite_hash(elem) + unless (jd = valid_date_with_hash?(elem, sg)) and + (fr = valid_time_with_hash?(elem)) + raise ArgumentError, 'invalid date' end + sf = (elem[:sec_fraction] || 0) + fr += sf/86400 + of = (elem[:offset] || 0) + of = of.to_r/86400 + new0(jd_to_ajd(jd, fr, of), of, sg) end private_class_method :new_with_hash @@ -1307,7 +1477,7 @@ class DateTime < Date def to_date() Date.new0(self.class.jd_to_ajd(jd, 0, 0), 0, @sg) end def to_datetime() self end - class << self; undef_method :today end rescue nil + class << self; undef_method :today end # Create a new DateTime object representing the current time. # @@ -1318,7 +1488,9 @@ end class Date - [ %w(exist1? valid_jd?), + [ %w(os? julian?), + %w(ns? gregorian?), + %w(exist1? valid_jd?), %w(exist2? valid_ordinal?), %w(exist3? valid_date?), %w(exist? valid_date?), @@ -1340,7 +1512,9 @@ class Date end; end - [ %w(sg start), + [ %w(os? julian?), + %w(ns? gregorian?), + %w(sg start), %w(newsg new_start), %w(of offset), %w(newof new_offset) diff --git a/lib/date/format.rb b/lib/date/format.rb index 4425635d33..fd8863d72a 100644 --- a/lib/date/format.rb +++ b/lib/date/format.rb @@ -1,585 +1,977 @@ # format.rb: Written by Tadayoshi Funaba 1999-2006 -# $Id: format.rb,v 2.15 2005-02-06 13:28:48+09 tadf Exp $ +# $Id: format.rb,v 2.20 2006-08-19 22:58:36+09 tadf Exp $ require 'rational' class Date - 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 - } - - DAYS = { - 'sunday' => 0, 'monday' => 1, 'tuesday' => 2, 'wednesday'=> 3, - 'thursday' => 4, 'friday' => 5, 'saturday' => 6 - } - - 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 - } - - ABBR_DAYS = { - 'sun' => 0, 'mon' => 1, 'tue' => 2, 'wed' => 3, - 'thu' => 4, 'fri' => 5, 'sat' => 6 - } - - 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, 'bst' => 1*3600, 'wat' => -1*3600, - 'at' => -2*3600, 'ast' => -4*3600, 'adt' => -3*3600, 'yst' => -9*3600, - 'ydt' => -8*3600, 'hst' =>-10*3600, 'hdt' => -9*3600, 'cat' =>-10*3600, - 'ahst'=>-10*3600, 'nt' =>-11*3600, 'idlw'=>-12*3600, 'cet' => 1*3600, - 'met' => 1*3600, 'mewt'=> 1*3600, 'mest'=> 2*3600, 'mesz'=> 2*3600, - 'swt' => 1*3600, 'sst' => 2*3600, 'fwt' => 1*3600, 'fst' => 2*3600, - 'eet' => 2*3600, 'bt' => 3*3600, 'zp4' => 4*3600, 'zp5' => 5*3600, - 'zp6' => 6*3600, 'wast'=> 7*3600, 'wadt'=> 8*3600, 'cct' => 8*3600, - 'jst' => 9*3600, 'east'=> 10*3600, 'eadt'=> 11*3600, 'gst' => 10*3600, - 'nzt' => 12*3600, 'nzst'=> 12*3600, 'nzdt'=> 13*3600, 'idle'=> 12*3600 - } - - def self.__strptime(str, fmt, elem) - fmt.scan(/%[EO]?.|./mo) do |c| - cc = c.sub(/\A%[EO]?(.)\z/mo, '%\\1') - case cc - when /\A\s/o - str.sub!(/\A[\s\v]+/o, '') - when '%A', '%a' - return unless str.sub!(/\A([a-z]+)\b/io, '') - val = DAYS[$1.downcase] || ABBR_DAYS[$1.downcase] - return unless val - elem[:wday] = val - when '%B', '%b', '%h' - return unless str.sub!(/\A([a-z]+)\b/io, '') - val = MONTHS[$1.downcase] || ABBR_MONTHS[$1.downcase] - return unless val - elem[:mon] = val - when '%C' - return unless str.sub!(/\A(\d+)/o, '') - val = $1.to_i - elem[:cent] = val - when '%c' - return unless __strptime(str, '%a %b %e %H:%M:%S %Y', elem) - when '%D' - return unless __strptime(str, '%m/%d/%y', elem) - when '%d', '%e' - return unless str.sub!(/\A ?(\d+)/o, '') - val = $1.to_i - return unless (1..31) === val - elem[:mday] = val - when '%F' - return unless __strptime(str, '%Y-%m-%d', elem) - when '%G' - return unless str.sub!(/\A([-+]?\d+)/o, '') - val = $1.to_i - elem[:cwyear] = val - when '%g' - return unless str.sub!(/\A(\d+)/o, '') - val = $1.to_i - return unless (0..99) === val - elem[:cwyear] = val - elem[:cent] ||= if val >= 69 then 19 else 20 end - when '%H', '%k' - return unless str.sub!(/\A ?(\d+)/o, '') - val = $1.to_i - return unless (0..24) === val - elem[:hour] = val - when '%I', '%l' - return unless str.sub!(/\A ?(\d+)/o, '') - val = $1.to_i - return unless (1..12) === val - elem[:hour] = val - when '%j' - return unless str.sub!(/\A(\d+)/o, '') - val = $1.to_i - return unless (1..366) === val - elem[:yday] = val - when '%M' - return unless str.sub!(/\A(\d+)/o, '') - val = $1.to_i - return unless (0..59) === val - elem[:min] = val - when '%m' - return unless str.sub!(/\A(\d+)/o, '') - val = $1.to_i - return unless (1..12) === val - elem[:mon] = val -=begin - when '%N' - return unless str.sub!(/\A(\d+)/o, '') - val = $1.to_i.to_r / (10**9) - elem[:sec_fraction] = val -=end - when '%n' - return unless __strptime(str, ' ', elem) - when '%p', '%P' - return unless str.sub!(/\A([ap])(?:m\b|\.m\.)/io, '') - elem[:merid] = if $1.downcase == 'a' then 0 else 12 end - when '%R' - return unless __strptime(str, '%H:%M', elem) - when '%r' - return unless __strptime(str, '%I:%M:%S %p', elem) - when '%S' - return unless str.sub!(/\A(\d+)/o, '') - val = $1.to_i - return unless (0..60) === val - elem[:sec] = val - when '%s' - return unless str.sub!(/\A(\d+)/o, '') - val = $1.to_i - elem[:seconds] = val - when '%T' - return unless __strptime(str, '%H:%M:%S', elem) - when '%t' - return unless __strptime(str, ' ', elem) - when '%U', '%W' - return unless str.sub!(/\A(\d+)/o, '') - val = $1.to_i - return unless (0..53) === val - elem[if c[-1,1] == 'U' then :wnum0 else :wnum1 end] = val - when '%u' - return unless str.sub!(/\A(\d+)/o, '') - val = $1.to_i - return unless (1..7) === val - elem[:cwday] = val - when '%V' - return unless str.sub!(/\A(\d+)/o, '') - val = $1.to_i - return unless (1..53) === val - elem[:cweek] = val - when '%v' - return unless __strptime(str, '%e-%b-%Y', elem) - when '%w' - return unless str.sub!(/\A(\d+)/o, '') - val = $1.to_i - return unless (0..6) === val - elem[:wday] = val - when '%X' - return unless __strptime(str, '%H:%M:%S', elem) - when '%x' - return unless __strptime(str, '%m/%d/%y', elem) - when '%Y' - return unless str.sub!(/\A([-+]?\d+)/o, '') - val = $1.to_i - elem[:year] = val - when '%y' - return unless str.sub!(/\A(\d+)/o, '') - val = $1.to_i - return unless (0..99) === val - elem[:year] = val - elem[:cent] ||= if val >= 69 then 19 else 20 end - when '%Z', '%z' - return unless str.sub!(/\A([-+:a-z0-9]+(?:\s+dst\b)?)/io, '') - val = $1 - elem[:zone] = val - offset = zone_to_diff(val) - elem[:offset] = offset - when '%%' - return unless str.sub!(/\A%/o, '') - when '%+' - return unless __strptime(str, '%a %b %e %H:%M:%S %Z %Y', elem) -=begin - when '%.' - return unless str.sub!(/\A(\d+)/o, '') - val = $1.to_i.to_r / (10**$1.size) - elem[:sec_fraction] = val -=end - when '%1' - if $VERBOSE - warn("warning: %1 is deprecated; forget this") - end - return unless str.sub!(/\A(\d+)/o, '') - val = $1.to_i - elem[:jd] = val - when '%2' - if $VERBOSE - warn("warning: %2 is deprecated; use '%Y-%j'") - end - return unless __strptime(str, '%Y-%j', elem) - when '%3' - if $VERBOSE - warn("warning: %3 is deprecated; use '%F'") + 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 + } + + DAYS = { + 'sunday' => 0, 'monday' => 1, 'tuesday' => 2, 'wednesday'=> 3, + 'thursday' => 4, 'friday' => 5, 'saturday' => 6 + } + + 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 + } + + ABBR_DAYS = { + 'sun' => 0, 'mon' => 1, 'tue' => 2, 'wed' => 3, + 'thu' => 4, 'fri' => 5, 'sat' => 6 + } + + 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, 'bst' => 1*3600, 'wat' => -1*3600, + 'at' => -2*3600, 'ast' => -4*3600, 'adt' => -3*3600, 'yst' => -9*3600, + 'ydt' => -8*3600, 'hst' =>-10*3600, 'hdt' => -9*3600, 'cat' =>-10*3600, + 'ahst'=>-10*3600, 'nt' =>-11*3600, 'idlw'=>-12*3600, 'cet' => 1*3600, + 'met' => 1*3600, 'mewt'=> 1*3600, 'mest'=> 2*3600, 'mesz'=> 2*3600, + 'swt' => 1*3600, 'sst' => 2*3600, 'fwt' => 1*3600, 'fst' => 2*3600, + 'eet' => 2*3600, 'bt' => 3*3600, 'zp4' => 4*3600, 'zp5' => 5*3600, + 'zp6' => 6*3600, 'wast'=> 7*3600, 'wadt'=> 8*3600, 'cct' => 8*3600, + 'jst' => 9*3600, 'east'=> 10*3600, 'eadt'=> 11*3600, 'gst' => 10*3600, + 'nzt' => 12*3600, 'nzst'=> 12*3600, 'nzdt'=> 13*3600, 'idle'=> 12*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 + } + + class Bag # :nodoc: + + def method_missing(t, *args, &block) + t = t.to_s + set = t.chomp!('=') + t = '@' + t + if set + instance_variable_set(t, *args) + else + if instance_variables.include?(t) + instance_variable_get(t) + end end - return unless __strptime(str, '%F', elem) - when /\A%(.)/m - return unless str.sub!(Regexp.new('\\A' + Regexp.quote($1)), '') - else - return unless str.sub!(Regexp.new('\\A' + Regexp.quote(c)), '') end - end - if cent = elem.delete(:cent) - if elem[:cwyear] - elem[:cwyear] += cent * 100 - end - if elem[:year] - elem[:year] += cent * 100 + def to_hash + instance_variables. + select{|n| !instance_variable_get(n).nil?}.grep(/\A@[^_]/). + inject({}){|r, n| r[n[1..-1].intern] = instance_variable_get(n); r} end + end - if merid = elem.delete(:merid) - if elem[:hour] - elem[:hour] %= 12 - elem[:hour] += merid + end + + def self.num_pattern? (s) # :nodoc: + /\A%[EO]?[CDdeFGgHIjkLlMmNQRrSsTUuVvWwXxYy\d]/ =~ s ||/\A\d/ =~ s + end + + private_class_method :num_pattern? + + def self._strptime_i(str, fmt, e) # :nodoc: + fmt.scan(/%[EO]?(.)|(.)/m) do |s, c| + if s + case s + when 'A', 'a' + return unless str.sub!(/\A(#{Format::DAYS.keys.join('|')})/io, '') || + str.sub!(/\A(#{Format::ABBR_DAYS.keys.join('|')})/io, '') + val = Format::DAYS[$1.downcase] || Format::ABBR_DAYS[$1.downcase] + return unless val + e.wday = val + when 'B', 'b', 'h' + return unless str.sub!(/\A(#{Format::MONTHS.keys.join('|')})/io, '') || + str.sub!(/\A(#{Format::ABBR_MONTHS.keys.join('|')})/io, '') + val = Format::MONTHS[$1.downcase] || Format::ABBR_MONTHS[$1.downcase] + return unless val + e.mon = val + when 'C' + 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' + 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' + 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' + return unless str.sub!(/\A( \d|\d{1,2})/, '') + val = $1.to_i + return unless (0..24) === val + e.hour = val + when 'I', 'l' + 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 = $1.to_i.to_r / (10**3) + val = $1.to_i.to_r / (10**$1.size) + e.sec_fraction = val + when 'M' + return unless str.sub!(/\A(\d{1,2})/, '') + val = $1.to_i + return unless (0..59) === val + e.min = val + when 'm' + 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 = $1.to_i.to_r / (10**9) + val = $1.to_i.to_r / (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 = $1.to_i.to_r / 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' + 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' + return unless str.sub!(/\A(\d{1,2})/, '') + val = $1.to_i + return unless (0..53) === val + e.__send__(if s == 'U' then :wnum0= else :wnum1= end, val) + when 'u' + return unless str.sub!(/\A(\d{1})/, '') + val = $1.to_i + return unless (1..7) === val + e.cwday = val + when 'V' + 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' + return unless _strptime_i(str, '%H:%M:%S', e) + when 'x' + return unless _strptime_i(str, '%m/%d/%y', e) + when 'Y' + 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' + 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', 'z' + return unless str.sub!(/\A((?:gmt|utc?)?[-+]\d+(?:[,.:]\d+(?::\d+)?)? + |[a-z.\s]+(?:standard|daylight)\s+time\b + |[a-z]+(?:\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(s)), '') + end + else + case c + when /\A[\s\v]/ + str.sub!(/\A[\s\v]+/, '') + else + return unless str.sub!(Regexp.new('\\A' + Regexp.quote(c)), '') + end end end - - str end - private_class_method :__strptime + private_class_method :_strptime_i def self._strptime(str, fmt='%F') - elem = {} - elem if __strptime(str.dup, fmt, elem) - end + e = Format::Bag.new + return unless _strptime_i(str.dup, fmt, e) - PARSE_MONTHPAT = ABBR_MONTHS.keys.join('|') - PARSE_DAYPAT = ABBR_DAYS. keys.join('|') + if e._cent + if e.cwyear + e.cwyear += e._cent * 100 + end + if e.year + e. year += e._cent * 100 + end + end - def self._parse(str, comp=false) - str = str.dup + if e._merid + if e.hour + e.hour %= 12 + e.hour += e._merid + end + end - str.gsub!(/[^-+,.\/:0-9a-z]+/ino, ' ') + e.to_hash + end - # day - if str.sub!(/(#{PARSE_DAYPAT})\S*/ino, ' ') - wday = ABBR_DAYS[$1.downcase] + def self._parse_day(str, e) # :nodoc: + if str.sub!(/(#{e._parse_daypat})[^-\d\s]*/in, ' ') + e.wday = Format::ABBR_DAYS[$1.downcase] + true end + end - # time + def self._parse_time(str, e) # :nodoc: if str.sub!( - /(\d+):(\d+) - (?: - :(\d+)(?:[,.](\d*))? - )? - (?: - \s* - ([ap])(?:m\b|\.m\.) - )? + /(?: + (\d+)\s*:\s*(\d+) + (?: + \s*:\s*(\d+)(?:[,.](\d*)\s*s?)? + )? + (?: + \s* + ([ap])(?:m\b|\.m\.) + )? + | + (\d+)\s*([ap])(?:m\b|\.m\.) + ) (?: \s* ( - [a-z]+(?:\s+dst)?\b + (?:gmt|utc?)?[-+]\d+(?:[,.:]\d+(?::\d+)?)? + | + [a-z.\s]+(?:standard|daylight)\stime\b | - [-+]\d+(?::?\d+) + [a-z]+(?:\sdst)?\b ) )? - /inox, + /inx, ' ') - hour = $1.to_i - min = $2.to_i - sec = $3.to_i if $3 + e.hour = ($1 || $6).to_i + e.min = $2.to_i if $2 + e.sec = $3.to_i if $3 if $4 - sec_fraction = $4.to_i.to_r / (10**$4.size) + e.sec_fraction = $4.to_i.to_r / (10**$4.size) end - if $5 - hour %= 12 - if $5.downcase == 'p' - hour += 12 + if $5 || $7 + e.hour %= 12 + if ($5 || $7).downcase == 'p' + e.hour += 12 end end - if $6 - zone = $6 + if $8 + e.zone = $8 end + true + end + end + + def self._parse_beat(str, e) # :nodoc: + if str.sub!(/@\s*(\d+)(?:[,.](\d*))?/, ' ') + beat = $1.to_i.to_r + beat += $2.to_i.to_r / (10**$2.size) if $2 + secs = beat.to_r / 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 = '+0100' + true end + end - # eu + def self._parse_eu(str, e) # :nodoc: if str.sub!( - /(\d+)\S* - \s+ - (#{PARSE_MONTHPAT})\S* + /(\d+)[^-\d\s]* + \s* + (#{e._parse_monthpat})[^-\d\s]* (?: - \s+ + \s* + (c(?:e|\.e\.)|b(?:ce|\.c\.e\.)|a(?:d|\.d\.)|b(?:c|\.c\.))? + \s* (-?\d+) )? - /inox, + /inx, ' ') - mday = $1.to_i - mon = ABBR_MONTHS[$2.downcase] + e.mday = $1.to_i + e.mon = Format::ABBR_MONTHS[$2.downcase] - if $3 - year = $3.to_i - if $3.size > 2 - comp = false + if $4 + e.year = $4.to_i + if $4.size > 2 + e._comp = false end end - # us - elsif str.sub!( - /(#{PARSE_MONTHPAT})\S* - \s+ - (\d+)\S* - (?: - \s+ - (-?\d+) - )? - /inox, - ' ') - mon = ABBR_MONTHS[$1.downcase] - mday = $2.to_i + if $3 && $4 + if $3[0,1].downcase == 'b' + e.year = -e.year + 1 + end + end + true + end + end - if $3 - year = $3.to_i - if $3.size > 2 - comp = false + def self._parse_us(str, e) # :nodoc: + if str.sub!( + /(#{e._parse_monthpat})[^-\d\s]* + \s* + (\d+)[^-\d\s]* + (?: + \s* + (c(?:e|\.e\.)|b(?:ce|\.c\.e\.)|a(?:d|\.d\.)|b(?:c|\.c\.))? + \s* + (-?\d+) + )? + /inx, + ' ') + e.mon = Format::ABBR_MONTHS[$1.downcase] + + unless $2.size > 2 && $3.nil? + e.mday = $2.to_i + else + e.year = $2.to_i + end + + if $4 + e.year = $4.to_i + if $4.size > 2 + e._comp = false + end + end + + if $3 && $4 + if $3[0,1].downcase == 'b' + e.year = -e.year + 1 end end + true + end + end - # iso - elsif str.sub!(/([-+]?\d+)-(\d+)-(-?\d+)/no, ' ') - year = $1.to_i - mon = $2.to_i - mday = $3.to_i + def self._parse_iso(str, e) # :nodoc: + if str.sub!(/([-+]?\d+)-(\d+)-(-?\d+)/n, ' ') + e.year = $1.to_i + e.mon = $2.to_i + e.mday = $3.to_i if $1.size > 2 - comp = false + e._comp = false elsif $3.size > 2 - comp = false - mday, mon, year = year, mon, mday + e._comp = false + e.mday, e.mon, e.year = e.year, e.mon, e.mday end + true + elsif str.sub!(/\b(\d{2}|\d{4})-?w(\d{2})-?(\d+)\b/in, ' ') + e.cwyear = $1.to_i + e.cweek = $2.to_i + e.cwday = $3.to_i + true + elsif str.sub!(/\b(\d{2}|\d{4})-(\d{3})\b/n, ' ') + e.year = $1.to_i + e.yday = $2.to_i + true + end + end - # jis - elsif str.sub!(/([MTSH])(\d+)\.(\d+)\.(\d+)/ino, ' ') - e = { 'm'=>1867, - 't'=>1911, - 's'=>1925, - 'h'=>1988 + def self._parse_jis(str, e) # :nodoc: + if str.sub!(/([MTSH])(\d+)\.(\d+)\.(\d+)/in, ' ') + era = { 'm'=>1867, + 't'=>1911, + 's'=>1925, + 'h'=>1988 }[$1.downcase] - year = $2.to_i + e - mon = $3.to_i - mday = $4.to_i + e.year = $2.to_i + era + e.mon = $3.to_i + e.mday = $4.to_i + true + end + end - # vms - elsif str.sub!(/(-?\d+)-(#{PARSE_MONTHPAT})[^-]*-(-?\d+)/ino, ' ') - mday = $1.to_i - mon = ABBR_MONTHS[$2.downcase] - year = $3.to_i + def self._parse_vms(str, e) # :nodoc: + if str.sub!(/(-?\d+)-(#{e._parse_monthpat})[^-]*-(-?\d+)/in, ' ') + e.mday = $1.to_i + e.mon = Format::ABBR_MONTHS[$2.downcase] + e.year = $3.to_i if $1.size > 2 - comp = false - year, mon, mday = mday, mon, year + e._comp = false + e.year, e.mon, e.mday = e.mday, e.mon, e.year elsif $3.size > 2 - comp = false + e._comp = false end + true + end + end - # sla - elsif str.sub!(%r|(-?\d+)/(\d+)(?:/(-?\d+))?|no, ' ') - mon = $1.to_i - mday = $2.to_i + def self._parse_sla_ja(str, e) # :nodoc: + if str.sub!(%r|(-?\d+)[/.](\d+)(?:[/.](-?\d+))?|n, ' ') + if $3 + e.year = $1.to_i + e.mon = $2.to_i + e.mday = $3.to_i + if $1.size > 2 + e._comp = false + end + else + if $1.size > 2 + e.year = $1.to_i + e.mon = $2.to_i + elsif $2.size > 2 + e.mon = $1.to_i + e.year = $2.to_i + else + e.mon = $1.to_i + e.mday = $2.to_i + end + end + if $3 && $3.size > 2 + e._comp = false + e.mday, e.mon, e.year = e.year, e.mon, e.mday + end + true + end + end + + def self._parse_sla_eu(str, e) # :nodoc: + if str.sub!(%r|(-?\d+)[/.](\d+)(?:[/.](-?\d+))?|n, ' ') if $3 - year = $3.to_i + e.mday = $1.to_i + e.mon = $2.to_i + e.year = $3.to_i if $3.size > 2 - comp = false + e._comp = false + end + else + if $1.size > 2 + e.year = $1.to_i + e.mon = $2.to_i + elsif $2.size > 2 + e.mon = $1.to_i + e.year = $2.to_i + else + e.mday = $1.to_i + e.mon = $2.to_i end end if $3 && $1.size > 2 - comp = false - year, mon, mday = mon, mday, year - end - - # ddd - elsif str.sub!( - /([-+]?)(\d{4,14}) - (?: - \s* - T? - \s* - (\d{2,6})(?:[,.](\d*))? - )? - (?: - \s* - ( - Z - | - [-+]\d{2,4} - ) - \b - )? - /inox, - ' ') + e._comp = false + e.year, e.mon, e.mday = e.mday, e.mon, e.year + end + true + end + end + + def self._parse_sla_us(str, e) # :nodoc: + if str.sub!(%r|(-?\d+)[/.](\d+)(?:[/.](-?\d+))?|n, ' ') + if $3 + e.mon = $1.to_i + e.mday = $2.to_i + e.year = $3.to_i + if $3.size > 2 + e._comp = false + end + else + if $1.size > 2 + e.year = $1.to_i + e.mon = $2.to_i + elsif $2.size > 2 + e.mon = $1.to_i + e.year = $2.to_i + else + e.mon = $1.to_i + e.mday = $2.to_i + end + end + + if $3 && $1.size > 2 + e._comp = false + e.year, e.mon, e.mday = e.mon, e.mday, e.year + end + true + end + end + + def self._parse_ddd(str, e) # :nodoc: + if str.sub!( + /([-+]?)(\d{2,14}) + (?: + \s* + T? + \s* + (\d{2,6})(?:[,.](\d*))? + )? + (?: + \s* + ( + Z + | + [-+]\d{1,4} + ) + \b + )? + /inx, + ' ') case $2.size + when 2 + e.mday = $2[ 0, 2].to_i when 4 - mon = $2[ 0, 2].to_i - mday = $2[ 2, 2].to_i + e.mon = $2[ 0, 2].to_i + e.mday = $2[ 2, 2].to_i when 6 - year = ($1 + $2[ 0, 2]).to_i - mon = $2[ 2, 2].to_i - mday = $2[ 4, 2].to_i + e.year = ($1 + $2[ 0, 2]).to_i + e.mon = $2[ 2, 2].to_i + e.mday = $2[ 4, 2].to_i when 8, 10, 12, 14 - year = ($1 + $2[ 0, 4]).to_i - mon = $2[ 4, 2].to_i - mday = $2[ 6, 2].to_i - hour = $2[ 8, 2].to_i if $2.size >= 10 - min = $2[10, 2].to_i if $2.size >= 12 - sec = $2[12, 2].to_i if $2.size >= 14 - comp = false + 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 + when 3 + e.yday = $2[ 0, 3].to_i + when 5 + e.year = ($1 + $2[ 0, 2]).to_i + e.yday = $2[ 2, 3].to_i + when 7 + e.year = ($1 + $2[ 0, 4]).to_i + e.yday = $2[ 4, 3].to_i end if $3 case $3.size when 2, 4, 6 - hour = $3[ 0, 2].to_i - min = $3[ 2, 2].to_i if $3.size >= 4 - sec = $3[ 4, 2].to_i if $3.size >= 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 - sec_fraction = $4.to_i.to_r / (10**$4.size) + e.sec_fraction = $4.to_i.to_r / (10**$4.size) end if $5 - zone = $5 + e.zone = $5 end + true end + end - if str.sub!(/\b(bc\b|bce\b|b\.c\.|b\.c\.e\.)/ino, ' ') - if year - year = -year + 1 + def self._parse_k_hi(str, e) # :nodoc: + if str.sub!(/(\265\252\270\265\301\260|\271\304\265\252|\300\276\316\361|\314\300\274\243|\302\347\300\265|\276\274\317\302|\312\277\300\256|\271\304|\300\276|\314\300|\302\347|\276\274|\312\277)?\s* + (?:(\270\265|\d+)\s*\307\257\s*)? + (?:(\d+)\s*\267\356\s*) + (?:(\d+)\s*\306\374\s*) + /nx, ' ') || + str.sub!(/(\265\252\270\265\301\260|\271\304\265\252|\300\276\316\361|\314\300\274\243|\302\347\300\265|\276\274\317\302|\312\277\300\256|\271\304|\300\276|\314\300|\302\347|\276\274|\312\277)\s* + (?:(\270\265|\d+)) + (?:\s*[-\/.]+\s*(\d+) + (?:\s*[-\/.]+\s*(\d+))?)? + /nx, ' ') + + era = { "\271\304\265\252" => -660, + "\300\276\316\361" => 0, + "\314\300\274\243" => 1867, + "\302\347\300\265" => 1911, + "\276\274\317\302" => 1925, + "\312\277\300\256" => 1988, + "\271\304" => -660, + "\300\276" => 0, + "\314\300" => 1867, + "\302\347" => 1911, + "\276\274" => 1925, + "\312\277" => 1988 + }[$1] + if $2 + e.year = ($2.to_i.nonzero? || 1) + e.year += era if era + end + if $1 && $2 + if $1 == "\265\252\270\265\301\260" + e.year = -e.year + 1 + end end + e.mon = $3.to_i if $3 + e.mday = $4.to_i if $4 end + end - if comp and year - if year >= 0 and year <= 99 - if year >= 69 - year += 1900 + def self._parse_k_ji(str, e) # :nodoc: + if str.sub!(/(?:(?:\270\341)?(\301\260|\270\345)|\277\274(?:\314\353)?)?\s* + (?:(\d+)\s*(?:\273\376)\s*) + (?:(\d+)\s*(?:\312\254)\s*)? + (?:(\d+)(?:[.,](\d*))?\s*(?:\311\303))? + (?i: + \s* + ( + (?:gmt|utc?)?[-+]\d+(?:[,.:]\d+(?::\d+)?)? + | + [a-z.\s]+(?:standard|daylight)\stime\b + | + [a-z]+(?:\sdst)?\b + ) + )? + /nx, ' ') || + str.sub!(/(?:(?:\270\341)?(\301\260|\270\345)|\277\274(?:\314\353)?)\s* + (\d+) + (?:\s*:+\s*(\d+) + (?:\s*:+\s*(\d+)(?:[.,](\d*))?)?)? + (?i: + \s* + ( + (?:gmt|utc?)?[-+]\d+(?:[,.:]\d+(?::\d+)?)? + | + [a-z.\s]+(?:standard|daylight)\stime\b + | + [a-z]+(?:\sdst)?\b + ) + )? + /nx, ' ') + + e.hour = $2.to_i if $2 + e.min = $3.to_i if $3 + e.sec = $4.to_i if $4 + if $5 + e.sec_fraction = $5.to_i.to_r / (10**$5.size) + end + + if $1 && $2 + e.hour %= 12 + if $1 == "\270\345" + e.hour += 12 + end + end + + if $6 + e.zone = $6 + end + end + end + + def self._parse_k_yo(str, e) # :nodoc: + if str.sub!(/(\306\374|\267\356|\262\320|\277\345|\314\332|\266\342|\305\332)[^-\d\s]*/n, ' ') + wday = { "\306\374" => 0, + "\267\356" => 1, + "\262\320" => 2, + "\277\345" => 3, + "\314\332" => 4, + "\266\342" => 5, + "\305\332" => 6 + }[$1] + e.wday = wday + end + end + + private_class_method :_parse_day, :_parse_time, :_parse_beat, + :_parse_eu, :_parse_us, :_parse_iso, :_parse_jis, :_parse_vms, + :_parse_sla_ja, :_parse_sla_eu, :_parse_sla_us, :_parse_ddd, + :_parse_k_hi, :_parse_k_ji, :_parse_k_yo + + def self._parse(str, comp=false) + str = str.dup + + e = Format::Bag.new + + e._comp = comp + e._parse_monthpat = Format::ABBR_MONTHS.keys.join('|') + e._parse_daypat = Format::ABBR_DAYS .keys.join('|') + + require 'nkf' + + ostr = str + str = NKF.nkf('-e', str) + + str.gsub!(/[^-+,.\/:0-9@a-z\x80-\xff]+/in, ' ') + + _parse_k_hi(str, e) + _parse_k_ji(str, e) + _parse_k_yo(str, e) + + if e.to_hash.empty? + str = ostr + str.gsub!(/[^-+,.\/:0-9@a-z\x80-\xff]+/in, ' ') + end + + _parse_time(str, e) # || _parse_beat(str, e) + _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_us(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 + end + end + + if e._comp and e.year + if e.year >= 0 and e.year <= 99 + if e.year >= 69 + e.year += 1900 else - year += 2000 + e.year += 2000 end end end - elem = {} - elem[:year] = year if year - elem[:mon] = mon if mon - elem[:mday] = mday if mday - elem[:hour] = hour if hour - elem[:min] = min if min - elem[:sec] = sec if sec - elem[:sec_fraction] = sec_fraction if sec_fraction - elem[:zone] = zone if zone - offset = zone_to_diff(zone) if zone - elem[:offset] = offset if offset - elem[:wday] = wday if wday - elem + e.offset ||= zone_to_diff(e.zone) if e.zone + + e.to_hash end - def self.zone_to_diff(str) - abb, dst = str.downcase.split(/\s+/o, 2) - if ZONES.include?(abb) - offset = ZONES[abb] + def self.zone_to_diff(zone) # :nodoc: + zone = zone.downcase + if zone.sub!(/\s+(standard|daylight)\s+time\z/, '') + dst = $1 == 'daylight' + else + dst = zone.sub!(/\s+dst\z/, '') + end + if Format::ZONES.include?(zone) + offset = Format::ZONES[zone] offset += 3600 if dst - elsif /\A([-+])(\d{2}):?(\d{2})?\Z/no =~ str - offset = $2.to_i * 3600 + $3.to_i * 60 - offset *= -1 if $1 == '-' + elsif zone.sub!(/\A(?:gmt|utc?)?([-+])/, '') + sign = $1 + if zone.include?(':') + hour, min, sec, = zone.split(':') + elsif zone.include?(',') || zone.include?('.') + hour, fr, = zone.split(/[,.]/) + min = fr.to_i.to_r / (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 + end + offset = hour.to_i * 3600 + min.to_i * 60 + sec.to_i + offset *= -1 if sign == '-' end offset end def strftime(fmt='%F') - o = '' - fmt.scan(/%[EO]?.|./mo) do |c| - cc = c.sub(/\A%[EO]?(.)\z/mo, '%\\1') - case cc - when '%A'; o << DAYNAMES[wday] - when '%a'; o << ABBR_DAYNAMES[wday] - when '%B'; o << MONTHNAMES[mon] - when '%b'; o << ABBR_MONTHNAMES[mon] - when '%C'; o << '%02d' % (year / 100.0).floor # P2,ID - when '%c'; o << strftime('%a %b %e %H:%M:%S %Y') - when '%D'; o << strftime('%m/%d/%y') # P2,ID - when '%d'; o << '%02d' % mday - when '%e'; o << '%2d' % mday - when '%F'; o << strftime('%Y-%m-%d') # ID - when '%G'; o << '%.4d' % cwyear # ID - when '%g'; o << '%02d' % (cwyear % 100) # ID - when '%H'; o << '%02d' % hour - when '%h'; o << strftime('%b') # P2,ID - when '%I'; o << '%02d' % ((hour % 12).nonzero? or 12) - when '%j'; o << '%03d' % yday - when '%k'; o << '%2d' % hour # AR,TZ,GL - when '%l'; o << '%2d' % ((hour % 12).nonzero? or 12) # AR,TZ,GL - when '%M'; o << '%02d' % min - when '%m'; o << '%02d' % mon -=begin - when '%N' # GNU date - o << '%09d' % (sec_fraction / (1.to_r/86400/(10**9))) -=end - when '%n'; o << "\n" # P2,ID - when '%P'; o << if hour < 12 then 'am' else 'pm' end # GL - when '%p'; o << if hour < 12 then 'AM' else 'PM' end - when '%R'; o << strftime('%H:%M') # ID - when '%r'; o << strftime('%I:%M:%S %p') # P2,ID - when '%S'; o << '%02d' % sec - when '%s' # TZ,GL + fmt.gsub(/%[EO]?(.)/m) do |_| + case $1 + when 'A'; DAYNAMES[wday] + when 'a'; ABBR_DAYNAMES[wday] + when 'B'; MONTHNAMES[mon] + when 'b'; ABBR_MONTHNAMES[mon] + when 'C'; '%02d' % (year / 100) # P2,ID + when 'c'; strftime('%a %b %e %H:%M:%S %Y') + when 'D'; strftime('%m/%d/%y') # P2,ID + when 'd'; '%02d' % mday + when 'e'; '%2d' % mday + when 'F'; strftime('%Y-%m-%d') # ID + when 'G'; '%.4d' % cwyear # ID + when 'g'; '%02d' % (cwyear % 100) # ID + when 'H'; '%02d' % hour + when 'h'; strftime('%b') # P2,ID + when 'I'; '%02d' % ((hour % 12).nonzero? or 12) + when 'j'; '%03d' % yday + when 'k'; '%2d' % hour # AR,TZ,GL + when 'L' # JV + '%03d' % (sec_fraction / (1.to_r/86400/(10**3))) + when 'l'; '%2d' % ((hour % 12).nonzero? or 12) # AR,TZ,GL + when 'M'; '%02d' % min + when 'm'; '%02d' % mon + when 'N' # JV, GD + '%09d' % (sec_fraction / (1.to_r/86400/(10**9))) + when 'n'; "\n" # P2,ID + when 'P'; strftime('%p').downcase # GL + when 'p'; if hour < 12 then 'AM' else 'PM' end + when 'Q' # JV + d = ajd - self.class.jd_to_ajd(self.class.civil_to_jd(1970,1,1), 0) + s = (d * 86400*10**3).to_i + '%d' % s + when 'R'; strftime('%H:%M') # ID + when 'r'; strftime('%I:%M:%S %p') # P2,ID + when 'S'; '%02d' % sec + when 's' # TZ,GL d = ajd - self.class.jd_to_ajd(self.class.civil_to_jd(1970,1,1), 0) s = (d * 86400).to_i - o << '%d' % s - when '%T'; o << strftime('%H:%M:%S') # P2,ID - when '%t'; o << "\t" # P2,ID - when '%U', '%W' - a = self.class.civil_to_jd(year, 1, 1, ns?) + 6 - k = if c[-1,1] == 'U' then 0 else 1 end - w = (jd - (a - ((a - k) + 1) % 7) + 7) / 7 - o << '%02d' % w - when '%u'; o << '%d' % cwday # P2,ID - when '%V'; o << '%02d' % cweek # P2,ID - when '%v'; o << strftime('%e-%b-%Y') # AR,TZ - when '%w'; o << '%d' % wday - when '%X'; o << strftime('%H:%M:%S') - when '%x'; o << strftime('%m/%d/%y') - when '%Y'; o << '%.4d' % year - when '%y'; o << '%02d' % (year % 100) - when '%Z'; o << (if offset.zero? then 'Z' else strftime('%z') end) - when '%z' # ID - o << if offset < 0 then '-' else '+' end + '%d' % s + when 'T'; strftime('%H:%M:%S') # P2,ID + when 't'; "\t" # P2,ID + when 'U', 'W' + k = if $1 == 'U' then 0 else 1 end + '%02d' % self.class.jd_to_weeknum(jd, k, fix_style)[1] + when 'u'; '%d' % cwday # P2,ID + when 'V'; '%02d' % cweek # P2,ID + when 'v'; strftime('%e-%b-%Y') # AR,TZ + when 'w'; '%d' % wday + when 'X'; strftime('%H:%M:%S') + when 'x'; strftime('%m/%d/%y') + when 'Y'; '%.4d' % year + when 'y'; '%02d' % (year % 100) + when 'Z'; (if offset.zero? then 'Z' else strftime('%z') end) + when 'z' # ID + p = if offset < 0 then '-' else '+' end of = offset.abs hh, fr = of.divmod(1.to_r/24) mm = fr / (1.to_r/1440) - o << '%02d' % hh - o << '%02d' % mm - when '%%'; o << '%' - when '%+'; o << strftime('%a %b %e %H:%M:%S %Z %Y') # TZ -=begin - when '%.' - o << '%06d' % (sec_fraction / (1.to_r/86400/(10**6))) -=end - when '%1' + '%s%02d%02d' % [p, hh, mm] + when '%'; '%' + when '+'; strftime('%a %b %e %H:%M:%S %Z %Y') # TZ + when '1' if $VERBOSE - warn("warning: %1 is deprecated; forget this") + warn("warning: strftime: %1 is deprecated; forget this") end - o << '%d' % jd - when '%2' + '%d' % jd + when '2' if $VERBOSE - warn("warning: %2 is deprecated; use '%Y-%j'") + warn("warning: strftime: %2 is deprecated; use '%Y-%j'") end - o << strftime('%Y-%j') - when '%3' + strftime('%Y-%j') + when '3' if $VERBOSE - warn("warning: %3 is deprecated; use '%F'") + warn("warning: strftime: %3 is deprecated; use '%F'") end - o << strftime('%F') - when /\A%(.)/m - o << $1 + strftime('%F') else - o << c + $1 end end - o end # alias_method :format, :strftime diff --git a/lib/parsedate.rb b/lib/parsedate.rb index 39b5e7fa1e..405ab46907 100644 --- a/lib/parsedate.rb +++ b/lib/parsedate.rb @@ -10,12 +10,6 @@ module ParseDate values_at(:year, :mon, :mday, :hour, :min, :sec, :zone, :wday) end + module_function :parsedate - def strptime(str, format) - d = Date._strptime(str, format) - raise ArgumentError, "invalid strptime format - `#{format}'" unless d - d.values_at(:year, :mon, :mday, :hour, :min, :sec, :zone, :wday) - end - - module_function :parsedate, :strptime end |