sisimai 4.20.2 → 4.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ae65a92e8ce97f94a3a2e9d49afac7daf4dd616
-  data.tar.gz: ac6fb8541ef2fcdfb931fb144ff6fcb6eab19774
+  metadata.gz: 2046eb91d0583931b210c5bd0e6aa6bdc504a366
+  data.tar.gz: 55aa06f4bc74998520e90f7271c998d54a55b605
 SHA512:
-  metadata.gz: 2ccd7a6266707802d83a0ad80c9e76e27660a93210c20620a0b9f641b9d5d0e2bc72560f1934b89c641e0ba9b1ab081eaa101d8289966a46db9da100d63b692f
-  data.tar.gz: bec6463ca315a9eae480c1302f1d7227c4dc8c389e911a65f2634c4cf1f7de5efd6ae8df94557d192714fb60eb9c303f5e7ece6519d7b8e42a7cfc981eb81e39
+  metadata.gz: 3f2b4f015f99be61210bc1e0831588a3239a993f8bd77843f0f6b1a0167016cae1986e6eef7a816937417cc83821990ed68e592e30f4779df710a4878f8639af
+  data.tar.gz: 319b32e062689516bb4c8caed1012b244dd3187bdb04ea7ae9746a0e90f9bad07d554c476014365332ee50da52b7b1777a4c6af5b605a437d7a4f76c7c34f179

data/Changes

@@ -1,5 +1,19 @@
 Revision history for the Ruby version of Sisimai
 
+4.21.0 Mon, 10 Apr 2017 12:17:22 +0900 (JST)
+    - Experimental implementation: new MTA module "Sisimai::MSP::US::GSuite" to 
+      parse bounce mails returned from G Suite.
+    - Sisimai.make and Sisimai::Message.new methods check "field" argument more
+      strictly.
+    - Improved Sisimai::SMTP::Status.find(). The method checks whether a found
+      value as D.S.N. is IPv4 address or not.
+    - Improved code for getting error messages, D.S.N. values, and SMTP reply
+      codes in Sisimai::MTA::Postfix.scan() method.
+    - Pull-Request #69, Fix some typos. Thanks to @koic.
+    - Pull-Request #71, Fix break statement. Thanks to @MichiakiNakaya.
+    - Issue #70, All the value of $PATH in Makefile have been fixed to build a
+      gem file for JRuby Platform. Thanks to @MichiakiNakaya, @hiroyuki-sato.
+
 4.20.2  Sat, 11 Mar 2017 16:32:48 +0900 (JST)
     - Pull-Request #63 Add some error message patterns from Amazon SES SMTP
       endpoint.
@@ -105,7 +119,7 @@ Revision history for the Ruby version of Sisimai
     - Implement new MTA/MSP module "Sisimai::MSP::US::Office365" to parse error
       mails via Microsoft Office 365. The module, test codes, and sample emails
       are imported from https://github.com/sisimai/p5-Sisimai/pull/164.
-    - New method Sisimai::Address#to_s to get a email address as String, it is
+    - New method Sisimai::Address#to_s to get an email address as String, it is
       implemented at pull-request #39. Thanks to @hiroyuki-sato.
     - Almost all of the class variables are removed for resolving issue #40 and
       merged pull-request #43, thanks to @hiroyuki-sato.

data/Makefile

@@ -27,38 +27,43 @@ REPOS_TARGETS = git-status git-push git-commit-amend git-tag-list git-diff \
 depend:
 	gem install $(DEPENDENCIES)
 	if [ test -d "$(JRUBY)" ]; then \
-		PATH="$$PATH:$(JRUBY)/bin" $(JRUBY)/bin/gem install $(DEPENDENCIES); \
+		PATH="$(JRUBY)/bin:$$PATH" $(JRUBY)/bin/gem install $(DEPENDENCIES); \
 	fi
 
 install-from-rubygems:
 	gem install $(NAME)
 	if [ test -d "$(JRUBY)" ]; then \
-		PATH="$$PATH:$(JRUBY)/bin" $(JRUBY)/bin/gem install $(NAME); \
+		PATH="$(JRUBY)/bin:$$PATH" $(JRUBY)/bin/gem install $(NAME); \
 	fi
 
 install-from-local:
 	$(RAKE) install
 	if [ test -d "$(JRUBY)" ]; then \
-		PATH="$$PATH:$(JRUBY)/bin" $(JRUBY)/bin/rake install; \
+		PATH="$(JRUBY)/bin:$$PATH" $(JRUBY)/bin/rake install; \
 	fi
 
 build:
 	$(RAKE) $@ 
 	if [ -d "$(JRUBY)" ]; then \
-		PATH="$$PATH:$(JRUBY)/bin" $(JRUBY)/bin/rake $@; \
+		PATH="$(JRUBY)/bin:$$PATH" $(JRUBY)/bin/rake $@; \
 	fi
 
 release:
 	$(RAKE) release
 	if [ -d "$(JRUBY)" ]; then \
-		PATH="$$PATH:$(JRUBY)/bin" $(JRUBY)/bin/rake release; \
+		PATH="$(JRUBY)/bin:$$PATH" $(JRUBY)/bin/rake release; \
 	fi
 
-test: user-test
+test: cruby-test
 
-user-test:
+cruby-test:
 	$(RAKE) spec
 
+jruby-test:
+	if [ -d "$(JRUBY)" ]; then \
+		PATH="$(JRUBY)/bin:$$PATH" LS_HEAP_SIZE='1024m' $(JRUBY)/bin/rake spec; \
+	fi
+
 patrol:
 	rubocop -fp --display-cop-names --display-style-guide --no-color lib
 

data/README-JA.md

@@ -55,7 +55,7 @@ Key features
 * __高い解析精度__
   * 解析精度はbounceHammerの2倍
   * 27種類のMTAに対応
-  * 21種類の著名なMSPに対応
+  * 22種類の著名なMSPに対応
   * 2種類の著名なメール配信クラウドに対応(JSON)
   * Feedback Loopにも対応
   * 27種類のエラー理由を検出
@@ -80,10 +80,10 @@ Install
 
 ```shell
 $ sudo gem install sisimai
-Fetching: sisimai-4.20.2.gem (100%)
-Successfully installed sisimai-4.20.2
-Parsing documentation for sisimai-4.20.2
-Installing ri documentation for sisimai-4.20.2
+Fetching: sisimai-4.21.0.gem (100%)
+Successfully installed sisimai-4.21.0
+Parsing documentation for sisimai-4.21.0
+Installing ri documentation for sisimai-4.21.0
 Done installing documentation for sisimai after 6 seconds
 1 gem installed
 ```
@@ -96,22 +96,11 @@ $ git clone https://github.com/sisimai/rb-Sisimai.git
 $ cd ./rb-Sisimai
 $ sudo make depend install-from-local
 gem install bundle rake rspec coveralls
-Successfully installed bundle-0.0.1
-Parsing documentation for bundle-0.0.1
-Done installing documentation for bundle after 0 seconds
-Successfully installed rake-10.5.0
-Parsing documentation for rake-10.5.0
-Done installing documentation for rake after 1 seconds
-Successfully installed rspec-3.4.0
-Parsing documentation for rspec-3.4.0
-Done installing documentation for rspec after 0 seconds
-Successfully installed coveralls-0.8.10
-Parsing documentation for coveralls-0.8.10
-Done installing documentation for coveralls after 0 seconds
+...
 4 gems installed
 bundle exec rake install
-sisimai 4.20.2 built to pkg/sisimai-4.20.2.gem.
-sisimai (4.20.2) installed.
+sisimai 4.21.0 built to pkg/sisimai-4.21.0.gem.
+sisimai (4.21.0) installed.
 ```
 
 Usage
@@ -250,8 +239,8 @@ Differences between Ruby version and Perl version
 | メール解析速度(1000通のメール)              | 3.30秒         | 2.33秒        |
 | インストール方法                            | gem install    | cpanm         |
 | 依存モジュール数(コアモジュールを除く)      | 1モジュール    | 2モジュール   |
-| LOC:ソースコードの行数                      | 12200行        | 8800行        |
-| テスト件数(spec/,t/,xt/ディレクトリ)        | 106600件       | 188000件      |
+| LOC:ソースコードの行数                      | 12400行        | 9000行        |
+| テスト件数(spec/,t/,xt/ディレクトリ)        | 108000件       | 189600件      |
 | ライセンス                                  | 二条項BSD      | 二条項BSD     |
 | 開発会社によるサポート契約                  | 準備中         | 提供中        |
 

data/README.md

@@ -54,7 +54,7 @@ Key Features
 * __High Precision of Analysis__
   * 2 times higher than bounceHammer
   * Support 22 known MTAs and 5 unknown MTAs
-  * Support 21 major MSPs(Mail Service Providers)
+  * Support 22 major MSPs(Mail Service Providers)
   * Support 2 major Cloud Email Delivery Services(JSON format)
   * Support Feedback Loop Message(ARF)
   * Can detect 27 error reasons
@@ -85,10 +85,10 @@ Install
 
 ```shell
 $ sudo gem install sisimai
-Fetching: sisimai-4.20.2.gem (100%)
-Successfully installed sisimai-4.20.2
-Parsing documentation for sisimai-4.20.2
-Installing ri documentation for sisimai-4.20.2
+Fetching: sisimai-4.21.0.gem (100%)
+Successfully installed sisimai-4.21.0
+Parsing documentation for sisimai-4.21.0
+Installing ri documentation for sisimai-4.21.0
 Done installing documentation for sisimai after 6 seconds
 1 gem installed
 ```
@@ -104,8 +104,8 @@ gem install bundle rake rspec coveralls
 ...
 4 gems installed
 bundle exec rake install
-sisimai 4.20.2 built to pkg/sisimai-4.20.2.gem.
-sisimai (4.20.2) installed.
+sisimai 4.21.0 built to pkg/sisimai-4.21.0.gem.
+sisimai (4.21.0) installed.
 ```
 
 Usage
@@ -243,8 +243,8 @@ and bounceHammer are available at
 | The speed of parsing email(1000 emails)     | 3.30s          | 2.33s         |
 | How to install                              | gem install    | cpanm         |
 | Dependencies (Except core modules)          | 1 module       | 2 modules     |
-| LOC:Source lines of code                    | 12200 lines    | 8850 lines    |
-| The number of tests(spec/,t/,xt/) directory | 107600 tests   | 188000 tests  |
+| LOC:Source lines of code                    | 12400 lines    | 9000 lines    |
+| The number of tests(spec/,t/,xt/) directory | 108000 tests   | 189600 tests  |
 | License                                     | BSD 2-Clause   | BSD 2-Clause  |
 | Support Contract provided by Developer      | Coming soon    | Available     |
 

data/lib/sisimai.rb

@@ -29,8 +29,11 @@ module Sisimai
       require 'sisimai/data'
       require 'sisimai/message'
 
-      input = argv1[:input] || nil
       rtype = nil
+      input = argv1[:input] || nil
+      field = argv1[:field] || []
+      fail ' ***error: "field" accepts an array reference only' unless field.is_a? Array
+
 
       unless input
         # "input" did not specified, try to detect automatically.
@@ -48,7 +51,6 @@ module Sisimai
       methodargv = {}
       delivered1 = argv1[:delivered] || false
       hookmethod = argv1[:hook] || nil
-      headerlist = argv1[:field] || []
       bouncedata = []
 
       if input == 'email'
@@ -59,7 +61,7 @@ module Sisimai
 
         while r = mail.read do
           # Read and parse each mail file
-          methodargv = { data: r, hook: hookmethod, input: 'email', field: headerlist }
+          methodargv = { data: r, hook: hookmethod, input: 'email', field: field }
           mesg = Sisimai::Message.new(methodargv)
           next if mesg.void
 

data/lib/sisimai/message.rb

@@ -14,7 +14,7 @@ module Sisimai
 
     @@rwaccessors = [
       :from,    # [String] UNIX From line
-      :header,  # [Hash]   Header part of a email
+      :header,  # [Hash]   Header part of an email
       :ds,      # [Array]  Parsed data by Sisimai::MTA::*
       :rfc822,  # [Hash]   Header part of the original message
       :catch,   # [?]      The results returned by hook method
@@ -53,6 +53,13 @@ module Sisimai
 
       else
         # Unsupported value in "input"
+        warn ' ***warning: Unsupported value in "input": ' + input.to_s
+        return nil
+      end
+
+      unless field.is_a? Array
+        # Unsupported value in "field"
+        warn ' ***warning: "field" accepts an array reference only'
         return nil
       end
 
@@ -66,7 +73,7 @@ module Sisimai
       methodargv = {
         'data'  => email,
         'hook'  => argvs[:hook] || nil,
-        'field' => argvs[:field],
+        'field' => field,
       }
       [:load, :order].each do |e|
         # Order of MTA, MSP modules

data/lib/sisimai/msp.rb

@@ -15,8 +15,8 @@ module Sisimai
       def index
         return [
           'US::Google', 'US::Yahoo', 'US::Aol', 'US::Outlook', 'US::AmazonSES',
-          'US::SendGrid', 'US::Verizon', 'RU::MailRu', 'RU::Yandex', 'DE::GMX',
-          'US::Bigfoot', 'US::Facebook', 'US::Zoho', 'DE::EinsUndEins',
+          'US::SendGrid', 'US::GSuite', '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::AmazonWorkMail', 'US::Office365',
         ]

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

@@ -0,0 +1,258 @@
+module Sisimai
+  module MSP::US
+    # Sisimai::MSP::US::GSuite parses a bounce email which created by G Suite.
+    # Methods in the module are called from only Sisimai::Message.
+    module GSuite
+      # Imported from p5-Sisimail/lib/Sisimai/MSP/US/GSuite.pm
+      class << self
+        require 'sisimai/msp'
+        require 'sisimai/rfc5322'
+
+        Re0 = {
+          :from    => %r/[@]googlemail[.]com[>]?\z/,
+          :subject => %r/Delivery[ ]Status[ ]Notification/,
+        }
+        Re1 = {
+          :begin   => %r/\A[*][*][ ].+[ ][*][*]\z/,
+          :error   => %r/\AThe[ ]response[ ]from[ ]the[ ]remote[ ]server[ ]was:\z/,
+          :html    => %r{\AContent-Type:[ ]*text/html;[ ]*charset=['"]?(?:UTF|utf)[-]8['"]?\z},
+          :rfc822  => %r{\AContent-Type:[ ]*(?:message/rfc822|text/rfc822-headers)\z},
+          :endof   => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
+        }
+        ErrorMayBe = { :userunknown => %r/because the address couldn't be found/ }
+        Indicators = Sisimai::MSP.INDICATORS
+
+        def description; return 'G Suite: https://gsuite.google.com'; end
+        def smtpagent;   return Sisimai::MSP.smtpagent(self); end
+        def headerlist;  return ['X-Gm-Message-State']; end
+        def pattern;     return Re0; end
+
+        # Parse bounce messages from G Suite (Transfer from G Suite to a destinaion host)
+        # @param         [Hash] mhead       Message header of a bounce email
+        # @options mhead [String] from      From header
+        # @options mhead [String] date      Date header
+        # @options mhead [String] subject   Subject header
+        # @options mhead [Array]  received  Received headers
+        # @options mhead [String] others    Other required headers
+        # @param         [String] mbody     Message body of a bounce email
+        # @return        [Hash, Nil]        Bounce data list and message/rfc822
+        #                                   part or nil if it failed to parse or
+        #                                   the arguments are missing
+        def scan(mhead, mbody)
+          return nil unless mhead
+          return nil unless mbody
+
+          return nil unless mhead['from']    =~ Re0[:from]
+          return nil unless mhead['subject'] =~ Re0[:subject]
+          return nil unless mhead['x-gm-message-state']
+
+          require 'sisimai/address'
+          dscontents = [Sisimai::MSP.DELIVERYSTATUS]
+          hasdivided = mbody.split("\n")
+          rfc822list = []     # (Array) Each line in message/rfc822 part string
+          blanklines = 0      # (Integer) The number of blank lines
+          readcursor = 0      # (Integer) Points the current cursor position
+          recipients = 0      # (Integer) The number of 'Final-Recipient' header
+          anotherset = {}     # (Hash) Another error information
+          emptylines = 0      # (Integer) The number of empty lines
+          connvalues = 0      # (Integer) Flag, 1 if all the value of $connheader have been set
+          connheader = {
+            'date'  => '',    # The value of Arrival-Date header
+            'lhost' => '',    # The value of Reporting-MTA header
+          }
+          v = nil
+
+          hasdivided.each do |e|
+            if readcursor.zero?
+              # Beginning of the bounce message or delivery status part
+              if e =~ Re1[:begin]
+                readcursor |= Indicators[:deliverystatus]
+              end
+            end
+
+            if readcursor & Indicators[:'message-rfc822'] == 0
+              # Beginning of the original message part
+              if e =~ Re1[:rfc822]
+                readcursor |= Indicators[:'message-rfc822']
+                next
+              end
+            end
+
+            if readcursor & Indicators[:'message-rfc822'] > 0
+              # After "message/rfc822"
+              if e.empty?
+                blanklines += 1
+                break if blanklines > 1
+                next
+              end
+              rfc822list << e
+
+            else
+              # Before "message/rfc822"
+              next if readcursor & Indicators[:deliverystatus] == 0
+              next if e.empty?
+
+              if connvalues == connheader.keys.size
+                # Final-Recipient: rfc822; kijitora@example.de
+                # Action: failed
+                # Status: 5.0.0
+                # Remote-MTA: dns; 192.0.2.222 (192.0.2.222, the server for the domain.)
+                # Diagnostic-Code: smtp; 550 #5.1.0 Address rejected.
+                # Last-Attempt-Date: Fri, 24 Mar 2017 23:34:10 -0700 (PDT)
+                v = dscontents[-1]
+
+                if cv = e.match(/\A[Ff]inal-[Rr]ecipient:[ ]*(?:RFC|rfc)822;[ ]*(.+)\z/)
+                  # Final-Recipient: rfc822; kijitora@example.de
+                  if v['recipient']
+                    # There are multiple recipient addresses in the message body.
+                    dscontents << Sisimai::MTA.DELIVERYSTATUS
+                    v = dscontents[-1]
+                  end
+                  v['recipient'] = cv[1]
+                  recipients += 1
+
+                elsif cv = e.match(/\A[Aa]ction:[ ]*(.+)\z/)
+                  # Action: failed
+                  v['action'] = cv[1].downcase
+
+                elsif cv = e.match(/\A[Ss]tatus:[ ]*(\d[.]\d+[.]\d+)/)
+                  # Status: 5.0.0
+                  v['status'] = cv[1]
+
+                elsif cv = e.match(/\A[Rr]emote-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
+                  # Remote-MTA: dns; 192.0.2.222 (192.0.2.222, the server for the domain.)
+                  v['rhost'] = cv[1].downcase
+                  v['rhost'] = '' if v['rhost'] =~ /\A\s+\z/  # Remote-MTA: DNS;
+
+                elsif cv = e.match(/\A[Ll]ast-[Aa]ttempt-[Dd]ate:[ ]*(.+)\z/)
+                  # Last-Attempt-Date: Fri, 24 Mar 2017 23:34:10 -0700 (PDT)
+                  v['date'] = cv[1]
+
+                else
+                  if cv = e.match(/\A[Dd]iagnostic-[Cc]ode:[ ]*(.+?);[ ]*(.+)\z/)
+                    # Diagnostic-Code: smtp; 550 #5.1.0 Address rejected.
+                    v['spec'] = cv[1].upcase
+                    v['diagnosis'] = cv[2]
+                  end
+                end
+
+              else
+                # Reporting-MTA: dns; googlemail.com
+                # Received-From-MTA: dns; sironeko@example.jp
+                # Arrival-Date: Fri, 24 Mar 2017 23:34:07 -0700 (PDT)
+                # X-Original-Message-ID: <06C1ED5C-7E02-4036-AEE1-AA448067FB2C@example.jp>
+                if cv = e.match(/\A[Rr]eporting-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
+                  # Reporting-MTA: dns; mx.example.jp
+                  next if connheader['lhost'].size > 0
+                  connheader['lhost'] = cv[1].downcase
+                  connvalues += 1
+
+                elsif cv = e.match(/\A[Aa]rrival-[Dd]ate:[ ]*(.+)\z/)
+                  # Arrival-Date: Wed, 29 Apr 2009 16:03:18 +0900
+                  next if connheader['date'].size > 0
+                  connheader['date'] = 1
+                  connvalues += 1
+
+                else
+                  # Detect SMTP session error or connection error
+                  if e =~ Re1[:error]
+                    # The response from the remote server was:
+                    anotherset['diagnosis'] = e
+                  else
+                    # ** Address not found **
+                    #
+                    # Your message wasn't delivered to * because the address couldn't be found.
+                    # Check for typos or unnecessary spaces and try again.
+                    #
+                    # The response from the remote server was:
+                    # 550 #5.1.0 Address rejected.
+                    next if e =~ Re1[:html]
+
+                    if anotherset['diagnosis']
+                      # 550 #5.1.0 Address rejected.
+                      emptylines += 1 if e.empty?
+                      next if emptylines > 2
+                      anotherset['diagnosis'] += ' ' + e
+                    else
+                      # ** Address not found **
+                      #
+                      # Your message wasn't delivered to * because the address couldn't be found.
+                      # Check for typos or unnecessary spaces and try again.
+                      next if e.empty?
+                      next unless e =~ Re1[:begin]
+                      anotherset['diagnosis'] = e
+                    end
+                  end
+
+                end
+              end
+            end
+          end
+
+          return nil if recipients.zero?
+          require 'sisimai/string'
+          require 'sisimai/smtp/reply'
+          require 'sisimai/smtp/status'
+
+          dscontents.map do |e|
+            # Set default values if each value is empty.
+            connheader.each_key { |a| e[a] ||= connheader[a] || '' }
+
+            if anotherset['diagnosis']
+              # Copy alternative error message
+              e['diagnosis'] = anotherset['diagnosis'] unless e['diagnosis']
+
+              if e['diagnosis'] =~ /\A\d+\z/
+                e['diagnosis'] = anotherset['diagnosis']
+              else
+                # More detailed error message is in "$anotherset"
+                as = nil  # status
+                ar = nil  # replycode
+
+                if e['status'] == '' || e['status'] =~ /\A[45][.]0[.]0\z/
+                  # Check the value of D.S.N. in $anotherset
+                  as = Sisimai::SMTP::Status.find(anotherset['diagnosis'])
+                  if as.size > 0 && as[-3, 3] != '0.0'
+                    # The D.S.N. is neither an empty nor *.0.0
+                    e['status'] = as
+                  end
+                end
+
+                if e['replycode'] == '' || e['replycode'] =~ /\A[45]00\z/
+                  # Check the value of SMTP reply code in $anotherset
+                  ar = Sisimai::SMTP::Reply.find(anotherset['diagnosis'])
+                  if ar.size > 0 && ar[-2, 2].to_i != 0
+                    # The SMTP reply code is neither an empty nor *00
+                    e['replycode'] = ar
+                  end
+                end
+
+                if ( as || ar ) && ( anotherset['diagnosis'].size > e['diagnosis'].size )
+                  # Update the error message in $e->{'diagnosis'}
+                  e['diagnosis'] = anotherset['diagnosis']
+                end
+              end
+            end
+
+            e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
+            e['agent']     = Sisimai::MSP::US::GSuite.smtpagent
+
+            ErrorMayBe.each_key do |q|
+              # Guess an reason of the bounce
+              next unless e['diagnosis'] =~ ErrorMayBe[q]
+              e['reason'] = q.to_s
+              break
+            end
+
+          end
+
+          rfc822part = Sisimai::RFC5322.weedout(rfc822list)
+          return { 'ds' => dscontents, 'rfc822' => rfc822part }
+        end
+
+      end
+    end
+  end
+end
+
+

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

@@ -248,7 +248,7 @@ module Sisimai
                 # Try to match with each key as a regular expression
                 next unless e['status'] =~ f
                 e['reason'] = CodeTable[f]
-                last
+                break
               end
             end
           end

data/lib/sisimai/mta/postfix.rb

@@ -186,10 +186,12 @@ module Sisimai
                 if cv = e.match(/[ \t][(]in reply to ([A-Z]{4}).*/)
                   # 5.1.1 <userunknown@example.co.jp>... User Unknown (in reply to RCPT TO
                   commandset << cv[1]
+                  anotherset['diagnosis'] += ' ' + e
 
                 elsif cv = e.match(/([A-Z]{4})[ \t]*.*command[)]\z/)
                   # to MAIL command)
                   commandset << cv[1]
+                  anotherset['diagnosis'] += ' ' + e
 
                 else
                   if cv = e.match(/\A[Rr]eporting-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
@@ -229,6 +231,7 @@ module Sisimai
                         anotherset['diagnosis'] += ' ' + e
                       end
                     end
+
                   end
                 end
               end
@@ -246,8 +249,8 @@ module Sisimai
           return nil if recipients.zero?
 
           require 'sisimai/string'
-          require 'sisimai/smtp'
           require 'sisimai/smtp/status'
+          require 'sisimai/smtp/reply'
 
           dscontents.map do |e|
             # Set default values if each value is empty.
@@ -259,8 +262,39 @@ module Sisimai
             if anotherset['diagnosis']
               # Copy alternative error message
               e['diagnosis'] = anotherset['diagnosis'] unless e['diagnosis']
-              e['diagnosis'] = anotherset['diagnosis'] if e['diagnosis'] =~ /\A\d+\z/
+
+              if e['diagnosis'] =~ /\A\d+\z/
+                e['diagnosis'] = anotherset['diagnosis']
+              else
+                # More detailed error message is in "$anotherset"
+                as = nil  # status
+                ar = nil  # replycode
+
+                if e['status'] == '' || e['status'] =~ /\A[45][.]0[.]0\z/
+                  # Check the value of D.S.N. in $anotherset
+                  as = Sisimai::SMTP::Status.find(anotherset['diagnosis'])
+                  if as.size > 0 && as[-3, 3] != '0.0'
+                    # The D.S.N. is neither an empty nor *.0.0
+                    e['status'] = as
+                  end
+                end
+
+                if e['replycode'] == '' || e['replycode'] =~ /\A[45]00\z/
+                  # Check the value of SMTP reply code in $anotherset
+                  ar = Sisimai::SMTP::Reply.find(anotherset['diagnosis'])
+                  if ar.size > 0 && ar[-2, 2].to_i != 0
+                    # The SMTP reply code is neither an empty nor *00
+                    e['replycode'] = ar
+                  end
+                end
+
+                if ( as || ar ) && ( anotherset['diagnosis'].size > e['diagnosis'].size )
+                  # Update the error message in $e->{'diagnosis'}
+                  e['diagnosis'] = anotherset['diagnosis']
+                end
+              end
             end
+
             e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
             e['spec']    ||= 'SMTP' if e['diagnosis'] =~ /host .+ said:/
             e.each_key { |a| e[a] ||= '' }

data/lib/sisimai/reason/mesgtoobig.rb

@@ -10,7 +10,7 @@ module Sisimai
       class << self
         def text; return 'mesgtoobig'; end
         def description
-          return 'Email rejected due to a email size is too big for a destination mail server'
+          return 'Email rejected due to an email size is too big for a destination mail server'
         end
 
         # Try to match that the given text and regular expressions

data/lib/sisimai/rfc5322.rb

@@ -78,7 +78,7 @@ module Sisimai
 
       # Check that the argument is an email address or not
       # @param    [String] email  Email address string
-      # @return   [True,False]    true: is a email address
+      # @return   [True,False]    true: is an email address
       #                           false: is not an email address
       def is_emailaddress(email)
         return false unless email.is_a?(::String)

data/lib/sisimai/smtp/status.rb

@@ -747,6 +747,12 @@ module Sisimai
             # Get the value of D.S.N. in the text
             next unless r = argv1.match(e)
             foundvalue = r[1]
+
+            if argv1 =~ /\b(?:#{foundvalue}[.]\d{1,3}|\d{1,3}[.]#{foundvalue})\b/
+              # Clear and skip if the value is an IPv4 address
+              foundvalue = ''
+              next
+            end
             break
           end
 

data/lib/sisimai/version.rb

@@ -1,4 +1,4 @@
 # Define the version number of Sisimai
 module Sisimai
-  VERSION = '4.20.2'.freeze
+  VERSION = '4.21.0'.freeze
 end

data/set-of-emails/maildir/bsd/msp-us-gsuite-01.eml

@@ -0,0 +1,189 @@
+Return-Path: <>
+Received: from mail-pg0-f67.google.com (mail-pg0-f67.google.com [74.125.83.67])
+	by aneyakoji.example.jp (V8/cf) with ESMTP id v22nekonyan
+	for <sironeko@example.jp>; Sat, 25 Mar 2017 12:34:56 +0900
+X-SenderID: Sendmail Sender-ID Filter v1.0.0 aneyakoji.example.jp v22nekonyan
+Authentication-Results: aneyakoji.example.jp; sender-id=pass header.from=mailer-daemon@googlemail.com
+Received: by mail-pg0-f67.google.com with SMTP id q22neko2222nn.1
+        for <sironeko@example.jp>; Fri, 24 Mar 2017 12:34:56 -0700 (PDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+        d=googlemail.com; s=20161025;
+        h=from:to:auto-submitted:subject:references:in-reply-to:message-id
+         :date;
+        bh=wHN9FsOc8eHpGnInjZe8hO+5G9NIf4zIVtk69pRMC9U=;
+        b=Uddu2IezvdWUyBWOpp0ENc3K9ElRKs+DGllfYC7k5ZWLg0DDEzRvHkvu8GBjtzTQTi
+         1vCNkxBMPyS/MSdIxlLgKf/ZQg+9FnknIj+oj+bKC6iVhfeYpSd+Kr++QTYsoPmhdkYT
+         yw0+gS2iSAponz/KwdCRn6PiV1lj6B6ute82OaqvtUP0wIRGSJxRFNXXtqOa+LlLkxEX
+         b0Xl3SMOd0G/Sa82AX7jOYhb/M5Y95z3ikMFlFkecyqxCikC9HtlZh3L0kRFHbQkDdR0
+         jF5Dpn6r08ZFReZ5WkCyYb1dxcOGgpwUX162VU5aT2lgfHYoPVq0Ipt1PS1HGfVncUDO
+         50Xg==
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+        d=1e100.net; s=20161025;
+        h=x-gm-message-state:from:to:auto-submitted:subject:references
+         :in-reply-to:message-id:date;
+        bh=wHN9FsOc8eHpGnInjZe8hO+5G9NIf4zIVtk69pRMC9U=;
+        b=uOUCl+vxmjPk5A/TQ08YtayveKldmt23MD6hR5E7ONm9ssx3SGjG0jagZH0KWltpU6
+         K2WbK9DkpYkrazY6m+OE1xnL63yI/iBKosC24SQR/shZCWXlcdTPwncVDIkp+fp7RoM5
+         3FUyj6ZUQI8pYfglHHoZwR6tBKSZg81lgCNYDAKipQP5XdDPY1l1+QEv4R/tCegmdxOF
+         GrlgrpdOSl/1g1tdcga3jAW33ZO4QsudPKXoOOA37YLIdT90JzNxTzyXnF7yxtpH72wq
+         ay82xboOVGzHeW3s51uTdGhkU2Hi1ICwoJb5th9m/D3wXblZFee4ELsf7aM3JEDxrRXS
+         AlEQ==
+X-Gm-Message-State: NEKO/Nyaaaaaaaaaaaaaaaaaaaaan/NoranekoNyaaaan+Nyaan/nekoneko22nyannyaaaaan==
+X-Received: by 10.99.122.22 with SMTP id v22neko222222332neko.222.1490423650000;
+        Fri, 24 Mar 2017 12:34:56 -0700 (PDT)
+Content-Type: multipart/report; boundary=ffff00000000000000ffff; report-type=delivery-status
+Received: by 10.99.122.22 with SMTP id v22neko222233nyan.222; Fri, 24 Mar 2017
+ 12:34:56 -0700 (PDT)
+From: Mail Delivery Subsystem <mailer-daemon@googlemail.com>
+To: sironeko@example.jp
+Auto-Submitted: auto-replied
+Subject: Delivery Status Notification (Failure)
+References: <00222222-2222-2222-2222-FF00FFFF0000@example.jp>
+In-Reply-To: <00222222-2222-2222-2222-FF00FFFF0000@example.jp>
+Message-ID: <ee002222.2200eeaa.2002f.e222.NYAAN@mx.google.com>
+Date: Fri, 24 Mar 2017 12:34:56 -0700 (PDT)
+
+--ffff00000000000000ffff
+Content-Type: multipart/related; boundary=ee00ff00002222eeffccdd
+
+--ee00ff00002222eeffccdd
+Content-Type: multipart/alternative; boundary=aa00220022222222ffeebb
+
+--aa00220022222222ffeebb
+Content-Type: text/plain; charset=UTF-8
+
+
+** Address not found **
+
+Your message wasn't delivered to kijitora@example.de because the address couldn't be found. Check for typos or unnecessary spaces and try again.
+
+
+
+The response from the remote server was:
+550 #5.1.0 Address rejected.
+
+--aa00220022222222ffeebb
+Content-Type: text/html; charset=UTF-8
+
+
+<html>
+<head>
+<style>
+* {
+font-family:Roboto, "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+</style>
+</head>
+<body>
+<table cellpadding="0" cellspacing="0" class="email-wrapper" style="padding-top:32px;background-color:#ffffff;"><tbody>
+<tr><td>
+<table cellpadding=0 cellspacing=0><tbody>
+<tr><td style="max-width:560px;padding:24px 24px 32px;background-color:#fafafa;border:1px solid #e0e0e0;border-radius:2px">
+<img style="padding:0 24px 16px 0;float:left" width=72 height=72 alt="Error Icon" src="cid:icon.png">
+<table style="min-width:272px;padding-top:8px"><tbody>
+<tr><td><h2 style="font-size:20px;color:#212121;font-weight:bold;margin:0">
+Address not found
+</h2></td></tr>
+<tr><td style="padding-top:20px;color:#757575;font-size:16px;font-weight:normal;text-align:left">
+Your message wasn't delivered to <a style='color:#212121;text-decoration:none'><b>kijitora@example.de</b></a> because the address couldn't be found. Check for typos or unnecessary spaces and try again.
+</td></tr>
+</tbody></table>
+</td></tr>
+</tbody></table>
+</td></tr>
+<tr style="border:none;background-color:#fff;font-size:12.8px;width:90%">
+<td align="left" style="padding:48px 10px">
+The response from the remote server was:<br/>
+<p style="font-family:monospace">
+550 #5.1.0 Address rejected.
+</p>
+</td>
+</tr>
+</tbody></table>
+</body>
+</html>
+
+--aa00220022222222ffeebb--
+--ee00ff00002222eeffccdd
+Content-Type: image/png; name="icon.png"
+Content-Disposition: attachment; filename="icon.png"
+Content-Transfer-Encoding: base64
+Content-ID: <icon.png>
+
+iVBORw0KGgoAAAANSUhEUgAAAJAAAACQCAYAAADnRuK4AAAACXBIWXMAABYlAAAWJQFJUiTwAAAA
+GXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABTdJREFUeNrsnD9sFEcUh5+PRMqZ
+yA0SPhAUQAQFUkyTgiBASARo6QApqVIkfdxGFJFSgGhJAUIiBaQB0ZIOKVCkwUgURjIg2fxL4kS+
+YDvkbC/388bi8N16Z4/d7J/5PsniuD3fyePP772ZeTsDQRAYQL/UGAJAIEAgQCBAIAAEAgQCBAIE
+AkAgyJT3Mv+Eq7vYK8mTE+MDRCAghQECAeRQA5V2ZOpmg5vDx3NPzRbmGRMEcmTrEbNNB8zWfRD+
+f/Efs2e3zCZvMjaksBg27TfbcuSNPEKP9ZyuAQKtHX2O9ncNgWC57umMPKvRNb0GEKgnLoUyxTQC
+rcns0/6uIRAs8/hGf9cQCJZpTpjdO2f25/03z+mxntM1eLtsZAgiUtX4JcaBCAQIBAgECARQ8CJa
+G5jab4J4pm4WZmO3OALVh802fIwcLkyPkcKAGggAgQCBAIEAgQCBABAIEAjKA/1AnahhbO5FdOOY
+VsrrDbPBYcYKgf5D2wLaV3p+22xh1u17tO3S+DTcvxvagUDeivPgx/a/95J/73w7Sj26Hn4pKo2M
+ehuV/KyBJM6d0f7k6RKx/R63vvL2tmf/ItDdM2ZTP6f7nkp9Y2fDx1v9akmpIU+KSCLVUghUQfSL
+zVKeTklbLxGoctw/nzC5rw8L5KRNbkpnKq6pgSqEClzNnFzY+XnYWrt6VpVk1vbwWvg+RKCKMOUw
+Q1LEOXA+/MX3mpJvGDHb265xtnzmFoUK1HaKQGlMtePYM+q2KKjXuaS1NJYIEKgI8jhEgqHt4cqy
+Ky53j3hyHz2bqSLp2o2LbJ7MxKovkGqXteoWpaOk96O9/yF/dF7NwlS36AuIQIBA5celQK4PIxBE
+4LLzrtoLgaALdSy6CJRkWQCBPGLsTHznomZ9nszUECgJ2ml3WWHe+QVFNPSQx6UdZNtxr9pbEShN
+eTTz8mQXHoHSlke7+Z+c9m6VGoHSkEfs/trLW3wQKApN1V3lGfnGu2Z6BFoLtYCs3GWBPAiUCLVh
+/HoaeRCoT9R873KLM/IgUBfapnCpe5AHgXry4pf412ihEHkQqCdxd5VqrcezhUIESsJMTJ+Pdthp
+Z0WgyNlXXPHc2Mc4IVAELl2Gnh8mhUDvCkfbIVAkcbf/aOoO3fMKhqAD3frTa4quwpn0hUDOkQhI
+YYBAgECAQAAU0QlYObl+5Ug8NcprZkZxjUCxRPVA6zmtEXHCBykskrhjgHXN09PoEcgFl4M4H11j
+nBAoApcj6ZoPGScEAgTKApcDoTw5sgWB+sGlz1n90IBAPdE6j1o21PfcC11jLagL1oFWRyGlKU3p
+OxcSJQ7NZAjkhHp/uG2HFAYIBAgECASAQIBAgECAQAAIBOkxEARBtp9wdVfAMOfIifEBIhCQwgCB
+ABAI0oV2jhxZ+nfBatuPZfgBCy0Eqqo8c01b+uu51XZvzOgDWoHNTGR+pCwpLEd5svuAZXlO2uEr
+PyEQ8hRWHgRCHmqg0sjTnLalv6crJQ8C/U8stqNO0I4+VZOHFIY8COS1PGL2ybd5yUMKK7s8zYmL
+dujyd3n+nESgcsvzZd4/KwIhDwIhT35QA6UyE1qyxZnfvJMHgdKS549JC1qvvJOHFIY8CFR5eV5O
+XimqPAhUdHnmfx+zgxdOFXkoqIGKKs/cswnb/8Oeog8HEai48nxUhiFBIORBIOShBioskkbySCLk
+IQIhDwIhj28p7FApR6b1qlEbHGpkO/rr6215vi/zH1r2x7tApSGFAQIBAgECAQIBIBAgECAQIBBA
+LK8FGADCTxYrr+EVJgAAAABJRU5ErkJggg==
+--ee00ff00002222eeffccdd--
+--ffff00000000000000ffff
+Content-Type: message/delivery-status
+
+Reporting-MTA: dns; googlemail.com
+Received-From-MTA: dns; sironeko@example.jp
+Arrival-Date: Fri, 24 Mar 2017 12:34:56 -0700 (PDT)
+X-Original-Message-ID: <00222222-2222-2222-2222-FF00FFFF0000@example.jp>
+
+Final-Recipient: rfc822; kijitora@example.de
+Action: failed
+Status: 5.0.0
+Remote-MTA: dns; 192.0.2.222 (192.0.2.222, the server for the domain.)
+Diagnostic-Code: smtp; 550 #5.1.0 Address rejected.
+Last-Attempt-Date: Fri, 24 Mar 2017 12:34:56 -0700 (PDT)
+
+--ffff00000000000000ffff
+Content-Type: message/rfc822
+
+X-Gm-Message-State: NEKO/Nyaaaan0ai9dgaig4u9u8hamcbh499/Nyaan2/222NN+nyaaanNekochan22nyaaaaaaaan/Sotoneko22Nyaan/NekoNyaaan2
+X-Received: by 10.99.122.22 with SMTP id v22nekochan488nya.222.1490423649015;
+        Fri, 24 Mar 2017 12:34:56 -0700 (PDT)
+X-Received: by 10.99.122.22 with SMTP id v22nekochan477nya.222.1490423648801;
+        Fri, 24 Mar 2017 12:34:56 -0700 (PDT)
+Return-Path: <sironeko@example.jp>
+Received: from aneyakoji.example.jp (aneyakoji.example.jp. [198.51.100.2])
+        by mx.google.com with ESMTP id 22neko22nyaaaan.404.2017.03.24.12.34.56
+        for <kijitora@example.de>;
+        Fri, 24 Mar 2017 12:34:56 -0700 (PDT)
+Received-SPF: pass (google.com: domain of sironeko@example.jp designates 198.51.100.2 as permitted sender) client-ip=198.51.100.2;
+Authentication-Results: mx.google.com;
+       spf=pass (google.com: domain of sironeko@example.jp designates 198.51.100.2 as permitted sender) smtp.mailfrom=sironeko@example.jp
+Received: from [172.31.127.65] (c222-222kyoto.kyoto.example.ne.jp [203.0.113.222])
+	(authenticated bits=0)
+	by aneyakoji.example.jp (V8/cf) with ESMTP id v2NekoNyaan22g
+	for <kijitora@example.de>; Sat, 25 Mar 2017 12:34:56 +0900
+X-SenderID: Sendmail Sender-ID Filter v1.0.0 aneyakoji.example.jp v2NekoNyaan22g
+Authentication-Results: aneyakoji.example.jp; sender-id=pass header.from=sironeko@example.jp; auth=pass (CRAM-MD5); spf=pass smtp.mfrom=sironeko@example.jp
+From: "Neko, Nyaaan" <sironeko@example.jp>
+Content-Type: text/plain; charset=us-ascii
+Content-Transfer-Encoding: 7bit
+Subject: Nyaaan
+Message-Id: <00222222-2222-2222-2222-FF00FFFF0000@example.jp>
+Date: Sat, 25 Mar 2017 12:34:56 +0900
+To: kijitora@example.de
+Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\))
+X-Mailer: Apple Mail (2.3124)
+
+Nyaan
+
+--ffff00000000000000ffff--

data/set-of-emails/maildir/bsd/msp-us-gsuite-02.eml

@@ -0,0 +1,180 @@
+X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on shelby.example.net
+X-Spam-Level: 
+X-Spam-Status: No, score=-0.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
+	DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,HTML_MESSAGE,MIME_HEADER_CTYPE_ONLY,
+	RCVD_IN_DNSWL_NONE,RCVD_IN_SORBS_SPAM,URIBL_BLOCKED autolearn=no version=3.3.2
+Received: from mail-lf0-f66.google.com ([209.85.215.66])
+	by shelby.example.net with esmtps (TLS1.2:RSA_AES_128_CBC_SHA1:128)
+	(Exim 4.80)
+	id 1crLWb-0001Wu-2x
+	for issue218@linux.example.de; Fri, 24 Mar 2017 10:28:49 +0100
+Received: by mail-lf0-f66.google.com with SMTP id v2so883599lfi.2
+        for <issue218@linux.example.de>; Fri, 24 Mar 2017 02:28:44 -0700 (PDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+        d=googlemail.com; s=20161025;
+        h=from:to:auto-submitted:subject:references:in-reply-to:message-id
+         :date;
+        bh=ZaXqPubt2Y09f+riOSQuXHWlmBs3J2KZBO54WcbtBbs=;
+        b=Rv9u7Eur5Wp5DTB7hYKOgAo/gspH/9TKLryAhBN2AB3Qt/3QIr6ygVtYA06s50Mgzq
+         kk1DDtPzLVWYaTgmYZjrgcxUCvfMyN6gRNKx77F807DfQUt7rNDanK7INrR7LPFuZcId
+         /SAQTfS6IR/dtv3/W7G62/gZWwlMyNRR5hpVmpJ4v6OBh42DWdsqpBIM1G/63XgeyqY3
+         DrgEBh45asP/FQrLQ2/krBL7UZOtUC19fQO98ncnLVXSJM4tMzw9ohOf3F6IyiNPaxAa
+         aLkphGZKxgMvmZbUyQSDtfHioxw8ysl1xaGRWU/lAPFSpnMbQ5pU7R4S/fnv+AzpRT1P
+         js3Q==
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+        d=1e100.net; s=20161025;
+        h=x-gm-message-state:from:to:auto-submitted:subject:references
+         :in-reply-to:message-id:date;
+        bh=ZaXqPubt2Y09f+riOSQuXHWlmBs3J2KZBO54WcbtBbs=;
+        b=jY2PhN9mja59DbIHRzgp67y7GkMWbhE5f6WUBrETSWy47flYvS8UVX0EnzmbyZqS+D
+         hd/zHhfjp31omPkIm3GBb+YCJOWSJr+gf/5D9r1r4owunRPPs5ezIHYVYdYogVCoQJNX
+         XWlg7UwlafB83IbDHMEH9A/jiLG6F24sgfYsDjEZ7dEbcE5sviJvBQMWu1ac1gq6c497
+         3Buy6f/wxlbKUByTnNMFYunOaK06LTrzcJ3JPo6n3wz2WRkCgp0U6CwOfx3RZHxtaoGZ
+         Zkqv4pyplW8EXAcrF1MgBPlS1e3djXSyaN4tsg8mqoGiEYzZnY9K2oeNGqyBtGfWZSjP
+         MRXQ==
+X-Gm-Message-State: AFeK/H3OuV9ifjCJwkb2Us7PvVoxwdQUuHnbSNbSaHXDml+9YXnFKPh+X1RtdVWDxiWK57WfdSc1Ya28oRMSbHx2dj3Bs/9zsS1p+oY=
+X-Received: by 10.25.37.10 with SMTP id l10mr3508841lfl.17.1490347718449;
+        Fri, 24 Mar 2017 02:28:38 -0700 (PDT)
+Content-Type: multipart/report; boundary=001a1140640e599149054b769e99; report-type=delivery-status
+Received: by 10.25.37.10 with SMTP id l10mr3857678lfl.17; Fri, 24 Mar 2017
+ 02:28:38 -0700 (PDT)
+From: Mail Delivery Subsystem <mailer-daemon@googlemail.com>
+To: issue218@linux.example.de
+Auto-Submitted: auto-replied
+Subject: Delivery Status Notification (Failure)
+References: <002b01d2a4bb$028be941$b756c59a@example>
+In-Reply-To: <002b01d2a4bb$028be941$b756c59a@example>
+Message-ID: <58d4e6c6.0a25190a.79dd8.8aff.GMRIR@mx.google.com>
+Date: Fri, 24 Mar 2017 02:28:38 -0700 (PDT)
+
+--001a1140640e599149054b769e99
+Content-Type: multipart/related; boundary=001a1140640e599177054b769e9a
+
+--001a1140640e599177054b769e9a
+Content-Type: multipart/alternative; boundary=001a1140640e59917b054b769e9b
+
+--001a1140640e59917b054b769e9b
+Content-Type: text/plain; charset=UTF-8
+
+
+** Address not found **
+
+Your message wasn't delivered to kijitora@example.it because the address couldn't be found. Check for typos or unnecessary spaces and try again.
+
+
+
+
+--001a1140640e59917b054b769e9b
+Content-Type: text/html; charset=UTF-8
+
+
+<html>
+<head>
+<style>
+* {
+font-family:Roboto, "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+</style>
+</head>
+<body>
+<table cellpadding="0" cellspacing="0" class="email-wrapper" style="padding-top:32px;background-color:#ffffff;"><tbody>
+<tr><td>
+<table cellpadding=0 cellspacing=0><tbody>
+<tr><td style="max-width:560px;padding:24px 24px 32px;background-color:#fafafa;border:1px solid #e0e0e0;border-radius:2px">
+<img style="padding:0 24px 16px 0;float:left" width=72 height=72 alt="Error Icon" src="cid:icon.png">
+<table style="min-width:272px;padding-top:8px"><tbody>
+<tr><td><h2 style="font-size:20px;color:#212121;font-weight:bold;margin:0">
+Address not found
+</h2></td></tr>
+<tr><td style="padding-top:20px;color:#757575;font-size:16px;font-weight:normal;text-align:left">
+Your message wasn't delivered to <a style='color:#212121;text-decoration:none'><b>kijitora@example.it</b></a> because the address couldn't be found. Check for typos or unnecessary spaces and try again.
+</td></tr>
+</tbody></table>
+</td></tr>
+</tbody></table>
+</td></tr>
+<tr style="border:none;background-color:#fff;font-size:12.8px;width:90%">
+<td align="left" style="padding:48px 10px">
+</td>
+</tr>
+</tbody></table>
+</body>
+</html>
+
+--001a1140640e59917b054b769e9b--
+--001a1140640e599177054b769e9a
+Content-Type: image/png; name="icon.png"
+Content-Disposition: attachment; filename="icon.png"
+Content-Transfer-Encoding: base64
+Content-ID: <icon.png>
+
+iVBORw0KGgoAAAANSUhEUgAAAJAAAACQCAYAAADnRuK4AAAACXBIWXMAABYlAAAWJQFJUiTwAAAA
+GXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABTdJREFUeNrsnD9sFEcUh5+PRMqZ
+yA0SPhAUQAQFUkyTgiBASARo6QApqVIkfdxGFJFSgGhJAUIiBaQB0ZIOKVCkwUgURjIg2fxL4kS+
+YDvkbC/388bi8N16Z4/d7J/5PsniuD3fyePP772ZeTsDQRAYQL/UGAJAIEAgQCBAIAAEAgQCBAIE
+AkAgyJT3Mv+Eq7vYK8mTE+MDRCAghQECAeRQA5V2ZOpmg5vDx3NPzRbmGRMEcmTrEbNNB8zWfRD+
+f/Efs2e3zCZvMjaksBg27TfbcuSNPEKP9ZyuAQKtHX2O9ncNgWC57umMPKvRNb0GEKgnLoUyxTQC
+rcns0/6uIRAs8/hGf9cQCJZpTpjdO2f25/03z+mxntM1eLtsZAgiUtX4JcaBCAQIBAgECARQ8CJa
+G5jab4J4pm4WZmO3OALVh802fIwcLkyPkcKAGggAgQCBAIEAgQCBABAIEAjKA/1AnahhbO5FdOOY
+VsrrDbPBYcYKgf5D2wLaV3p+22xh1u17tO3S+DTcvxvagUDeivPgx/a/95J/73w7Sj26Hn4pKo2M
+ehuV/KyBJM6d0f7k6RKx/R63vvL2tmf/ItDdM2ZTP6f7nkp9Y2fDx1v9akmpIU+KSCLVUghUQfSL
+zVKeTklbLxGoctw/nzC5rw8L5KRNbkpnKq6pgSqEClzNnFzY+XnYWrt6VpVk1vbwWvg+RKCKMOUw
+Q1LEOXA+/MX3mpJvGDHb265xtnzmFoUK1HaKQGlMtePYM+q2KKjXuaS1NJYIEKgI8jhEgqHt4cqy
+Ky53j3hyHz2bqSLp2o2LbJ7MxKovkGqXteoWpaOk96O9/yF/dF7NwlS36AuIQIBA5celQK4PIxBE
+4LLzrtoLgaALdSy6CJRkWQCBPGLsTHznomZ9nszUECgJ2ml3WWHe+QVFNPSQx6UdZNtxr9pbEShN
+eTTz8mQXHoHSlke7+Z+c9m6VGoHSkEfs/trLW3wQKApN1V3lGfnGu2Z6BFoLtYCs3GWBPAiUCLVh
+/HoaeRCoT9R873KLM/IgUBfapnCpe5AHgXry4pf412ihEHkQqCdxd5VqrcezhUIESsJMTJ+Pdthp
+Z0WgyNlXXPHc2Mc4IVAELl2Gnh8mhUDvCkfbIVAkcbf/aOoO3fMKhqAD3frTa4quwpn0hUDOkQhI
+YYBAgECAQAAU0QlYObl+5Ug8NcprZkZxjUCxRPVA6zmtEXHCBykskrhjgHXN09PoEcgFl4M4H11j
+nBAoApcj6ZoPGScEAgTKApcDoTw5sgWB+sGlz1n90IBAPdE6j1o21PfcC11jLagL1oFWRyGlKU3p
+OxcSJQ7NZAjkhHp/uG2HFAYIBAgECASAQIBAgECAQAAIBOkxEARBtp9wdVfAMOfIifEBIhCQwgCB
+ABAI0oV2jhxZ+nfBatuPZfgBCy0Eqqo8c01b+uu51XZvzOgDWoHNTGR+pCwpLEd5svuAZXlO2uEr
+PyEQ8hRWHgRCHmqg0sjTnLalv6crJQ8C/U8stqNO0I4+VZOHFIY8COS1PGL2ybd5yUMKK7s8zYmL
+dujyd3n+nESgcsvzZd4/KwIhDwIhT35QA6UyE1qyxZnfvJMHgdKS549JC1qvvJOHFIY8CFR5eV5O
+XimqPAhUdHnmfx+zgxdOFXkoqIGKKs/cswnb/8Oeog8HEai48nxUhiFBIORBIOShBioskkbySCLk
+IQIhDwIhj28p7FApR6b1qlEbHGpkO/rr6215vi/zH1r2x7tApSGFAQIBAgECAQIBIBAgECAQIBBA
+LK8FGADCTxYrr+EVJgAAAABJRU5ErkJggg==
+--001a1140640e599177054b769e9a--
+--001a1140640e599149054b769e99
+Content-Type: message/delivery-status
+
+Reporting-MTA: dns; googlemail.com
+Received-From-MTA: dns; issue218@linux.example.de
+Arrival-Date: Fri, 24 Mar 2017 02:28:38 -0700 (PDT)
+X-Original-Message-ID: <002b01d2a4bb$028be941$b756c59a@example>
+
+Final-Recipient: rfc822; kijitora@example.it
+Action: failed
+Status: 5.0.0
+Last-Attempt-Date: Fri, 24 Mar 2017 02:28:38 -0700 (PDT)
+
+--001a1140640e599149054b769e99
+Content-Type: message/rfc822
+
+X-Received: by 10.25.37.10 with SMTP id l10mr3508834lfl.17.1490347718262;
+        Fri, 24 Mar 2017 02:28:38 -0700 (PDT)
+Return-Path: <issue218@linux.example.de>
+Received: from 222.2.0.192.neko.example.co.th ([192.0.2.222])
+        by mx.google.com with ESMTP id o66si992250lfg.117.2017.03.24.02.28.37
+        for <kijitora@example.it>;
+        Fri, 24 Mar 2017 02:28:38 -0700 (PDT)
+Received-SPF: neutral (google.com: 192.0.2.222 is neither permitted nor denied by best guess record for domain of issue218@linux.example.de) client-ip=192.0.2.222;
+Authentication-Results: mx.google.com;
+       spf=neutral (google.com: 192.0.2.222 is neither permitted nor denied by best guess record for domain of issue218@linux.example.de) smtp.mailfrom=issue218@linux.example.de
+Message-ID: <002b01d2a4bb$028be941$b756c59a@example>
+From: <issue218@linux.example.de>
+To: <kijitora@example.it>
+Subject: 5394
+Date: 24 Mar 2017 22:01:42 +0600
+MIME-Version: 1.0
+Content-Type: multipart/alternative;
+	boundary="----=_NextPart_000_0028_01D2A4BB.02869201"
+X-Priority: 3
+X-MSMail-Priority: Normal
+X-Mailer: Microsoft Outlook Express 6.00.2800.1106
+X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2800.1106
+
+Nyaan
+
+--001a1140640e599149054b769e99--
+

data/sisimai-java.gemspec

@@ -25,10 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.8'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 0'
-
-  if RUBY_PLATFORM == 'java'
-    spec.add_runtime_dependency 'jrjackson','~> 0.3', '>= 0.3.8'
-  else
-    spec.add_runtime_dependency 'oj', '~> 2.14', '>= 2.14.4'
-  end
+  spec.add_runtime_dependency 'jrjackson','~> 0.3', '>= 0.3.8'
 end

data/sisimai.gemspec

@@ -24,10 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.8'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 0'
-
-  if RUBY_PLATFORM == 'java'
-    spec.add_runtime_dependency 'jrjackson','~> 0.3', '>= 0.3.8'
-  else
-    spec.add_runtime_dependency 'oj', '~> 2.14', '>= 2.14.4'
-  end
+  spec.add_runtime_dependency 'oj', '~> 2.14', '>= 2.14.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sisimai
 version: !ruby/object:Gem::Version
-  version: 4.20.2
+  version: 4.21.0
 platform: ruby
 authors:
 - azumakuniyuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-11 00:00:00.000000000 Z
+date: 2017-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -132,6 +132,7 @@ files:
 - lib/sisimai/msp/us/bigfoot.rb
 - lib/sisimai/msp/us/facebook.rb
 - lib/sisimai/msp/us/google.rb
+- lib/sisimai/msp/us/gsuite.rb
 - lib/sisimai/msp/us/office365.rb
 - lib/sisimai/msp/us/outlook.rb
 - lib/sisimai/msp/us/receivingses.rb
@@ -316,6 +317,8 @@ files:
 - set-of-emails/maildir/bsd/msp-us-google-15.eml
 - set-of-emails/maildir/bsd/msp-us-google-16.eml
 - set-of-emails/maildir/bsd/msp-us-google-17.eml
+- set-of-emails/maildir/bsd/msp-us-gsuite-01.eml
+- set-of-emails/maildir/bsd/msp-us-gsuite-02.eml
 - set-of-emails/maildir/bsd/msp-us-office365-01.eml
 - set-of-emails/maildir/bsd/msp-us-office365-02.eml
 - set-of-emails/maildir/bsd/msp-us-outlook-01.eml