sisimai 4.16.0-java → 4.17.0-java

data/lib/sisimai/data.rb

@@ -41,10 +41,10 @@ module Sisimai
 
     EndOfEmail = Sisimai::String.EOM
     RetryIndex = Sisimai::Reason.retry
-    RFC822Head = Sisimai::RFC5322.HEADERFIELDS('all')
+    RFC822Head = Sisimai::RFC5322.HEADERFIELDS(:all)
     AddrHeader = {
-      'addresser' => RFC822Head['addresser'],
-      'recipient' => RFC822Head['recipient'],
+      addresser: RFC822Head[:addresser],
+      recipient: RFC822Head[:recipient],
     }
 
     # Constructor of Sisimai::Data
@@ -56,34 +56,26 @@ module Sisimai
       # Create email address object
       x0 = Sisimai::Address.parse([argvs['addresser']])
       y0 = Sisimai::Address.parse([argvs['recipient']])
-      v0 = nil
 
-      if x0.is_a? Array
-        v0 = Sisimai::Address.new(x0.shift)
-        if v0.is_a? Sisimai::Address
-          thing['addresser'] = v0
-          thing['senderdomain'] = v0.host
-        end
-      end
+      return nil unless x0.is_a? Array
+      return nil unless y0.is_a? Array
 
-      if y0.is_a? Array
-        v0 = Sisimai::Address.new(y0.shift)
-        if v0.is_a? Sisimai::Address
-          thing['recipient'] = v0
-          thing['destination'] = v0.host
-          thing['alias'] = argvs['alias'] || ''
-        end
-      end
-      return nil unless thing['recipient'].is_a? Sisimai::Address
-      return nil unless thing['addresser'].is_a? Sisimai::Address
-      return nil if thing['recipient'].void
-      return nil if thing['addresser'].void
+      thing[:addresser] = Sisimai::Address.new(x0.shift)
+      return nil unless thing[:addresser].is_a? Sisimai::Address
+      return nil if thing[:addresser].void
+      thing[:senderdomain] = thing[:addresser].host
+
+      thing[:recipient] = Sisimai::Address.new(y0.shift)
+      return nil unless thing[:recipient].is_a? Sisimai::Address
+      return nil if thing[:recipient].void
+      thing[:destination] = thing[:recipient].host
+      thing[:alias] = argvs['alias'] || ''
 
-      @addresser    = thing['addresser']
-      @senderdomain = thing['senderdomain']
-      @recipient    = thing['recipient']
-      @destination  = thing['destination']
-      @alias        = thing['alias']
+      @addresser    = thing[:addresser]
+      @senderdomain = thing[:senderdomain]
+      @recipient    = thing[:recipient]
+      @destination  = thing[:destination]
+      @alias        = thing[:alias]
 
       @token = Sisimai::String.token(@addresser.address, @recipient.address, argvs['timestamp'])
       @timestamp = Sisimai::Time.parse(::Time.at(argvs['timestamp']).to_s)
@@ -101,19 +93,10 @@ module Sisimai
       @smtpcommand    = argvs['smtpcommand']    || ''
       @feedbacktype   = argvs['feedbacktype']   || ''
       @action         = argvs['action']         || ''
-      @replycode      = Sisimai::SMTP::Reply.find(argvs['diagnosticcode'])
+      @replycode      = argvs['replycode']      || ''
+      @replycode      = Sisimai::SMTP::Reply.find(argvs['diagnosticcode']) if @replycode.empty?
       @softbounce     = argvs['softbounce']     || ''
       @softbounce     = 1 if @replycode =~ /\A4/
-
-      if cv = @action.match(/\A(.+?) .+/)
-        @action = cv[1]
-      end
-
-      if @replycode.size > 0 && @deliverystatus.size > 0
-        # The first digits did not match: 5.1.1 250
-        @replycode = '' unless @replycode[0, 1] == @deliverystatus[0, 1]
-      end
-
     end
 
     # Another constructor of Sisimai::Data
@@ -127,11 +110,12 @@ module Sisimai
       return nil unless data.is_a? Sisimai::Message
 
       messageobj = data
+      mailheader = data.header
       rfc822data = messageobj.rfc822
-      fieldorder = { 'recipient' => [], 'addresser' => [] }
+      fieldorder = { :recipient => [], :addresser => [] }
       objectlist = []
       rxcommands = %r/\A(?:EHLO|HELO|MAIL|RCPT|DATA|QUIT)\z/
-      givenorder = argvs['order'] || {}
+      givenorder = argvs[:order] || {}
       delivered1 = argvs[:delivered] || false
 
       return nil unless messageobj.ds
@@ -169,6 +153,7 @@ module Sisimai
           'alias'          => e['alias']        || '',
           'action'         => e['action']       || '',
           'reason'         => e['reason']       || '',
+          'replycode'      => e['replycode']    || '',
           'smtpagent'      => e['agent']        || '',
           'recipient'      => e['recipient']    || '',
           'softbounce'     => e['softbounce']   || '',
@@ -185,7 +170,7 @@ module Sisimai
 
         # EMAIL_ADDRESS:
         # Detect email address from message/rfc822 part
-        fieldorder['addresser'].each do |f|
+        fieldorder[:addresser].each do |f|
           # Check each header in message/rfc822 part
           h = f.downcase
           next unless rfc822data.key?(h)
@@ -213,7 +198,7 @@ module Sisimai
         end
 
         # Date information did not exist in message/delivery-status part,...
-        RFC822Head['date'].each do |f|
+        RFC822Head[:date].each do |f|
           # Get the value of Date header or other date related header.
           next unless rfc822data[f.downcase]
           datevalues << rfc822data[f.downcase]
@@ -251,6 +236,14 @@ module Sisimai
         next unless p['timestamp']
 
         # OTHER_TEXT_HEADERS:
+        if mailheader['received'].size > 0
+          # Get localhost and remote host name from Received header.
+          r0 = mailheader['received']
+          %w|lhost rhost|.each { |a| e[a] ||= '' }
+          e['lhost'] = Sisimai::RFC5322.received(r0[0]).shift if e['lhost'].empty?
+          e['rhost'] = Sisimai::RFC5322.received(r0[-1]).pop  if e['rhost'].empty?
+        end
+
         # Remove square brackets and curly brackets from the host variable
         %w|rhost lhost|.each do |v|
           p[v] = p[v].delete('[]()')    # Remove square brackets and curly brackets from the host variable
@@ -301,9 +294,33 @@ module Sisimai
           p['deliverystatus'] = d
         end
 
+        if p['reason'] == 'mailererror'
+          p['diagnostictype'] ||= 'X-UNIX'
+        else
+          unless p['reason'] =~ /\A(?:feedback|vacation)\z/
+            p['diagnostictype'] ||= 'SMTP' 
+          end
+        end
+
         # Check the value of SMTP command
         p['smtpcommand'] = '' unless p['smtpcommand'] =~ rxcommands
 
+        # Check the value of "action"
+        if p['action'].size > 0
+          if cv = p['action'].match(/\A(.+?) .+/)
+            # Action: expanded (to multi-recipient alias)
+            p['action'] = cv[1]
+          end
+        else
+          if p['reason'] == 'expired'
+            # Action: delayed
+            p['action'] = 'delayed'
+          elsif p['deliverystatus'] =~ /\A[45]/
+            # Action: failed
+            p['action'] = 'failed'
+          end
+        end
+
         o = Sisimai::Data.new(p)
         next unless o.recipient
 
@@ -357,9 +374,16 @@ module Sisimai
               end
             end
           end
+
+          if o.replycode.size > 0
+            # Check both of the first digit of "deliverystatus" and "replycode"
+            o.replycode = '' unless o.replycode[0, 1] == o.deliverystatus[0, 1]
+          end
+
         else
           # The value of reason is "vacation" or "feedback"
           o.softbounce = -1
+          o.replycode = ''
         end
         objectlist << o
       end

data/lib/sisimai/datetime.rb

@@ -14,170 +14,170 @@ module Sisimai
       TZ_OFFSET = 54000               # Max time zone offset, 54000 seconds
 
       TimeUnit = {
-        'o' => (BASE_D * BASE_Y * 4), # Olympiad, 4 years
-        'y' => (BASE_D * BASE_Y),     # Year, Gregorian Calendar
-        'q' => (BASE_D * BASE_Y / 4), # Quarter, year/4
-        'l' => (BASE_D * BASE_L),     # Lunar month
-        'f' => (BASE_D * 14),         # Fortnight, 2 weeks
-        'w' => (BASE_D * 7),          # Week, 604800 seconds
-        'd' => BASE_D,                # Day
-        'h' => 3600,                  # Hour
-        'b' => 86.4,                  # Beat, Swatch internet time: 1000b = 1d
-        'm' => 60,                    # Minute,
-        's' => 1,                     # Second
+        o: (BASE_D * BASE_Y * 4), # Olympiad, 4 years
+        y: (BASE_D * BASE_Y),     # Year, Gregorian Calendar
+        q: (BASE_D * BASE_Y / 4), # Quarter, year/4
+        l: (BASE_D * BASE_L),     # Lunar month
+        f: (BASE_D * 14),         # Fortnight, 2 weeks
+        w: (BASE_D * 7),          # Week, 604800 seconds
+        d: BASE_D,                # Day
+        h: 3600,                  # Hour
+        b: 86.4,                  # Beat, Swatch internet time: 1000b = 1d
+        m: 60,                    # Minute,
+        s: 1,                     # Second
       }
 
       MathematicalConstant = {
-        'e' => CONST_E,
-        'p' => CONST_P,
-        'g' => CONST_E**CONST_P,
+        e: CONST_E,
+        p: CONST_P,
+        g: CONST_E**CONST_P,
       }
 
       MonthName = {
-        'full' => %w|January February March April May June July August September October November December|,
-        'abbr' => %w|Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec|,
+        full: %w|January February March April May June July August September October November December|,
+        abbr: %w|Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec|,
       }
 
       DayOfWeek = {
-        'full' => %w|Sunday Monday Tuesday Wednesday Thursday Friday Saturday|,
-        'abbr' => %w|Sun Mon Tue Wed Thu Fri Sat |,
+        full: %w|Sunday Monday Tuesday Wednesday Thursday Friday Saturday|,
+        abbr: %w|Sun Mon Tue Wed Thu Fri Sat |,
       }
 
       HourName = {
-        'full' => [
+        full: [
           'Midnight', 1, 2, 3, 4, 5, 'Morning', 7, 8, 9, 10, 11,
           'Noon', 13, 14, 15, 16, 17, 'Evening', 19, 20, 21, 22, 23,
         ],
-        'abbr' => [0..23],
+        abbr: [0..23],
       }
 
       TimeZoneAbbr = {
         # http://en.wikipedia.org/wiki/List_of_time_zone_abbreviations
-        #'ACDT' => '+1030', # Australian Central Daylight Time  UTC+10:30
-        #'ACST' => '+0930', # Australian Central Standard Time  UTC+09:30
-        #'ACT'  => '+0800', # ASEAN Common Time                 UTC+08:00
-        'ADT'   => '-0300', # Atlantic Daylight Time            UTC-03:00
-        #'AEDT' => '+1100', # Australian Eastern Daylight Time  UTC+11:00
-        #'AEST' => '+1000', # Australian Eastern Standard Time  UTC+10:00
-        #'AFT'  => '+0430', # Afghanistan Time                  UTC+04:30
-        'AKDT'  => '-0800', # Alaska Daylight Time              UTC-08:00
-        'AKST'  => '-0900', # Alaska Standard Time              UTC-09:00
-        #'AMST' => '+0500', # Armenia Summer Time               UTC+05:00
-        #'AMT'  => '+0400', # Armenia Time                      UTC+04:00
-        #'ART'  => '-0300', # Argentina Time                    UTC+03:00
-        #'AST'  => '+0300', # Arab Standard Time (Kuwait, Riyadh)       UTC+03:00
-        #'AST'  => '+0400', # Arabian Standard Time (Abu Dhabi, Muscat) UTC+04:00
-        #'AST'  => '+0300', # Arabic Standard Time (Baghdad)    UTC+03:00
-        'AST'   => '-0400', # Atlantic Standard Time            UTC-04:00
-        #'AWDT' => '+0900', # Australian Western Daylight Time  UTC+09:00
-        #'AWST' => '+0800', # Australian Western Standard Time  UTC+08:00
-        #'AZOST'=> '-0100', # Azores Standard Time              UTC-01:00
-        #'AZT'  => '+0400', # Azerbaijan Time                   UTC+04:00
-        #'BDT'  => '+0800', # Brunei Time                       UTC+08:00
-        #'BIOT' => '+0600', # British Indian Ocean Time         UTC+06:00
-        #'BIT'  => '-1200', # Baker Island Time                 UTC-12:00
-        #'BOT'  => '-0400', # Bolivia Time                      UTC-04:00
-        #'BRT'  => '-0300', # Brasilia Time                     UTC-03:00
-        #'BST'  => '+0600', # Bangladesh Standard Time          UTC+06:00
-        #'BST'  => '+0100', # British Summer Time (British Standard Time from Feb 1968 to Oct 1971) UTC+01:00
-        #'BTT'  => '+0600', # Bhutan Time                       UTC+06:00
-        #'CAT'  => '+0200', # Central Africa Time               UTC+02:00
-        #'CCT'  => '+0630', # Cocos Islands Time                UTC+06:30
-        'CDT'   => '-0500', # Central Daylight Time (North America)     UTC-05:00
-        #'CEDT' => '+0200', # Central European Daylight Time    UTC+02:00
-        #'CEST' => '+0200', # Central European Summer Time      UTC+02:00
-        #'CET'  => '+0100', # Central European Time             UTC+01:00
-        #'CHAST'=> '+1245', # Chatham Standard Time             UTC+12:45
-        #'CIST' => '-0800', # Clipperton Island Standard Time   UTC-08:00
-        #'CKT'  => '-1000', # Cook Island Time                  UTC-10:00
-        #'CLST' => '-0300', # Chile Summer Time                 UTC-03:00
-        #'CLT'  => '-0400', # Chile Standard Time               UTC-04:00
-        #'COST' => '-0400', # Colombia Summer Time              UTC-04:00
-        #'COT'  => '-0500', # Colombia Time                     UTC-05:00
-        'CST'   => '-0600', # Central Standard Time (North America) UTC-06:00
-        #'CST'  => '+0800', # China Standard Time               UTC+08:00
-        #'CVT'  => '-0100', # Cape Verde Time                   UTC-01:00
-        #'CXT'  => '+0700', # Christmas Island Time             UTC+07:00
-        #'ChST' => '+1000', # Chamorro Standard Time            UTC+10:00
-        # 'DST' => ''       # Daylight saving time              Depending
-        #'DFT'  => '+0100', # AIX specific equivalent of Central European Time  UTC+01:00
-        #'EAST' => '-0600', # Easter Island Standard Time       UTC-06:00
-        #'EAT'  => '+0300', # East Africa Time                  UTC+03:00
-        #'ECT'  => '-0400', # Eastern Caribbean Time (does not recognise DST)   UTC-04:00
-        #'ECT'  => '-0500', # Ecuador Time                      UTC-05:00
-        'EDT'   => '-0400', # Eastern Daylight Time (North America)     UTC-04:00
-        #'EEDT' => '+0300', # Eastern European Daylight Time    UTC+03:00
-        #'EEST' => '+0300', # Eastern European Summer Time      UTC+03:00
-        #'EET'  => '+0200', # Eastern European Time             UTC+02:00
-        'EST'   => '+0500', # Eastern Standard Time (North America) UTC-05:00
-        #'FJT'  => '+1200', # Fiji Time                         UTC+12:00
-        #'FKST' => '-0400', # Falkland Islands Standard Time    UTC-04:00
-        #'GALT' => '-0600', # Galapagos Time                    UTC-06:00
-        #'GET'  => '+0400', # Georgia Standard Time             UTC+04:00
-        #'GFT'  => '-0300', # French Guiana Time                UTC-03:00
-        #'GILT' => '+1200', # Gilbert Island Time               UTC+12:00
-        #'GIT'  => '-0900', # Gambier Island Time               UTC-09:00
-        'GMT'   => '+0000', # Greenwich Mean Time               UTC
-        #'GST'  => '-0200', # South Georgia and the South Sandwich Islands  UTC-02:00
-        #'GYT'  => '-0400', # Guyana Time                       UTC-04:00
-        'HADT'  => '-0900', # Hawaii-Aleutian Daylight Time     UTC-09:00
-        'HAST'  => '-1000', # Hawaii-Aleutian Standard Time     UTC-10:00
-        #'HKT'  => '+0800', # Hong Kong Time                    UTC+08:00
-        #'HMT'  => '+0500', # Heard and McDonald Islands Time   UTC+05:00
-        'HST'   => '-1000', # Hawaii Standard Time              UTC-10:00
-        #'IRKT' => '+0800', # Irkutsk Time                      UTC+08:00
-        #'IRST' => '+0330', # Iran Standard Time                UTC+03:30
-        #'IST'  => '+0530', # Indian Standard Time              UTC+05:30
-        #'IST'  => '+0100', # Irish Summer Time                 UTC+01:00
-        #'IST'  => '+0200', # Israel Standard Time              UTC+02:00
-        'JST'   => '+0900', # Japan Standard Time               UTC+09:00
-        #'KRAT' => '+0700', # Krasnoyarsk Time                  UTC+07:00
-        #'KST'  => '+0900', # Korea Standard Time               UTC+09:00
-        #'LHST' => '+1030', # Lord Howe Standard Time           UTC+10:30
-        #'LINT' => '+1400', # Line Islands Time                 UTC+14:00
-        #'MAGT' => '+1100', # Magadan Time                      UTC+11:00
-        'MDT'   => '-0600', # Mountain Daylight Time(North America) UTC-06:00
-        #'MIT'  => '-0930', # Marquesas Islands Time            UTC-09:30
-        #'MSD'  => '+0400', # Moscow Summer Time                UTC+04:00
-        #'MSK'  => '+0300', # Moscow Standard Time              UTC+03:00
-        #'MST'  => '+0800', # Malaysian Standard Time           UTC+08:00
-        'MST'   => '-0700', # Mountain Standard Time(North America) UTC-07:00
-        #'MST'  => '+0630', # Myanmar Standard Time             UTC+06:30
-        #'MUT'  => '+0400', # Mauritius Time                    UTC+04:00
-        #'NDT'  => '-0230', # Newfoundland Daylight Time        UTC-02:30
-        #'NFT'  => '+1130', # Norfolk Time[1]                   UTC+11:30
-        #'NPT'  => '+0545', # Nepal Time                        UTC+05:45
-        #'NST'  => '-0330', # Newfoundland Standard Time        UTC-03:30
-        #'NT'   => '-0330', # Newfoundland Time                 UTC-03:30
-        #'OMST' => '+0600', # Omsk Time                         UTC+06:00
-        'PDT'   => '-0700', # Pacific Daylight Time(North America)  UTC-07:00
-        #'PETT' => '+1200', # Kamchatka Time                    UTC+12:00
-        #'PHOT' => '+1300', # Phoenix Island Time               UTC+13:00
-        #'PKT'  => '+0500', # Pakistan Standard Time            UTC+05:00
-        'PST'   => '-0800', # Pacific Standard Time (North America) UTC-08:00
-        #'PST'  => '+0800', # Philippine Standard Time          UTC+08:00
-        #'RET'  => '+0400', # Reunion Time                      UTC+04:00
-        #'SAMT' => '+0400', # Samara Time                       UTC+04:00
-        #'SAST' => '+0200', # South African Standard Time       UTC+02:00
-        #'SBT'  => '+1100', # Solomon Islands Time              UTC+11:00
-        #'SCT'  => '+0400', # Seychelles Time                   UTC+04:00
-        #'SLT'  => '+0530', # Sri Lanka Time                    UTC+05:30
-        #'SST'  => '-1100', # Samoa Standard Time               UTC-11:00
-        #'SST'  => '+0800', # Singapore Standard Time           UTC+08:00
-        #'TAHT' => '-1000', # Tahiti Time                       UTC-10:00
-        #'THA'  => '+0700', # Thailand Standard Time            UTC+07:00
-        'UT'    => '-0000', # Coordinated Universal Time        UTC
-        'UTC'   => '-0000', # Coordinated Universal Time        UTC
-        #'UYST' => '-0200', # Uruguay Summer Time               UTC-02:00
-        #'UYT'  => '-0300', # Uruguay Standard Time             UTC-03:00
-        #'VET'  => '-0430', # Venezuelan Standard Time          UTC-04:30
-        #'VLAT' => '+1000', # Vladivostok Time                  UTC+10:00
-        #'WAT'  => '+0100', # West Africa Time                  UTC+01:00
-        #'WEDT' => '+0100', # Western European Daylight Time    UTC+01:00
-        #'WEST' => '+0100', # Western European Summer Time      UTC+01:00
-        #'WET'  => '-0000', # Western European Time             UTC
-        #'YAKT' => '+0900', # Yakutsk Time                      UTC+09:00
-        #'YEKT' => '+0500', # Yekaterinburg Time                UTC+05:00
+        # ACDT:  '+1030', # Australian Central Daylight Time  UTC+10:30
+        # ACST:  '+0930', # Australian Central Standard Time  UTC+09:30
+        # ACT:   '+0800', # ASEAN Common Time                 UTC+08:00
+        ADT:     '-0300', # Atlantic Daylight Time            UTC-03:00
+        # AEDT:  '+1100', # Australian Eastern Daylight Time  UTC+11:00
+        # AEST:  '+1000', # Australian Eastern Standard Time  UTC+10:00
+        # AFT:   '+0430', # Afghanistan Time                  UTC+04:30
+        AKDT:    '-0800', # Alaska Daylight Time              UTC-08:00
+        AKST:    '-0900', # Alaska Standard Time              UTC-09:00
+        # AMST   '+0500', # Armenia Summer Time               UTC+05:00
+        # AMT    '+0400', # Armenia Time                      UTC+04:00
+        # ART    '-0300', # Argentina Time                    UTC+03:00
+        # AST    '+0300', # Arab Standard Time (Kuwait, Riyadh)       UTC+03:00
+        # AST    '+0400', # Arabian Standard Time (Abu Dhabi, Muscat) UTC+04:00
+        # AST    '+0300', # Arabic Standard Time (Baghdad)    UTC+03:00
+        AST:     '-0400', # Atlantic Standard Time            UTC-04:00
+        # AWDT:  '+0900', # Australian Western Daylight Time  UTC+09:00
+        # AWST:  '+0800', # Australian Western Standard Time  UTC+08:00
+        # AZOST: '-0100', # Azores Standard Time              UTC-01:00
+        # AZT:   '+0400', # Azerbaijan Time                   UTC+04:00
+        # BDT:   '+0800', # Brunei Time                       UTC+08:00
+        # BIOT:  '+0600', # British Indian Ocean Time         UTC+06:00
+        # BIT:   '-1200', # Baker Island Time                 UTC-12:00
+        # BOT:   '-0400', # Bolivia Time                      UTC-04:00
+        # BRT:   '-0300', # Brasilia Time                     UTC-03:00
+        # BST:   '+0600', # Bangladesh Standard Time          UTC+06:00
+        # BST:   '+0100', # British Summer Time (British Standard Time from Feb 1968 to Oct 1971) UTC+01:00
+        # BTT:   '+0600', # Bhutan Time                       UTC+06:00
+        # CAT:   '+0200', # Central Africa Time               UTC+02:00
+        # CCT:   '+0630', # Cocos Islands Time                UTC+06:30
+        CDT:     '-0500', # Central Daylight Time (North America)     UTC-05:00
+        # CEDT:  '+0200', # Central European Daylight Time    UTC+02:00
+        # CEST:  '+0200', # Central European Summer Time      UTC+02:00
+        # CET:   '+0100', # Central European Time             UTC+01:00
+        # CHAST: '+1245', # Chatham Standard Time             UTC+12:45
+        # CIST:  '-0800', # Clipperton Island Standard Time   UTC-08:00
+        # CKT:   '-1000', # Cook Island Time                  UTC-10:00
+        # CLST   '-0300', # Chile Summer Time                 UTC-03:00
+        # CLT    '-0400', # Chile Standard Time               UTC-04:00
+        # COST   '-0400', # Colombia Summer Time              UTC-04:00
+        # COT    '-0500', # Colombia Time                     UTC-05:00
+        CST:     '-0600', # Central Standard Time (North America) UTC-06:00
+        # CST:   '+0800', # China Standard Time               UTC+08:00
+        # CVT:   '-0100', # Cape Verde Time                   UTC-01:00
+        # CXT:   '+0700', # Christmas Island Time             UTC+07:00
+        # ChST:  '+1000', # Chamorro Standard Time            UTC+10:00
+        # DST:   ''       # Daylight saving time              Depending
+        # DFT:   '+0100', # AIX specific equivalent of Central European Time  UTC+01:00
+        # EAST:  '-0600', # Easter Island Standard Time       UTC-06:00
+        # EAT:   '+0300', # East Africa Time                  UTC+03:00
+        # ECT:   '-0400', # Eastern Caribbean Time (does not recognise DST)   UTC-04:00
+        # ECT:   '-0500', # Ecuador Time                      UTC-05:00
+        EDT:     '-0400', # Eastern Daylight Time (North America)     UTC-04:00
+        # EEDT:  '+0300', # Eastern European Daylight Time    UTC+03:00
+        # EEST:  '+0300', # Eastern European Summer Time      UTC+03:00
+        # EET:   '+0200', # Eastern European Time             UTC+02:00
+        EST:     '+0500', # Eastern Standard Time (North America) UTC-05:00
+        # FJT:   '+1200', # Fiji Time                         UTC+12:00
+        # FKST:  '-0400', # Falkland Islands Standard Time    UTC-04:00
+        # GALT:  '-0600', # Galapagos Time                    UTC-06:00
+        # GET:   '+0400', # Georgia Standard Time             UTC+04:00
+        # GFT:   '-0300', # French Guiana Time                UTC-03:00
+        # GILT:  '+1200', # Gilbert Island Time               UTC+12:00
+        # GIT:   '-0900', # Gambier Island Time               UTC-09:00
+        GMT:     '+0000', # Greenwich Mean Time               UTC
+        # :GST   '-0200', # South Georgia and the South Sandwich Islands  UTC-02:00
+        # :GYT   '-0400', # Guyana Time                       UTC-04:00
+        HADT:    '-0900', # Hawaii-Aleutian Daylight Time     UTC-09:00
+        HAST:    '-1000', # Hawaii-Aleutian Standard Time     UTC-10:00
+        # HKT:   '+0800', # Hong Kong Time                    UTC+08:00
+        # HMT:   '+0500', # Heard and McDonald Islands Time   UTC+05:00
+        HST:     '-1000', # Hawaii Standard Time              UTC-10:00
+        # IRKT:  '+0800', # Irkutsk Time                      UTC+08:00
+        # IRST:  '+0330', # Iran Standard Time                UTC+03:30
+        # IST:   '+0530', # Indian Standard Time              UTC+05:30
+        # IST:   '+0100', # Irish Summer Time                 UTC+01:00
+        # IST:   '+0200', # Israel Standard Time              UTC+02:00
+        JST:     '+0900', # Japan Standard Time               UTC+09:00
+        # KRAT:  '+0700', # Krasnoyarsk Time                  UTC+07:00
+        # KST:   '+0900', # Korea Standard Time               UTC+09:00
+        # LHST:  '+1030', # Lord Howe Standard Time           UTC+10:30
+        # LINT:  '+1400', # Line Islands Time                 UTC+14:00
+        # MAGT:  '+1100', # Magadan Time                      UTC+11:00
+        MDT:     '-0600', # Mountain Daylight Time(North America) UTC-06:00
+        # MIT:   '-0930', # Marquesas Islands Time            UTC-09:30
+        # MSD:   '+0400', # Moscow Summer Time                UTC+04:00
+        # MSK:   '+0300', # Moscow Standard Time              UTC+03:00
+        # MST:   '+0800', # Malaysian Standard Time           UTC+08:00
+        MST:     '-0700', # Mountain Standard Time(North America) UTC-07:00
+        # MST:   '+0630', # Myanmar Standard Time             UTC+06:30
+        # MUT:   '+0400', # Mauritius Time                    UTC+04:00
+        # NDT:   '-0230', # Newfoundland Daylight Time        UTC-02:30
+        # NFT:   '+1130', # Norfolk Time[1]                   UTC+11:30
+        # NPT:   '+0545', # Nepal Time                        UTC+05:45
+        # NST:   '-0330', # Newfoundland Standard Time        UTC-03:30
+        # NT:    '-0330', # Newfoundland Time                 UTC-03:30
+        # OMST:  '+0600', # Omsk Time                         UTC+06:00
+        PDT:     '-0700', # Pacific Daylight Time(North America)  UTC-07:00
+        # PETT:  '+1200', # Kamchatka Time                    UTC+12:00
+        # PHOT:  '+1300', # Phoenix Island Time               UTC+13:00
+        # PKT:   '+0500', # Pakistan Standard Time            UTC+05:00
+        PST:     '-0800', # Pacific Standard Time (North America) UTC-08:00
+        # PST:   '+0800', # Philippine Standard Time          UTC+08:00
+        # RET:   '+0400', # Reunion Time                      UTC+04:00
+        # SAMT:  '+0400', # Samara Time                       UTC+04:00
+        # SAST:  '+0200', # South African Standard Time       UTC+02:00
+        # SBT:   '+1100', # Solomon Islands Time              UTC+11:00
+        # SCT:   '+0400', # Seychelles Time                   UTC+04:00
+        # SLT:   '+0530', # Sri Lanka Time                    UTC+05:30
+        # SST:   '-1100', # Samoa Standard Time               UTC-11:00
+        # SST:   '+0800', # Singapore Standard Time           UTC+08:00
+        # TAHT:  '-1000', # Tahiti Time                       UTC-10:00
+        # THA:   '+0700', # Thailand Standard Time            UTC+07:00
+        UT:      '-0000', # Coordinated Universal Time        UTC
+        UTC:     '-0000', # Coordinated Universal Time        UTC
+        # UYST:  '-0200', # Uruguay Summer Time               UTC-02:00
+        # UYT:   '-0300', # Uruguay Standard Time             UTC-03:00
+        # VET:   '-0430', # Venezuelan Standard Time          UTC-04:30
+        # VLAT:  '+1000', # Vladivostok Time                  UTC+10:00
+        # WAT:   '+0100', # West Africa Time                  UTC+01:00
+        # WEDT:  '+0100', # Western European Daylight Time    UTC+01:00
+        # WEST:  '+0100', # Western European Summer Time      UTC+01:00
+        # WET:   '-0000', # Western European Time             UTC
+        # YAKT:  '+0900', # Yakutsk Time                      UTC+09:00
+        # YEKT:  '+0500', # Yekaterinburg Time                UTC+05:00
       }
 
       # Convert to second
@@ -198,15 +198,15 @@ module Sisimai
           # 1d, 1.5w
           n = cr[1].to_f
           u = cr[2] || 'd'
-          getseconds = n * TimeUnit[u].to_f
+          getseconds = n * TimeUnit[u.to_sym].to_f
 
         elsif cr = argv1.match(/\A(\d+|\d+[.]\d+)?([#{mathconsts}])([#{unitoftime}])?\z/)
           # 1pd, 1.5pw
           n = cr[1].to_f || 1
           n = 1 if n.to_i == 0
-          m = MathematicalConstant[cr[2]].to_f
+          m = MathematicalConstant[cr[2].to_sym].to_f
           u = cr[3] || 'd'
-          getseconds = n * m * TimeUnit[u].to_f
+          getseconds = n * m * TimeUnit[u.to_sym].to_f
 
         else
           getseconds = 0
@@ -223,7 +223,7 @@ module Sisimai
       #   monthname()  #=> [ 'Jan', 'Feb', ... ]
       #   monthname(1) #=> [ 'January', 'February', 'March', ... ]
       def monthname(argv1 = 0)
-        value = argv1 > 0 ? 'full' : 'abbr'
+        value = argv1 > 0 ? :full : :abbr
         return MonthName[value]
       end
 
@@ -234,7 +234,7 @@ module Sisimai
       #   dayofweek()  #=> [ 'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat' ]
       #   dayofweek(1) #=> [ 'Sunday', 'Monday', 'Tuesday', ... ]
       def dayofweek(argv1 = 0)
-        value = argv1 > 0 ? 'full' : 'abbr'
+        value = argv1 > 0 ? :full : :abbr
         return DayOfWeek[value]
       end
 
@@ -245,7 +245,7 @@ module Sisimai
       #   hourname()  #=> [ 0, 1, 2, ... 23 ]
       #   hourname(1) #=> [ 'Midnight', 1, 2, ... 'Morning', 7, ... 'Noon', ... 23 ]
       def hourname(argv1 = 1)
-        value = argv1 > 0 ? 'full' : 'abbr'
+        value = argv1 > 0 ? :full : :abbr
         return HourName[value]
       end
 
@@ -292,12 +292,12 @@ module Sisimai
         afternoon1 = 0    # (Integer) After noon flag
         altervalue = {}   # (Hash) To store alternative values
         v = {
-          'Y' => nil,   # (Integer) Year
-          'M' => nil,   # (String) Month Abbr.
-          'd' => nil,   # (Integer) Day
-          'a' => nil,   # (String) Day of week, Abbr.
-          'T' => nil,   # (String) Time
-          'z' => nil,   # (Integer) Timezone offset
+          Y: nil, # (Integer) Year
+          M: nil, # (String) Month Abbr.
+          d: nil, # (Integer) Day
+          a: nil, # (String) Day of week, Abbr.
+          T: nil, # (String) Time
+          z: nil, # (Integer) Timezone offset
         }
 
         while p = timetokens.shift do
@@ -306,13 +306,13 @@ module Sisimai
             # Day of week or Day of week; Thu, Apr, ...
             p.chop if p.length == 4 # Thu, -> Thu
 
-            if DayOfWeek['abbr'].include?(p)
+            if DayOfWeek[:abbr].include?(p)
               # Day of week; Mon, Thu, Sun,...
-              v['a'] = p
+              v[:a] = p
 
-            elsif MonthName['abbr'].include?(p)
+            elsif MonthName[:abbr].include?(p)
               # Month name abbr.; Apr, May, ...
-              v['M'] = p
+              v[:M] = p
 
             end
 
@@ -320,16 +320,16 @@ module Sisimai
             # Year or Day; 2005, 31, 04,  1, ...
             if p.to_i > 31
               # The piece is the value of an year
-              v['Y'] = p
+              v[:Y] = p
 
             else
               # The piece is the value of a day
-              if v['d']
+              if v[:d]
                 # 2-digit year?
-                altervalue['Y'] = p unless v['Y']
+                altervalue[:Y] = p unless v[:Y]
               else
                 # The value is "day"
-                v['d'] = p
+                v[:d] = p
               end
             end
 
@@ -340,18 +340,18 @@ module Sisimai
 
             if cr[1].to_i < 24 && cr[2].to_i < 60 && cr[3].to_i < 60
               # Valid time format, maybe...
-              v['T'] = sprintf('%02d:%02d:%02d', cr[1].to_i, cr[2].to_i, cr[3].to_i)
+              v[:T] = sprintf('%02d:%02d:%02d', cr[1].to_i, cr[2].to_i, cr[3].to_i)
             end
 
           elsif cr = p.match(/\A([0-2]\d):([0-5]\d)\z/)
             # Time; 12:34 => 12:34:00
             if cr[1].to_i < 24 && cr[2].to_i < 60
-              v['T'] = sprintf('%02d:%02d:00', cr[1], cr[2])
+              v[:T] = sprintf('%02d:%02d:00', cr[1], cr[2])
             end
 
           elsif cr = p.match(/\A(\d\d?):(\d\d?)\z/)
             # Time: 1:4 => 01:04:00
-            v['T'] = sprintf('%02d:%02d:00', cr[1], cr[2])
+            v[:T] = sprintf('%02d:%02d:00', cr[1], cr[2])
 
           elsif p =~ /\A[APap][Mm]\z/
             # AM or PM
@@ -361,68 +361,68 @@ module Sisimai
             # Timezone offset and others
             if p =~ /\A[-+][01]\d{3}\z/
               # Timezone offset; +0000, +0900, -1000, ...
-              v['z'] ||= p
+              v[:z] ||= p
 
             elsif p =~ /\A[(]?[A-Z]{2,5}[)]?\z/
               # Timezone abbreviation; JST, GMT, UTC, ...
-              v['z'] ||= abbr2tz(p) || '+0000'
+              v[:z] ||= abbr2tz(p) || '+0000'
 
             else
               # Other date format
               if cr = p.match(%r|\A(\d{4})[-/](\d{1,2})[-/](\d{1,2})\z|)
                 # Mail.app(MacOS X)'s faked Bounce, Arrival-Date: 2010-06-18 17:17:52 +0900
-                v['Y'] = cr[1].to_i
-                v['M'] = MonthName['abbr'][cr[2].to_i - 1]
-                v['d'] = cr[3].to_i
+                v[:Y] = cr[1].to_i
+                v[:M] = MonthName[:abbr][cr[2].to_i - 1]
+                v[:d] = cr[3].to_i
 
               elsif cr = p.match(%r|\A(\d{4})[-/](\d{1,2})[-/](\d{1,2})T([0-2]\d):([0-5]\d):([0-5]\d)\z|)
                 # ISO 8601; 2000-04-29T01:23:45
-                v['Y'] = cr[1].to_i
-                v['M'] = MonthName['abbr'][cr[2].to_i - 1]
+                v[:Y] = cr[1].to_i
+                v[:M] = MonthName[:abbr][cr[2].to_i - 1]
 
                 if cr[3].to_i < 32
-                  v['d'] = cr[3].to_i
+                  v[:d] = cr[3].to_i
                 end
 
                 if cr[4].to_i < 24 && cr[5].to_i < 60 && cr[6].to_i < 60
-                  v['T'] = sprintf('%02d:%02d:%02d', cr[4], cr[5], cr[6])
+                  v[:T] = sprintf('%02d:%02d:%02d', cr[4], cr[5], cr[6])
                 end
 
               elsif cr = p.match(%r|\A(\d{1,2})/(\d{1,2})/(\d{1,2})\z|)
                 # 4/29/01 11:34:45 PM
-                v['M']  = MonthName['abbr'][cr[1].to_i - 1]
-                v['d']  = cr[2].to_i
-                v['Y']  = cr[3].to_i + 2000
-                v['Y'] -= 100 if v['Y'].to_i > ::DateTime.now.year + 1
+                v[:M]  = MonthName[:abbr][cr[1].to_i - 1]
+                v[:d]  = cr[2].to_i
+                v[:Y]  = cr[3].to_i + 2000
+                v[:Y] -= 100 if v[:Y].to_i > ::DateTime.now.year + 1
               end
             end
           end
         end # End of while()
 
-        if v['T'] && afternoon1 > 0
+        if v[:T] && afternoon1 > 0
           # +12
-          t0 = v['T']
-          t1 = v['T'].split(':')
-          v['T'] = sprintf('%02d:%02d:%02d', t1[0].to_i + 12, t1[1], t1[2])
-          v['T'] = t0 if t1[0].to_i > 12
+          t0 = v[:T]
+          t1 = v[:T].split(':')
+          v[:T] = sprintf('%02d:%02d:%02d', t1[0].to_i + 12, t1[1], t1[2])
+          v[:T] = t0 if t1[0].to_i > 12
         end
-        v['a'] ||= 'Thu' # There is no day of week
+        v[:a] ||= 'Thu' # There is no day of week
 
-        if !v['Y'].nil? && v['Y'].to_i < 200
+        if !v[:Y].nil? && v[:Y].to_i < 200
           # 99 -> 1999, 102 -> 2002
-          v['Y'] = v['Y'].to_i + 1900
+          v[:Y] = v[:Y].to_i + 1900
         end
-        v['z'] ||= ::DateTime.now.zone.delete(':')
+        v[:z] ||= ::DateTime.now.zone.delete(':')
 
         # Adjust 2-digit Year
-        if altervalue['Y'] && !v['Y']
+        if altervalue[:Y] && !v[:Y]
           # Check alternative value(Year)
-          if altervalue['Y'].to_i >= 82
+          if altervalue[:Y].to_i >= 82
             # SMTP was born in 1982
-            v['Y'] ||= 1900 + altervalue['Y'].to_i
+            v[:Y] ||= 1900 + altervalue[:Y].to_i
           else
             # 20XX
-            v['Y'] ||= 2000 + altervalue['Y'].to_i
+            v[:Y] ||= 2000 + altervalue[:Y].to_i
           end
         end
 
@@ -433,14 +433,14 @@ module Sisimai
           return nil
         end
 
-        if v['Y'].to_i < 1902 || v['Y'].to_i > 2037
+        if v[:Y].to_i < 1902 || v[:Y].to_i > 2037
           # -(2^31) ~ (2^31)
           return nil
         end
 
         # Build date string
         #   Thu, 29 Apr 2004 10:01:11 +0900
-        return sprintf('%s, %s %s %s %s %s', v['a'], v['d'], v['M'], v['Y'], v['T'], v['z'])
+        return sprintf('%s, %s %s %s %s %s', v[:a], v[:d], v[:M], v[:Y], v[:T], v[:z])
       end
 
       # Abbreviation -> Tiemzone
@@ -451,7 +451,7 @@ module Sisimai
       #   abbr2tz('JST')  #=> '+0900'
       def abbr2tz(argv1)
         return nil unless argv1.is_a?(::String)
-        return TimeZoneAbbr[argv1]
+        return TimeZoneAbbr[argv1.to_sym]
       end
 
       # Convert to second
@@ -467,20 +467,20 @@ module Sisimai
 
         if cr = argv1.match(/\A([-+])(\d)(\d)(\d{2})\z/)
           digit = {
-            'operator' => cr[1],
-            'hour-10'  => cr[2].to_i,
-            'hour-01'  => cr[3].to_i,
-            'minutes'  => cr[4].to_i,
+            :'operator' => cr[1],
+            :'hour-10'  => cr[2].to_i,
+            :'hour-01'  => cr[3].to_i,
+            :'minutes'  => cr[4].to_i,
           }
-          ztime += (digit['hour-10'] * 10 + digit['hour-01']) * 3600
-          ztime += (digit['minutes'] * 60)
-          ztime *= -1 if digit['operator'] == '-'
+          ztime += (digit[:'hour-10'] * 10 + digit[:'hour-01']) * 3600
+          ztime += (digit[:'minutes'] * 60)
+          ztime *= -1 if digit[:'operator'] == '-'
 
           return nil if ztime.abs > TZ_OFFSET
           return ztime
 
         elsif argv1 =~ /\A[A-Za-z]+\z/
-          return tz2second(TimeZoneAbbr[argv1])
+          return tz2second(TimeZoneAbbr[argv1.to_sym])
 
         else
           return nil
@@ -495,14 +495,14 @@ module Sisimai
       #   second2tz(12345)    #=> '+0325'
       def second2tz(argv1)
         return '+0000' unless argv1.is_a?(Number)
-        digit = { 'operator' => '+' }
+        digit = { :operator => '+' }
 
         return '' if argv1.abs > TZ_OFFSET  # UTC+14 + 1(DST?)
-        digit['operator'] = '-' if argv1 < 0
-        digit['hours']    = (argv1.abs / 3600).to_i
-        digit['minutes']  = ((argv1.abs % 3600) / 60).to_i
+        digit[:operator] = '-' if argv1 < 0
+        digit[:hours]    = (argv1.abs / 3600).to_i
+        digit[:minutes]  = ((argv1.abs % 3600) / 60).to_i
 
-        timez = sprintf('%s%02d%02d', digit['operator'], digit['hours'], digit['minutes'])
+        timez = sprintf('%s%02d%02d', digit[:operator], digit[:hours], digit[:minutes])
         return timez
       end
     end