sisimai 4.19.0-java → 4.20.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3238e983863da3933d103f71358b6015485303c
-  data.tar.gz: 4dadbefe26b2ad27ea767b5191c01dd217059b12
+  metadata.gz: 4aa57e1cf8c2d9527a687e5d7898a45c7614fd26
+  data.tar.gz: 2f1e6693b52cce3ea971bc63bc473929c7f1bd8f
 SHA512:
-  metadata.gz: a1ee9bd67a47080a2a659ee67dca6fa49ce4bf1928b9b29feb39cdbe440f02f8a44f70bd15142e487d66b9a11aa77a45b6e61cda3a2ddee777dd6569749ee31b
-  data.tar.gz: 3bd272ffc64c71f5e0c2a231835b99a99bca330fb71df5e825709690f9d972828b58adc48b781dc731a967ba497e1fcbe8de20c1d1acc57159934cd58a0c551e
+  metadata.gz: f6e3a09494458a23b719264207ff0a77c283578a4fcb4452d9f1446f6f2c2311639014033452d2a6bfb28ff4e482bd905d7f13b3faf47460cd17a6478190bb69
+  data.tar.gz: 6a6ccffbf4f81b16fc547a6cb0f129161bab038d4e3bc0c15512f9d816593191eda91f6f714b052a9a2493ad726af5872db74aa7feb9ce721e9d1ae9d9e003ee

data/.travis.yml

@@ -4,6 +4,7 @@ rvm:
   - 2.2.2
   - 2.2.4
   - 2.3.0
+  - 2.4.0
   - jruby-9.0.4.0
   - jruby-9.0.5.0
 before_install:

data/ANALYTICAL-PRECISION

@@ -16,9 +16,9 @@ MTA::MailMarshalSMTP ....    0/0003  0.0000  Trustwave Secure Email Gateway
 MTA::McAfee .............    0/0010  0.0000  McAfee Email Appliance
 MTA::MessagingServer ....   19/0022  0.8636  Oracle Communications Messaging Server
 MTA::Notes ..............    0/0012  0.0000  Lotus Notes
-MTA::OpenSMTPD ..........    5/0023  0.2174  OpenSMTPD
+MTA::OpenSMTPD ..........    6/0024  0.2500  OpenSMTPD
 MTA::Postfix ............  171/0189  0.9048  Postfix
-MTA::Sendmail ...........  331/0253  1.0000  V8Sendmail: /usr/sbin/sendmail
+MTA::Sendmail ...........  332/0255  1.0000  V8Sendmail: /usr/sbin/sendmail
 MTA::SurfControl ........    6/0008  0.7500  WebSense SurfControl
 MTA::V5sendmail .........    0/0386  0.0000  Sendmail version 5
 MTA::X1 .................    0/0007  0.0000  Unknown MTA #1
@@ -46,12 +46,14 @@ MSP::US::Office365 ......    8/0011  0.7273  Microsoft Office 365: http://office
 MSP::US::Outlook ........   19/0021  0.9048  Microsoft Outlook.com: https://www.outlook.com/
 MSP::US::ReceivingSES ...    0/0007  0.0000  Amazon SES(Receiving): http://aws.amazon.com/ses/
 MSP::US::SendGrid .......    7/0012  0.5833  SendGrid: http://sendgrid.com/
-MSP::US::Verizon ........    3/0003  1.0000  Verizon Wireless: http://www.verizonwireless.com
+MSP::US::Verizon ........    4/0004  1.0000  Verizon Wireless: http://www.verizonwireless.com
 MSP::US::Yahoo ..........    0/0009  0.0000  Yahoo! MAIL: https://www.yahoo.com
 MSP::US::Zoho ...........    0/0011  0.0000  Zoho Mail: https://www.zoho.com
+CED::US::AmazonSES ......    0/0009  0.0000  Amazon SES(JSON): http://aws.amazon.com/ses/
+CED::US::SendGrid .......    0/0000  1.0000  SendGrid(JSON): http://sendgrid.com/
 ARF .....................    9/0050  0.1800  Abuse Feedback Reporting Format
-RFC3464 .................  136/0277  0.4910  Fallback Module for MTAs
+RFC3464 .................  136/0278  0.4892  Fallback Module for MTAs
 RFC3834 .................    0/0006  0.0000  Detector for auto replied message
 -------------------------------------------------------------------------------
- bounceHammer 2.7.13p3    1201/2178  0.5514
- Sisimai 4.19.0           2178/2178  1.0000
+ bounceHammer 2.7.13p3    1204/2192  0.5493
+ Sisimai 4.20.0           2192/2192  1.0000

data/Changes

@@ -1,5 +1,20 @@
 Revision history for Ruby version of Sisimai
 
+4.20.0  Sat, 31 Dec 2016 13:36:22 +0900 (JST)
+    - Experimental implementation: New MTA modules for 2 Cloud Email Deliveries,
+      Sisimai::CED::US::AmazonSES and Sisimai::CED::US::SendGrid. These modules
+      can parse JSON formatted bounce objects and can convert to Sisimai::Data
+      object.
+    - Format of "smtpagent" in the parsed result has been changed. It includes
+      the category name of MTA/MSP modules like "MTA::Sendmail", "MTA::Exim",
+      and "MSP::US::SendGrid".
+    - The Domain part of dummy email address defined in Sisimai::Address module
+      has been changed from "dummy-domain.invalid" to "libsisimai.org.invalid".
+    - Sisimai::SMTP.is_softbounce() method has been deleted.
+    - Improved code for avoid "Invalid byte sequence in UTF-8 (ArgumentError)"
+      error in Sisimai::String.to_plain method reported from M.R.
+    - Sisimai works on Ruby 2.4.0.
+
 4.19.0  Tue, 18 Oct 2016 14:19:10 +0900 (JST)
     - Implement a callback feature at Sisimai.make and Sisimai.dump methods.
       More imformation about the feature are available at the following pages:

data/Developers.mk

@@ -9,7 +9,7 @@
 SHELL := /bin/sh
 HERE  := $(shell pwd)
 NAME  := Sisimai
-RUBY  := ruby
+RUBY  ?= ruby
 MKDIR := mkdir -p
 LS    := ls -1
 CP    := cp
@@ -21,6 +21,7 @@ PERL_SISIMAI := p5-Sisimai
 PRECISIONTAB := ANALYTICAL-PRECISION
 BENCHMARKDIR := tmp/benchmark
 PARSERLOGDIR := var/log
+CEDMODULEDIR := lib/sisimai/ced
 MTAMODULEDIR := lib/sisimai/mta
 MSPMODULEDIR := lib/sisimai/msp
 MTARELATIVES := ARF rfc3464 rfc3834
@@ -28,11 +29,13 @@ EMAIL_PARSER := sbin/emparser
 BENCHMARKEMP := sbin/mp
 VELOCITYTEST := tmp/emails-for-velocity-measurement
 BENCHMARKSET := tmp/sample
+
 SET_OF_EMAIL := set-of-emails
 PRIVATEMAILS := $(SET_OF_EMAIL)/private
 PUBLICEMAILS := $(SET_OF_EMAIL)/maildir/bsd
 DOSFORMATSET := $(SET_OF_EMAIL)/maildir/dos
 MACFORMATSET := $(SET_OF_EMAIL)/maildir/mac
+
 INDEX_LENGTH := 24
 DESCR_LENGTH := 48
 BH_CAN_PARSE := courier exim messagingserver postfix sendmail surfcontrol x5 \
@@ -74,6 +77,15 @@ sample:
 			$(CP) $(PRIVATEMAILS)/$$DIR-$$MSP/* $(BENCHMARKSET)/$$DIR-$$MSP/ ;\
 		done ;\
 	done
+	for c in `$(LS) ./$(CEDMODULEDIR)`; do \
+		for v in `$(LS) ./$(CEDMODULEDIR)/$$c/*.rb`; do \
+			DIR=`echo $$c | tr '[A-Z]' '[a-z]' | tr -d '/'` ;\
+			CED="`echo $$v | cut -d/ -f6 | tr '[A-Z]' '[a-z]' | sed 's/.rb//g'`" ;\
+			$(MKDIR) $(BENCHMARKSET)/$$DIR-$$CED ;\
+			$(CP) $(PUBLICEMAILS)/$$DIR-$$CED-*.eml $(BENCHMARKSET)/$$DIR-$$CED/ ;\
+			$(CP) $(PRIVATEMAILS)/$$DIR-$$CED/* $(BENCHMARKSET)/$$DIR-$$CED/ ;\
+		done ;\
+	done
 	for v in arf rfc3464 rfc3834; do \
 		$(MKDIR) $(BENCHMARKSET)/$$v ;\
 		$(CP) $(PUBLICEMAILS)/$$v*.eml $(BENCHMARKSET)/$$v/ ;\

data/Makefile

@@ -8,9 +8,9 @@
 SHELL := /bin/sh
 TIME  := $(shell date '+%s')
 NAME  := sisimai
-RUBY  := ruby
-JRUBY := /usr/local/jr
-RAKE  := rake
+RUBY  ?= ruby
+JRUBY ?= /usr/local/jr
+RAKE  ?= rake
 MKDIR := mkdir -p
 RSPEC := rspec -Ilib -f progress
 CP    := cp

data/README-JA.md

@@ -97,7 +97,7 @@ v = Sisimai.make('/path/to/mbox')       # or path to Maildir/
 # option to make() method like the following:
 v = Sisimai.make('/path/to/mbox', delivered: true)
 
-unless v.void
+if v.is_a? Array
   v.each do |e|
     puts e.class                # Sisimai::Data
     puts e.recipient.class      # Sisimai::Address
@@ -123,9 +123,28 @@ puts Sisimai.dump('/path/to/mbox')  # or path to Maildir/
 puts Sisimai.dump('/path/to/mbox', delivered: true)
 ```
 
-```json
-[{"recipient": "kijitora@example.jp", "addresser": "shironeko@1jo.example.org", "feedbacktype": "", "action": "failed", "subject": "Nyaaaaan", "smtpcommand": "DATA", "diagnosticcode": "550 Unknown user kijitora@example.jp", "listid": "", "destination": "example.jp", "smtpagent": "Courier", "lhost": "1jo.example.org", "deliverystatus": "5.0.0", "timestamp": 1291954879, "messageid": "201012100421.oBA4LJFU042012@1jo.example.org", "diagnostictype": "SMTP", "timezoneoffset": "+0900", "reason": "filtered", "token": "ce999a4c869e3f5e4d8a77b2e310b23960fb32ab", "alias": "", "senderdomain": "1jo.example.org", "rhost": "mfsmax.example.jp"}, {"diagnostictype": "SMTP", "timezoneoffset": "+0900", "reason": "userunknown", "timestamp": 1381900535, "messageid": "E1C50F1B-1C83-4820-BC36-AC6FBFBE8568@example.org", "token": "9fe754876e9133aae5d20f0fd8dd7f05b4e9d9f0", "alias": "", "senderdomain": "example.org", "rhost": "mx.bouncehammer.jp", "action": "failed", "addresser": "kijitora@example.org", "recipient": "userunknown@bouncehammer.jp", "feedbacktype": "", "smtpcommand": "DATA", "subject": "バウンスメールのテスト(日本語)", "destination": "bouncehammer.jp", "listid": "", "diagnosticcode": "550 5.1.1 <userunknown@bouncehammer.jp>... User Unknown", "deliverystatus": "5.1.1", "lhost": "p0000-ipbfpfx00kyoto.kyoto.example.co.jp", "smtpagent": "Sendmail"}]
+バウンスオブジェクト(JSON)を読む
+--------------------------------
+メール配信クラウドからAPIで取得したバウンスオブジェクト(JSON)を読んで解析する
+場合は、次のようなコードを書いてください。この機能はSisimai v4.20.0で実装され
+ました。
+
+```ruby
+#! /usr/bin/env ruby
+require 'json'
+require 'sisimai'
+
+j = JSON.load('{"notificationType"=>"Bounce", "bounce"=>{"...') # JSON String
+v = Sisimai.make(j, input: 'json')
+
+if v.is_a? Array
+  v.each do |e|
+    ...
+  end
+end
 ```
+現時点ではAmazon SESとSendGridのみをサポートしています。
+
 
 コールバック機能
 ----------------
@@ -163,6 +182,15 @@ puts data[0].catch['x-mailer']      # Apple Mail (2.1283)
 % ruby -rsisimai -e 'puts Sisimai.dump($*.shift)' /path/to/mbox
 ```
 
+解析結果の例(JSON)
+------------------
+```json
+[{"recipient": "kijitora@example.jp", "addresser": "shironeko@1jo.example.org", "feedbacktype": "", "action": "failed", "subject": "Nyaaaaan", "smtpcommand": "DATA", "diagnosticcode": "550 Unknown user kijitora@example.jp", "listid": "", "destination": "example.jp", "smtpagent": "Courier", "lhost": "1jo.example.org", "deliverystatus": "5.0.0", "timestamp": 1291954879, "messageid": "201012100421.oBA4LJFU042012@1jo.example.org", "diagnostictype": "SMTP", "timezoneoffset": "+0900", "reason": "filtered", "token": "ce999a4c869e3f5e4d8a77b2e310b23960fb32ab", "alias": "", "senderdomain": "1jo.example.org", "rhost": "mfsmax.example.jp"}, {"diagnostictype": "SMTP", "timezoneoffset": "+0900", "reason": "userunknown", "timestamp": 1381900535, "messageid": "E1C50F1B-1C83-4820-BC36-AC6FBFBE8568@example.org", "token": "9fe754876e9133aae5d20f0fd8dd7f05b4e9d9f0", "alias": "", "senderdomain": "example.org", "rhost": "mx.bouncehammer.jp", "action": "failed", "addresser": "kijitora@example.org", "recipient": "userunknown@bouncehammer.jp", "feedbacktype": "", "smtpcommand": "DATA", "subject": "バウンスメールのテスト(日本語)", "destination": "bouncehammer.jp", "listid": "", "diagnosticcode": "550 5.1.1 <userunknown@bouncehammer.jp>... User Unknown", "deliverystatus": "5.1.1", "lhost": "p0000-ipbfpfx00kyoto.kyoto.example.co.jp", "smtpagent": "Sendmail"}]
+```
+
+シシマイの仕様
+==============
+
 Perl版Sisimaiとの違い
 ---------------------
 公開中のPerl版Sisimai(p5-Sisimai)とRuby版Sisimai(rb-Sisimai)は下記のような違いが
@@ -171,14 +199,14 @@ Perl版Sisimaiとの違い
 
 | 機能                                        | Ruby version   | Perl version  |
 |---------------------------------------------|----------------|---------------|
-| 動作環境                                    | Ruby 2.1-2.3   | Perl 5.10 -   |
+| 動作環境                                    | Ruby 2.1 - 2.4 | Perl 5.10 -   |
 |                                             | JRuby 9.0.4.0- |               |
 | 解析精度の割合(2000通のメール)[1]           | 1.00           | 1.00          |
 | メール解析速度(1000通のメール)              | 3.30秒         | 2.33秒        |
 | インストール方法                            | gem install    | cpanm         |
 | 依存モジュール数(コアモジュールを除く)      | 1モジュール    | 2モジュール   |
-| LOC:ソースコードの行数                      | 11700行        | 8600行        |
-| テスト件数(spec/,t/,xt/ディレクトリ)        | 103800件       | 184100件      |
+| LOC:ソースコードの行数                      | 12200行        | 8800行        |
+| テスト件数(spec/,t/,xt/ディレクトリ)        | 106600件       | 188000件      |
 | ライセンス                                  | 二条項BSD      | 二条項BSD     |
 | 開発会社によるサポート契約                  | 準備中         | 提供中        |
 
@@ -292,6 +320,7 @@ Sisimaiは下記のエラー27種を検出します。バウンス理由につ
 | action         | Action:ヘッダの値                                           |
 | addresser      | 送信者のアドレス                                            |
 | alias          | 受信者アドレスのエイリアス                                  |
+| catch          | 引数に指定したフックメソッドが返すデータ                    |
 | destination    | "recipient"のドメイン部分                                   |
 | deliverystatus | 配信状態(DSN)の値(例: 5.1.1, 4.4.7)                         |
 | diagnosticcode | エラーメッセージ                                            |

data/README.md

@@ -24,6 +24,7 @@ Key Features
   * 2 times higher than bounceHammer
   * Support 22 known MTAs and 5 unknown MTAs
   * Support 21 major MSPs(Mail Service Providers)
+  * Support 2 major Cloud Email Delivery Services(JSON format)
   * Support Feedback Loop Message(ARF)
   * Can detect 27 error reasons
 
@@ -46,10 +47,10 @@ Install
 
 ```shell
 % sudo gem install sisimai
-Fetching: sisimai-4.16.0.gem (100%)
-Successfully installed sisimai-4.16.0
-Parsing documentation for sisimai-4.16.0
-Installing ri documentation for sisimai-4.16.0
+Fetching: sisimai-4.20.0.gem (100%)
+Successfully installed sisimai-4.20.0
+Parsing documentation for sisimai-4.20.0
+Installing ri documentation for sisimai-4.20.0
 Done installing documentation for sisimai after 6 seconds
 1 gem installed
 ```
@@ -62,22 +63,11 @@ Done installing documentation for sisimai after 6 seconds
 % 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.14.2 built to pkg/sisimai-4.16.0.gem.
-sisimai (4.14.2) installed.
+sisimai 4.20.0 built to pkg/sisimai-4.20.0.gem.
+sisimai (4.20.0) installed.
 ```
 
 Usage
@@ -96,7 +86,7 @@ v = Sisimai.make('/path/to/mbox')       # or path to Maildir/
 # option to make() method like the following:
 v = Sisimai.make('/path/to/mbox', delivered: true)
 
-unless v.void
+if v.is_a? Array
   v.each do |e|
     puts e.class                # Sisimai::Data
     puts e.recipient.class      # Sisimai::Address
@@ -122,9 +112,27 @@ puts Sisimai.dump('/path/to/mbox')  # or path to Maildir/
 puts Sisimai.dump('/path/to/mbox', delivered: true)
 ```
 
-```json
-[{"recipient": "kijitora@example.jp", "addresser": "shironeko@1jo.example.org", "feedbacktype": "", "action": "failed", "subject": "Nyaaaaan", "smtpcommand": "DATA", "diagnosticcode": "550 Unknown user kijitora@example.jp", "listid": "", "destination": "example.jp", "smtpagent": "Courier", "lhost": "1jo.example.org", "deliverystatus": "5.0.0", "timestamp": 1291954879, "messageid": "201012100421.oBA4LJFU042012@1jo.example.org", "diagnostictype": "SMTP", "timezoneoffset": "+0900", "reason": "filtered", "token": "ce999a4c869e3f5e4d8a77b2e310b23960fb32ab", "alias": "", "senderdomain": "1jo.example.org", "rhost": "mfsmax.example.jp"}, {"diagnostictype": "SMTP", "timezoneoffset": "+0900", "reason": "userunknown", "timestamp": 1381900535, "messageid": "E1C50F1B-1C83-4820-BC36-AC6FBFBE8568@example.org", "token": "9fe754876e9133aae5d20f0fd8dd7f05b4e9d9f0", "alias": "", "senderdomain": "example.org", "rhost": "mx.bouncehammer.jp", "action": "failed", "addresser": "kijitora@example.org", "recipient": "userunknown@bouncehammer.jp", "feedbacktype": "", "smtpcommand": "DATA", "subject": "バウンスメールのテスト(日本語)", "destination": "bouncehammer.jp", "listid": "", "diagnosticcode": "550 5.1.1 <userunknown@bouncehammer.jp>... User Unknown", "deliverystatus": "5.1.1", "lhost": "p0000-ipbfpfx00kyoto.kyoto.example.co.jp", "smtpagent": "Sendmail"}]
+Read bounce object(JSON)
+------------------------
+The way to read a bounce object retrived from Cloud Email Services as JSON using
+their API is the following code. This feature is available at Sisimai 4.20.0 or
+later.
+
+```ruby
+#! /usr/bin/env ruby
+require 'json'
+require 'sisimai'
+
+j = JSON.load('{"notificationType"=>"Bounce", "bounce"=>{"...') # JSON String
+v = Sisimai.make(j, input: 'json')
+
+if v.is_a? Array
+  v.each do |e|
+    ...
+  end
+end
 ```
+As of present, Only Amazon SES and SendGrid are supported.
 
 Callback Feature
 ----------------
@@ -154,7 +162,6 @@ More information about the callback feature is available at
 [Sisimai | How To Parse - Callback](http://libsisimai.org/en/usage/#callback)
 Page.
 
-
 One-Liner
 ---------
 
@@ -162,6 +169,15 @@ One-Liner
 % ruby -rsisimai -e 'puts Sisimai.dump($*.shift)' /path/to/mbox
 ```
 
+Parsed results as JSON
+----------------------
+```json
+[{"recipient": "kijitora@example.jp", "addresser": "shironeko@1jo.example.org", "feedbacktype": "", "action": "failed", "subject": "Nyaaaaan", "smtpcommand": "DATA", "diagnosticcode": "550 Unknown user kijitora@example.jp", "listid": "", "destination": "example.jp", "smtpagent": "Courier", "lhost": "1jo.example.org", "deliverystatus": "5.0.0", "timestamp": 1291954879, "messageid": "201012100421.oBA4LJFU042012@1jo.example.org", "diagnostictype": "SMTP", "timezoneoffset": "+0900", "reason": "filtered", "token": "ce999a4c869e3f5e4d8a77b2e310b23960fb32ab", "alias": "", "senderdomain": "1jo.example.org", "rhost": "mfsmax.example.jp"}, {"diagnostictype": "SMTP", "timezoneoffset": "+0900", "reason": "userunknown", "timestamp": 1381900535, "messageid": "E1C50F1B-1C83-4820-BC36-AC6FBFBE8568@example.org", "token": "9fe754876e9133aae5d20f0fd8dd7f05b4e9d9f0", "alias": "", "senderdomain": "example.org", "rhost": "mx.bouncehammer.jp", "action": "failed", "addresser": "kijitora@example.org", "recipient": "userunknown@bouncehammer.jp", "feedbacktype": "", "smtpcommand": "DATA", "subject": "バウンスメールのテスト(日本語)", "destination": "bouncehammer.jp", "listid": "", "diagnosticcode": "550 5.1.1 <userunknown@bouncehammer.jp>... User Unknown", "deliverystatus": "5.1.1", "lhost": "p0000-ipbfpfx00kyoto.kyoto.example.co.jp", "smtpagent": "Sendmail"}]
+```
+
+Sisimai Specification
+=====================
+
 Differences between Perl version and Ruby version
 -------------------------------------------------
 The following table show the differences between Perl version of Sisimai
@@ -171,14 +187,14 @@ and bounceHammer are available at
 
 | Features                                    | Ruby version   | Perl version  |
 |---------------------------------------------|----------------|---------------|
-| System requirements                         | Ruby 2.1-2.3   | Perl 5.10 -   |
+| System requirements                         | Ruby 2.1 - 2.4 | Perl 5.10 -   |
 |                                             | JRuby 9.0.4.0- |               |
 | Analytical precision ratio(2000 emails)[1]  | 1.00           | 1.00          |
 | 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                    | 11750 lines    | 8600 lines    |
-| The number of tests(spec/,t/,xt/) directory | 103800 tests   | 184100 tests  |
+| LOC:Source lines of code                    | 12200 lines    | 8800 lines    |
+| The number of tests(spec/,t/,xt/) directory | 106400 tests   | 188000 tests  |
 | License                                     | BSD 2-Clause   | BSD 2-Clause  |
 | Support Contract provided by Developer      | Coming soon    | Available     |
 
@@ -240,6 +256,8 @@ details about these modules are available at
 | MSP::US::Verizon         | Verizon Wireless: http://www.verizonwireless.com  |
 | MSP::US::Yahoo           | Yahoo! MAIL: https://www.yahoo.com                |
 | MSP::US::Zoho            | Zoho Mail: https://www.zoho.com                   |
+| CED::US::AmazonSES       | AmazonSES(JSON): http://aws.amazon.com/ses/       |
+| CED::US::SendGrid        | SendGrid(JSON): http://sendgrid.com/              |
 | ARF                      | Abuse Feedback Reporting Format                   |
 | RFC3464                  | Fallback Module for MTAs                          |
 | RFC3834                  | Detector for auto replied message                 |
@@ -293,6 +311,7 @@ More details about data structure are available at available at
 | action         | The value of Action: header                                 |
 | addresser      | The sender's email address (From:)                          |
 | alias          | Alias of the recipient                                      |
+| catch          | Data returned from a hook mehotd                            |
 | destination    | The domain part of the "recipinet"                          |
 | deliverystatus | Delivery Status(DSN), ex) 5.1.1, 4.4.7                      |
 | diagnosticcode | Error message                                               |

data/Repository.mk

@@ -7,7 +7,7 @@
 #           |_|                              |___/                  
 # -----------------------------------------------------------------------------
 SHELL := /bin/sh
-GIT   := /usr/bin/git
+GIT   ?= git
 CP    := cp
 B      = master
 V      = neko

data/lib/sisimai.rb

@@ -13,49 +13,109 @@ module Sisimai
     def libname(); return 'Sisimai';        end
 
     # Wrapper method for parsing mailbox/maidir
-    # @param         [String] path       Path to mbox or Maildir/
-    # @param         [Hash]  argvs       Parser options(delivered=false)
-    # @options argvs [Boolean] delivered true: Include "delivered" reason
-    # @options argvs [Lambda]  hook      Lambda object to be called back
+    # @param         [String] argv0      Path to mbox or Maildir/
+    # @param         [Hash]   argv0      or Hash (decoded JSON)
+    # @param         [IO]     argv0      or STDIN object
+    # @param         [Hash]   argv1      Parser options(delivered=false)
+    # @options argv1 [Boolean] delivered true: Include "delivered" reason
+    # @options argv1 [Lambda]  hook      Lambda object to be called back
+    # @options argv1 [String]  input     Input data format: 'email', 'json'
     # @return        [Array]             Parsed objects
     # @return        [nil]               nil if the argument was wrong or an empty array
-    def make(path, **argvs)
-      return nil unless path
+    def make(argv0, **argv1)
+      return nil unless argv0
 
-      require 'sisimai/mail'
-      mail = Sisimai::Mail.new(path)
-      list = []
-
-      return nil unless mail
       require 'sisimai/data'
       require 'sisimai/message'
 
-      methodargv = { :delivered => argvs[:delivered] || false }
-      hookmethod = argvs[:hook] || nil
+      input = argv1[:input] || nil
+      rtype = nil
+
+      unless input
+        # "input" did not specified, try to detect automatically.
+        rtype = argv0.class.to_s
+        if rtype == 'String'
+          # The argument may be a path to email
+          input = 'email'
+
+        elsif rtype =~ /\A(?:Array|Hash)\z/
+          # The argument may be a decoded JSON object
+          input = 'json'
+        end
+      end
 
-      while r = mail.read do
-        # Read and parse each mail file
-        mesg = Sisimai::Message.new(data: r, hook: hookmethod)
-        next if mesg.void
-        data = Sisimai::Data.make(data: mesg, delivered: methodargv)
-        next unless data
-        list.concat(data) if data.size > 0
+      methodargv = {}
+      delivered1 = argv1[:delivered] || false
+      hookmethod = argv1[:hook] || nil
+      bouncedata = []
+
+      if input == 'email'
+        # Path to mailbox or Maildir/, or STDIN: 'input' => 'email'
+        require 'sisimai/mail'
+        mail = Sisimai::Mail.new(argv0)
+        return nil unless mail
+
+        while r = mail.read do
+          # Read and parse each mail file
+          methodargv = { data: r, hook: hookmethod, input: 'email' }
+          mesg = Sisimai::Message.new(methodargv)
+          next if mesg.void
+
+          methodargv = { data: mesg, hook: hookmethod, input: 'email', delivered: delivered1 }
+          data = Sisimai::Data.make(methodargv)
+          next unless data
+          bouncedata.concat(data) if data.size > 0
+        end
+
+      elsif input == 'json'
+        # Decoded JSON object: 'input' => 'json'
+        type = argv0.class.to_s
+        list = []
+
+        if type == 'Array'
+          # [ {...}, {...}, ... ]
+          argv0.each do |e|
+            next unless e.class.to_s == 'Hash'
+            list << e
+          end
+        else
+          list << argv0
+        end
+
+        list.each do |e|
+          methodargv = { data: e, hook: hookmethod, input: 'json' }
+          mesg = Sisimai::Message.new(methodargv)
+          next if mesg.void
+
+          methodargv = { data: mesg, hook: hookmethod, input: 'json', delivered: delivered1 }
+          data = Sisimai::Data.make(methodargv)
+
+          next unless data
+          bouncedata.concat(data) if data.size > 0
+        end
+
+      else
+        # The value of "input" neither "email" nor "json"
+        fail ' ***error: invalid value of "input"'
       end
 
-      return nil if list.size == 0
-      return list
+      return nil if bouncedata.size == 0
+      return bouncedata
     end
 
     # Wrapper method to parse mailbox/Maildir and dump as JSON
-    # @param         [String] path       Path to mbox or Maildir/
-    # @param         [Hash] argvs        Parser options
-    # @options argvs [Integer] delivered true: Include "delivered" reason
-    # @options argvs [Lambda]  hook      Lambda object to be called back
+    # @param         [String] argv0      Path to mbox or Maildir/
+    # @param         [Hash]   argv0      or Hash (decoded JSON)
+    # @param         [IO]     argv0      or STDIN object
+    # @param         [Hash] argv1        Parser options
+    # @options argv1 [Integer] delivered true: Include "delivered" reason
+    # @options argv1 [Lambda]  hook      Lambda object to be called back
+    # @options argv1 [String]  input     Input data format: 'email', 'json'
     # @return        [String]            Parsed data as JSON text
-    def dump(path, **argvs)
-      return nil unless path
+    def dump(argv0, **argv1)
+      return nil unless argv0
 
-      nyaan = Sisimai.make(path, argvs) || []
+      nyaan = Sisimai.make(argv0, argv1) || []
       if RUBY_PLATFORM =~ /java/
         # java-based ruby environment like JRuby.
         require 'jrjackson'
@@ -70,15 +130,15 @@ module Sisimai
     # Parser engine list (MTA/MSP modules)
     # @return   [Hash]     Parser engine table
     def engine
-      names = %w|MTA MSP ARF RFC3464 RFC3834|
+      names = %w|MTA MSP CED ARF RFC3464 RFC3834|
       table = {}
 
       names.each do |e|
         r = 'Sisimai::' + e
         require r.gsub('::', '/').downcase
 
-        if e == 'MTA' || e == 'MSP'
-          # Sisimai::MTA or Sisimai::MSP
+        if e == 'MTA' || e == 'MSP' || e == 'CED'
+          # Sisimai::MTA or Sisimai::MSP or Sisimai::CED
           Module.const_get(r).send(:index).each do |ee|
             # Load and get the value of "description" from each module
             rr = sprintf('Sisimai::%s::%s', e, ee)