hijri 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 43396ddd0542fcf4246247863d340194bbf09f52
-  data.tar.gz: 7ef4ea0f4d761bdd723f0cf9cbeec3154249a2a3
+SHA256:
+  metadata.gz: 6e50011d4655e25f84f05d477ea82dc05dc3b100dd2c4811fc1b0f407d534c8d
+  data.tar.gz: 605027362b082021453311e602e8b8b4189563f6c9ae192cca3b7d276db56b17
 SHA512:
-  metadata.gz: 3d027e1a118336127fa816ad25feda65fccc622b1449088cb8b7d378b80b994714fdf2fce28f5be9189231324351c8fffa6037a8035d23e794b9f32c45ae4e62
-  data.tar.gz: 53e4700a6e0615180881bef35d1af164158fb678cb4b26ec10193e214b09b28b6d62ce97217e62f25ac2fc02bb604c0d2d906e9c0fe9fc58bf7632800194c98b
+  metadata.gz: 2be9e5fec28e71cd801c6bf791d7f7086cf3ec29a2581fa0e561a00bc00425f08fbc92a18be83981a93cafed0b0e8d6e7b157f75b2bc50bad67b6cbe8b873e51
+  data.tar.gz: 2d104b2f9e6ca427585a67509f21f82a6217a016fea91af5caf1da54c24e4b3af0274adad52f15448d37ca3328edc9e19883a8cdb91ebf7e0c6b4df4cc49524c

data/.document

@@ -1,3 +1,3 @@
-- 
+-
 ChangeLog.rdoc
 LICENSE.txt

data/.travis.yml

@@ -7,9 +7,21 @@ rvm:
   - "2.0.0"
   - "2.1"
   - "2.2.0"
+  - "2.2.2"
+  - "2.3.0"
+  - "2.3.1"
+  - "2.4.0"
+  - "2.4.1"
+  - "2.5.1"
+  - "2.6.2"
   - jruby-18mode # JRuby in 1.8 mode
   - jruby-19mode # JRuby in 1.9 mode
-  - rbx
-  - rbx-2
 
 sudo: false
+notifications:
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/d9c6d1347901833a5f5b
+    on_success: change  # options: [always|never|change] default: always
+    on_failure: always  # options: [always|never|change] default: always
+    on_start: false     # default: false

data/CHANGELOG

@@ -1,3 +1,10 @@
+=== master
+
+=== 0.6.0 / 2019-04-22
+
+* Resolve some hijri date causing error. fix issue #5
+* Ability to adjust date. resolve issue #6
+
 === 0.5.0 / 2015-02-26
 
 * Add Hijri::Date.change

data/Gemfile

@@ -1,7 +1,13 @@
 source 'https://rubygems.org'
 
-gemspec
-
-if %w(1.8.7 2.2.0).include? RUBY_VERSION
+group :test, :development do
   gem 'minitest'
-end
+
+  if RUBY_VERSION < '1.9.3'
+    gem 'rake', "< 11.0.1"
+  else
+    gem 'rake'
+  end
+end
+
+gemspec

data/README.md

@@ -2,10 +2,12 @@
 
 [![Gem Version](https://badge.fury.io/rb/hijri.svg)](http://badge.fury.io/rb/hijri)
 [![Build Status](https://travis-ci.org/ecleel/hijri.svg?branch=master)](https://travis-ci.org/ecleel/hijri)
+[![Join the chat at https://gitter.im/ecleel/hijri](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/ecleel/hijri?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-#####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 Date library for Ruby.
+hijri is full lunar Islamic Hijri calendar lib for ruby.
+
+##### 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
@@ -26,18 +28,6 @@ Or install it yourself as:
 
     $ gem install hijri
 
-###hijri tested and worked in:
-- Ruby MRI:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
-  - 2.1
-  - 2.2
-- JRuby 1.7.16.1
-  - jruby-18mode
-  - jruby-19mode
-- Rubinius 2.4.1
 
 ## Usage
 
@@ -51,7 +41,7 @@ h = Date.today.to_hijri # => #<Hijri::Date:0x007f875e8c84e8 @year=1436, @month=2
 hijri = Hijri::Date.new 1430, 1, 3 # => #<Hijri::Date:0x007f875e8dbb38 @year=1430, @month=1, @day=3>
 
 # or you can get today hijri date directly.
-toady = Hijri::Date.today # => #<Hijri::Date:0x007f875e8d8410 @year=1436, @month=2, @day=16>
+today = Hijri::Date.today # => #<Hijri::Date:0x007f875e8d8410 @year=1436, @month=2, @day=16>
 
 # and you can convert hijri date to greogian date also.
 hijri.to_greo # => #<Date: 2009-01-01 ((2454833j,0s,0n),+0s,2299161j)>
@@ -63,6 +53,37 @@ date_and_time = Hijri::DateTime.now # => #<Hijri::DateTime:0x007f875e8eac00 @yea
 Hijri::DateTime.now.strftime('%c') # => "Ahad Rabia I 20 16:00:25 1436"
 ```
 
+## Supported Ruby versions
+
+This library aims to support and is [tested against](https://travis-ci.org/ecleel/hijri) the following Ruby
+implementations:
+
+* MRI 1.8.7
+* MRI 1.9.2
+* MRI 1.9.3
+* MRI 2.0.0
+* MRI 2.1.0
+* MRI 2.2.0
+* MRI 2.3.0
+* MRI 2.4.0
+* MRI 2.4.1
+* MRI 2.5.1
+* MRI 2.6.2
+* JRuby 1.8 mode
+* JRuby 1.9 mode
+
+If something doesn't work on one of these Ruby versions, it's a bug.
+
+This library may inadvertently work (or seem to work) on other Ruby
+implementations, however support will only be provided for the versions listed
+above.
+
+If you would like this library to support another Ruby version, you may
+volunteer to be a maintainer. Being a maintainer entails making sure all tests
+run and pass on that implementation. When something breaks on your
+implementation, you will be responsible for providing patches in a timely
+fashion. If critical issues for a particular implementation exist at the time
+of a major release, support for that Ruby version may be dropped.
 
 ## TODO
 

data/hijri.gemspec

@@ -2,6 +2,8 @@
 
 require File.expand_path('../lib/hijri/version', __FILE__)
 
+rake_version = "11.2.2"
+
 Gem::Specification.new do |gem|
   gem.name          = "hijri"
   gem.version       = Hijri::VERSION
@@ -17,7 +19,6 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_development_dependency 'bundler', '~> 1.0'
-  gem.add_development_dependency 'rake', '~> 0.8'
-  gem.add_development_dependency 'yard', '~> 0.8'
+  gem.add_development_dependency 'bundler'
+  gem.add_development_dependency 'yard'
 end

data/lib/hijri.rb

@@ -4,9 +4,9 @@ module Hijri
   ISLAMIC_EPOCH = 227014
   AVERAGE_YEARS_DAYS = 354.367056
   AVERAGE_MONTH_DAYS = 29.530588
-  
+
   INFINITY = +1.0/0.0
-  
+
   if RUBY_VERSION < '1.8.8'
     class ::Range
       alias :cover? :include?

data/lib/hijri/converter.rb

@@ -2,12 +2,13 @@ module Hijri
   module Converter
     def self.hijri_to_greo hijri
       results = absolute_to_greo(hijri_to_absolute(hijri.year, hijri.month, hijri.day))
+
       if hijri.is_a? DateTime
         results.push hijri.hour, hijri.minute, hijri.second, hijri.zone
       end
       results
     end
-      
+
     def self.greo_to_hijri greg
       results = absolute_to_hijri(greo_to_absolute(greg.year, greg.month, greg.day))
       if greg.is_a? ::DateTime
@@ -16,18 +17,18 @@ module Hijri
       results
     end
 
-    module_function 
-                    
+    module_function
+
     # Hijri Methods
     def islamic_leap_year?(year)
       return (((((11 * year) + 14) % 30) < 11) ? true : false)
     end
-  
+
     def last_day_of_islamic_month(month, year)
       # Last day in month during year on the Islamic calendar.
       return ((month % 2 == 1) || (month == 12 && islamic_leap_year?(year)) ? 30 : 29)
     end
-      
+
     def hijri_to_absolute(year, month, day)
       month_days = 29 * (month - 1) # days on this year
       nonleap_year_days  = 354 * (year - 1)
@@ -36,7 +37,7 @@ module Hijri
 
       return (day + month_days + this_year + nonleap_year_days + leap_year_days + ISLAMIC_EPOCH).to_i
     end
-      
+
     # Gregorian Methods
     def last_day_of_gregorian_month(month, year)
       # Compute the last date of the month for the Gregorian calendar.
@@ -45,11 +46,21 @@ module Hijri
       end
       return [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][month - 1]
     end
-      
+
+    def adjust_day(year, month, day)
+      last_day = last_day_of_gregorian_month(month, year)
+      if last_day > day
+        day
+      else
+        last_day
+      end
+    end
+
     # Absolute Methods
     def greo_to_absolute(year, month, day)
       # Computes the absolute date from the Gregorian date.
       d = day
+
       (month - 1).downto(1) do |m|
         d += last_day_of_gregorian_month(m, year)
       end
@@ -69,16 +80,19 @@ module Hijri
       while abs >= greo_to_absolute(year + 1, 1, 1)
         year += 1
       end
+
       # Search forward month by month from January
       month = 1
       while abs > greo_to_absolute(year, month, last_day_of_gregorian_month(month, year))
         month += 1
+        break if month == 12
       end
       day = abs - greo_to_absolute(year, month, 1) + 1
+      day = adjust_day(year, month, day)
 
       return [year, month, day]
     end
-      
+
     def absolute_to_hijri(abs)
       # Computes the Islamic date from the absolute date.
       if abs <= ISLAMIC_EPOCH

data/lib/hijri/date.rb

@@ -1,6 +1,5 @@
 module Hijri
   class Date
-
     include Comparable
 
     attr_reader :day, :month, :year
@@ -12,11 +11,11 @@ module Hijri
     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:
@@ -37,10 +36,10 @@ module Hijri
       if valid_date?(year, month, day)
         @year, @month, @day = year, month, day
       else
-        raise ArgumentError, "Invalid Date"           
+        raise ArgumentError, "Invalid Date"
       end
     end
-    
+
     def change(kargs)
       # Remove nil values
       kargs.reject!{|k,v| v.nil?}
@@ -77,15 +76,15 @@ module Hijri
     end
     alias :abs :to_abs
 
-    def to_greo
-      ::Date.new *Converter.hijri_to_greo(self)
+    def to_greo(adjust=0)
+      ::Date.new(*Converter.hijri_to_greo(self)) + adjust
     end
 
     # Just to have a consistent Interface.
     def to_hijri
       self
     end
-    
+
     def valid_date?(year, month, day)
       return false unless (1..INFINITY).cover?(year)
       return false unless (1..12).cover?(month)

data/lib/hijri/datetime.rb

@@ -15,7 +15,7 @@ module Hijri
         @offset = zone.to_f / 24
         @zone   = zone
       else
-        raise ArgumentError, "Invalid Date"        
+        raise ArgumentError, "Invalid Date"
       end
     end
 
@@ -55,4 +55,4 @@ module Hijri
 
   end
 
-end
+end

data/lib/hijri/format.rb

@@ -114,22 +114,22 @@ module Hijri
       class Bag # :nodoc:
 
         def initialize
-        	@elem = {}
+          @elem = {}
         end
 
         def method_missing(t, *args, &block)
-        	t = t.to_s
-        	set = t.chomp!('=')
-        	t = t.intern
-        	if set
-        	  @elem[t] = args[0]
-        	else
-        	  @elem[t]
-        	end
+          t = t.to_s
+          set = t.chomp!('=')
+          t = t.intern
+          if set
+            @elem[t] = args[0]
+          else
+            @elem[t]
+          end
         end
 
         def to_hash
-        	@elem.reject{|k, v| /\A_/ =~ k.to_s || v.nil?}
+          @elem.reject{|k, v| /\A_/ =~ k.to_s || v.nil?}
         end
 
       end
@@ -212,7 +212,7 @@ module Hijri
     end
 
     private :emit, :emit_w, :emit_n, :emit_sn, :emit_z,
-  	  :emit_a, :emit_ad, :emit_au
+      :emit_a, :emit_ad, :emit_au
 
     def strftime(fmt='%F')
       fmt.gsub(/%([-_0^#]+)?(\d+)?([EO]?(?::{1,3}z|.))/m) do
@@ -362,13 +362,13 @@ module Hijri
       else
         case jd
         when 2405160...2419614
-  	g = 'M%02d' % (year - 1867)
+    g = 'M%02d' % (year - 1867)
         when 2419614...2424875
-  	g = 'T%02d' % (year - 1911)
+    g = 'T%02d' % (year - 1911)
         when 2424875...2447535
-  	g = 'S%02d' % (year - 1925)
+    g = 'S%02d' % (year - 1925)
         else
-  	g = 'H%02d' % (year - 1988)
+    g = 'H%02d' % (year - 1988)
         end
         g + strftime('.%m.%d')
       end
@@ -394,177 +394,177 @@ module Hijri
       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
+    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
+    case c
+    when /\A\s/
+      str.sub!(/\A\s+/, '')
+    else
+      return unless str.sub!(Regexp.new('\\A' + Regexp.quote(a)), '')
+    end
         end
       end
     end
@@ -578,17 +578,17 @@ module Hijri
 
       if e._cent
         if e.cwyear
-  	e.cwyear += e._cent * 100
+    e.cwyear += e._cent * 100
         end
         if e.year
-  	e.  year += e._cent * 100
+    e.  year += e._cent * 100
         end
       end
 
       if e._merid
         if e.hour
-  	e.hour %= 12
-  	e.hour += e._merid
+    e.hour %= 12
+    e.hour += e._merid
         end
       end
 
@@ -610,42 +610,42 @@ module Hijri
 
       if y == nil
         if d && d.size > 2
-  	y = d
-  	d = nil
+    y = d
+    d = nil
         end
         if d && d[0,1] == "'"
-  	y = d
-  	d = nil
+    y = d
+    d = nil
         end
       end
 
       if y
         y.scan(/(\d+)(.+)?/)
         if $2
-  	y, d = d, $1
+    y, d = d, $1
         end
       end
 
       if m
         if m[0,1] == "'" || m.size > 2
-  	y, m, d = m, d, y # us -> be
+    y, m, d = m, d, y # us -> be
         end
       end
 
       if d
         if d[0,1] == "'" || d.size > 2
-  	y, d = d, y
+    y, d = d, y
         end
       end
 
       if y
         y =~ /([-+])?(\d+)/
         if $1 || $2.size > 2
-  	c = false
+    c = false
         end
         iy = $&.to_i
         if bc
-  	iy = -iy + 1
+    iy = -iy + 1
         end
         e.year = iy
       end
@@ -680,45 +680,45 @@ module Hijri
 
     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,
-  		' ')
+      /(
+         (?:
+           \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
+          (?:\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
@@ -726,10 +726,10 @@ module Hijri
         e.sec_fraction = Rational($4.to_i, 10**$4.size) if $4
 
         if $5
-  	e.hour %= 12
-  	if $5.downcase == 'p'
-  	  e.hour += 12
-  	end
+    e.hour %= 12
+    if $5.downcase == 'p'
+      e.hour += 12
+    end
         end
         true
       end
@@ -752,38 +752,38 @@ module Hijri
 
     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,
-  		' ') # '
+      /'?(\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')
+      $3 && $3[0,1].downcase == 'b')
         true
       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,
-  		' ') # '
+      /\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')
+      $3 && $3[0,1].downcase == 'b')
         true
       end
     end
@@ -813,12 +813,12 @@ module Hijri
         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/, ' ')
+    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/, ' ')
+    str.sub!(/\b-(\d{3})\b/, ' ')
         e.yday = $1.to_i
         true
       end
@@ -827,10 +827,10 @@ module Hijri
     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]
+          't'=>1911,
+          's'=>1925,
+          'h'=>1988
+      }[$1.downcase]
         e.year = $2.to_i + era
         e.mon = $3.to_i
         e.mday = $4.to_i
@@ -840,11 +840,11 @@ module Hijri
 
     def self._parse_vms(str, e) # :nodoc:
       if str.sub!(/('?-?\d+)-(#{Format::ABBR_MONTHS.keys.join('|')})[^-]*
-  		-('?-?\d+)/iox, ' ')
+      -('?-?\d+)/iox, ' ')
         s3e(e, $3, Format::ABBR_MONTHS[$2.downcase], $1)
         true
       elsif str.sub!(/\b(#{Format::ABBR_MONTHS.keys.join('|')})[^-]*
-  		-('?-?\d+)(?:-('?-?\d+))?/iox, ' ')
+      -('?-?\d+)(?:-('?-?\d+))?/iox, ' ')
         s3e(e, $3, Format::ABBR_MONTHS[$1.downcase], $2)
         true
       end
@@ -887,141 +887,141 @@ module Hijri
 
     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,
-  		' ')
+      /([-+]?)(\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
+    if $3.nil? && $4
+      e.sec  = $2[-2, 2].to_i
+    else
+      e.mday = $2[ 0, 2].to_i
+    end
         when 4
-  	if $3.nil? && $4
-  	  e.sec  = $2[-2, 2].to_i
-  	  e.min  = $2[-4, 2].to_i
-  	else
-  	  e.mon  = $2[ 0, 2].to_i
-  	  e.mday = $2[ 2, 2].to_i
-  	end
+    if $3.nil? && $4
+      e.sec  = $2[-2, 2].to_i
+      e.min  = $2[-4, 2].to_i
+    else
+      e.mon  = $2[ 0, 2].to_i
+      e.mday = $2[ 2, 2].to_i
+    end
         when 6
-  	if $3.nil? && $4
-  	  e.sec  = $2[-2, 2].to_i
-  	  e.min  = $2[-4, 2].to_i
-  	  e.hour = $2[-6, 2].to_i
-  	else
-  	  e.year = ($1 + $2[ 0, 2]).to_i
-  	  e.mon  = $2[ 2, 2].to_i
-  	  e.mday = $2[ 4, 2].to_i
-  	end
+    if $3.nil? && $4
+      e.sec  = $2[-2, 2].to_i
+      e.min  = $2[-4, 2].to_i
+      e.hour = $2[-6, 2].to_i
+    else
+      e.year = ($1 + $2[ 0, 2]).to_i
+      e.mon  = $2[ 2, 2].to_i
+      e.mday = $2[ 4, 2].to_i
+    end
         when 8, 10, 12, 14
-  	if $3.nil? && $4
-  	  e.sec  = $2[-2, 2].to_i
-  	  e.min  = $2[-4, 2].to_i
-  	  e.hour = $2[-6, 2].to_i
-  	  e.mday = $2[-8, 2].to_i
-  	  if $2.size >= 10
-  	    e.mon  = $2[-10, 2].to_i
-  	  end
-  	  if $2.size == 12
-  	    e.year = ($1 + $2[-12, 2]).to_i
-  	  end
-  	  if $2.size == 14
-  	    e.year = ($1 + $2[-14, 4]).to_i
-  	    e._comp = false
-  	  end
-  	else
-  	  e.year = ($1 + $2[ 0, 4]).to_i
-  	  e.mon  = $2[ 4, 2].to_i
-  	  e.mday = $2[ 6, 2].to_i
-  	  e.hour = $2[ 8, 2].to_i if $2.size >= 10
-  	  e.min  = $2[10, 2].to_i if $2.size >= 12
-  	  e.sec  = $2[12, 2].to_i if $2.size >= 14
-  	  e._comp = false
-  	end
+    if $3.nil? && $4
+      e.sec  = $2[-2, 2].to_i
+      e.min  = $2[-4, 2].to_i
+      e.hour = $2[-6, 2].to_i
+      e.mday = $2[-8, 2].to_i
+      if $2.size >= 10
+        e.mon  = $2[-10, 2].to_i
+      end
+      if $2.size == 12
+        e.year = ($1 + $2[-12, 2]).to_i
+      end
+      if $2.size == 14
+        e.year = ($1 + $2[-14, 4]).to_i
+        e._comp = false
+      end
+    else
+      e.year = ($1 + $2[ 0, 4]).to_i
+      e.mon  = $2[ 4, 2].to_i
+      e.mday = $2[ 6, 2].to_i
+      e.hour = $2[ 8, 2].to_i if $2.size >= 10
+      e.min  = $2[10, 2].to_i if $2.size >= 12
+      e.sec  = $2[12, 2].to_i if $2.size >= 14
+      e._comp = false
+    end
         when 3
-  	if $3.nil? && $4
-  	  e.sec  = $2[-2, 2].to_i
-  	  e.min  = $2[-3, 1].to_i
-  	else
-  	  e.yday = $2[ 0, 3].to_i
-  	end
+    if $3.nil? && $4
+      e.sec  = $2[-2, 2].to_i
+      e.min  = $2[-3, 1].to_i
+    else
+      e.yday = $2[ 0, 3].to_i
+    end
         when 5
-  	if $3.nil? && $4
-  	  e.sec  = $2[-2, 2].to_i
-  	  e.min  = $2[-4, 2].to_i
-  	  e.hour = $2[-5, 1].to_i
-  	else
-  	  e.year = ($1 + $2[ 0, 2]).to_i
-  	  e.yday = $2[ 2, 3].to_i
-  	end
+    if $3.nil? && $4
+      e.sec  = $2[-2, 2].to_i
+      e.min  = $2[-4, 2].to_i
+      e.hour = $2[-5, 1].to_i
+    else
+      e.year = ($1 + $2[ 0, 2]).to_i
+      e.yday = $2[ 2, 3].to_i
+    end
         when 7
-  	if $3.nil? && $4
-  	  e.sec  = $2[-2, 2].to_i
-  	  e.min  = $2[-4, 2].to_i
-  	  e.hour = $2[-6, 2].to_i
-  	  e.mday = $2[-7, 1].to_i
-  	else
-  	  e.year = ($1 + $2[ 0, 4]).to_i
-  	  e.yday = $2[ 4, 3].to_i
-  	end
+    if $3.nil? && $4
+      e.sec  = $2[-2, 2].to_i
+      e.min  = $2[-4, 2].to_i
+      e.hour = $2[-6, 2].to_i
+      e.mday = $2[-7, 1].to_i
+    else
+      e.year = ($1 + $2[ 0, 4]).to_i
+      e.yday = $2[ 4, 3].to_i
+    end
         end
         if $3
-  	if $4
-  	  case $3.size
-  	  when 2, 4, 6
-  	    e.sec  = $3[-2, 2].to_i
-  	    e.min  = $3[-4, 2].to_i if $3.size >= 4
-  	    e.hour = $3[-6, 2].to_i if $3.size >= 6
-  	  end
-  	else
-  	  case $3.size
-  	  when 2, 4, 6
-  	    e.hour = $3[ 0, 2].to_i
-  	    e.min  = $3[ 2, 2].to_i if $3.size >= 4
-  	    e.sec  = $3[ 4, 2].to_i if $3.size >= 6
-  	  end
-  	end
+    if $4
+      case $3.size
+      when 2, 4, 6
+        e.sec  = $3[-2, 2].to_i
+        e.min  = $3[-4, 2].to_i if $3.size >= 4
+        e.hour = $3[-6, 2].to_i if $3.size >= 6
+      end
+    else
+      case $3.size
+      when 2, 4, 6
+        e.hour = $3[ 0, 2].to_i
+        e.min  = $3[ 2, 2].to_i if $3.size >= 4
+        e.sec  = $3[ 4, 2].to_i if $3.size >= 6
+      end
+    end
         end
         if $4
-  	e.sec_fraction = Rational($4.to_i, 10**$4.size)
+    e.sec_fraction = Rational($4.to_i, 10**$4.size)
         end
         if $5
-  	e.zone = $5
-  	if e.zone[0,1] == '['
-  	  o, n, = e.zone[1..-2].split(':')
-  	  e.zone = n || o
-  	  if /\A\d/ =~ o
-  	    o = format('+%s', o)
-  	  end
-  	  e.offset = zone_to_diff(o)
-  	end
+    e.zone = $5
+    if e.zone[0,1] == '['
+      o, n, = e.zone[1..-2].split(':')
+      e.zone = n || o
+      if /\A\d/ =~ o
+        o = format('+%s', o)
+      end
+      e.offset = zone_to_diff(o)
+    end
         end
         true
       end
     end
 
     private_class_method :_parse_day, :_parse_time, # :_parse_beat,
-  	:_parse_eu, :_parse_us, :_parse_iso, :_parse_iso2,
-  	:_parse_jis, :_parse_vms, :_parse_sla, :_parse_dot,
-  	:_parse_year, :_parse_mon, :_parse_mday, :_parse_ddd
+    :_parse_eu, :_parse_us, :_parse_iso, :_parse_iso2,
+    :_parse_jis, :_parse_vms, :_parse_sla, :_parse_dot,
+    :_parse_year, :_parse_mon, :_parse_mday, :_parse_ddd
 
     def self._parse(str, comp=true)
       str = str.dup
@@ -1050,37 +1050,37 @@ module Hijri
 
       if str.sub!(/\b(bc\b|bce\b|b\.c\.|b\.c\.e\.)/i, ' ')
         if e.year
-  	e.year = -e.year + 1
+    e.year = -e.year + 1
         end
       end
 
       if str.sub!(/\A\s*(\d{1,2})\s*\z/, ' ')
         if e.hour && !e.mday
-  	v = $1.to_i
-  	if (1..31) === v
-  	  e.mday = v
-  	end
+    v = $1.to_i
+    if (1..31) === v
+      e.mday = v
+    end
         end
         if e.mday && !e.hour
-  	v = $1.to_i
-  	if (0..24) === v
-  	  e.hour = v
-  	end
+    v = $1.to_i
+    if (0..24) === v
+      e.hour = v
+    end
         end
       end
 
       if e._comp
         if e.cwyear
-  	if e.cwyear >= 0 && e.cwyear <= 99
-  	  e.cwyear += if e.cwyear >= 69
-  		      then 1900 else 2000 end
-  	end
+    if e.cwyear >= 0 && e.cwyear <= 99
+      e.cwyear += if e.cwyear >= 69
+            then 1900 else 2000 end
+    end
         end
         if e.year
-  	if e.year >= 0 && e.year <= 99
-  	  e.year += if e.year >= 69
-  		    then 1900 else 2000 end
-  	end
+    if e.year >= 0 && e.year <= 99
+      e.year += if e.year >= 69
+          then 1900 else 2000 end
+    end
         end
       end
 
@@ -1091,43 +1091,43 @@ module Hijri
 
     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
+          ([-+]?\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
+          ([-+]?(\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
+    (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
+    (z|[-+]\d{2}(\d{2})?)?)?\s*\z/ix =~ str
         _parse(str)
       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
+    (t|\s)
+    \d{2}:\d{2}:\d{2}(\.\d+)?
+    (z|[-+]\d{2}:\d{2})\s*\z/ix =~ str
         _parse(str)
       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
+    (?: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
@@ -1137,31 +1137,31 @@ module Hijri
         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)
+    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
+    (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)
+    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
+    (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)
+    e.zone = $4
+    e.offset = zone_to_diff($4)
         end
         e.to_hash
       end
@@ -1169,18 +1169,18 @@ module Hijri
 
     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
+    \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
+    if e[:year] < 50
+      e[:year] += 2000
+    elsif e[:year] < 1000
+      e[:year] += 1900
+    end
         end
         e
       end
@@ -1190,37 +1190,37 @@ module Hijri
 
     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
+    \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
+    \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
+    (#{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
     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
+    (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'))
+    _parse(str.sub(/\A\s*(\d)/, 'h\1'))
         else
-  	_parse(str)
+    _parse(str)
         end
       else
         _iso8601(str)
@@ -1234,33 +1234,33 @@ module Hijri
       def zone_to_diff(zone) # :nodoc:
         zone = zone.downcase
         if zone.sub!(/\s+(standard|daylight)\s+time\z/, '')
-  	dst = $1 == 'daylight'
+    dst = $1 == 'daylight'
         else
-  	dst = zone.sub!(/\s+dst\z/, '')
+    dst = zone.sub!(/\s+dst\z/, '')
         end
         if Format::ZONES.include?(zone)
-  	offset = Format::ZONES[zone]
-  	offset += 3600 if dst
+    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 == '-'
+    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
@@ -1284,12 +1284,12 @@ module Hijri
 
     def iso8601_timediv(n) # :nodoc:
       strftime('T%T' +
-  	     if n < 1
-  	       ''
-  	     else
-  	       '.%0*d' % [n, (sec_fraction / Rational(1, 10**n)).round]
-  	     end +
-  	     '%:z')
+         if n < 1
+           ''
+         else
+           '.%0*d' % [n, (sec_fraction / Rational(1, 10**n)).round]
+         end +
+         '%:z')
     end
 
     private :iso8601_timediv
@@ -1307,4 +1307,4 @@ module Hijri
     end
 
   end
-end
+end