hijri 0.2.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a57a98c55f59a921c16661f2dde825a5600d32d
-  data.tar.gz: d1f368e87d525735c9e01afc3a4841e3ce2d1052
+  metadata.gz: 7d85b27d3b44ff6c7d07d0c694b00e0ff7aa8b9c
+  data.tar.gz: 82fb98fc862f70e0d04477e12f74a77408979500
 SHA512:
-  metadata.gz: 6d9061ec1e355f146a8be9b1ca1b58a2fe6c111078929fcb88b5aecc7d9edbf9dcaf5453ba120b899c5bdab8107c8b9c516e8adceea22ce40980cf974bb9ef35
-  data.tar.gz: 83e0d0511d673e93479a75520d9401f05aa5a6d6e3a7fb9911e508354e31aa8edf6b33e25438eeb59f31e9ea311bfb38e0fa55172e8480ab0824beaf8ea8401d
+  metadata.gz: cb74e3acfc640014bbd3499a74122f8b01d753fac32942015d4d3928f5dcde7133fdc8c34bfb6212c2fea76aa901b884f4132a80c1c1e2d735548925bfcc358f
+  data.tar.gz: 91fc784276f15e1a6b0e39adedf1830a15ee1fdf338a4cdd2337f747e52567eaea8d7440811d72a078ca88f3dc77a164f59286a7e0935aae1a4e12e3f2f99f70

data/.travis.yml

@@ -6,8 +6,10 @@ rvm:
   - "1.9.3"
   - "2.0.0"
   - "2.1"
+  - "2.2.0"
   - jruby-18mode # JRuby in 1.8 mode
   - jruby-19mode # JRuby in 1.9 mode
   - rbx
+  - rbx-2
 
 sudo: false

data/CHANGELOG

@@ -1,3 +1,12 @@
+=== 0.4.0 / 2015-01-11
+
+* Add Hijri::DateTime.to_s
+* protect year, month and day in Hijri::Date.
+* Implement Hijri::Date.strftime method.
+* Add Hijri::Date.yday method
+* Add Hijri::Date.wday method
+* Add Hijri::Date.weeknum method
+
 === 0.2.5 / 2014-12-11
 
 * Add Comparable for Hijri::Date.

data/Gemfile

@@ -2,6 +2,6 @@ source 'https://rubygems.org'
 
 gemspec
 
-if RUBY_VERSION < '1.8.8'
+if %w(1.8.7 2.2.0).include? RUBY_VERSION
   gem 'minitest'
 end

data/README.md

@@ -5,7 +5,7 @@
 
 #####Hijri Date library for Ruby.
 hijri is full Islamic Hijri calendar lib for ruby. The way it work is to convert Gregorian date to absolute date then convert it to Hijri date.
-### Hijri Calendar (from Wikipedia)
+#### Hijri Calendar (from Wikipedia)
 The Islamic calendar or Muslim calendar or Hijri calendar: is a lunar calendar consisting of 12 lunar months in a year of 354 or 355 days. It is used to date events in many Muslim countries (concurrently with the Gregorian calendar), and used by Muslims everywhere to determine the proper day on which to celebrate Islamic holy days and festivals. The first year was the year during which the emigration of the Islamic prophet Muhammad from Mecca to Medina, known as the Hijra, occurred. Each numbered year is designated either H for Hijra or AH for the Latin anno Hegirae (in the year of the Hijra).[1] A limited number of years before Hijra (BH) are used to date events related to Islam, such as the birth of Muhammad in 53 BH.[2] The current Islamic year is 1431 AH, from approximately 18 December 2009 (evening) to 6 December 2010 (evening).
 
 http://en.wikipedia.org/wiki/Islamic_calendar
@@ -33,6 +33,7 @@ Or install it yourself as:
   - 1.9.3
   - 2.0.0
   - 2.1
+  - 2.2
 - JRuby 1.7.16.1
   - jruby-18mode
   - jruby-19mode
@@ -57,6 +58,9 @@ hijri.to_greo # => #<Date: 2009-01-01 ((2454833j,0s,0n),+0s,2299161j)>
 
 # and there is DateTime too
 date_and_time = Hijri::DateTime.now # => #<Hijri::DateTime:0x007f875e8eac00 @year=1436, @month=2, @day=16, @hour=14, @minute=14, @second=39, @zone="+03:00">
+
+# hijri support strftime method with the same option as Greogian date format
+Hijri::DateTime.now.strftime('%c') # => "Ahad Rabia I 20 16:00:25 1436"
 ```
 
 
@@ -67,7 +71,8 @@ date_and_time = Hijri::DateTime.now # => #<Hijri::DateTime:0x007f875e8eac00 @yea
 - [x] Add Hijri::DateTime.now to create Hijri::DateTime object.
 - [x] Add Hijri::Date.today to create Hijri::Date object with today date.
 - [x] Add Comparable for Hijri::Date.
-- [ ] Implement strftime method.
+- [x] Implement strftime method.
+- [ ] Add Hijri::Date.change method.
 
 
 ## Contributing

data/lib/hijri.rb

@@ -2,6 +2,8 @@ require 'date'
 
 module Hijri
   ISLAMIC_EPOCH = 227014
+  AVERAGE_YEARS_DAYS = 354.367056
+  AVERAGE_MONTH_DAYS = 29.530588
 end
 
 require 'hijri/version'
@@ -9,4 +11,4 @@ require 'hijri/date'
 require 'hijri/datetime'
 require 'hijri/gregorian'
 require 'hijri/converter'
-
+require 'hijri/format'

data/lib/hijri/date.rb

@@ -3,9 +3,30 @@ module Hijri
 
     include Comparable
 
-    attr_accessor :day, :month, :year
-    MONTHNAMES_EN = %w(Muharram Safar Rabia-Awwal Rabia-Thani Jumaada-Awal Jumaada-Thani Rajab Sha'ban Ramadan Shawwal Dhul-Qi'dah Dhul-Hijjah)
+    attr_reader :day, :month, :year
+
+    # TODO change mon to month in format.rb.
+    alias :mon  :month
+    alias :mday :day
+    
+
+    MONTHNAMES = [nil] + %w(Muharram Safar Rabia-Awwal Rabia-Thani Jumaada-Awal Jumaada-Thani Rajab Sha'ban Ramadan Shawwal Dhul-Qi'dah Dhul-Hijjah)
     DAYNAMES = %w(as-Sabt al-Ahad al-Ithnayn ath-Thalaathaa al-Arba'aa' al-Khamis al-Jumu'ah)
+    ABBR_MONTHNAMES = [nil] + ["Muharram", "Safar", "Rabia I", "Rabia II", "Jumaada I", "Jumaada II", "Rajab", "Sha'ban", "Ramadan", "Shawwal", "Dhul-Qi'dah", "Dhul-Hijjah"]
+    ABBR_DAYNAMES = %w(Sabt Ahad Ithnayn Thalaathaa Arba'aa' Khamis Jumu'ah)
+    
+    [MONTHNAMES, DAYNAMES, ABBR_MONTHNAMES, ABBR_DAYNAMES].each do |xs|
+      xs.each{|x| x.freeze unless x.nil?}.freeze
+    end
+    
+    HALF_DAYS_IN_DAY       = Rational(1, 2) # :nodoc:
+    HOURS_IN_DAY           = Rational(1, 24) # :nodoc:
+    MINUTES_IN_DAY         = Rational(1, 1440) # :nodoc:
+    SECONDS_IN_DAY         = Rational(1, 86400) # :nodoc:
+    MILLISECONDS_IN_DAY    = Rational(1, 86400*10**3) # :nodoc:
+    NANOSECONDS_IN_DAY     = Rational(1, 86400*10**9) # :nodoc:
+    MILLISECONDS_IN_SECOND = Rational(1, 10**3) # :nodoc:
+    NANOSECONDS_IN_SECOND  = Rational(1, 10**9) # :nodoc:
 
     class << self
       def today
@@ -51,6 +72,7 @@ module Hijri
 
       return (day + month_days + this_year + nonleap_year_days + leap_year_days + Hijri::ISLAMIC_EPOCH).to_i
     end
+    alias :abs :to_abs
 
     def to_greo
       ::Date.new *Converter.hijri_to_greo(self)
@@ -61,5 +83,22 @@ module Hijri
       self
     end
 
+    def yday
+      (((month - 1) * AVERAGE_MONTH_DAYS) + day).floor
+    end
+
+    def wday
+      (((year * AVERAGE_YEARS_DAYS) + yday) % 7).floor
+    end
+
+    def weeknum(week_start=0)
+      yday / 7
+    end
+    alias :cweek :weeknum
+
+    def wnum0() weeknum(0) end # :nodoc:
+    def wnum1() weeknum(1) end # :nodoc:
+
+    private :wnum0, :wnum1
   end
 end

data/lib/hijri/datetime.rb

@@ -1,12 +1,18 @@
 module Hijri
   class DateTime < Date
     
-    attr_reader :hour, :minute, :second, :zone
+    attr_reader :hour, :minute, :second, :offset, :zone
+
+    alias :min :minute
+    alias :sec :second
+    
+
     def initialize(year=1, month=1, day=1, hour=0, minute=0, second=0, zone="00:00")
       super(year, month, day)
       @hour   = hour
       @minute = minute
       @second = second
+      @offset = zone.to_f / 24
       @zone   = zone
     end
     
@@ -21,7 +27,10 @@ module Hijri
       ::DateTime.new *Converter.hijri_to_greo(self)
     end
     
-    # TODO to_s
+    def to_s
+      zone_str = (@zone == '00:00' ? "+#{@zone}" : @zone)
+      "#{super}T#{sprintf('%02d', @hour)}:#{sprintf('%02d', @minute)}:#{sprintf('%02d', @second)}#{zone_str}"
+    end
 
     class << self
       def now

data/lib/hijri/format.rb

@@ -1,235 +1,237 @@
 # format.rb: Written by Tadayoshi Funaba 1999-2009
 # $Id: format.rb,v 2.43 2008-01-17 20:16:31+09 tadf Exp $
 
-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
-    }
-
-    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,
-      '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
-    }
-
-    [MONTHS, DAYS, ABBR_MONTHS, ABBR_DAYS, ZONES].each do |x|
-      x.freeze
-    end
+# I stole this code from ruby date.
+module Hijri
+  class Date
+
+    module Format # :nodoc:
+
+      MONTHS = {
+        'Muharram'  => 1, 'Safar' => 2, 'Rabia-Awwal' => 3, 'Rabia-Thani' => 4,
+        'Jumaada-Awal' => 5, 'Jumaada-Thani' => 6, 'Rajab' => 7, "Sha'ban" => 8,
+        'Ramadan'=> 9, 'Shawwal' => 10, "Dhul-Qi'dah" => 11, 'Dhul-Hijjah' => 12
+      }
+
+      DAYS = {
+        'al-Ahad'   => 0, 'al-Ithnayn'   => 1, 'ath-Thalaathaa'  => 2, "al-Arba'aa'"=> 3,
+        'al-Khamis' => 4, "al-Jumu'ah"   => 5, 'as-Sabt' => 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,
+        '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
+      }
+
+      [MONTHS, DAYS, ABBR_MONTHS, ABBR_DAYS, ZONES].each do |x|
+        x.freeze
+      end
 
-    class Bag # :nodoc:
+      class Bag # :nodoc:
 
-      def initialize
-      	@elem = {}
-      end
+        def initialize
+        	@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
-      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
+        end
+
+        def to_hash
+        	@elem.reject{|k, v| /\A_/ =~ k.to_s || v.nil?}
+        end
 
-      def to_hash
-      	@elem.reject{|k, v| /\A_/ =~ k.to_s || v.nil?}
       end
 
     end
 
-  end
+    def emit(e, f) # :nodoc:
+      case e
+      when Numeric
+        sign = %w(+ + -)[e <=> 0]
+        e = e.abs
+      end
 
-  def emit(e, f) # :nodoc:
-    case e
-    when Numeric
-      sign = %w(+ + -)[e <=> 0]
-      e = e.abs
-    end
+      s = e.to_s
 
-    s = e.to_s
+      if f[:s] && f[:p] == '0'
+        f[:w] -= 1
+      end
 
-    if f[:s] && f[:p] == '0'
-      f[:w] -= 1
-    end
+      if f[:s] && f[:p] == "\s"
+        s[0,0] = sign
+      end
 
-    if f[:s] && f[:p] == "\s"
-      s[0,0] = sign
-    end
+      if f[:p] != '-'
+        s = s.rjust(f[:w], f[:p])
+      end
 
-    if f[:p] != '-'
-      s = s.rjust(f[:w], f[:p])
-    end
+      if f[:s] && f[:p] != "\s"
+        s[0,0] = sign
+      end
 
-    if f[:s] && f[:p] != "\s"
-      s[0,0] = sign
+      s = s.upcase if f[:u]
+      s = s.downcase if f[:d]
+      s
     end
 
-    s = s.upcase if f[:u]
-    s = s.downcase if f[:d]
-    s
-  end
+    def emit_w(e, w, f) # :nodoc:
+      f[:w] = [f[:w], w].compact.max
+      emit(e, f)
+    end
 
-  def emit_w(e, w, f) # :nodoc:
-    f[:w] = [f[:w], w].compact.max
-    emit(e, f)
-  end
+    def emit_n(e, w, f) # :nodoc:
+      f[:p] ||= '0'
+      emit_w(e, w, f)
+    end
 
-  def emit_n(e, w, f) # :nodoc:
-    f[:p] ||= '0'
-    emit_w(e, w, f)
-  end
+    def emit_sn(e, w, f) # :nodoc:
+      if e < 0
+        w += 1
+        f[:s] = true
+      end
+      emit_n(e, w, f)
+    end
 
-  def emit_sn(e, w, f) # :nodoc:
-    if e < 0
+    def emit_z(e, w, f) # :nodoc:
       w += 1
       f[:s] = true
+      emit_n(e, w, f)
     end
-    emit_n(e, w, f)
-  end
 
-  def emit_z(e, w, f) # :nodoc:
-    w += 1
-    f[:s] = true
-    emit_n(e, w, f)
-  end
-
-  def emit_a(e, w, f) # :nodoc:
-    f[:p] ||= "\s"
-    emit_w(e, w, f)
-  end
+    def emit_a(e, w, f) # :nodoc:
+      f[:p] ||= "\s"
+      emit_w(e, w, f)
+    end
 
-  def emit_ad(e, w, f) # :nodoc:
-    if f[:x]
-      f[:u] = true
-      f[:d] = false
+    def emit_ad(e, w, f) # :nodoc:
+      if f[:x]
+        f[:u] = true
+        f[:d] = false
+      end
+      emit_a(e, w, f)
     end
-    emit_a(e, w, f)
-  end
 
-  def emit_au(e, w, f) # :nodoc:
-    if f[:x]
-      f[:u] = false
-      f[:d] = true
+    def emit_au(e, w, f) # :nodoc:
+      if f[:x]
+        f[:u] = false
+        f[:d] = true
+      end
+      emit_a(e, w, f)
     end
-    emit_a(e, w, f)
-  end
 
-  private :emit, :emit_w, :emit_n, :emit_sn, :emit_z,
-	  :emit_a, :emit_ad, :emit_au
+    private :emit, :emit_w, :emit_n, :emit_sn, :emit_z,
+  	  :emit_a, :emit_ad, :emit_au
 
-  def strftime(fmt='%F')
-    fmt.gsub(/%([-_0^#]+)?(\d+)?([EO]?(?::{1,3}z|.))/m) do
+    def strftime(fmt='%F')
+      fmt.gsub(/%([-_0^#]+)?(\d+)?([EO]?(?::{1,3}z|.))/m) do
       f = {}
       m = $&
       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)
@@ -242,11 +244,11 @@ class Date
       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)
@@ -255,1059 +257,1054 @@ class Date
       when 'j'; emit_n(yday, 3, f)
       when 'k'; emit_a(hour, 2, f)
       when 'L'
-	f[:p] = nil
-	w = f[:w] || 3
-	u = 10**w
-	emit_n((sec_fraction * u).floor, w, f)
+        f[:p] = nil
+        w = f[:w] || 3
+        u = 10**w
+        emit_n((sec_fraction * u).floor, w, 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'
-	f[:p] = nil
-	w = f[:w] || 9
-	u = 10**w
-	emit_n((sec_fraction * u).floor, w, f)
+        f[:p] = nil
+        w = f[:w] || 9
+        u = 10**w
+        emit_n((sec_fraction * u).floor, w, f)
       when 'n'; emit_a("\n", 0, f)
       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)
-      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)
-      when 'T'
-	if m == '%T'
-	  format('%02d:%02d:%02d', hour, min, sec) # 4p
-	else
-	  emit_a(strftime('%H:%M:%S'), 0, f)
-	end
-      when 't'; emit_a("\t", 0, f)
-      when 'U', 'W', 'OU', 'OW'
-	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)
-      when 'w', 'Ow'; emit_n(wday, 1, f)
-      when 'X', 'EX'; emit_a(strftime('%H:%M:%S'), 0, f)
-      when 'x', 'Ex'; emit_a(strftime('%m/%d/%y'), 0, f)
-      when 'Y', 'EY'; emit_sn(year, 4, 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)
+    when 'Q'
+      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)
+    when 'T'
+      if m == '%T'
+        format('%02d:%02d:%02d', hour, min, sec) # 4p
+      else
+        emit_a(strftime('%H:%M:%S'), 0, f)
+      end
+    when 't'; emit_a("\t", 0, f)
+    when 'U', 'W', 'OU', 'OW'
+      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)
+    when 'w', 'Ow'; emit_n(wday, 1, f)
+    when 'X', 'EX'; emit_a(strftime('%H:%M:%S'), 0, f)
+    when 'x', 'Ex'; emit_a(strftime('%m/%d/%y'), 0, f)
+    when 'Y', 'EY'; emit_sn(year, 4, 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)
       when '%'; emit_a('%', 0, f)
       when '+'; emit_a(strftime('%a %b %e %H:%M:%S %Z %Y'), 0, f)
       else
-	m
+        m
       end
     end
   end
 
-# alias_method :format, :strftime
+  # alias_method :format, :strftime
 
-  def asctime() strftime('%c') end
+    def asctime() strftime('%c') end
 
-  alias_method :ctime, :asctime
+    alias_method :ctime, :asctime
 
-  def iso8601() strftime('%F') end
+    def iso8601() strftime('%F') end
 
-  def rfc3339() iso8601 end
+    def rfc3339() iso8601 end
 
-  def xmlschema() iso8601 end # :nodoc:
+    def xmlschema() iso8601 end # :nodoc:
 
-  def rfc2822() strftime('%a, %-d %b %Y %T %z') end
+    def rfc2822() strftime('%a, %-d %b %Y %T %z') end
 
-  alias_method :rfc822, :rfc2822
+    alias_method :rfc822, :rfc2822
 
-  def httpdate() new_offset(0).strftime('%a, %d %b %Y %T GMT') end # :nodoc:
+    def httpdate() new_offset(0).strftime('%a, %d %b %Y %T GMT') end # :nodoc:
 
-  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)
+    def jisx0301
+      if jd < 2405160
+        iso8601
       else
-	g = 'H%02d' % (year - 1988)
+        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
-      g + strftime('.%m.%d')
     end
-  end
 
-=begin
-  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 self.num_pattern? (s) # :nodoc:
-    /\A%[EO]?[CDdeFGgHIjkLlMmNQRrSsTUuVvWwXxYy\d]/ =~ s || /\A\d/ =~ s
-  end
-
-  private_class_method :num_pattern?
+    #   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
+    end
 
-  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!(/\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', '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)
-	else
-	  return unless str.sub!(Regexp.new('\\A' + Regexp.quote(a)), '')
-	end
-      else
-	case c
-	when /\A\s/
-	  str.sub!(/\A\s+/, '')
-	else
-	  return unless str.sub!(Regexp.new('\\A' + Regexp.quote(a)), '')
-	end
+    private_class_method :num_pattern?
+
+    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!(/\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', '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)
+  	else
+  	  return unless str.sub!(Regexp.new('\\A' + Regexp.quote(a)), '')
+  	end
+        else
+  	case c
+  	when /\A\s/
+  	  str.sub!(/\A\s+/, '')
+  	else
+  	  return unless str.sub!(Regexp.new('\\A' + Regexp.quote(a)), '')
+  	end
+        end
       end
     end
-  end
 
-  private_class_method :_strptime_i
+    private_class_method :_strptime_i
 
-  def self._strptime(str, fmt='%F')
-    str = str.dup
-    e = Format::Bag.new
-    return unless _strptime_i(str, fmt, e)
-
-    if e._cent
-      if e.cwyear
-	e.cwyear += e._cent * 100
-      end
-      if e.year
-	e.  year += e._cent * 100
+    def self._strptime(str, fmt='%F')
+      str = str.dup
+      e = Format::Bag.new
+      return unless _strptime_i(str, fmt, e)
+
+      if e._cent
+        if e.cwyear
+  	e.cwyear += e._cent * 100
+        end
+        if e.year
+  	e.  year += e._cent * 100
+        end
       end
-    end
 
-    if e._merid
-      if e.hour
-	e.hour %= 12
-	e.hour += e._merid
+      if e._merid
+        if e.hour
+  	e.hour %= 12
+  	e.hour += e._merid
+        end
       end
-    end
-
-    unless str.empty?
-      e.leftover = str
-    end
 
-    e.to_hash
-  end
+      unless str.empty?
+        e.leftover = str
+      end
 
-  def self.s3e(e, y, m, d, bc=false)
-    unless String === m
-      m = m.to_s
+      e.to_hash
     end
 
-    if y && m && !d
-      y, m, d = d, y, m
-    end
+    def self.s3e(e, y, m, d, bc=false)
+      unless String === m
+        m = m.to_s
+      end
 
-    if y == nil
-      if d && d.size > 2
-	y = d
-	d = nil
+      if y && m && !d
+        y, m, d = d, y, m
       end
-      if d && d[0,1] == "'"
-	y = d
-	d = nil
+
+      if y == nil
+        if d && d.size > 2
+  	y = d
+  	d = nil
+        end
+        if d && d[0,1] == "'"
+  	y = d
+  	d = nil
+        end
       end
-    end
 
-    if y
-      y.scan(/(\d+)(.+)?/)
-      if $2
-	y, d = d, $1
+      if y
+        y.scan(/(\d+)(.+)?/)
+        if $2
+  	y, d = d, $1
+        end
       end
-    end
 
-    if m
-      if m[0,1] == "'" || m.size > 2
-	y, m, d = m, d, y # us -> be
+      if m
+        if m[0,1] == "'" || m.size > 2
+  	y, m, d = m, d, y # us -> be
+        end
       end
-    end
 
-    if d
-      if d[0,1] == "'" || d.size > 2
-	y, d = d, y
+      if d
+        if d[0,1] == "'" || d.size > 2
+  	y, d = d, y
+        end
       end
-    end
 
-    if y
-      y =~ /([-+])?(\d+)/
-      if $1 || $2.size > 2
-	c = false
+      if y
+        y =~ /([-+])?(\d+)/
+        if $1 || $2.size > 2
+  	c = false
+        end
+        iy = $&.to_i
+        if bc
+  	iy = -iy + 1
+        end
+        e.year = iy
       end
-      iy = $&.to_i
-      if bc
-	iy = -iy + 1
+
+      if m
+        m =~ /\d+/
+        e.mon = $&.to_i
       end
-      e.year = iy
-    end
 
-    if m
-      m =~ /\d+/
-      e.mon = $&.to_i
-    end
+      if d
+        d =~ /\d+/
+        e.mday = $&.to_i
+      end
 
-    if d
-      d =~ /\d+/
-      e.mday = $&.to_i
-    end
+      if c != nil
+        e._comp = c
+      end
 
-    if c != nil
-      e._comp = c
     end
 
-  end
+    private_class_method :s3e
 
-  private_class_method :s3e
-
-  def self._parse_day(str, e) # :nodoc:
-    if str.sub!(/\b(#{Format::ABBR_DAYS.keys.join('|')})[^-\d\s]*/io, ' ')
-      e.wday = Format::ABBR_DAYS[$1.downcase]
-      true
-=begin
-    elsif str.sub!(/\b(?!\dth)(su|mo|tu|we|th|fr|sa)\b/i, ' ')
-      e.wday = %w(su mo tu we th fr sa).index($1.downcase)
-      true
-=end
+    def self._parse_day(str, e) # :nodoc:
+      if str.sub!(/\b(#{Format::ABBR_DAYS.keys.join('|')})[^-\d\s]*/io, ' ')
+        e.wday = Format::ABBR_DAYS[$1.downcase]
+        true
+        # elsif str.sub!(/\b(?!\dth)(su|mo|tu|we|th|fr|sa)\b/i, ' ')
+        # e.wday = %w(su mo tu we th fr sa).index($1.downcase)
+        # true
+      end
     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
-		   )
-		 )?
-		/ix,
-		' ')
-
-      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\.))?/ix
-
-      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
+    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
+  		   )
+  		 )?
+  		/ix,
+  		' ')
+
+        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\.))?/ix
+
+        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
+        end
+        true
       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_eu(str, e) # :nodoc:
-    if str.sub!(
-		/'?(\d+)[^-\d\s]*
-		 \s*
-		 (#{Format::ABBR_MONTHS.keys.join('|')})[^-\d\s']*
-		 (?:
-		   \s*
-		   (c(?:e|\.e\.)|b(?:ce|\.c\.e\.)|a(?:d|\.d\.)|b(?:c|\.c\.))?
-		   \s*
-		   ('?-?\d+(?:(?:st|nd|rd|th)\b)?)
-		 )?
-		/iox,
-		' ') # '
-      s3e(e, $4, Format::ABBR_MONTHS[$2.downcase], $1,
-	  $3 && $3[0,1].downcase == 'b')
-      true
+    #   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
+
+    def self._parse_eu(str, e) # :nodoc:
+      if str.sub!(
+  		/'?(\d+)[^-\d\s]*
+  		 \s*
+  		 (#{Format::ABBR_MONTHS.keys.join('|')})[^-\d\s']*
+  		 (?:
+  		   \s*
+  		   (c(?:e|\.e\.)|b(?:ce|\.c\.e\.)|a(?:d|\.d\.)|b(?:c|\.c\.))?
+  		   \s*
+  		   ('?-?\d+(?:(?:st|nd|rd|th)\b)?)
+  		 )?
+  		/iox,
+  		' ') # '
+        s3e(e, $4, Format::ABBR_MONTHS[$2.downcase], $1,
+  	  $3 && $3[0,1].downcase == 'b')
+        true
+      end
     end
-  end
 
-  def self._parse_us(str, e) # :nodoc:
-    if str.sub!(
-		/\b(#{Format::ABBR_MONTHS.keys.join('|')})[^-\d\s']*
-		 \s*
-		 ('?\d+)[^-\d\s']*
-		 (?:
-		   \s*
-		   (c(?:e|\.e\.)|b(?:ce|\.c\.e\.)|a(?:d|\.d\.)|b(?:c|\.c\.))?
-		   \s*
-		   ('?-?\d+)
-		 )?
-		/iox,
-		' ') # '
-      s3e(e, $4, Format::ABBR_MONTHS[$1.downcase], $2,
-	  $3 && $3[0,1].downcase == 'b')
-      true
+    def self._parse_us(str, e) # :nodoc:
+      if str.sub!(
+  		/\b(#{Format::ABBR_MONTHS.keys.join('|')})[^-\d\s']*
+  		 \s*
+  		 ('?\d+)[^-\d\s']*
+  		 (?:
+  		   \s*
+  		   (c(?:e|\.e\.)|b(?:ce|\.c\.e\.)|a(?:d|\.d\.)|b(?:c|\.c\.))?
+  		   \s*
+  		   ('?-?\d+)
+  		 )?
+  		/iox,
+  		' ') # '
+        s3e(e, $4, Format::ABBR_MONTHS[$1.downcase], $2,
+  	  $3 && $3[0,1].downcase == 'b')
+        true
+      end
     end
-  end
 
-  def self._parse_iso(str, e) # :nodoc:
-    if str.sub!(/('?[-+]?\d+)-(\d+)-('?-?\d+)/, ' ')
-      s3e(e, $1, $2, $3)
-      true
+    def self._parse_iso(str, e) # :nodoc:
+      if str.sub!(/('?[-+]?\d+)-(\d+)-('?-?\d+)/, ' ')
+        s3e(e, $1, $2, $3)
+        true
+      end
     end
-  end
 
-  def self._parse_iso2(str, e) # :nodoc:
-    if str.sub!(/\b(\d{2}|\d{4})?-?w(\d{2})(?:-?(\d))?\b/i, ' ')
-      e.cwyear = $1.to_i if $1
-      e.cweek = $2.to_i
-      e.cwday = $3.to_i if $3
-      true
-    elsif str.sub!(/-w-(\d)\b/i, ' ')
-      e.cwday = $1.to_i
-      true
-    elsif str.sub!(/--(\d{2})?-(\d{2})\b/, ' ')
-      e.mon = $1.to_i if $1
-      e.mday = $2.to_i
-      true
-    elsif str.sub!(/--(\d{2})(\d{2})?\b/, ' ')
-      e.mon = $1.to_i
-      e.mday = $2.to_i if $2
-      true
-    elsif /[,.](\d{2}|\d{4})-\d{3}\b/ !~ str &&
-	str.sub!(/\b(\d{2}|\d{4})-(\d{3})\b/, ' ')
-      e.year = $1.to_i
-      e.yday = $2.to_i
-      true
-    elsif /\d-\d{3}\b/ !~ str &&
-	str.sub!(/\b-(\d{3})\b/, ' ')
-      e.yday = $1.to_i
-      true
+    def self._parse_iso2(str, e) # :nodoc:
+      if str.sub!(/\b(\d{2}|\d{4})?-?w(\d{2})(?:-?(\d))?\b/i, ' ')
+        e.cwyear = $1.to_i if $1
+        e.cweek = $2.to_i
+        e.cwday = $3.to_i if $3
+        true
+      elsif str.sub!(/-w-(\d)\b/i, ' ')
+        e.cwday = $1.to_i
+        true
+      elsif str.sub!(/--(\d{2})?-(\d{2})\b/, ' ')
+        e.mon = $1.to_i if $1
+        e.mday = $2.to_i
+        true
+      elsif str.sub!(/--(\d{2})(\d{2})?\b/, ' ')
+        e.mon = $1.to_i
+        e.mday = $2.to_i if $2
+        true
+      elsif /[,.](\d{2}|\d{4})-\d{3}\b/ !~ str &&
+  	str.sub!(/\b(\d{2}|\d{4})-(\d{3})\b/, ' ')
+        e.year = $1.to_i
+        e.yday = $2.to_i
+        true
+      elsif /\d-\d{3}\b/ !~ str &&
+  	str.sub!(/\b-(\d{3})\b/, ' ')
+        e.yday = $1.to_i
+        true
+      end
     end
-  end
 
-  def self._parse_jis(str, e) # :nodoc:
-    if str.sub!(/\b([mtsh])(\d+)\.(\d+)\.(\d+)/i, ' ')
-      era = { 'm'=>1867,
-	      't'=>1911,
-	      's'=>1925,
-	      'h'=>1988
-	  }[$1.downcase]
-      e.year = $2.to_i + era
-      e.mon = $3.to_i
-      e.mday = $4.to_i
-      true
+    def self._parse_jis(str, e) # :nodoc:
+      if str.sub!(/\b([mtsh])(\d+)\.(\d+)\.(\d+)/i, ' ')
+        era = { 'm'=>1867,
+  	      't'=>1911,
+  	      's'=>1925,
+  	      'h'=>1988
+  	  }[$1.downcase]
+        e.year = $2.to_i + era
+        e.mon = $3.to_i
+        e.mday = $4.to_i
+        true
+      end
     end
-  end
 
-  def self._parse_vms(str, e) # :nodoc:
-    if str.sub!(/('?-?\d+)-(#{Format::ABBR_MONTHS.keys.join('|')})[^-]*
-		-('?-?\d+)/iox, ' ')
-      s3e(e, $3, Format::ABBR_MONTHS[$2.downcase], $1)
-      true
-    elsif str.sub!(/\b(#{Format::ABBR_MONTHS.keys.join('|')})[^-]*
-		-('?-?\d+)(?:-('?-?\d+))?/iox, ' ')
-      s3e(e, $3, Format::ABBR_MONTHS[$1.downcase], $2)
-      true
+    def self._parse_vms(str, e) # :nodoc:
+      if str.sub!(/('?-?\d+)-(#{Format::ABBR_MONTHS.keys.join('|')})[^-]*
+  		-('?-?\d+)/iox, ' ')
+        s3e(e, $3, Format::ABBR_MONTHS[$2.downcase], $1)
+        true
+      elsif str.sub!(/\b(#{Format::ABBR_MONTHS.keys.join('|')})[^-]*
+  		-('?-?\d+)(?:-('?-?\d+))?/iox, ' ')
+        s3e(e, $3, Format::ABBR_MONTHS[$1.downcase], $2)
+        true
+      end
     end
-  end
 
-  def self._parse_sla(str, e) # :nodoc:
-    if str.sub!(%r|('?-?\d+)/\s*('?\d+)(?:\D\s*('?-?\d+))?|, ' ') # '
-      s3e(e, $1, $2, $3)
-      true
+    def self._parse_sla(str, e) # :nodoc:
+      if str.sub!(%r|('?-?\d+)/\s*('?\d+)(?:\D\s*('?-?\d+))?|, ' ') # '
+        s3e(e, $1, $2, $3)
+        true
+      end
     end
-  end
 
-  def self._parse_dot(str, e) # :nodoc:
-    if str.sub!(%r|('?-?\d+)\.\s*('?\d+)\.\s*('?-?\d+)|, ' ') # '
-      s3e(e, $1, $2, $3)
-      true
+    def self._parse_dot(str, e) # :nodoc:
+      if str.sub!(%r|('?-?\d+)\.\s*('?\d+)\.\s*('?-?\d+)|, ' ') # '
+        s3e(e, $1, $2, $3)
+        true
+      end
     end
-  end
 
-  def self._parse_year(str, e) # :nodoc:
-    if str.sub!(/'(\d+)\b/, ' ')
-      e.year = $1.to_i
-      true
+    def self._parse_year(str, e) # :nodoc:
+      if str.sub!(/'(\d+)\b/, ' ')
+        e.year = $1.to_i
+        true
+      end
     end
-  end
 
-  def self._parse_mon(str, e) # :nodoc:
-    if str.sub!(/\b(#{Format::ABBR_MONTHS.keys.join('|')})\S*/io, ' ')
-      e.mon = Format::ABBR_MONTHS[$1.downcase]
-      true
+    def self._parse_mon(str, e) # :nodoc:
+      if str.sub!(/\b(#{Format::ABBR_MONTHS.keys.join('|')})\S*/io, ' ')
+        e.mon = Format::ABBR_MONTHS[$1.downcase]
+        true
+      end
     end
-  end
 
-  def self._parse_mday(str, e) # :nodoc:
-    if str.sub!(/(\d+)(st|nd|rd|th)\b/i, ' ')
-      e.mday = $1.to_i
-      true
+    def self._parse_mday(str, e) # :nodoc:
+      if str.sub!(/(\d+)(st|nd|rd|th)\b/i, ' ')
+        e.mday = $1.to_i
+        true
+      end
     end
-  end
 
-  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[^\]]*\]
-		    )
-		  )?
-		/ix,
-		' ')
-      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
-      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
-      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
-      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
-      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
-      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
-      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
-	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)
+    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[^\]]*\]
+  		    )
+  		  )?
+  		/ix,
+  		' ')
+        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
+        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
+        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
+        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
+        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
+        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
+        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
+  	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)
+        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
+        end
+        true
       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
-      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
-
-  def self._parse(str, comp=true)
-    str = str.dup
 
-    e = Format::Bag.new
+    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
 
-    e._comp = comp
+    def self._parse(str, comp=true)
+      str = str.dup
 
-    str.gsub!(/[^-+',.\/:@[:alnum:]\[\]]+/, ' ')
-
-    _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(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)
+      e = Format::Bag.new
 
-    if str.sub!(/\b(bc\b|bce\b|b\.c\.|b\.c\.e\.)/i, ' ')
-      if e.year
-	e.year = -e.year + 1
+      e._comp = comp
+
+      str.gsub!(/[^-+',.\/:@[:alnum:]\[\]]+/, ' ')
+
+      _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(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\.)/i, ' ')
+        if e.year
+  	e.year = -e.year + 1
+        end
       end
-    end
 
-    if str.sub!(/\A\s*(\d{1,2})\s*\z/, ' ')
-      if e.hour && !e.mday
-	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
+      if str.sub!(/\A\s*(\d{1,2})\s*\z/, ' ')
+        if e.hour && !e.mday
+  	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
+        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
-      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._comp
+        if e.cwyear
+  	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
+        end
       end
-    end
 
-    e.offset ||= zone_to_diff(e.zone) if e.zone
+      e.offset ||= zone_to_diff(e.zone) if e.zone
 
-    e.to_hash
-  end
-
-  def self._iso8601(str) # :nodoc:
-    if /\A\s*(([-+]?\d{2,}|-)-\d{2}-\d{2}|
-	      ([-+]?\d{2,})?-\d{3}|
-	      (\d{2}|\d{4})?-w\d{2}-\d|
-	      -w-\d)
-	(t
-	\d{2}:\d{2}(:\d{2}([,.]\d+)?)?
-	(z|[-+]\d{2}(:?\d{2})?)?)?\s*\z/ix =~ str
-      _parse(str)
-    elsif /\A\s*(([-+]?(\d{2}|\d{4})|--)\d{2}\d{2}|
-	      ([-+]?(\d{2}|\d{4}))?\d{3}|-\d{3}|
-	      (\d{2}|\d{4})?w\d{2}\d)
-	(t?
-	\d{2}\d{2}(\d{2}([,.]\d+)?)?
-	(z|[-+]\d{2}(\d{2})?)?)?\s*\z/ix =~ str
-      _parse(str)
-    elsif /\A\s*(\d{2}:\d{2}(:\d{2}([,.]\d+)?)?
-	(z|[-+]\d{2}(:?\d{2})?)?)?\s*\z/ix =~ str
-      _parse(str)
-    elsif /\A\s*(\d{2}\d{2}(\d{2}([,.]\d+)?)?
-	(z|[-+]\d{2}(\d{2})?)?)?\s*\z/ix =~ str
-      _parse(str)
+      e.to_hash
     end
-  end
 
-  def self._rfc3339(str) # :nodoc:
-    if /\A\s*-?\d{4}-\d{2}-\d{2} # allow minus, anyway
-	(t|\s)
-	\d{2}:\d{2}:\d{2}(\.\d+)?
-	(z|[-+]\d{2}:\d{2})\s*\z/ix =~ str
-      _parse(str)
+    def self._iso8601(str) # :nodoc:
+      if /\A\s*(([-+]?\d{2,}|-)-\d{2}-\d{2}|
+  	      ([-+]?\d{2,})?-\d{3}|
+  	      (\d{2}|\d{4})?-w\d{2}-\d|
+  	      -w-\d)
+  	(t
+  	\d{2}:\d{2}(:\d{2}([,.]\d+)?)?
+  	(z|[-+]\d{2}(:?\d{2})?)?)?\s*\z/ix =~ str
+        _parse(str)
+      elsif /\A\s*(([-+]?(\d{2}|\d{4})|--)\d{2}\d{2}|
+  	      ([-+]?(\d{2}|\d{4}))?\d{3}|-\d{3}|
+  	      (\d{2}|\d{4})?w\d{2}\d)
+  	(t?
+  	\d{2}\d{2}(\d{2}([,.]\d+)?)?
+  	(z|[-+]\d{2}(\d{2})?)?)?\s*\z/ix =~ str
+        _parse(str)
+      elsif /\A\s*(\d{2}:\d{2}(:\d{2}([,.]\d+)?)?
+  	(z|[-+]\d{2}(:?\d{2})?)?)?\s*\z/ix =~ str
+        _parse(str)
+      elsif /\A\s*(\d{2}\d{2}(\d{2}([,.]\d+)?)?
+  	(z|[-+]\d{2}(\d{2})?)?)?\s*\z/ix =~ str
+        _parse(str)
+      end
     end
-  end
 
-  def self._xmlschema(str) # :nodoc:
-    if /\A\s*(-?\d{4,})(?:-(\d{2})(?:-(\d{2}))?)?
-	(?:t
-	  (\d{2}):(\d{2}):(\d{2})(?:\.(\d+))?)?
-	(z|[-+]\d{2}:\d{2})?\s*\z/ix =~ str
-      e = Format::Bag.new
-      e.year = $1.to_i
-      e.mon = $2.to_i if $2
-      e.mday = $3.to_i if $3
-      e.hour = $4.to_i if $4
-      e.min = $5.to_i if $5
-      e.sec = $6.to_i if $6
-      e.sec_fraction = Rational($7.to_i, 10**$7.size) if $7
-      if $8
-	e.zone = $8
-	e.offset = zone_to_diff($8)
-      end
-      e.to_hash
-    elsif /\A\s*(\d{2}):(\d{2}):(\d{2})(?:\.(\d+))?
-	(z|[-+]\d{2}:\d{2})?\s*\z/ix =~ str
-      e = Format::Bag.new
-      e.hour = $1.to_i if $1
-      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.zone = $5
-	e.offset = zone_to_diff($5)
+    def self._rfc3339(str) # :nodoc:
+      if /\A\s*-?\d{4}-\d{2}-\d{2} # allow minus, anyway
+  	(t|\s)
+  	\d{2}:\d{2}:\d{2}(\.\d+)?
+  	(z|[-+]\d{2}:\d{2})\s*\z/ix =~ str
+        _parse(str)
       end
-      e.to_hash
-    elsif /\A\s*(?:--(\d{2})(?:-(\d{2}))?|---(\d{2}))
-	(z|[-+]\d{2}:\d{2})?\s*\z/ix =~ str
-      e = Format::Bag.new
-      e.mon = $1.to_i if $1
-      e.mday = $2.to_i if $2
-      e.mday = $3.to_i if $3
-      if $4
-	e.zone = $4
-	e.offset = zone_to_diff($4)
-      end
-      e.to_hash
     end
-  end
 
-  def self._rfc2822(str) # :nodoc:
-    if /\A\s*(?:(?:#{Format::ABBR_DAYS.keys.join('|')})\s*,\s+)?
-	\d{1,2}\s+
-	(?:#{Format::ABBR_MONTHS.keys.join('|')})\s+
-	-?(\d{2,})\s+ # allow minus, anyway
-	\d{2}:\d{2}(:\d{2})?\s*
-	(?:[-+]\d{4}|ut|gmt|e[sd]t|c[sd]t|m[sd]t|p[sd]t|[a-ik-z])\s*\z/iox =~ str
-      e = _parse(str, false)
-      if $1.size < 4
-	if e[:year] < 50
-	  e[:year] += 2000
-	elsif e[:year] < 1000
-	  e[:year] += 1900
-	end
+    def self._xmlschema(str) # :nodoc:
+      if /\A\s*(-?\d{4,})(?:-(\d{2})(?:-(\d{2}))?)?
+  	(?:t
+  	  (\d{2}):(\d{2}):(\d{2})(?:\.(\d+))?)?
+  	(z|[-+]\d{2}:\d{2})?\s*\z/ix =~ str
+        e = Format::Bag.new
+        e.year = $1.to_i
+        e.mon = $2.to_i if $2
+        e.mday = $3.to_i if $3
+        e.hour = $4.to_i if $4
+        e.min = $5.to_i if $5
+        e.sec = $6.to_i if $6
+        e.sec_fraction = Rational($7.to_i, 10**$7.size) if $7
+        if $8
+  	e.zone = $8
+  	e.offset = zone_to_diff($8)
+        end
+        e.to_hash
+      elsif /\A\s*(\d{2}):(\d{2}):(\d{2})(?:\.(\d+))?
+  	(z|[-+]\d{2}:\d{2})?\s*\z/ix =~ str
+        e = Format::Bag.new
+        e.hour = $1.to_i if $1
+        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.zone = $5
+  	e.offset = zone_to_diff($5)
+        end
+        e.to_hash
+      elsif /\A\s*(?:--(\d{2})(?:-(\d{2}))?|---(\d{2}))
+  	(z|[-+]\d{2}:\d{2})?\s*\z/ix =~ str
+        e = Format::Bag.new
+        e.mon = $1.to_i if $1
+        e.mday = $2.to_i if $2
+        e.mday = $3.to_i if $3
+        if $4
+  	e.zone = $4
+  	e.offset = zone_to_diff($4)
+        end
+        e.to_hash
       end
-      e
     end
-  end
 
-  class << self; alias_method :_rfc822, :_rfc2822 end
-
-  def self._httpdate(str) # :nodoc:
-    if /\A\s*(#{Format::ABBR_DAYS.keys.join('|')})\s*,\s+
-	\d{2}\s+
-	(#{Format::ABBR_MONTHS.keys.join('|')})\s+
-	-?\d{4}\s+ # allow minus, anyway
-	\d{2}:\d{2}:\d{2}\s+
-	gmt\s*\z/iox =~ str
-      _rfc2822(str)
-    elsif /\A\s*(#{Format::DAYS.keys.join('|')})\s*,\s+
-	\d{2}\s*-\s*
-	(#{Format::ABBR_MONTHS.keys.join('|')})\s*-\s*
-	\d{2}\s+
-	\d{2}:\d{2}:\d{2}\s+
-	gmt\s*\z/iox =~ str
-      _parse(str)
-    elsif /\A\s*(#{Format::ABBR_DAYS.keys.join('|')})\s+
-	(#{Format::ABBR_MONTHS.keys.join('|')})\s+
-	\d{1,2}\s+
-	\d{2}:\d{2}:\d{2}\s+
-	\d{4}\s*\z/iox =~ str
-      _parse(str)
+    def self._rfc2822(str) # :nodoc:
+      if /\A\s*(?:(?:#{Format::ABBR_DAYS.keys.join('|')})\s*,\s+)?
+  	\d{1,2}\s+
+  	(?:#{Format::ABBR_MONTHS.keys.join('|')})\s+
+  	-?(\d{2,})\s+ # allow minus, anyway
+  	\d{2}:\d{2}(:\d{2})?\s*
+  	(?:[-+]\d{4}|ut|gmt|e[sd]t|c[sd]t|m[sd]t|p[sd]t|[a-ik-z])\s*\z/iox =~ str
+        e = _parse(str, false)
+        if $1.size < 4
+  	if e[:year] < 50
+  	  e[:year] += 2000
+  	elsif e[:year] < 1000
+  	  e[:year] += 1900
+  	end
+        end
+        e
+      end
     end
-  end
 
-  def self._jisx0301(str) # :nodoc:
-    if /\A\s*[mtsh]?\d{2}\.\d{2}\.\d{2}
-	(t
-	(\d{2}:\d{2}(:\d{2}([,.]\d*)?)?
-	(z|[-+]\d{2}(:?\d{2})?)?)?)?\s*\z/ix =~ str
-      if /\A\s*\d/ =~ str
-	_parse(str.sub(/\A\s*(\d)/, 'h\1'))
-      else
-	_parse(str)
+    class << self; alias_method :_rfc822, :_rfc2822 end
+
+    def self._httpdate(str) # :nodoc:
+      if /\A\s*(#{Format::ABBR_DAYS.keys.join('|')})\s*,\s+
+  	\d{2}\s+
+  	(#{Format::ABBR_MONTHS.keys.join('|')})\s+
+  	-?\d{4}\s+ # allow minus, anyway
+  	\d{2}:\d{2}:\d{2}\s+
+  	gmt\s*\z/iox =~ str
+        _rfc2822(str)
+      elsif /\A\s*(#{Format::DAYS.keys.join('|')})\s*,\s+
+  	\d{2}\s*-\s*
+  	(#{Format::ABBR_MONTHS.keys.join('|')})\s*-\s*
+  	\d{2}\s+
+  	\d{2}:\d{2}:\d{2}\s+
+  	gmt\s*\z/iox =~ str
+        _parse(str)
+      elsif /\A\s*(#{Format::ABBR_DAYS.keys.join('|')})\s+
+  	(#{Format::ABBR_MONTHS.keys.join('|')})\s+
+  	\d{1,2}\s+
+  	\d{2}:\d{2}:\d{2}\s+
+  	\d{4}\s*\z/iox =~ str
+        _parse(str)
       end
-    else
-      _iso8601(str)
     end
-  end
-
-  t = Module.new do
-
-    private
 
-    def zone_to_diff(zone) # :nodoc:
-      zone = zone.downcase
-      if zone.sub!(/\s+(standard|daylight)\s+time\z/, '')
-	dst = $1 == 'daylight'
+    def self._jisx0301(str) # :nodoc:
+      if /\A\s*[mtsh]?\d{2}\.\d{2}\.\d{2}
+  	(t
+  	(\d{2}:\d{2}(:\d{2}([,.]\d*)?)?
+  	(z|[-+]\d{2}(:?\d{2})?)?)?)?\s*\z/ix =~ str
+        if /\A\s*\d/ =~ str
+  	_parse(str.sub(/\A\s*(\d)/, 'h\1'))
+        else
+  	_parse(str)
+        end
       else
-	dst = zone.sub!(/\s+dst\z/, '')
+        _iso8601(str)
       end
-      if Format::ZONES.include?(zone)
-	offset = Format::ZONES[zone]
-	offset += 3600 if dst
-      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 = 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
-	end
-	offset = hour.to_i * 3600 + min.to_i * 60 + sec.to_i
-	offset *= -1 if sign == '-'
+    end
+
+    t = Module.new do
+
+      private
+
+      def 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 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 = 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
+  	end
+  	offset = hour.to_i * 3600 + min.to_i * 60 + sec.to_i
+  	offset *= -1 if sign == '-'
+        end
+        offset
       end
-      offset
+
     end
 
-  end
+    extend  t
+    include t
 
-  extend  t
-  include t
+  end
 
-end
+  class DateTime < Date
 
-class DateTime < Date
+    def strftime(fmt='%FT%T%:z')
+      super(fmt)
+    end
 
-  def strftime(fmt='%FT%T%:z')
-    super(fmt)
-  end
+    def self._strptime(str, fmt='%FT%T%z')
+      super(str, fmt)
+    end
 
-  def self._strptime(str, fmt='%FT%T%z')
-    super(str, fmt)
-  end
+    def iso8601_timediv(n) # :nodoc:
+      strftime('T%T' +
+  	     if n < 1
+  	       ''
+  	     else
+  	       '.%0*d' % [n, (sec_fraction / Rational(1, 10**n)).round]
+  	     end +
+  	     '%:z')
+    end
 
-  def iso8601_timediv(n) # :nodoc:
-    strftime('T%T' +
-	     if n < 1
-	       ''
-	     else
-	       '.%0*d' % [n, (sec_fraction / Rational(1, 10**n)).round]
-	     end +
-	     '%:z')
-  end
+    private :iso8601_timediv
 
-  private :iso8601_timediv
+    def iso8601(n=0)
+      super() + iso8601_timediv(n)
+    end
 
-  def iso8601(n=0)
-    super() + iso8601_timediv(n)
-  end
+    def rfc3339(n=0) iso8601(n) end
 
-  def rfc3339(n=0) iso8601(n) end
+    def xmlschema(n=0) iso8601(n) end # :nodoc:
 
-  def xmlschema(n=0) iso8601(n) end # :nodoc:
+    def jisx0301(n=0)
+      super() + iso8601_timediv(n)
+    end
 
-  def jisx0301(n=0)
-    super() + iso8601_timediv(n)
   end
-
-end
+end