sisimai 4.22.3 → 4.22.4

data/lib/sisimai/message/json.rb

@@ -58,7 +58,7 @@ module Sisimai
         modulelist = []
         tobeloaded = []
 
-        %w|load order|.each do |e|
+        %w[load order].each do |e|
           # The order of MTA(JSON) modules specified by user
           next unless argvs.key?(e)
           next unless argvs[e].is_a? Array
@@ -73,7 +73,7 @@ module Sisimai
             begin
               require v.to_s.gsub('::', '/').downcase
             rescue LoadError
-              warn ' ***warning: Failed to load ' + v
+              warn ' ***warning: Failed to load ' << v
               next
             end
             tobeloaded << v
@@ -134,12 +134,12 @@ module Sisimai
             }
             havecaught = hookmethod.call(p)
           rescue StandardError => ce
-            warn sprintf(' ***warning: Something is wrong in hook method :%s', ce.to_s)
+            warn ' ***warning: Something is wrong in hook method :' << ce.to_s
           end
         end
 
         catch :ADAPTOR do
-          loop do
+          while true
             # 1. User-Defined Module
             # 2. MTA(JSON) Module Candidates to be tried on first
             # 3. Sisimai::Bite::JSON::*
@@ -150,7 +150,7 @@ module Sisimai
               begin
                 require r.gsub('::', '/').downcase
               rescue LoadError => ce
-                warn ' ***warning: Failed to load ' + ce.to_s
+                warn ' ***warning: Failed to load ' << ce.to_s
                 next
               end
               hasadapted = Module.const_get(r).adapt(bouncedata)
@@ -165,7 +165,7 @@ module Sisimai
               begin
                 require r.gsub('::', '/').downcase
               rescue LoadError => ce
-                warn ' ***warning: ' + ce.to_s
+                warn ' ***warning: ' << ce.to_s
                 next
               end
               hasadapted = Module.const_get(r).adapt(bouncedata)
@@ -179,7 +179,7 @@ module Sisimai
               begin
                 require r.gsub('::', '/').downcase
               rescue => ce
-                warn ' ***warning: ' + ce.to_s
+                warn ' ***warning: ' << ce.to_s
                 next
               end
 

data/lib/sisimai/mime.rb

@@ -7,12 +7,12 @@ module Sisimai
       require 'sisimai/string'
 
       ReE = {
-        :'7bit-encoded' => %r/^Content-Transfer-Encoding:[ ]*7bit$/im,
-        :'quoted-print' => %r/^Content-Transfer-Encoding:[ ]*quoted-printable$/im,
-        :'some-iso2022' => %r/^Content-Type:[ ]*.+;[ ]*charset=["']?(iso-2022-[-a-z0-9]+?)['"]?$/im,
-        :'with-charset' => %r/^Content[-]Type:[ ]*.+[;][ ]*charset=['"]?(.+?)['"]?$/i,
-        :'only-charset' => %r/^[\s\t]+charset=['"]?(.+?)['"]?$/i,
-        :'html-message' => %r|^Content-Type:[ ]*text/html;|mi,
+        :'7bit-encoded' => %r/^content-transfer-encoding:[ ]*7bit$/m,
+        :'quoted-print' => %r/^content-transfer-encoding:[ ]*quoted-printable$/m,
+        :'some-iso2022' => %r/^content-type:[ ]*.+;[ ]*charset=["']?(iso-2022-[-a-z0-9]+?)['"]?$/m,
+        :'with-charset' => %r/^content[-]type:[ ]*.+[;][ ]*charset=['"]?(.+?)['"]?$/,
+        :'only-charset' => %r/^[\s\t]+charset=['"]?(.+?)['"]?$/,
+        :'html-message' => %r|^content-type:[ ]*text/html;|m,
       }.freeze
 
       # Make MIME-Encoding and Content-Type related headers regurlar expression
@@ -32,14 +32,14 @@ module Sisimai
         piece = []
         mime1 = false
 
-        if argv1 =~ /[ ]/
+        if argv1.include?(' ')
           # Multiple MIME-Encoded strings in a line
           piece = argv1.split(' ')
         else
           piece << argv1
         end
 
-        piece.each do |e|
+        while e = piece.shift do
           # Check all the string in the array
           next unless e =~ /[ \t]*=[?][-_0-9A-Za-z]+[?][BbQq][?].+[?]=?[ \t]*/
           mime1 = true
@@ -58,7 +58,6 @@ module Sisimai
         encodingname = nil
         mimeencoded0 = nil
         decodedtext0 = []
-
         notmimetext0 = ''
         notmimetext1 = ''
 
@@ -129,22 +128,24 @@ module Sisimai
         # or "Content-Transfer-Encoding: quoted-printable" are not included in
         # the message body.
         return argv1.unpack('M').first if boundary00.size.zero?
-        return argv1.unpack('M').first unless argv1 =~ ReE[:'quoted-print']
+        return argv1.unpack('M').first unless argv1.downcase =~ ReE[:'quoted-print']
 
         boundary01 = Sisimai::MIME.boundary(heads['content-type'], 1)
         reboundary = {
-          :begin => Regexp.new('\A' + Regexp.escape(boundary00)),
-          :until => Regexp.new(Regexp.escape(boundary01) + '\z')
+          :begin => Regexp.new('\A' << Regexp.escape(boundary00)),
+          :until => Regexp.new(Regexp.escape(boundary01) << '\z')
         }
         bodystring = ''
         notdecoded = ''
         getencoded = ''
+        lowercased = ''
 
         encodename = nil
         ctencoding = nil
         mimeinside = false
+        hasdivided = argv1.split("\n")
 
-        argv1.split("\n").each do |e|
+        while e = hasdivided.shift do
           # This is a multi-part message in MIME format. Your mail reader does not
           # understand MIME message format.
           # --=_gy7C4Gpes0RP4V5Bs9cK4o2Us2ZT57b-3OLnRN+4klS8dTmQ
@@ -157,8 +158,8 @@ module Sisimai
               # --=_gy7C4Gpes0RP4V5Bs9cK4o2Us2ZT57b-3OLnRN+4klS8dTmQ
               getencoded = Sisimai::String.to_utf8(notdecoded.unpack('M').first, encodename)
 
-              bodystring += getencoded
-              bodystring += e + "\n"
+              bodystring << getencoded
+              bodystring << e + "\n"
 
               notdecoded = ''
               mimeinside = false
@@ -166,10 +167,11 @@ module Sisimai
               encodename = nil
             else
               # Inside of Queoted printable encoded text
-              notdecoded += e + "\n"
+              notdecoded << e + "\n"
             end
           else
             # NOT Quoted-Printable encoded text block
+            lowercased = e.downcase
             if e =~ /\A[-]{2}[^\s]+[^-]\z/
               # Start of the boundary block
               # --=_gy7C4Gpes0RP4V5Bs9cK4o2Us2ZT57b-3OLnRN+4klS8dTmQ
@@ -178,16 +180,16 @@ module Sisimai
                 boundary00 = e
                 boundary01 = e + '--'
                 reboundary = {
-                  :begin => Regexp.new('\A' + Regexp.escape(boundary00)),
-                  :until => Regexp.new(Regexp.escape(boundary01) + '\z')
+                  :begin => Regexp.new('\A' << Regexp.escape(boundary00)),
+                  :until => Regexp.new(Regexp.escape(boundary01) << '\z')
                 }
               end
-            elsif cv = e.match(ReE[:'with-charset']) || e.match(ReE[:'only-charset'])
+            elsif cv = lowercased.match(ReE[:'with-charset']) || lowercased.match(ReE[:'only-charset'])
               # Content-Type: text/plain; charset=ISO-2022-JP
               encodename = cv[1]
               mimeinside = true if ctencoding
 
-            elsif e =~ ReE[:'quoted-print']
+            elsif lowercased =~ ReE[:'quoted-print']
               # Content-Transfer-Encoding: quoted-printable
               ctencoding = true
               mimeinside = true if encodename
@@ -198,7 +200,7 @@ module Sisimai
               mimeinside = false
             end
 
-            bodystring += e + "\n"
+            bodystring << e + "\n"
           end
         end
 
@@ -235,8 +237,8 @@ module Sisimai
           #    boundary="n6H9lKZh014511.1247824040/mx.example.jp"
           value = cv[1]
           value = value.delete(%q|'"|)
-          value = sprintf('--%s', value) if start > -1
-          value = sprintf('%s--', value) if start >  0
+          value = '--' + value if start > -1
+          value = value + '--' if start >  0
         end
 
         return value

data/lib/sisimai/order/email.rb

@@ -154,7 +154,7 @@ module Sisimai
           # Make default order of MTA modules to be loaded
           rv = []
           begin
-            rv.concat(Sisimai::Bite::Email.index.map { |e| 'Sisimai::Bite::Email::' + e })
+            rv.concat(Sisimai::Bite::Email.index.map { |e| 'Sisimai::Bite::Email::' << e })
           rescue
             # Failed to load an MTA module
             next
@@ -203,7 +203,7 @@ module Sisimai
             begin
               require e.gsub('::', '/').downcase
             rescue LoadError
-              warn ' ***warning: Failed to load ' + e
+              warn ' ***warning: Failed to load ' << e
               next
             end
 

data/lib/sisimai/order/json.rb

@@ -8,18 +8,14 @@ module Sisimai
         require 'sisimai/bite/json'
 
         PatternTable = {
-          'keyname' => {
-            'notificationType' => [
-              'Sisimai::Bite::JSON::AmazonSES',
-            ],
-          },
+          'keyname' => { 'notificationType' => ['Sisimai::Bite::JSON::AmazonSES'] },
         }.freeze
 
         make_default_order = lambda do
           # Make default order of MTA(JSON) modules to be loaded
           rv = []
           begin
-            rv.concat(Sisimai::Bite::JSON.index.map { |e| 'Sisimai::Bite::JSON::' + e })
+            rv.concat(Sisimai::Bite::JSON.index.map { |e| 'Sisimai::Bite::JSON::' << e })
           rescue
             # Failed to load MTA(JSON) module
             next
@@ -54,4 +50,3 @@ module Sisimai
   end
 end
 
-

data/lib/sisimai/reason.rb

@@ -8,12 +8,26 @@ module Sisimai
       # Reason list better to retry detecting an error reason
       # @return   [Array] Reason list
       def retry
-        return %w|
-          undefined onhold systemerror securityerror networkerror
-          hostunknown userunknown
-        |
+        return %w[undefined onhold systemerror securityerror networkerror hostunknown userunknown]
       end
-      RetryReasons = Sisimai::Reason.retry
+      GetRetried = Sisimai::Reason.retry
+      ClassOrder = [
+        %w[
+          MailboxFull MesgTooBig ExceedLimit Suspend HasMoved NoRelaying UserUnknown
+          Filtered Rejected HostUnknown SpamDetected TooManyConn Blocked
+        ],
+        %w[
+          MailboxFull SpamDetected PolicyViolation VirusDetected SecurityError
+          SystemError NetworkError Suspend Expired ContentError SystemFull
+          NotAccept MailerError
+        ],
+        %w[
+          MailboxFull MesgTooBig ExceedLimit Suspend UserUnknown Filtered Rejected
+          HostUnknown SpamDetected TooManyConn Blocked SpamDetected SecurityError
+          SystemError NetworkError Suspend Expired ContentError HasMoved SystemFull
+          NotAccept MailerError NoRelaying SyntaxError OnHold
+        ]
+      ]
 
       # All the error reason list Sisimai support
       # @return   [Array] Reason list
@@ -35,7 +49,7 @@ module Sisimai
         return nil unless argvs
         return nil unless argvs.is_a? Sisimai::Data
 
-        unless RetryReasons.index(argvs.reason)
+        unless GetRetried.index(argvs.reason)
           # Return reason text already decided except reason match with the
           # regular expression of ->retry() method.
           return argvs.reason if argvs.reason.size > 0
@@ -43,24 +57,20 @@ module Sisimai
 
         statuscode = argvs.deliverystatus || ''
         reasontext = ''
-        classorder = %w|
-          MailboxFull MesgTooBig ExceedLimit Suspend HasMoved NoRelaying UserUnknown
-          Filtered Rejected HostUnknown SpamDetected TooManyConn Blocked
-        |
-        return 'delivered' if statuscode =~ /\A2[.]/
+        return 'delivered' if statuscode.start_with?('2.')
 
         if argvs.diagnostictype == 'SMTP' || argvs.diagnostictype == ''
           # Diagnostic-Code: SMTP; ... or empty value
-          classorder.each do |e|
+          ClassOrder[0].each do |e|
             # Check the value of Diagnostic-Code: and the value of Status:, it is a
             # deliverystats, with true() method in each Sisimai::Reason::* class.
-            p = 'Sisimai::Reason::' + e
+            p = 'Sisimai::Reason::' << e
             r = nil
             begin
               require p.downcase.gsub('::', '/')
               r = Module.const_get(p)
             rescue
-              warn ' ***warning: Failed to load ' + p
+              warn ' ***warning: Failed to load ' << p
               next
             end
             next unless r.true(argvs)
@@ -80,9 +90,9 @@ module Sisimai
             unless reasontext
               # Try to match with message patterns in Sisimai::Reason::Vacation
               require 'sisimai/reason/vacation'
-              reasontext = 'vacation' if Sisimai::Reason::Vacation.match(argvs.diagnosticcode)
+              reasontext = 'vacation' if Sisimai::Reason::Vacation.match(argvs.diagnosticcode.downcase)
             end
-            reasontext ||= 'onhold'  if argvs.diagnosticcode.size > 0
+            reasontext ||= 'onhold' if argvs.diagnosticcode.size > 0
           end
           reasontext ||= 'undefined'
         end
@@ -100,36 +110,31 @@ module Sisimai
         return argvs.reason if argvs.reason.size > 0
 
         statuscode = argvs.deliverystatus || ''
-        diagnostic = argvs.diagnosticcode || ''
+        diagnostic = argvs.diagnosticcode.downcase || ''
         commandtxt = argvs.smtpcommand    || ''
         trytomatch = nil
         reasontext = ''
-        classorder = %w|
-          MailboxFull SpamDetected PolicyViolation VirusDetected SecurityError
-          SystemError NetworkError Suspend Expired ContentError SystemFull
-          NotAccept MailerError
-        |
 
         require 'sisimai/smtp/status'
         reasontext = Sisimai::SMTP::Status.name(statuscode)
 
         catch :TRY_TO_MATCH do
-          loop do
+          while true
             trytomatch ||= true if reasontext.empty?
-            trytomatch ||= true if RetryReasons.index(reasontext)
+            trytomatch ||= true if GetRetried.index(reasontext)
             trytomatch ||= true if argvs.diagnostictype != 'SMTP'
             throw :TRY_TO_MATCH unless trytomatch
 
             # Could not decide the reason by the value of Status:
-            classorder.each do |e|
+            ClassOrder[1].each do |e|
               # Trying to match with other patterns in Sisimai::Reason::* classes
-              p = 'Sisimai::Reason::' + e
+              p = 'Sisimai::Reason::' << e
               r = nil
               begin
                 require p.downcase.gsub('::', '/')
                 r = Module.const_get(p)
               rescue
-                warn ' ***warning: Failed to load ' + p
+                warn ' ***warning: Failed to load ' << p
                 next
               end
 
@@ -149,10 +154,9 @@ module Sisimai
                 #  X.7.0   Other or undefined security status
                 reasontext = 'securityerror'
 
-              elsif argvs.diagnostictype =~ /\AX-(?:UNIX|POSTFIX)\z/
+              elsif %w[X-UNIX X-POSTFIX].include?(argvs.diagnostictype)
                 # Diagnostic-Code: X-UNIX; ...
                 reasontext = 'mailererror'
-
               else
                 # 50X Syntax Error?
                 require 'sisimai/reason/syntaxerror'
@@ -162,16 +166,12 @@ module Sisimai
 
             if reasontext.empty?
               # Check the value of Action: field, first
-              if argvs.action =~ /\A(?:delayed|expired)/
+              if argvs.action.start_with?('delayed', 'expired')
                 # Action: delayed, expired
                 reasontext = 'expired'
-
               else
-                # Check the value of SMTP command
-                if commandtxt =~ /\A(?:EHLO|HELO)\z/
-                  # Rejected at connection or after EHLO|HELO
-                  reasontext = 'blocked'
-                end
+                # Rejected at connection or after EHLO|HELO
+                reasontext = 'blocked' if %w[HELO EHLO].index(commandtxt)
               end
             end
 
@@ -190,12 +190,7 @@ module Sisimai
 
         reasontext = ''
         typestring = ''
-        classorder = %w|
-          MailboxFull MesgTooBig ExceedLimit Suspend UserUnknown Filtered Rejected
-          HostUnknown SpamDetected TooManyConn Blocked SpamDetected SecurityError
-          SystemError NetworkError Suspend Expired ContentError HasMoved SystemFull
-          NotAccept MailerError NoRelaying SyntaxError OnHold
-        |
+        diagnostic = argv1.downcase
 
         statuscode = Sisimai::SMTP::Status.find(argv1)
         if cv = argv1.match(/\A(SMTP|X-.+);/i)
@@ -203,20 +198,20 @@ module Sisimai
         end
 
         # Diagnostic-Code: SMTP; ... or empty value
-        classorder.each do |e|
+        ClassOrder[2].each do |e|
           # Check the value of Diagnostic-Code: and the value of Status:, it is a
           # deliverystats, with true() method in each Sisimai::Reason::* class.
-          p = 'Sisimai::Reason::' + e
+          p = 'Sisimai::Reason::' << e
           r = nil
           begin
             require p.downcase.gsub('::', '/')
             r = Module.const_get(p)
           rescue
-            warn ' ***warning: Failed to load ' + p
+            warn ' ***warning: Failed to load ' << p
             next
           end
 
-          next unless r.match(argv1)
+          next unless r.match(diagnostic)
           reasontext = r.text
           break
         end

data/lib/sisimai/reason/blocked.rb

@@ -10,9 +10,7 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/Blocked.pm
       class << self
         def text; return 'blocked'; end
-        def description
-          return 'Email rejected due to client IP address or a hostname'
-        end
+        def description; return 'Email rejected due to client IP address or a hostname'; end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions
@@ -21,18 +19,21 @@ module Sisimai
         def match(argv1)
           return nil unless argv1
           regex = %r{(?>
-             access[ ]denied[.][ ]IP[ ]name[ ]lookup[ ]failed
+             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[ ]sender[ ]IP[ ]address
+            |all[ ]mail[ ]servers[ ]must[ ]have[ ]a[ ]ptr[ ]record[ ]with[ ]a[ ]valid[ ]reverse[ ]dns[ ]entry
+            |bad[ ]sender[ ]ip[ ]address
             |blacklisted[ ]by
-            |(?:Blocked|Refused)[ ]-[ ]see[ ]https?://
-            |can[']t[ ]determine[ ]Purported[ ]Responsible[ ]Address
-            |cannot[ ]resolve[ ]your[ ]address
+            |(?:blocked|refused)[ ]-[ ]see[ ]https?://
+            |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
+                 abus[ ]detecte[ ]gu_eib_0[24]      # SFR
                 |cannot[ ]find[ ]your[ ]hostname    # Yahoo!
                 |may[ ]not[ ]be[ ]mail[ ]exchanger
                 |was[ ]not[ ]authenticated          # Microsoft
@@ -45,106 +46,106 @@ module Sisimai
               |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
+            |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:[ ]
+            |currently[ ]sending[ ]spam[ ]see:[ ]
             |domain[ ](?:
                .+[ ]mismatches[ ]client[ ]ip
               |does[ ]not[ ]exist:
               )
             |dns[ ]lookup[ ]failure:[ ].+[ ]try[ ]again[ ]later
-            |DNSBL:ATTRBL
-            |Dynamic/zombied/spam[ ]IPs[ ]blocked
-            |Email[ ]blocked[ ]by[ ](?:.+[.]barracudacentral[.]org|SPAMHAUS)
-            |Fix[ ]reverse[ ]DNS[ ]for[ ].+
-            |Go[ ]away
-            |host[ ].+[ ]refused[ ]to[ ]talk[ ]to[ ]me:[ ]\d+[ ]Blocked
+            |dnsbl:attrbl
+            |dynamic/zombied/spam[ ]ips[ ]blocked
+            |email[ ]blocked[ ]by[ ](?:.+[.]barracudacentral[.]org|spamhaus)
+            |fix[ ]reverse[ ]dns[ ]for[ ].+
+            |go[ ]away
+            |host[ ].+[ ]refused[ ]to[ ]talk[ ]to[ ]me:[ ]\d+[ ]blocked
             |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
+            |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[ ].+
+              |in[ ]an[ ].*rbl[ ]on[ ].+
               |not[ ]allowed[ ]to[ ]send[ ](?:
                  mail[ ]from
-                |from[ ].+[ ]per[ ]it's[ ]SPF[ ]Record
+                |from[ ].+[ ]per[ ]it's[ ]spf[ ]record
                 )
               )
             |mail[ ]server[ ]at[ ].+[ ]is[ ]blocked
-            |Mail[ ]from[ ]\d+[.]\d+[.]\d+[.]\d[ ]refused:
-            |Message[ ]from[ ].+[ ]rejected[ ]based[ ]on[ ]blacklist
-            |Messages[ ]from[ ].+[ ]temporarily[ ]deferred[ ]due[ ]to[ ]user[ ]complaints   # Yahoo!
+            |mail[ ]from[ ]\d+[.]\d+[.]\d+[.]\d[ ]refused:
+            |message[ ]from[ ].+[ ]rejected[ ]based[ ]on[ ]blacklist
+            |messages[ ]from[ ].+[ ]temporarily[ ]deferred[ ]due[ ]to[ ]user[ ]complaints   # Yahoo!
             |no[ ](?:
                access[ ]from[ ]mail[ ]server
-              |PTR[ ]Record[ ]found[.]
+              |ptr[ ]record[ ]found[.]
               )
-            |Not[ ]currently[ ]accepting[ ]mail[ ]from[ ]your[ ]ip  # Microsoft
+            |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
-            |Rejecting[ ]open[ ]proxy   # Sendmail(srvrsmtp.c)
-            |Reverse[ ]DNS[ ](?:
+            |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
+            |rejecting[ ]open[ ]proxy   # Sendmail(srvrsmtp.c)
+            |reverse[ ]dns[ ](?:
                failed
               |required
               |lookup[ ]for[ ]host[ ].+[ ]failed[ ]permanently
               )
-            |Sender[ ]IP[ ](?:
+            |sender[ ]ip[ ](?:
                address[ ]rejected
               |reverse[ ]lookup[ ]rejected
               )
-            |Server[ ]access[ ](?:
-               .+[ ]forbidden[ ]by[ ]invalid[ ]RDNS[ ]record[ ]of[ ]your[ ]mail[ ]server
-              |forbidden[ ]by[ ]your[ ]IP[ ]
+            |server[ ]access[ ](?:
+               .+[ ]forbidden[ ]by[ ]invalid[ ]rdns[ ]record[ ]of[ ]your[ ]mail[ ]server
+              |forbidden[ ]by[ ]your[ ]ip[ ]
               )
-            |Server[ ]IP[ ].+[ ]listed[ ]as[ ]abusive
-            |service[ ]permits[ ]\d+[ ]unverifyable[ ]sending[ ]IPs
-            |SMTP[ ]error[ ]from[ ]remote[ ]mail[ ]server[ ]after[ ]initial[ ]connection:   # Exim
+            |server[ ]ip[ ].+[ ]listed[ ]as[ ]abusive
+            |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[ ](?:
+            |spf[ ](?:
                .+[ ]domain[ ]authentication[ ]fail
               |record
               |check:[ ]fail
               )
-            |SPF:[ ].+[ ]is[ ]not[ ]allowed[ ]to[ ]send[ ]mail.+[A-Z]{3}.+401
+            |spf:[ ].+[ ]is[ ]not[ ]allowed[ ]to[ ]send[ ]mail.+[a-z]{3}.+401
             |the[ ](?:email|domain|ip).+[ ]is[ ]blacklisted
-            |This[ ]system[ ]will[ ]not[ ]accept[ ]messages[ ]from[ ]servers[/]devices[ ]with[ ]no[ ]reverse[ ]DNS
-            |Too[ ]many[ ]spams[ ]from[ ]your[ ]IP  # free.fr
+            |this[ ]system[ ]will[ ]not[ ]accept[ ]messages[ ]from[ ]servers[/]devices[ ]with[ ]no[ ]reverse[ ]dns
+            |too[ ]many[ ]spams[ ]from[ ]your[ ]ip  # free.fr
             |unresolvable[ ]relay[ ]host[ ]name
-            |Veuillez[ ]essayer[ ]plus[ ]tard.+[A-Z]{3}.+(?:103|510)
+            |veuillez[ ]essayer[ ]plus[ ]tard.+[a-z]{3}.+(?:103|510)
             |your[ ](?:
                network[ ]is[ ]temporary[ ]blacklisted
-              |sender's[ ]IP[ ]address[ ]is[ ]listed[ ]at[ ].+[.]abuseat[.]org
+              |sender's[ ]ip[ ]address[ ]is[ ]listed[ ]at[ ].+[.]abuseat[.]org
               |server[ ]requires[ ]confirmation
               )
             |was[ ]blocked[ ]by[ ].+
             |we[ ]do[ ]not[ ]accept[ ]mail[ ]from[ ](?: # @mail.ru
                dynamic[ ]ips
-              |hosts[ ]with[ ]dynamic[ ]IP[ ]or[ ]generic[ ]dns[ ]PTR-records
+              |hosts[ ]with[ ]dynamic[ ]ip[ ]or[ ]generic[ ]dns[ ]ptr-records
               )
-            |You[ ]are[ ](?:
+            |you[ ]are[ ](?:
                not[ ]allowed[ ]to[ ]connect
               |sending[ ]spam
               )
-            |Your[ ](?:
+            |your[ ](?:
                access[ ]to[ ]submit[ ]messages[ ]to[ ]this[ ]e-mail[ ]system[ ]has[ ]been[ ]rejected
               |message[ ]was[ ]rejected[ ]for[ ]possible[ ]spam/virus[ ]content
               )
             )
-          }xi
+          }x
 
           return true if argv1 =~ regex
           return false
@@ -158,24 +159,12 @@ module Sisimai
         def true(argvs)
           return nil unless argvs
           return nil unless argvs.is_a? Sisimai::Data
-          return true if argvs.reason == Sisimai::Reason::Blocked.text
+          return true if argvs.reason == 'blocked'
 
           require 'sisimai/smtp/status'
-          diagnostic = argvs.diagnosticcode || ''
-          statuscode = argvs.deliverystatus || ''
-          tempreason = Sisimai::SMTP::Status.name(statuscode)
-          reasontext = Sisimai::Reason::Blocked.text
-          v = false
-
-          if tempreason == reasontext
-            # Delivery status code points "blocked".
-            v = true
-          else
-            # Matched with a pattern in this class
-            v = true if Sisimai::Reason::Blocked.match(diagnostic)
-          end
-
-          return v
+          return true if Sisimai::SMTP::Status.name(argvs.deliverystatus) == 'blocked'
+          return true if match(argvs.diagnosticcode.downcase)
+          return false
         end
 
       end