RubyGems - sisimai - Versions diffs - 4.21.1-java → 4.22.0-java - Mend

sisimai 4.21.1-java → 4.22.0-java

Potentially problematic release.

This version of sisimai might be problematic. Click here for more details.

Files changed (571) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e56734a1878b0db4142786ec818b43b461f0282
-  data.tar.gz: 5a13a22e91a2c6d7fda1fef5b7a5fab06ea5e0ed
+  metadata.gz: 380a919d6366c40fb138073540ad3c0402d24519
+  data.tar.gz: 4563a380fc2bc772525479279738b28982dd4771
 SHA512:
-  metadata.gz: 5c709e7029e2d4f3470986846f29178e47e5dde07af07a2f6e780dc9d1ea3b4a675ca3ec40b9b08587d575f4ccceb7c3d09abbf3a6d1d1aa35d40700718876c0
-  data.tar.gz: 07c06395781aec135c47138158dfaeafd59e5904f73f2f3d180c04481f2e2927d0fbb08f4062871d72fd1385a6f251986d5a7c9e94bb04f76b873affe57ed9ae
+  metadata.gz: 14580ebfd9a5908ca0da1625a8a2c71515a04383a25a1ae338cf3c2bd8c90d7a13354d28c4d6d80c14f789e1be5678d28f451ec27915adc6118ad105ca030481
+  data.tar.gz: 511a8644c47d1c5d3a291b4012383361b9c4e32054a34d0240f404e99df9cbc53767443054dc9c1c6790d3ddbf56c468ed0860bb929fb3eb322eb129d5070dbc

data/ANALYTICAL-PRECISION CHANGED Viewed

@@ -1,60 +1,60 @@
  bounceHammer 2.7.13p3
  MTA MODULE NAME          CAN PARSE   RATIO   NOTES
--------------------------------------------------------------------------------
-MTA::Activehunter .......    0/0014  0.0000  TransWARE Active!hunter
-MTA::ApacheJames ........    0/0006  0.0000  Java Apache Mail Enterprise Server
-MTA::Courier ............   14/0016  0.8750  Courier MTA
-MTA::Domino .............    6/0015  0.4000  IBM Domino Server
-MTA::Exchange2003 .......    1/0051  0.0196  Microsoft Exchange Server 2003
-MTA::Exchange2007 .......    6/0007  0.8571  Microsoft Exchange Server 2007
-MTA::Exim ...............  146/0176  0.8295  Exim
-MTA::IMailServer ........    0/0045  0.0000  IPSWITCH IMail Server
-MTA::InterScanMSS .......    0/0009  0.0000  Trend Micro InterScan Messaging Security Suite
-MTA::MXLogic ............    0/0014  0.0000  McAfee SaaS
-MTA::MailFoundry ........    0/0007  0.0000  MailFoundry
-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 ..........    6/0024  0.2500  OpenSMTPD
-MTA::Postfix ............  173/0191  0.9058  Postfix
-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
-MTA::X2 .................    0/0069  0.0000  Unknown MTA #2
-MTA::X3 .................    0/0012  0.0000  Unknown MTA #3
-MTA::X4 .................    0/0029  0.0000  Unknown MTA #4 qmail clones
-MTA::X5 .................    3/0003  1.0000  Unknown MTA #5
-MTA::mFILTER ............    0/0009  0.0000  Digital Arts m-FILTER
-MTA::qmail ..............   53/0082  0.6463  qmail
-MSP::DE::EinsUndEins ....    0/0003  0.0000  1&1: http://www.1and1.de
-MSP::DE::GMX ............    0/0010  0.0000  GMX: http://www.gmx.net
-MSP::JP::Biglobe ........    5/0007  0.7143  BIGLOBE: http://www.biglobe.ne.jp
-MSP::JP::EZweb ..........  130/0125  1.0000  au EZweb: http://www.au.kddi.com/mobile/
-MSP::JP::KDDI ...........    6/0006  1.0000  au by KDDI: http://www.au.kddi.com
-MSP::RU::MailRu .........    4/0014  0.2857  @mail.ru: https://mail.ru
-MSP::RU::Yandex .........    4/0007  0.5714  Yandex.Mail: http://www.yandex.ru
-MSP::UK::MessageLabs ....    2/0002  1.0000  Symantec.cloud http://www.messagelabs.com
-MSP::US::AmazonSES ......   22/0022  1.0000  Amazon SES(Sending): http://aws.amazon.com/ses/
-MSP::US::AmazonWorkMail .    8/0012  0.6667  Amazon WorkMail: https://aws.amazon.com/workmail/
-MSP::US::Aol ............   18/0021  0.8571  Aol Mail: http://www.aol.com
-MSP::US::Bigfoot ........    2/0002  1.0000  Bigfoot: http://www.bigfoot.com
-MSP::US::Facebook .......    3/0003  1.0000  Facebook: https://www.facebook.com
-MSP::US::GSuite .........    8/0008  1.0000  G Suite: https://gsuite.google.com/
-MSP::US::Google .........   58/0062  0.9355  Google Gmail: https://mail.google.com
-MSP::US::Office365 ......    8/0011  0.7273  Microsoft Office 365: http://office.microsoft.com/
-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 ........    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/
+--------------------------------------------------------------------------------
+Email::Activehunter .....    0/0014  0.0000  TransWARE Active!hunter
+Email::AmazonSES ........   22/0031  0.7097  Amazon SES(Sending): http://aws.amazon.com/ses/
+Email::AmazonWorkMail ...    8/0012  0.6667  Amazon WorkMail: https://aws.amazon.com/workmail/
+Email::Aol ..............   20/0023  0.8696  Aol Mail: http://www.aol.com
+Email::ApacheJames ......    0/0006  0.0000  Java Apache Mail Enterprise Server
+Email::Bigfoot ..........    2/0002  1.0000  Bigfoot: http://www.bigfoot.com
+Email::Biglobe ..........    5/0007  0.7143  BIGLOBE: http://www.biglobe.ne.jp
+Email::Courier ..........   14/0016  0.8750  Courier MTA
+Email::Domino ...........    6/0015  0.4000  IBM Domino Server
+Email::EZweb ............  130/0125  1.0000  au EZweb: http://www.au.kddi.com/mobile/
+Email::EinsUndEins ......    0/0003  0.0000  1&1: http://www.1and1.de
+Email::Exchange2003 .....    1/0051  0.0196  Microsoft Exchange Server 2003
+Email::Exchange2007 .....    6/0007  0.8571  Microsoft Exchange Server 2007
+Email::Exim .............  146/0176  0.8295  Exim
+Email::Facebook .........    3/0003  1.0000  Facebook: https://www.facebook.com
+Email::GMX ..............    0/0010  0.0000  GMX: http://www.gmx.net
+Email::GSuite ...........    9/0009  1.0000  G Suite: https://gsuite.google.com/
+Email::Google ...........   58/0062  0.9355  Google Gmail: https://mail.google.com
+Email::IMailServer ......    0/0045  0.0000  IPSWITCH IMail Server
+Email::InterScanMSS .....    0/0009  0.0000  Trend Micro InterScan Messaging Security Suite
+Email::KDDI .............    6/0006  1.0000  au by KDDI: http://www.au.kddi.com
+Email::MXLogic ..........    0/0014  0.0000  McAfee SaaS
+Email::MailFoundry ......    0/0007  0.0000  MailFoundry
+Email::MailMarshalSMTP ..    0/0003  0.0000  Trustwave Secure Email Gateway
+Email::MailRu ...........    4/0016  0.2500  @mail.ru: https://mail.ru
+Email::McAfee ...........    0/0010  0.0000  McAfee Email Appliance
+Email::MessageLabs ......    2/0002  1.0000  Symantec.cloud http://www.messagelabs.com
+Email::MessagingServer ..   19/0022  0.8636  Oracle Communications Messaging Server
+Email::Notes ............    0/0012  0.0000  Lotus Notes
+Email::Office365 ........    8/0011  0.7273  Microsoft Office 365: http://office.microsoft.com/
+Email::OpenSMTPD ........    6/0024  0.2500  OpenSMTPD
+Email::Outlook ..........   19/0021  0.9048  Microsoft Outlook.com: https://www.outlook.com/
+Email::Postfix ..........  175/0193  0.9067  Postfix
+Email::ReceivingSES .....    0/0007  0.0000  Amazon SES(Receiving): http://aws.amazon.com/ses/
+Email::SendGrid .........    7/0012  0.5833  SendGrid: http://sendgrid.com/
+Email::Sendmail .........  334/0257  1.0000  V8Sendmail: /usr/sbin/sendmail
+Email::SurfControl ......    6/0008  0.7500  WebSense SurfControl
+Email::V5sendmail .......    0/0386  0.0000  Sendmail version 5
+Email::Verizon ..........    4/0004  1.0000  Verizon Wireless: http://www.verizonwireless.com
+Email::X1 ...............    0/0007  0.0000  Unknown MTA #1
+Email::X2 ...............    0/0069  0.0000  Unknown MTA #2
+Email::X3 ...............    0/0012  0.0000  Unknown MTA #3
+Email::X4 ...............    0/0029  0.0000  Unknown MTA #4 qmail clones
+Email::X5 ...............    3/0003  1.0000  Unknown MTA #5
+Email::Yahoo ............    0/0009  0.0000  Yahoo! MAIL: https://www.yahoo.com
+Email::Yandex ...........    4/0007  0.5714  Yandex.Mail: http://www.yandex.ru
+Email::Zoho .............    0/0011  0.0000  Zoho Mail: https://www.zoho.com
+Email::MFILTER ..........    0/0009  0.0000  Digital Arts m-FILTER
+Email::Qmail ............   53/0082  0.6463  qmail
+JSON::AmazonSES .........   22/0031  0.7097  Amazon SES(JSON): http://aws.amazon.com/ses/
+JSON::SendGrid ..........    7/0012  0.5833  SendGrid(JSON): http://sendgrid.com/
 ARF .....................    9/0050  0.1800  Abuse Feedback Reporting Format
-RFC3464 .................  136/0278  0.4892  Fallback Module for MTAs
+RFC3464 .................  136/0280  0.4857  Fallback Module for MTAs
 RFC3834 .................    0/0007  0.0000  Detector for auto replied message
--------------------------------------------------------------------------------
- bounceHammer 2.7.13p3    1218/2205  0.5524
- Sisimai 4.21.0p2         2205/2205  1.0000
+--------------------------------------------------------------------------------
+ bounceHammer 2.7.13p3    1254/2259  0.5551
+ Sisimai 4.22.0           2259/2259  1.0000

data/ChangeLog.md CHANGED Viewed

@@ -3,6 +3,22 @@ RELEASE NOTES for Ruby version of Sisimai
 - releases: "https://github.com/sisimai/rb-Sisimai/releases"
 - download: "https://rubygems.org/gems/sisimai"
+v4.22.0
+--------------------------------------------------------------------------------
+- release: "Tue, 22 Aug 2017 18:25:55 +0900 (JST)"
+- version: "4.22.0"
+- changes:
+  - Import Pull-Request sisimai/p5-Sisimai#225, bounce reason: "securityerror"
+    has been divided into the following three reasons:
+    - securityerror
+    - virusdetected
+    - policyviolation
+  - Issue #78 All the MTA modules have been moved to Sisimai::Bite::* and old
+    MTA modules: Sisimai::MTA, Sisimai::MSP, Sisimai::CED, and all the methods
+    in these classes have been marked as obsoleted.
+  - Import Pull-Request sisimai/p5-Sisimai#230 Sisimai::Address.find method has
+    been implemented experimentaly as bourne again parser for email addresses.
 v4.21.1
 --------------------------------------------------------------------------------
 - release: "Mon, 29 May 2017 14:22:22 +0900 (JST)"

data/Developers.mk CHANGED Viewed

@@ -21,9 +21,8 @@ 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
+MAILCLASSDIR := lib/$(NAME)/Bite/Email
+JSONCLASSDIR := lib/$(NAME)/Bite/JSON
 MTARELATIVES := ARF rfc3464 rfc3834
 EMAIL_PARSER := sbin/emparser
 BENCHMARKEMP := sbin/mp
@@ -37,10 +36,11 @@ DOSFORMATSET := $(SET_OF_EMAIL)/maildir/dos
 MACFORMATSET := $(SET_OF_EMAIL)/maildir/mac
 INDEX_LENGTH := 24
-DESCR_LENGTH := 48
+DESCR_LENGTH := 50
 BH_CAN_PARSE := courier exim messagingserver postfix sendmail surfcontrol x5 \
-				jp-ezweb jp-kddi ru-yandex uk-messagelabs us-amazonses us-aol \
-				us-bigfoot us-facebook us-outlook us-verizon
+				ezweb kddi yandex messagelabs amazonses aol bigfoot facebook \
+				outlook verizon
 # -----------------------------------------------------------------------------
 .PHONY: clean
@@ -51,8 +51,8 @@ private-sample:
 precision-table:
 	cat ../$(PERL_SISIMAI)/$(PRECISIONTAB) | sed \
-		-e 's/MTA::qmail/MTA::Qmail/g' \
-		-e 's/MTA::mFILTER/MTA::MFILTER/g' > $(PRECISIONTAB)
+		-e 's/Email::qmail/Email::Qmail/g' \
+		-e 's/Email::mFILTER/Email::MFILTER/g' > $(PRECISIONTAB)
 update-sample-emails:
 	for v in `find $(PUBLICEMAILS) -name '*-01.eml' -type f`; do \
@@ -62,29 +62,11 @@ update-sample-emails:
 	done
 sample:
-	for v in `$(LS) ./$(MTAMODULEDIR)/*.rb | grep -v userdefined`; do \
-		MTA=`echo $$v | cut -d/ -f5 | tr '[A-Z]' '[a-z]' | sed 's/.rb//g'` ;\
-		$(MKDIR) $(BENCHMARKSET)/$$MTA ;\
-		$(CP) $(PUBLICEMAILS)/$$MTA-*.eml $(BENCHMARKSET)/$$MTA/ ;\
-		$(CP) $(PRIVATEMAILS)/$$MTA/* $(BENCHMARKSET)/$$MTA/ ;\
-	done
-	for c in `$(LS) ./$(MSPMODULEDIR)`; do \
-		for v in `$(LS) ./$(MSPMODULEDIR)/$$c/*.rb`; do \
-			DIR=`echo $$c | tr '[A-Z]' '[a-z]' | tr -d '/'` ;\
-			MSP="`echo $$v | cut -d/ -f6 | tr '[A-Z]' '[a-z]' | sed 's/.rb//g'`" ;\
-			$(MKDIR) $(BENCHMARKSET)/$$DIR-$$MSP ;\
-			$(CP) $(PUBLICEMAILS)/$$DIR-$$MSP-*.eml $(BENCHMARKSET)/$$DIR-$$MSP/ ;\
-			$(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 ;\
+	for v in `$(LS) ./$(MAILCLASSDIR)/*.rb | grep -v userdefined`; do \
+		MTA=`echo $$v | cut -d/ -f6 | tr '[A-Z]' '[a-z]' | sed 's/.rb//g'` ;\
+		$(MKDIR) $(BENCHMARKSET)/email-$$MTA ;\
+		$(CP) $(PUBLICEMAILS)/email-$$MTA-*.eml $(BENCHMARKSET)/email-$$MTA/ ;\
+		$(CP) $(PRIVATEMAILS)/email-$$MTA/* $(BENCHMARKSET)/email-$$MTA/ ;\
 	done
 	for v in arf rfc3464 rfc3834; do \
 		$(MKDIR) $(BENCHMARKSET)/$$v ;\
@@ -98,8 +80,8 @@ profile: benchmark-mbox
 velocity-measurement:
 	@ $(MKDIR) $(VELOCITYTEST)
 	@ for v in $(BH_CAN_PARSE); do \
-		$(CP) $(PUBLICEMAILS)/$$v-*.eml $(VELOCITYTEST)/; \
-		$(CP) $(PRIVATEMAILS)/$$v/*.eml $(VELOCITYTEST)/; \
+		$(CP) $(PUBLICEMAILS)/email-$$v-*.eml $(VELOCITYTEST)/; \
+		$(CP) $(PRIVATEMAILS)/email-$$v/*.eml $(VELOCITYTEST)/; \
 	done
 	@ echo -------------------------------------------------------------------
 	@ echo `$(LS) $(VELOCITYTEST) | wc -l` emails in $(VELOCITYTEST)

data/LICENSE CHANGED Viewed

@@ -1,6 +1,6 @@
 THIS SOFTWARE IS DISTRIBUTED UNDER THE FOLLOWING BSD 2-CLAUSE LICENSE:
-Copyright (C) 2015,2016 azumakuniyuki, All rights reserved.
+Copyright (C) 2015-2017 azumakuniyuki, All rights reserved.
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:

data/README-JA.md CHANGED Viewed

@@ -58,7 +58,7 @@ Key features
   * 22種類の著名なMSPに対応
   * 2種類の著名なメール配信クラウドに対応(JSON)
   * Feedback Loopにも対応
-  * 27種類のエラー理由を検出
+  * 29種類のエラー理由を検出
 Setting Up Sisimai
 ===============================================================================
@@ -80,10 +80,10 @@ Install
 ```shell
 $ sudo gem install sisimai
-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
+Fetching: sisimai-4.22.0.gem (100%)
+Successfully installed sisimai-4.22.0
+Parsing documentation for sisimai-4.22.0
+Installing ri documentation for sisimai-4.22.0
 Done installing documentation for sisimai after 6 seconds
 1 gem installed
 ```
@@ -99,8 +99,8 @@ gem install bundle rake rspec coveralls
 ...
 4 gems installed
 bundle exec rake install
-sisimai 4.21.0 built to pkg/sisimai-4.21.0.gem.
-sisimai (4.21.0) installed.
+sisimai 4.22.0 built to pkg/sisimai-4.22.0.gem.
+sisimai (4.22.0) installed.
 ```
 Usage
@@ -219,7 +219,7 @@ Output example
 ![](http://libsisimai.org/static/images/demo/sisimai-dump-02.gif)
 ```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"}]
+[{"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": "Email::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": "Email::Sendmail"}]
 ```
 Sisimai Specification
@@ -237,10 +237,10 @@ Differences between Ruby version and Perl version
 |                                             | JRuby 9.0.4.0- |               |
 | 解析精度の割合(2000通のメール)[1]           | 1.00           | 1.00          |
 | メール解析速度(1000通のメール)              | 3.30秒         | 2.33秒        |
-| インストール方法                            | gem install    | cpanm         |
+| インストール方法                            | gem install    | cpanm, cpm    |
 | 依存モジュール数(コアモジュールを除く)      | 1モジュール    | 2モジュール   |
-| LOC:ソースコードの行数                      | 12400行        | 9000行        |
-| テスト件数(spec/,t/,xt/ディレクトリ)        | 109700件       | 191300件      |
+| LOC:ソースコードの行数                      | 12400行        | 9100行        |
+| テスト件数(spec/,t/,xt/ディレクトリ)        | 205700件       | 202400件      |
 | ライセンス                                  | 二条項BSD      | 二条項BSD     |
 | 開発会社によるサポート契約                  | 準備中         | 提供中        |

data/README.md CHANGED Viewed

@@ -57,7 +57,7 @@ Key Features
   * 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
+  * Can detect 29 error reasons
 Command line demo
 -------------------------------------------------------------------------------
@@ -85,10 +85,10 @@ Install
 ```shell
 $ sudo gem install sisimai
-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
+Fetching: sisimai-4.22.0.gem (100%)
+Successfully installed sisimai-4.22.0
+Parsing documentation for sisimai-4.22.0
+Installing ri documentation for sisimai-4.22.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.21.0 built to pkg/sisimai-4.21.0.gem.
-sisimai (4.21.0) installed.
+sisimai 4.22.0 built to pkg/sisimai-4.22.0.gem.
+sisimai (4.22.0) installed.
 ```
 Usage
@@ -222,7 +222,7 @@ Output example
 ![](http://libsisimai.org/static/images/demo/sisimai-dump-02.gif)
 ```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"}]
+[{"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": "Email::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": "Email::Sendmail"}]
 ```
 Sisimai Specification
@@ -241,10 +241,10 @@ and bounceHammer are available at
 |                                             | 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         |
+| How to install                              | gem install    | cpanm, cpm    |
 | Dependencies (Except core modules)          | 1 module       | 2 modules     |
-| LOC:Source lines of code                    | 12400 lines    | 9000 lines    |
-| The number of tests(spec/,t/,xt/) directory | 109700 tests   | 191300 tests  |
+| LOC:Source lines of code                    | 12400 lines    | 9100 lines    |
+| The number of tests(spec/,t/,xt/) directory | 205700 tests   | 202400 tests  |
 | License                                     | BSD 2-Clause   | BSD 2-Clause  |
 | Support Contract provided by Developer      | Coming soon    | Available     |

data/fig/sisimai-architecture.png CHANGED Viewed

Binary file

data/lib/sisimai.rb CHANGED Viewed

@@ -131,18 +131,18 @@ module Sisimai
       return jsonstring
     end
-    # Parser engine list (MTA/MSP modules)
+    # Parser engine list (MTA modules)
     # @return   [Hash]     Parser engine table
     def engine
-      names = %w|MTA MSP CED ARF RFC3464 RFC3834|
+      names = %w|Bite::Email Bite::JSON ARF RFC3464 RFC3834|
       table = {}
       names.each do |e|
         r = 'Sisimai::' + e
         require r.gsub('::', '/').downcase
-        if e == 'MTA' || e == 'MSP' || e == 'CED'
-          # Sisimai::MTA or Sisimai::MSP or Sisimai::CED
+        if e =~ /\ABite::(?:Email|JSON)\z/
+          # Sisimai::Bite::Email or Sisimai::Bite::JSON
           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)

data/lib/sisimai/address.rb CHANGED Viewed

@@ -16,6 +16,255 @@ module Sisimai
       return sprintf('undisclosed-%s-in-headers@libsisimai.org.invalid', local)
     end
+    def self.find(argvs, addrs = nil)
+      # Email address parser with a name and a comment
+      # @param    [String] argvs  String including email address
+      # @param    [Boolean] addrs true:  Returns list including all the elements
+      #                           false: Returns list including email addresses only
+      # @return   [Array, Nil]    Email address list or Undef when there is no
+      #                           email address in the argument
+      # @example  Parse email address
+      #   input:  parse('Neko <neko@example.cat>')
+      #   output: [{'address' => 'neko@example.cat', 'name' => 'Neko'}]
+      return nil unless argvs
+      argvs = argvs.gsub(/[\r\n]/, '')
+      emailtable = { 'address' => '', 'name' => '', 'comment' => '' }
+      addrtables = []
+      readcursor = 0
+      delimiters = ['<', '>', '(', ')', '"', ',']
+      indicators = {
+        :'email-address' => (1 << 0),    # <neko@example.org>
+        :'quoted-string' => (1 << 1),    # "Neko, Nyaan"
+        :'comment-block' => (1 << 2),    # (neko)
+      }
+      characters = argvs.split('')
+      readbuffer = []
+      v = emailtable  # temporary buffer
+      p = ''          # current position
+      characters.each do |e|
+        # Check each characters
+        if delimiters.detect { |r| r == e }
+          # The character is a delimiter character
+          if e == ','
+            # Separator of email addresses or not
+            if v['address'] =~ /\A[<].+[@].+[>]\z/
+              # An email address has already been picked
+              if readcursor & indicators[:'comment-block'] > 0
+                # The cursor is in the comment block (Neko, Nyaan)
+                v['comment'] += e
+              elsif readcursor & indicators[:'quoted-string'] > 0
+                # "Neko, Nyaan"
+                v['name'] += e
+              else
+                # The cursor is not in neither the quoted-string nor the comment block
+                readcursor = 0  # reset cursor position
+                readbuffer << v
+                v = { 'address' => '', 'name' => '', 'comment' => '' }
+                p = ''
+              end
+            else
+              # "Neko, Nyaan" <neko@nyaan.example.org> OR <"neko,nyaan"@example.org>
+              p.size > 0 ? (v[p] += e) : (v['name'] += e)
+            end
+            next
+          end # End of if(',')
+          if e == '<'
+            # <: The beginning of an email address or not
+            if v['address'].size > 0
+              p.size > 0 ? (v[p] += e) : (v['name'] += e)
+            else
+              # <neko@nyaan.example.org>
+              readcursor |= indicators[:'email-address']
+              v['address'] += e
+              p = 'address'
+            end
+            next
+          end
+          # End of if('<')
+          if e == '>'
+            # >: The end of an email address or not
+            if readcursor & indicators[:'email-address'] > 0
+              # <neko@example.org>
+              readcursor &= ~indicators[:'email-address']
+              v['address'] += e
+              p = ''
+            else
+              # a comment block or a display name
+              p.size > 0 ? (v['comment'] += e) : (v['name'] += e)
+            end
+            next
+          end # End of if('>')
+          if e == '('
+            # The beginning of a comment block or not
+            if readcursor & indicators[:'email-address'] > 0
+              # <"neko(nyaan)"@example.org> or <neko(nyaan)@example.org>
+              if v['address'] =~ /["]/
+                # Quoted local part: <"neko(nyaan)"@example.org>
+                v['address'] += e
+              else
+                # Comment: <neko(nyaan)@example.org>
+                readcursor |= indicators[:'comment-block']
+                v['comment'] += e
+                p = 'comment'
+              end
+            elsif readcursor & indicators[:'comment-block'] > 0
+              # Comment at the outside of an email address (...(...)
+              v['comment'] += e
+            elsif readcursor & indicators[:'quoted-string'] > 0
+              # "Neko, Nyaan(cat)", Deal as a display name
+              v['name'] += e
+            else
+              # The beginning of a comment block
+              readcursor |= indicators[:'comment-block']
+              v['comment'] += e
+              p = 'comment'
+            end
+            next
+          end # End of if('(')
+          if e == ')'
+            # The end of a comment block or not
+            if readcursor & indicators[:'email-address'] > 0
+              # <"neko(nyaan)"@example.org> OR <neko(nyaan)@example.org>
+              if v['address'] =~ /["]/
+                # Quoted string in the local part: <"neko(nyaan)"@example.org>
+                v['address'] += e
+              else
+                # Comment: <neko(nyaan)@example.org>
+                readcursor &= ~indicators[:'comment-block']
+                v['comment'] += e
+                p = 'address'
+              end
+            elsif readcursor & indicators[:'comment-block'] > 0
+              # Comment at the outside of an email address (...(...)
+              readcursor &= ~indicators[:'comment-block']
+              v['comment'] += e
+              p = ''
+            else
+              # Deal as a display name
+              readcursor &= ~indicators[:'comment-block']
+              v['name'] = e
+              p = ''
+            end
+            next
+          end # End of if(')')
+          if e == '"'
+            # The beginning or the end of a quoted-string
+            if p.size > 0
+              # email-address or comment-block
+              v[p] += e
+            else
+              # Display name
+              v['name'] += e
+              if readcursor & indicators[:'quoted-string'] > 0
+                # "Neko, Nyaan"
+                unless v['name'] =~ /\x5c["]\z/
+                  # "Neko, Nyaan \"...
+                  readcursor &= ~indicators[:'quoted-string']
+                  p = ''
+                end
+              else
+                if readcursor & indicators[:'email-address'] == 0 &&
+                   readcursor & indicators[:'comment-block'] == 0
+                  # Deal as the beginning of a display name
+                  readcursor |= indicators[:'quoted-string']
+                  p = 'name'
+                end
+              end
+            end
+            next
+          end # End of if('"')
+        else
+          # The character is not a delimiter
+          p.size > 0 ? (v[p] += e) : (v['name'] += e)
+          next
+        end
+      end
+      if v['address'].size > 0
+        # Push the latest values
+        readbuffer << v
+      else
+        # No email address like <neko@example.org> in the argument
+        if v['name'] =~ /[@]/
+          # String like an email address will be set to the value of "address"
+          if cv = v['name'].match(/(["].+?["][@][^ ]+)/)
+            # "neko nyaan"@example.org
+            v['address'] = cv[1]
+          elsif cv = v['name'].match(/([^\s]+[@][^\s]+)/)
+            # neko-nyaan@example.org
+            v['address'] = cv[1]
+          end
+        elsif Sisimai::RFC5322.is_mailerdaemon(v['name'])
+          # Allow if the argument is MAILER-DAEMON
+          v['address'] = v['name']
+        end
+        if v['address'].size > 0
+          # Remove the value of "name" and remove the comment from the address
+          if cv = v['address'].match(/(.*)([(].+[)])(.*)/)
+            # (nyaan)nekochan@example.org, nekochan(nyaan)cat@example.org or
+            # nekochan(nyaan)@example.org
+            v['address'] = cv[1] + cv[3]
+            v['comment'] = cv[2]
+          end
+          v['name'] = ''
+          readbuffer << v
+        end
+      end
+      readbuffer.each do |e|
+        unless e['address'] =~ /\A.+[@].+\z/
+          # Allow if the argument is MAILER-DAEMON
+          next unless Sisimai::RFC5322.is_mailerdaemon(e['address'])
+        end
+        e['address'] = e['address'].sub(/\A[\[<{('`]/, '')
+        e['address'] = e['address'].sub(/['`>})\]]\z/, '')
+        unless e['address'] =~ /\A["].+["][@]/
+          # Remove double-quotations
+          e['address'] = e['address'].sub(/\A["]/, '')
+          e['address'] = e['address'].sub(/["]\z/, '')
+        end
+        if addrs
+          # Almost compatible with parse() method, returns email address only
+          e.delete('name')
+          e.delete('comment')
+        else
+          # Remove double-quotations, trailing spaces.
+          %w|name comment|.each do |f|
+            e[f] = e[f].sub(/\A\s*/, '')
+            e[f] = e[f].sub(/\s*\z/, '')
+          end
+          e['name'] = e['name'].sub(/\A["]/, '')
+          e['name'] = e['name'].sub(/["]\z/, '')
+        end
+        addrtables << e
+      end
+      return nil if addrtables.empty?
+      return addrtables
+    end
     # Email address parser
     # @param    [Array] argvs   List of strings including email address
     # @return   [Array, Nil]    Email address list or Undef when there is no
@@ -55,8 +304,8 @@ module Sisimai
       unless input =~ /[ ]/
         # no space character between " and < .
         # no space character between " and < .
-        input = input.sub(/\A(.+)"<(.+)\z/, '\1" <\2')      # "=?ISO-2022-JP?B?....?="<user@example.jp>,
-        input = input.sub(/\A(.+)[?]=<(.+)\z/, '\1?= <\2')  # =?ISO-2022-JP?B?....?=<user@example.jp>
+        input = input.sub(/\A(.+)"<(.+)\z/, '\1" <\2')      # "=?ISO-2022-JP?B?....?="<user@example.org>,
+        input = input.sub(/\A(.+)[?]=<(.+)\z/, '\1?= <\2')  # =?ISO-2022-JP?B?....?=<user@example.org>
         # comment-part<localpart@domainpart>
         input = input.sub(/[<]/, ' <') unless input =~ /\A[<]/
@@ -101,7 +350,7 @@ module Sisimai
       canon = canon.delete('<>[]():;')  # Remove brackets, colons
       if canon =~ /\A["].+["][@].+\z/
-        canon = canon.delete(%q|{}'`|)  # "localpart..."@example.jp
+        canon = canon.delete(%q|{}'`|)  # "localpart..."@example.org
       else
         canon = canon.delete(%q|{}'"`|) # Remove brackets, quotations
       end
@@ -113,7 +362,7 @@ module Sisimai
     # @param    [String] email  VERP Address
     # @return   [String]        Email address
     # @example  Expand VERP address
-    #   expand_verp('bounce+neko=example.jp@example.org') #=> 'neko@example.jp'
+    #   expand_verp('bounce+neko=example.org@example.org') #=> 'neko@example.org'
     def self.expand_verp(email)
       local = email.split('@', 2).first
       verp0 = ''
@@ -131,7 +380,7 @@ module Sisimai
     # @param    [String] email  Email alias string
     # @return   [String]        Expanded email address
     # @example  Expand alias
-    #   expand_alias('neko+straycat@example.jp') #=> 'neko@example.jp'
+    #   expand_alias('neko+straycat@example.org') #=> 'neko@example.org'
     def self.expand_alias(email)
       return '' unless Sisimai::RFC5322.is_emailaddress(email)