sisimai 4.14.2 → 4.15.0

data/lib/sisimai/data/json.rb

@@ -5,8 +5,6 @@ module Sisimai
     module JSON
       # Imported from p5-Sisimail/lib/Sisimai/Data/JSON.pm
       class << self
-        require 'json'
-
         # Data dumper(JSON)
         # @param    [Sisimai::Data] argvs   Object
         # @return   [String, Nil]           Dumped data or Undef if the argument
@@ -15,16 +13,22 @@ module Sisimai
           return nil unless argvs
           return nil unless argvs.is_a? Sisimai::Data
 
-          damneddata = argvs.damn
-          jsonstring = nil
-          jsonoption = ::JSON::state.new
-
-          begin
-            jsonoption.space = ' '
-            jsonoption.object_nl = ' '
-            jsonstring = ::JSON.generate(damneddata, jsonoption)
-          rescue
-            warn '***warning: Failed to JSON.generate'
+          if RUBY_PLATFORM =~ /java/
+            # java-based ruby environment like JRuby.
+            begin
+              require 'jrjackson'
+              jsonstring = JrJackson::Json.dump(argvs.damn)
+            rescue
+              warn '***warning: Failed to JrJackson::Json.dump'
+            end
+          else
+            # MRI
+            begin
+              require 'oj'
+              jsonstring = Oj.dump(argvs.damn, :mode => :compat)
+            rescue
+              warn '***warning: Failed to Oj.dump'
+            end
           end
 
           return jsonstring

data/lib/sisimai/datetime.rb

@@ -258,7 +258,6 @@ module Sisimai
       #   o2d(2,'/')  #=> 2015/11/02
       def o2d(argv1 = 0, argv2 = '-')
         piece = ::DateTime.now
-        epoch = 0
 
         return piece.strftime('%Y/%m/%d') unless argv1 =~ /\A[-]?\d+\z/
         epoch = piece.to_time.to_i - argv1 * 86400
@@ -290,7 +289,6 @@ module Sisimai
         datestring = datestring.sub(/[,](\d+)/, ', \1')  # Thu,13 -> Thu, 13
         datestring = datestring.sub(/(\d{1,2}),/, '\1')  # Apr,29 -> Apr 29
         timetokens = datestring.split(' ')
-        parseddate = ''   # (String) Canonified Date/Time string
         afternoon1 = 0    # (Integer) After noon flag
         altervalue = {}   # (Hash) To store alternative values
         v = {
@@ -442,10 +440,7 @@ module Sisimai
 
         # Build date string
         #   Thu, 29 Apr 2004 10:01:11 +0900
-        parseddate = sprintf(
-          '%s, %s %s %s %s %s',
-          v['a'], v['d'], v['M'], v['Y'], v['T'], v['z'])
-        return parseddate
+        return sprintf('%s, %s %s %s %s %s', v['a'], v['d'], v['M'], v['Y'], v['T'], v['z'])
       end
 
       # Abbreviation -> Tiemzone
@@ -468,7 +463,6 @@ module Sisimai
       #   tz2second('+0900')  #=> 32400
       def tz2second(argv1)
         return nil unless argv1.is_a?(::String)
-        digit = {}
         ztime = 0
 
         if cr = argv1.match(/\A([-+])(\d)(\d)(\d{2})\z/)
@@ -502,7 +496,6 @@ module Sisimai
       def second2tz(argv1)
         return '+0000' unless argv1.is_a?(Number)
         digit = { 'operator' => '+' }
-        timez = ''
 
         return '' if argv1.abs > TZ_OFFSET  # UTC+14 + 1(DST?)
         digit['operator'] = '-' if argv1 < 0

data/lib/sisimai/mail/maildir.rb

@@ -41,10 +41,7 @@ module Sisimai
         return nil unless self.offset < self.size
 
         seekhandle = self.handle
-        filehandle = nil
         readbuffer = ''
-        emailindir = ''
-        emailinode = nil
 
         begin
           while r = seekhandle.read do

data/lib/sisimai/mail/mbox.rb

@@ -1,6 +1,6 @@
 module Sisimai
-  # Sisimai::Mail::Mbox is a mailbox file (UNIX mbox) reader.
   class Mail
+    # Sisimai::Mail::Mbox is a mailbox file (UNIX mbox) reader.
     class Mbox
       # Imported from p5-Sisimail/lib/Sisimai/Mail/Mbox.pm
       @@roaccessors = [

data/lib/sisimai/mail/stdin.rb

@@ -1,6 +1,7 @@
-# Sisimai::Mail::STDIN is a reader for getting contents of each email from STDIN
 module Sisimai
   class Mail
+    # Sisimai::Mail::STDIN is a reader for getting contents of each email from
+    # STDIN
     class STDIN
       # Imported from p5-Sisimail/lib/Sisimai/Mail/STDIN.pm
       @@roaccessors = [

data/lib/sisimai/message.rb

@@ -30,14 +30,12 @@ module Sisimai
     MultiHeads = { 'received' => true }
     IgnoreList = { 'dkim-signature' => true }
     Indicators = {
-      :begin => ( 1 << 1 ),
-      :endof => ( 1 << 2 ),
+      :begin => (1 << 1),
+      :endof => (1 << 2),
     }
-    @@DefaultSet = Sisimai::Order.another
-    @@PatternSet = Sisimai::Order.by('subject')
-    @@ExtHeaders = Sisimai::Order.headers
-    @@ToBeLoaded = []
-    @@TryOnFirst = []
+    DefaultSet = Sisimai::Order.another
+    PatternSet = Sisimai::Order.by('subject')
+    ExtHeaders = Sisimai::Order.headers
 
     # Constructor of Sisimai::Message
     # @param         [String] data      Email text data
@@ -87,8 +85,11 @@ module Sisimai
 
       processing = { 'from' => '', 'header' => {}, 'rfc822' => '', 'ds' => [] }
       mtamodules = []
+      extheaders = ExtHeaders
+      tobeloaded = []
+      headerargv = {}
 
-      ['load', 'order'].each do |e|
+      %w|load order|.each do |e|
         # The order of MTA modules specified by user
         next unless argvs.key?(e)
         next unless argvs[e].is_a? Array
@@ -109,37 +110,41 @@ module Sisimai
 
           Module.const_get(v).headerlist.each do |w|
             # Get header name which required user defined MTA module
-            @@ExtHeaders[w]  ||= {}
-            @@ExtHeaders[w][v] = 1
+            extheaders[w]  ||= {}
+            extheaders[w][v] = 1
           end
-          @@ToBeLoaded << v
+          tobeloaded << v
         end
       end
 
       mtamodules.each do |e|
         # Append the custom order of MTA modules
-        next if @@ToBeLoaded.index(e)
-        @@ToBeLoaded << e
+        next if tobeloaded.index(e)
+        tobeloaded << e
       end
 
       # 0. Split email data to headers and a body part.
       aftersplit = Sisimai::Message.divideup(email)
       return nil if aftersplit.empty?
 
-      # 1. Initialize variables for setting the value of each email header.
-      @@TryOnFirst = []
-
-      # 2. Convert email headers from text to hash reference
+      # 1. Convert email headers from text to hash reference
+      headerargv['extheaders'] = extheaders
+      headerargv['tryonfirst'] = []
       processing['from']   = aftersplit['from']
-      processing['header'] = Sisimai::Message.headers(aftersplit['header'])
+      processing['header'] = Sisimai::Message.headers(aftersplit['header'], headerargv)
 
       # 3. Check headers for detecting MTA/MSP module
-      if @@TryOnFirst.empty?
-        @@TryOnFirst.concat(Sisimai::Message.makeorder(processing['header']))
+      if headerargv['tryonfirst'].empty?
+        headerargv['tryonfirst'].concat(Sisimai::Message.makeorder(processing['header']))
       end
 
       # 4. Rewrite message body for detecting the bounce reason
-      methodargv = { 'mail' => processing, 'body' => aftersplit['body'] }
+      methodargv = {
+        'mail' => processing,
+        'body' => aftersplit['body'],
+        'tryonfirst' => headerargv['tryonfirst'],
+        'tobeloaded' => tobeloaded,
+      }
       bouncedata = Sisimai::Message.parse(methodargv)
 
       return nil unless bouncedata
@@ -180,6 +185,7 @@ module Sisimai
       hasdivided.each do |e|
         # Split email data to headers and a body part.
         e = e.delete("\r").delete("\n")
+        e = e.gsub(/[ \t]+\z/, '')
 
         if readcursor & Indicators[:endof] > 0
           # The body part of the email
@@ -208,19 +214,22 @@ module Sisimai
 
     # Convert email headers from text to hash reference
     # @param         [String] heads  Email header data
+    # @param         [Hash]   argvs
+    # @param options extheaders [Array] External header table
     # @return        [Hash]          Structured email header data
-    def self.headers(heads)
+    def self.headers(heads, argvs = {})
       return nil unless heads
 
       currheader = ''
       allheaders = {}
       structured = {}
+      extheaders = argvs['extheaders'] || []
 
       HeaderList.each { |e| structured[e] = nil  }
       HeaderList.each { |e| allheaders[e] = true }
       RFC3834Set.each { |e| allheaders[e] = true }
       MultiHeads.each_key { |e| structured[e.downcase] = [] }
-      @@ExtHeaders.each_key { |e| allheaders[e] = true }
+      extheaders.each_key { |e| allheaders[e] = true }
 
       heads.split("\n").each do |e|
         # Convert email headers to hash
@@ -241,9 +250,12 @@ module Sisimai
 
           else
             # Other headers except "Received" and so on
-            if @@ExtHeaders[currheader]
+            if extheaders[currheader]
               # MTA specific header
-              @@TryOnFirst.concat(@@ExtHeaders[currheader].keys)
+              extheaders[currheader].keys.each do |r|
+                next if argvs['tryonfirst'].index(r)
+                argvs['tryonfirst'] << r
+              end
             end
             structured[currheader] = rhs
           end
@@ -277,12 +289,12 @@ module Sisimai
 
       # Try to match the value of "Subject" with patterns generated by
       # Sisimai::Order->by('subject') method
-      @@PatternSet.each_key do |e|
+      PatternSet.each_key do |e|
         # Get MTA list from the subject header
         next unless heads['subject'] =~ e
 
         # Matched and push MTA list
-        order.concat(@@PatternSet[e])
+        order.concat(PatternSet[e])
         break
       end
       return order
@@ -379,11 +391,14 @@ module Sisimai
     # @param options mail  [String] rfc822 Original message part
     # @param options mail  [Array]  ds     Delivery status list(parsed data)
     # @param options argvs [String] body   Email message body
-    # @param options argvs [Array] load    MTA/MSP module list to load on first
+    # @param options argvs [Array] tryonfirst  MTA/MSP module list to load on first
+    # @param options argvs [Array] tobeloaded  User defined MTA module list
     # @return              [Hash]          Parsed and structured bounce mails
     def self.parse(argvs)
       mesgentity = argvs['mail']
       bodystring = argvs['body']
+      tryonfirst = argvs['tryonfirst'] || []
+      tobeloaded = argvs['tobeloaded'] || []
       mailheader = mesgentity['header']
 
       return nil unless argvs['mail']
@@ -443,7 +458,7 @@ module Sisimai
             throw :SCANNER if scannedset
           end
 
-          @@ToBeLoaded.each do |r|
+          tobeloaded.each do |r|
             # Call user defined MTA modules
             next if haveloaded[r]
             begin
@@ -457,7 +472,7 @@ module Sisimai
             throw :SCANNER if scannedset
           end
 
-          @@TryOnFirst.each do |r|
+          tryonfirst.each do |r|
             # Try MTA module candidates which are detected from MTA specific
             # mail headers on first
             next if haveloaded.key?(r)
@@ -472,7 +487,7 @@ module Sisimai
             throw :SCANNER if scannedset
           end
 
-          @@DefaultSet.each do |r|
+          DefaultSet.each do |r|
             # MTA/MSP modules which does not have MTA specific header and did
             # not match with any regular expressions of Subject header.
             next if haveloaded.key?(r)

data/lib/sisimai/mime.rb

@@ -116,8 +116,8 @@ module Sisimai
           value = value.delete(%q|'"|)
         end
 
-        value = sprintf( '--%s', value ) if start > -1
-        value = sprintf( '%s--', value ) if start >  0
+        value = sprintf('--%s', value) if start > -1
+        value = sprintf('%s--', value) if start >  0
         return value
       end
     end

data/lib/sisimai/msp.rb

@@ -10,8 +10,8 @@ module Sisimai
       # @private
       def INDICATORS
         return {
-          :'deliverystatus' => ( 1 << 1 ),
-          :'message-rfc822' => ( 1 << 2 ),
+          :'deliverystatus' => (1 << 1),
+          :'message-rfc822' => (1 << 2),
         }
       end
 
@@ -45,7 +45,7 @@ module Sisimai
           'US::SendGrid', 'US::Verizon', 'RU::MailRu', 'RU::Yandex', 'DE::GMX',
           'US::Bigfoot', 'US::Facebook', 'US::Zoho', 'DE::EinsUndEins',
           'UK::MessageLabs', 'JP::EZweb', 'JP::KDDI', 'JP::Biglobe',
-          'US::ReceivingSES',
+          'US::ReceivingSES', 'US::AmazonWorkMail', 'US::Office365',
         ]
       end
 

data/lib/sisimai/msp/de/einsundeins.rb

@@ -144,7 +144,7 @@ module Sisimai
             if mhead['received'].size > 0
               # Get localhost and remote host name from Received header.
               r0 = mhead['received']
-              ['lhost', 'rhost'].each { |a| e[a] ||= '' }
+              %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

data/lib/sisimai/msp/de/gmx.rb

@@ -168,7 +168,7 @@ module Sisimai
             if mhead['received'].size > 0
               # Get localhost and remote host name from Received header.
               r0 = mhead['received']
-              ['lhost', 'rhost'].each { |a| e[a] ||= '' }
+              %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

data/lib/sisimai/msp/jp/biglobe.rb

@@ -29,7 +29,7 @@ module Sisimai
 
         def description; return 'BIGLOBE: http://www.biglobe.ne.jp'; end
         def smtpagent;   return 'JP::Biglobe'; end
-        def headerlist;  return ['']; end
+        def headerlist;  return []; end
         def pattern;     return Re0; end
 
         # Parse bounce messages from Biglobe
@@ -151,7 +151,7 @@ module Sisimai
             if mhead['received'].size > 0
               # Get localhost and remote host name from Received header.
               r0 = mhead['received']
-              ['lhost', 'rhost'].each { |a| e[a] ||= '' }
+              %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

data/lib/sisimai/msp/jp/ezweb.rb

@@ -29,21 +29,21 @@ module Sisimai
         ReFailure = {
           #'notaccept' => [ %r/The following recipients did not receive this message:/ ],
           'mailboxfull' => [
-              %r/The user[(]s[)] account is temporarily over quota/,
+            %r/The user[(]s[)] account is temporarily over quota/,
           ],
           'suspend' => [
-              # http://www.naruhodo-au.kddi.com/qa3429203.html
-              # The recipient may be unpaid user...?
-              %r/The user[(]s[)] account is disabled[.]/,
-              %r/The user[(]s[)] account is temporarily limited[.]/,
+            # http://www.naruhodo-au.kddi.com/qa3429203.html
+            # The recipient may be unpaid user...?
+            %r/The user[(]s[)] account is disabled[.]/,
+            %r/The user[(]s[)] account is temporarily limited[.]/,
           ],
           'expired' => [
-              # Your message was not delivered within 0 days and 1 hours.
-              # Remote host is not responding.
-              %r/Your message was not delivered within /,
+            # Your message was not delivered within 0 days and 1 hours.
+            # Remote host is not responding.
+            %r/Your message was not delivered within /,
           ],
           'onhold' => [
-              %r/Each of the following recipients was rejected by a remote mail server/,
+            %r/Each of the following recipients was rejected by a remote mail server/,
           ],
         }
         Indicators = Sisimai::MSP.INDICATORS
@@ -225,7 +225,7 @@ module Sisimai
             if mhead['received'].size > 0
               # Get localhost and remote host name from Received header.
               r0 = mhead['received']
-              ['lhost', 'rhost'].each { |a| e[a] ||= '' }
+              %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

data/lib/sisimai/msp/jp/kddi.rb

@@ -153,7 +153,7 @@ module Sisimai
             if mhead['received'].size > 0
               # Get localhost and remote host name from Received header.
               r0 = mhead['received']
-              ['lhost', 'rhost'].each { |a| e[a] ||= '' }
+              %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

data/lib/sisimai/msp/ru/yandex.rb

@@ -213,7 +213,7 @@ module Sisimai
             if mhead['received'].size > 0
               # Get localhost and remote host name from Received header.
               r0 = mhead['received']
-              ['lhost', 'rhost'].each { |a| e[a] ||= '' }
+              %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

data/lib/sisimai/msp/uk/messagelabs.rb

@@ -216,7 +216,7 @@ module Sisimai
             if mhead['received'].size > 0
               # Get localhost and remote host name from Received header.
               r0 = mhead['received']
-              ['lhost', 'rhost'].each { |a| e[a] ||= '' }
+              %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

data/lib/sisimai/msp/us/amazonses.rb

@@ -206,7 +206,7 @@ module Sisimai
             if mhead['received'].size > 0
               # Get localhost and remote host name from Received header.
               r0 = mhead['received']
-              ['lhost', 'rhost'].each { |a| e[a] ||= '' }
+              %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