sisimai 4.25.16-java → 5.0.2-java

data/lib/sisimai/order.rb

@@ -1,13 +1,11 @@
 module Sisimai
-  # Sisimai::Order - Parent class for making optimized order list for calling
-  # MTA modules
+  # Sisimai::Order - Parent class for making optimized order list for calling MTA modules
   module Order
-    # Imported from p5-Sisimail/lib/Sisimai/Order.pm
     class << self
       require 'sisimai/lhost'
 
-      # There are another patterns in the value of "Subject:" header of a bounce
-      # mail generated by the following MTA/ESP modules
+      # There are another patterns in the value of "Subject:" header of a bounce mail generated by the
+      # following MTA/ESP modules
       OrderE0 = [
         'Sisimai::Lhost::MailRu',
         'Sisimai::Lhost::Yandex',
@@ -121,9 +119,11 @@ module Sisimai
         'message-delivery' => ['Sisimai::Lhost::MailFoundry'],
         'message-frozen'   => ['Sisimai::Lhost::Exim'],
         'message-you'      => ['Sisimai::Lhost::Barracuda'],
+        'não-entregue'     => ['Sisimai::Lhost::Office365'],
         'non-recapitabile' => ['Sisimai::Lhost::Exchange2007'],
         'non-remis' => ['Sisimai::Lhost::Exchange2007'],
         'notice'    => ['Sisimai::Lhost::Courier'],
+        'onbestelbaar'       => ['Sisimai::Lhost::Office365'],
         'permanent-delivery' => ['Sisimai::Lhost::X4'],
         'postmaster-notify'  => ['Sisimai::Lhost::Sendmail'],
         'returned-mail' => [

data/lib/sisimai/reason/authfailure.rb

@@ -0,0 +1,65 @@
+module Sisimai
+  module Reason
+    # Sisimai::Reason::AuthFailure checks the bounce reason is "authfailure" or not. This class is
+    # called only Sisimai::Reason class.
+    #
+    # This is the error that an authenticaion failure related to SPF, DKIM, or DMARC was detected
+    # on a destination mail host. 
+    #
+    # Action: failed
+    # Status: 5.7.1
+    # Remote-MTA: dns; smtp.example.com
+    # Diagnostic-Code: smtp; 550 5.7.1 Email rejected per DMARC policy for example.org
+    module AuthFailure
+      class << self
+        require 'sisimai/string'
+
+        Index = [
+          '//spf.pobox.com',
+          'bad spf records for',
+          'dmarc policy',
+          'please inspect your spf settings',
+          'sender policy framework (spf) fail',
+          'sender policy framework violation',
+          'spf (sender policy framework) domain authentication fail',
+          'spf check: fail',
+        ].freeze
+        Pairs = [
+          [' is not allowed to send mail.', '_401'],
+          ['is not allowed to send from <', " per it's spf record"],
+        ].freeze
+
+        def text; return 'authfailure'; end
+        def description; return 'Email rejected due to SPF, DKIM, DMARC failure'; end
+
+        # Try to match that the given text and regular expressions
+        # @param    [String] argv1  String to be matched with regular expressions
+        # @return   [True,False]    false: Did not match
+        #                           true: Matched
+        def match(argv1)
+          return nil unless argv1
+          return true if Index.any? { |a| argv1.include?(a) }
+          return true if Pairs.any? { |a| Sisimai::String.aligned(argv1, a) }
+          return false
+        end
+
+        # The bounce reason is "authfailure" or not
+        # @param    [Sisimai::Fact] argvs Object to be detected the reason
+        # @return   [True,False]          true:  is AuthFailure
+        #                                 false: is not AuthFailure
+        # @see      http://www.ietf.org/rfc/rfc2822.txt
+        def true(argvs)
+          return nil  if argvs['deliverystatus'].empty?
+          return true if argvs['reason'] == 'authfailure'
+          return true if Sisimai::SMTP::Status.name(argvs['deliverystatus']).to_s == 'authfailure'
+
+          # Check the value of Diagnosic-Code: header with patterns
+          return true if match(argvs['diagnosticcode'].downcase)
+          return false
+        end
+
+      end
+    end
+  end
+end
+

data/lib/sisimai/reason/badreputation.rb

@@ -0,0 +1,53 @@
+module Sisimai
+  module Reason
+    # Sisimai::Reason::BadReputation checks the bounce reason is "badreputation" or not. This class
+    # is called only Sisimai::Reason class.
+    #
+    # This is the error that an email rejected due to a reputation score of the sender IP address.
+    #
+    #   Action: failed
+    #   Status: 5.7.1
+    #   Remote-MTA: dns; gmail-smtp-in.l.google.com
+    #   Diagnostic-Code: smtp; 550-5.7.1 [192.0.2.22] Our system has detected that this message is
+    #                    likely suspicious due to the very low reputation of the sending IP address.
+    #                    To best protect our users from spam, the message has been blocked. Please
+    #                    visit https://support.google.com/mail/answer/188131 for more information.
+    module BadReputation
+      class << self
+        Index = [
+          'a poor email reputation score',
+          'has been temporarily rate limited due to ip reputation',
+          'ip/domain reputation problems',
+          'likely suspicious due to the very low reputation',
+          "the sending mta's poor reputation",
+        ].freeze
+        def text; return 'badreputation'; end
+        def description; return 'Email rejected due to an IP address reputation'; end
+
+        # Try to match that the given text and regular expressions
+        # @param    [String] argv1  String to be matched with regular expressions
+        # @return   [True,False]    false: Did not match
+        #                           true: Matched
+        def match(argv1)
+          return nil unless argv1
+          return true if Index.any? { |a| argv1.include?(a) }
+          return false
+        end
+
+        # The bounce reason is "badreputation" or not
+        # @param    [Sisimai::Fact] argvs Object to be detected the reason
+        # @return   [True,False]          true:  is BadReputation
+        #                                 false: is not BadReputation
+        # @see      http://www.ietf.org/rfc/rfc2822.txt
+        def true(argvs)
+          return nil  if argvs['deliverystatus'].empty?
+          return true if argvs['reason'] == 'badreputation'
+          return true if match(argvs['diagnosticcode'].downcase)
+          return false
+        end
+
+      end
+    end
+  end
+end
+

data/lib/sisimai/reason/blocked.rb

@@ -1,165 +1,99 @@
 module Sisimai
   module Reason
-    # Sisimai::Reason::Blocked checks the bounce reason is "blocked" or not.
-    # This class is called only Sisimai::Reason class.
+    # Sisimai::Reason::Blocked checks the bounce reason is "blocked" or not. This class is called
+    # only Sisimai::Reason class.
     #
-    # This is the error that SMTP connection was rejected due to a client IP address
-    # or a hostname, or the parameter of "HELO/EHLO" command. This reason has added
-    # in Sisimai 4.0.0 and does not exist in any version of bounceHammer.
+    # This is the error that SMTP connection was rejected due to a client IP address or a hostname,
+    # or the parameter of "HELO/EHLO" command. This reason has added in Sisimai 4.0.0.
     module Blocked
-      # Imported from p5-Sisimail/lib/Sisimai/Reason/Blocked.pm
       class << self
+        require 'sisimai/string'
+
+        Index = [
+          ' said: 550 blocked',
+          '//www.spamcop.net/bl.',
+          'bad sender ip address',
+          'banned sending ip',    # Office365
+          'blacklisted by',
+          'blocked using ',
+          'blocked - see http',
+          'dnsbl:attrbl',
+          'client host rejected: abus detecte gu_eib_02',     # SFR
+          'client host rejected: abus detecte gu_eib_04',     # SFR
+          'client host rejected: may not be mail exchanger',
+          'client host rejected: was not authenticated',      # Microsoft
+          'confirm this mail server',
+          'connection dropped',
+          'connection refused by',
+          'connection reset by peer',
+          'connection was dropped by remote host',
+          'connections not accepted from ip addresses on spamhaus xbl',
+          'currently sending spam see: ',
+          'domain does not exist:',
+          'dynamic/zombied/spam ips blocked',
+          'error: no valid recipients from ',
+          'esmtp not accepting connections',  # icloud.com
+          'extreme bad ip profile',
+          'go away',
+          'helo command rejected:',
+          'host network not allowed',
+          'hosts with dynamic ip',
+          'invalid ip for sending mail of domain',
+          'is not allowed to send mail from',
+          'no access from mail server',
+          'no matches to nameserver query',
+          'not currently accepting mail from your ip',    # Microsoft
+          'part of their network is on our block list',
+          'please use the smtp server of your isp',
+          'refused - see http',
+          'rejected - multi-blacklist', # junkemailfilter.com
+          'rejected because the sending mta or the sender has not passed validation',
+          'rejecting open proxy', # Sendmail(srvrsmtp.c)
+          'sender ip address rejected',
+          'server access forbidden by your ip ',
+          'service not available, closing transmission channel',
+          'smtp error from remote mail server after initial connection:', # Exim
+          "sorry, that domain isn't in my list of allowed rcpthosts",
+          'sorry, your remotehost looks suspiciously like spammer',
+          'temporarily deferred due to unexpected volume or user complaints',
+          'to submit messages to this e-mail system has been rejected',
+          'too many spams from your ip',  # free.fr
+          'too many unwanted messages have been sent from the following ip address above',
+          'we do not accept mail from dynamic ips',   # @mail.ru
+          'you are not allowed to connect',
+          'you are sending spam',
+          'your network is temporary blacklisted',
+          'your server requires confirmation',
+        ].freeze
+        Pairs = [
+          ['access from ip address ', ' blocked'],
+          ['client host ', ' blocked using'],
+          ['connections will not be accepted from ', " because the ip is in spamhaus's list"],
+          ['dnsbl:rbl ', '>_is_blocked'],
+          ['email blocked by ', '.barracudacentral.org'],
+          ['email blocked by ', 'spamhaus'],
+          ['ip ', ' is blocked by earthlink'],    # Earthlink
+          ['is in an ', 'rbl on '],
+          ['mail server at ', ' is blocked'],
+          ['mail from ',' refused:'],
+          ['message from ', ' rejected based on blacklist'],
+          ['messages from ', ' temporarily deferred due to user complaints'], # Yahoo!
+          ['server ip ', ' listed as abusive'],
+          ['sorry! your ip address', ' is blocked by rbl'], # junkemailfilter.com
+          ['the domain ', ' is blacklisted'],
+          ['the email ', ' is blacklisted'],
+          ['the ip', ' is blacklisted'],
+          ['veuillez essayer plus tard. service refused, please try later. ', '103'],
+          ['veuillez essayer plus tard. service refused, please try later. ', '510'],
+          ["your sender's ip address is listed at ", '.abuseat.org'],
+        ].freeze
         Regex = %r{(?>
-           [ ]said:[ ]550[ ]blocked
-          |[(][^ ]+[@][^ ]+:blocked[)]
-          |access[ ]denied[.][ ]ip[ ]name[ ]lookup[ ]failed
-          |access[ ]from[ ]ip[ ]address[ ][^ ]+[ ]blocked
-          |all[ ]mail[ ]servers[ ]must[ ]have[ ]a[ ]ptr[ ]record[ ]with[ ]a[ ]valid[ ]reverse[ ]dns[ ]entry
-          |bad[ ](:?dns[ ]ptr[ ]resource[ ]record|sender[ ]ip[ ]address)
-          |banned[ ]sending[ ]ip  # Office365
-          |blacklisted[ ]by
-          |(?:blocked|refused)[ ]-[ ]see[ ]https?://
-          |blocked[ ]using[ ]
-          |can[']t[ ]determine[ ]purported[ ]responsible[ ]address
-          |cannot[ ](?:
-             find[ ]your[ ]hostname
-            |resolve[ ]your[ ]address
-            )
-          |client[ ]host[ ](?:
-             [^ ]+[ ]blocked[ ]using
-            |rejected:[ ](?:
-               abus[ ]detecte[ ]gu_eib_0[24]      # SFR
-              |cannot[ ]find[ ]your[ ]hostname    # Yahoo!
-              |may[ ]not[ ]be[ ]mail[ ]exchanger
-              |was[ ]not[ ]authenticated          # Microsoft
-              )
-            )
-          |confirm[ ]this[ ]mail[ ]server
-          |connection[ ](?:
-             dropped
-            |refused[ ]by
-            |reset[ ]by[ ]peer
-            |was[ ]dropped[ ]by[ ]remote[ ]host
-            )
-          |connections[ ](?:
-             not[ ]accepted[ ]from[ ]ip[ ]addresses[ ]on[ ]spamhaus[ ]xbl
-            |will[ ]not[ ]be[ ]accepted[ ]from[ ][^ ]+,[ ]because[ ]the[ ]ip[ ]is[ ]in[ ]spamhaus's[ ]list
-            )
-          |currently[ ]sending[ ]spam[ ]see:[ ]
-          |domain[ ](?:
-             [^ ]+[ ]mismatches[ ]client[ ]ip
-            |does[ ]not[ ]exist:
-            )
-          |dns[ ]lookup[ ]failure:[ ][^ ]+[ ]try[ ]again[ ]later
-          |dnsbl:(?:attrbl|rbl[ ]\d+[<][ ].+[ ][>]_is_blocked)
-          |dynamic/zombied/spam[ ]ips[ ]blocked
-          |email[ ]blocked[ ]by[ ](?:[^ ]+[.]barracudacentral[.]org|spamhaus)
-          |error:[ ]no[ ]valid[ ]recipients[ ]from[ ]
-          |esmtp[ ]not[ ]accepting[ ]connections  # icloud.com
-          |extreme[ ]bad[ ]ip[ ]profile
-          |fix[ ]reverse[ ]dns[ ]for[ ][^ ]+
-          |go[ ]away
-          |helo[ ]command[ ]rejected:
-          |host[ ]+[^ ]refused[ ]to[ ]talk[ ]to[ ]me:[ ]\d+[ ]blocked
-          |host[ ]network[ ]not[ ]allowed
-          |hosts[ ]with[ ]dynamic[ ]ip
-          |http://(?:
-             spf[.]pobox[.]com/why[.]html
-            |www[.]spamcop[.]net/bl[.]
-            )
-          |invalid[ ]ip[ ]for[ ]sending[ ]mail[ ]of[ ]domain
-          |ip[ ]\d{1,3}[.]\d{1,3}[.]\d{1,3}[.]\d{1,3}[ ]is[ ]blocked[ ]by[ ]EarthLink # Earthlink
-          |ip[/]domain[ ]reputation[ ]problems
-          |is[ ](?:
-             in[ ]a[ ]black[ ]list(?:[ ]at[ ][^ ]+[.])?
-            |in[ ]an[ ][^ ]+rbl[ ]on[ ][^ ]+
-            |not[ ]allowed[ ]to[ ]send[ ](?:
-               mail[ ]from
-              |from[ ][<][^ ]+[>][ ]per[ ]it's[ ]spf[ ]record
-              )
-            )
-          |mail[ ]server[ ]at[ ][^ ]+[ ]is[ ]blocked
-          |mail[ ]from[ ]\d+[.]\d+[.]\d+[.]\d[ ]refused:
-          |message[ ]from[ ][^ ]+[ ]rejected[ ]based[ ]on[ ]blacklist
-          |message[ ]was[ ]rejected[ ]for[ ]possible[ ]spam/virus[ ]content
-          |messages[ ]from[ ][^ ]+[ ]temporarily[ ]deferred[ ]due[ ]to[ ]user[ ]complaints   # Yahoo!
-          |no[ ](?:
-             access[ ]from[ ]mail[ ]server
-            |ptr[ ]record[ ]found[.]
-            )
-          |not[ ]currently[ ]accepting[ ]mail[ ]from[ ]your[ ]ip  # Microsoft
-          |part[ ]of[ ]their[ ]network[ ]is[ ]on[ ]our[ ]block[ ]list
-          |please[ ](?:
-             get[ ]a[ ]custom[ ]reverse[ ]dns[ ]name[ ]from[ ]your[ ]isp[ ]for[ ]your[ ]host
-            |inspect[ ]your[ ]spf[ ]settings
-            |use[ ]the[ ]smtp[ ]server[ ]of[ ]your[ ]isp
-            )
-          |ptr[ ]record[ ]setup
-          |rejected[ ]because[ ]the[ ]sending[ ]mta[ ]or[ ]the[ ]sender[ ]has[ ]not[ ]passed[ ]validation
-          |rejected[ ]due[ ]to[ ](?:
-             a[ ]poor[ ]email[ ]reputation[ ]score
-            |the[ ]sending[ ]mta's[ ]poor[ ]reputation
-            )
-          |rejecting[ ]open[ ]proxy   # Sendmail(srvrsmtp.c)
-          |reverse[ ]dns[ ](?:
-             failed
-            |required
-            |lookup[ ]for[ ]host[ ][^ ]+[ ]failed[ ]permanently
-            )
-          |sender[ ]ip[ ](?:
-             address[ ]rejected
-            |reverse[ ]lookup[ ]rejected
-            )
-          |server[ ]access[ ](?:
-             [^ ]+[ ]forbidden[ ]by[ ]invalid[ ]rdns[ ]record[ ]of[ ]your[ ]mail[ ]server
-            |forbidden[ ]by[ ]your[ ]ip[ ]
-            )
-          |server[ ]ip[ ][^ ]+[ ]listed[ ]as[ ]abusive
-          |service[ ]not[ ]available,[ ]closing[ ]transmission[ ]channel
-          |service[ ]permits[ ]\d+[ ]unverifyable[ ]sending[ ]ips
-          |smtp[ ]error[ ]from[ ]remote[ ]mail[ ]server[ ]after[ ]initial[ ]connection:   # Exim
-          |sorry,[ ](?:
-             that[ ]domain[ ]isn'?t[ ]in[ ]my[ ]list[ ]of[ ]allowed[ ]rcpthosts
-            |your[ ]remotehost[ ]looks[ ]suspiciously[ ]like[ ]spammer
-            )
-          |spf[ ](?:
-             [(]sender[ ]policy[ ]framework[)][ ]domain[ ]authentication[ ]fail
-            |record
-            |check:[ ]fail
-            )
-          |spf:[ ][^ ]+[ ]is[ ]not[ ]allowed[ ]to[ ]send[ ]mail[.][ ][a-z0-9]_401
-          |temporarily[ ]deferred[ ]due[ ]to[ ]unexpected[ ]volume[ ]or[ ]user[ ]complaints
-          |the[ ](?:email|domain|ip)[ ][^ ]+[ ]is[ ]blacklisted
-          |this[ ]system[ ]will[ ]not[ ]accept[ ]messages[ ]from[ ]servers[/]devices[ ]with[ ]no[ ]reverse[ ]dns
-          |to[ ]submit[ ]messages[ ]to[ ]this[ ]e-mail[ ]system[ ]has[ ]been[ ]rejected
-          |too[ ]many[ ](?:
-             spams[ ]from[ ]your[ ]ip  # free.fr
-            |unwanted[ ]messages[ ]have[ ]been[ ]sent[ ]from[ ]the[ ]following[ ]ip[ ]address[ ]above
-            )
-          |unresolvable[ ]relay[ ]host[ ]name
-          |veuillez[ ]essayer[ ]plus[ ]tard[.][ ]service[ ]refused,[ ]please[ ]try[ ]later[.][ ][0-9a-z_]+(?:103|510)
-          |your[ ](?:
-             network[ ]is[ ]temporary[ ]blacklisted
-            |sender's[ ]ip[ ]address[ ]is[ ]listed[ ]at[ ][^ ]+[.]abuseat[.]org
-            |server[ ]requires[ ]confirmation
-            )
+           [(][^ ]+[@][^ ]+:blocked[)]
+          |host[ ][^ ]+[ ]refused[ ]to[ ]talk[ ]to[ ]me:[ ]\d+[ ]blocked
+          |is[ ]in[ ]a[ ]black[ ]list(?:[ ]at[ ][^ ]+[.])?
           |was[ ]blocked[ ]by[ ][^ ]+
-          |we[ ]do[ ]not[ ]accept[ ]mail[ ]from[ ](?: # @mail.ru
-             dynamic[ ]ips
-            |hosts[ ]with[ ]dynamic[ ]ip[ ]or[ ]generic[ ]dns[ ]ptr-records
-            )
-          |you[ ]are[ ](?:
-             not[ ]allowed[ ]to[ ]connect
-            |sending[ ]spam
-            )
-          |your[ ](?:
-             email[ ]address[ ]has[ ]been[ ]blacklisted
-            |network[ ]is[ ]temporary[ ]blacklisted
-            |sender's[ ]ip[ ]address[ ]is[ ]listed[ ]at[ ][^ ]+[.]abuseat[.]org
-            |server[ ]requires[ ]confirmation
-            )
           )
-        }x
+        }x.freeze
 
         def text; return 'blocked'; end
         def description; return 'Email rejected due to client IP address or a hostname'; end
@@ -170,19 +104,21 @@ module Sisimai
         #                           true: Matched
         def match(argv1)
           return nil unless argv1
+          return true if Index.any? { |a| argv1.include?(a) }
+          return true if Pairs.any? { |a| Sisimai::String.aligned(argv1, a) }
           return true if argv1 =~ Regex
           return false
         end
 
         # Blocked due to client IP address or hostname
-        # @param    [Sisimai::Data] argvs   Object to be detected the reason
-        # @return   [True,False]            true: is blocked
-        #                                   false: is not blocked by the client
+        # @param    [Hash] argvs  Hash to be detected the value of reason
+        # @return   [true,false]  true: is blocked
+        #                         false: is not blocked by the client
         # @see      http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return true if argvs.reason == 'blocked'
-          return true if Sisimai::SMTP::Status.name(argvs.deliverystatus).to_s == 'blocked'
-          return true if match(argvs.diagnosticcode.downcase)
+          return true if argvs['reason'] == 'blocked'
+          return true if Sisimai::SMTP::Status.name(argvs['deliverystatus']).to_s == 'blocked'
+          return true if match(argvs['diagnosticcode'].downcase)
           return false
         end
 

data/lib/sisimai/reason/contenterror.rb

@@ -1,16 +1,15 @@
 module Sisimai
   module Reason
-    # Sisimai::Reason::ContentError checks the bounce reason is "contenterror"
-    # or not This class is called only Sisimai::Reason class.
+    # Sisimai::Reason::ContentError checks the bounce reason is "contenterror" or not This class is
+    # called only Sisimai::Reason class.
     #
-    # This is the error that a destination mail server has rejected email due to
-    # header format of the email like the following. Sisimai will set "contenterror"
-    # to the reason of email bounce if the value of Status: field in a bounce email
-    # is "5.6.*".
+    # This is the error that a destination mail server has rejected email due to header format of the
+    # email like the following. Sisimai will set "contenterror" to the reason of email bounce if the
+    # value of Status: field in a bounce email is "5.6.*".
     module ContentError
-      # Imported from p5-Sisimail/lib/Sisimai/Reason/ContentError.pm
       class << self
         Index = [
+          'duplicate header',
           'header size exceeds maximum permitted',
           'improper use of 8-bit data in message header',
           'message header size, or recipient list, exceeds policy limit',
@@ -19,7 +18,7 @@ module Sisimai
           'this message contain invalid mime headers',
           'this message contain improperly-formatted binary content',
           'this message contain text that uses unnecessary base64 encoding',
-        ]
+        ].freeze
 
         def text; return 'contenterror'; end
         def description; return 'Email rejected due to a header format of the email'; end
@@ -35,7 +34,7 @@ module Sisimai
         end
 
         # Rejected email due to header format of the email
-        # @param    [Sisimai::Data] argvs   Object to be detected the reason
+        # @param    [Sisimai::Fact] argvs   Object to be detected the reason
         # @return   [True,False]            true: rejected due to content error
         #                                   false: is not content error
         # @see      http://www.ietf.org/rfc/rfc2822.txt

data/lib/sisimai/reason/delivered.rb

@@ -1,18 +1,16 @@
 module Sisimai
   module Reason
-    # Sisimai::Reason::Delivered checks the email you sent is delivered successfully
-    # or not by matching diagnostic messages with message patterns. Sisimai will
-    # set "delivered" to the value of "reason" when Status: field in the bounce
-    # message begins with "2" like following:
+    # Sisimai::Reason::Delivered checks the email you sent is delivered successfully or not by matching
+    # diagnostic messages with message patterns. Sisimai will set "delivered" to the value of "reason"
+    # when Status: field in the bounce message begins with "2" like following:
     #
     #  Final-Recipient: rfc822; kijitora@neko.nyaan.jp
-    #  Action: deliverable
+    #  Action: delivered
     #  Status: 2.1.5
     #  Diagnostic-Code: SMTP; 250 2.1.5 OK
     #
     # This class is called only Sisimai.reason method. This is NOT AN ERROR reason.
     module Delivered
-      # Imported from p5-Sisimail/lib/Sisimai/Reason/Delivered.pm
       class << self
         def text; return 'delivered'; end
         def description; return 'Email delivered successfully'; end

data/lib/sisimai/reason/exceedlimit.rb

@@ -1,18 +1,16 @@
 module Sisimai
   module Reason
-    # Sisimai::Reason::ExceedLimit checks the bounce reason is "exceedlimit" or
-    # not. This class is called only Sisimai::Reason class.
+    # Sisimai::Reason::ExceedLimit checks the bounce reason is "exceedlimit" or not. This class is
+    # called only Sisimai::Reason class.
     #
-    # This is the error that a message was rejected due to an email exceeded the
-    # limit. The value of D.S.N. is 5.2.3. This reason is almost the same as
-    # "MesgTooBig", we think.
+    # This is the error that a message was rejected due to an email exceeded the limit. The value
+    # of D.S.N. is 5.2.3. This reason is almost the same as "MesgTooBig", we think.
     module ExceedLimit
-      # Imported from p5-Sisimail/lib/Sisimai/Reason/ExceedLimit.pm
       class << self
         Index = [
           'message header size exceeds limit',
           'message too large',
-        ]
+        ].freeze
 
         def text; return 'exceedlimit'; end
         def description; return 'Email rejected due to an email exceeded the limit'; end
@@ -28,21 +26,21 @@ module Sisimai
         end
 
         # Exceed limit or not
-        # @param    [Sisimai::Data] argvs Object to be detected the reason
+        # @param    [Sisimai::Fact] argvs Object to be detected the reason
         # @return   [True,False]          true: Exceeds the limit
         #                                 false: Did not exceed the limit
         # @see      http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return nil  if argvs.deliverystatus.empty?
-          return true if argvs.reason == 'exceedlimit'
+          return nil  if argvs['deliverystatus'].empty?
+          return true if argvs['reason'] == 'exceedlimit'
 
           # Delivery status code points exceedlimit.
           # Status: 5.2.3
           # Diagnostic-Code: SMTP; 552 5.2.3 Message size exceeds fixed maximum message size
-          return true if Sisimai::SMTP::Status.name(argvs.deliverystatus).to_s == 'exceedlimit'
+          return true if Sisimai::SMTP::Status.name(argvs['deliverystatus']).to_s == 'exceedlimit'
 
           # Check the value of Diagnosic-Code: header with patterns
-          return true if match(argvs.diagnosticcode.downcase)
+          return true if match(argvs['diagnosticcode'].downcase)
           return false
         end
 

data/lib/sisimai/reason/expired.rb

@@ -1,13 +1,11 @@
 module Sisimai
   module Reason
-    # Sisimai::Reason::Expired checks the bounce reason is "expired" or not.
-    # This class is called only Sisimai::Reason class.
+    # Sisimai::Reason::Expired checks the bounce reason is "expired" or not. This class is called only
+    # Sisimai::Reason class.
     #
-    # This is the error that delivery time has expired due to connection failure
-    # or network error and the message you sent has been in the queue for long
-    # time.
+    # This is the error that delivery time has expired due to connection failure or network error and
+    # the message you sent has been in the queue for long time.
     module Expired
-      # Imported from p5-Sisimail/lib/Sisimai/Reason/Expired.pm
       class << self
         Index = [
           'connection timed out',
@@ -20,6 +18,7 @@ module Sisimai
           'has been delayed',
           'it has not been collected after',
           'message expired after sitting in queue for',
+          'message expired, cannot connect to remote server',
           'message expired, connection refulsed',
           'message timed out',
           'retry time not reached for any host after a long failure period',
@@ -28,7 +27,7 @@ module Sisimai
           'unable to deliver message after multiple retries',
           'was not reachable within the allowed queue period',
           'your message could not be delivered for more than',
-        ]
+        ].freeze
 
         def text; return 'expired'; end
         def description; return 'Delivery time has expired due to a connection failure'; end
@@ -44,7 +43,7 @@ module Sisimai
         end
 
         # Delivery expired due to connection failure or network error
-        # @param    [Sisimai::Data] argvs   Object to be detected the reason
+        # @param    [Sisimai::Fact] argvs   Object to be detected the reason
         # @return   [True,False]            true: is expired
         #                                   false: is not expired
         # @see      http://www.ietf.org/rfc/rfc2822.txt

data/lib/sisimai/reason/feedback.rb

@@ -1,9 +1,8 @@
 module Sisimai
   module Reason
-    # Sisimai::Reason::Feedback is for only returning text and description.
-    # This class is called only from Sisimai.reason method and Sisimai::ARF class.
+    # Sisimai::Reason::Feedback is for only returning text and description. This class is called only
+    # from Sisimai.reason method and Sisimai::ARF class.
     module Feedback
-      # Imported from p5-Sisimail/lib/Sisimai/Reason/Feedback.pm
       class << self
         def text; return 'feedback'; end
         def description; return 'Email forwarded to the sender as a complaint message from your mailbox provider'; end