sisimai 4.22.3-java → 4.22.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa167d561a6db258e6a2c99edee1d8f9486911b4
-  data.tar.gz: e98e6e71ff82cbd971dc5937ccecfd95dd651a0d
+  metadata.gz: 3cab18a983292f9e1afbecc7be1242a3f506db06
+  data.tar.gz: f24f870234b6808c419859c1f29a33fee6c71af0
 SHA512:
-  metadata.gz: 1734abd35586c113cd6fc3737c98a37767e7eab9827a3b07517bce298c723ab88b5085159a303054f55f815b79c7da7e8d5bfd592311617addf7179b1bfcb14b
-  data.tar.gz: e6ecc8759f527fa0d3370d6146b1302a3434f09bdfeb2d7fdd98666c9b95770d7120301d518e2508f60a2f519645472fe798c3574fa94a6f49c1af6a6c5dc227
+  metadata.gz: 6ba51cdd1949c2314ab3bb79b538e8dcd4f4c932c9bdf181a7474d4d15415b7e0b7ec9fa24909e4bfd9639b73ea85297b97c0513b761c7d550ef906a905afb40
+  data.tar.gz: 2698c61eb920736397665fe8228edfb37ed79e34cabb3a00307a8501598aab466956dfd9fa6c9a69ee24ce678e36dad88a65b93dcc56e56a404615f913a9eae9

data/.travis.yml

@@ -1,10 +1,10 @@
 language: ruby
 rvm:
   - 2.1.1
-  - 2.2.2
   - 2.2.4
   - 2.3.0
   - 2.4.0
+  - 2.5.0
   - jruby-9.0.5.0
   - jruby-9.1.9.0
 before_install:

data/Benchmarks.mk

@@ -0,0 +1,54 @@
+# rb-Sisimai/Benchmarks.mk
+#  ____                  _                          _                    _    
+# | __ )  ___ _ __   ___| |__  _ __ ___   __ _ _ __| | _____   _ __ ___ | | __
+# |  _ \ / _ \ '_ \ / __| '_ \| '_ ` _ \ / _` | '__| |/ / __| | '_ ` _ \| |/ /
+# | |_) |  __/ | | | (__| | | | | | | | | (_| | |  |   <\__ \_| | | | | |   < 
+# |____/ \___|_| |_|\___|_| |_|_| |_| |_|\__,_|_|  |_|\_\___(_)_| |_| |_|_|\_\
+# -----------------------------------------------------------------------------
+SHELL := /bin/sh
+HERE  := $(shell pwd)
+NAME  := Sisimai
+RUBY  ?= ruby
+MKDIR := mkdir -p
+LS    := ls -1
+CP    := cp
+
+EMAILROOTDIR := set-of-emails
+PUBLICEMAILS := $(EMAILROOTDIR)/maildir/bsd
+DOSFORMATSET := $(EMAILROOTDIR)/maildir/dos
+MACFORMATSET := $(EMAILROOTDIR)/maildir/mac
+SPEEDTESTDIR := $(PUBLICEMAILS)
+
+COMMANDARGVS := -I./lib -rsisimai
+TOBEEXECUTED := 'Sisimai.make($$*.shift, delivered: true)' $(PUBLICMAILS)
+HOWMANYMAILS := $(PERL) $(COMMANDARGVS) -le 'puts Sisimai.make($$*.shift, delivered: true).size' 
+
+# -----------------------------------------------------------------------------
+.PHONY: clean
+
+speed-test:
+	@ echo `$(HOWMANYMAILS) $(SPEEDTESTDIR)` emails in $(SPEEDTESTDIR)
+	@ echo -------------------------------------------------------------------
+	@ uptime
+	@ echo -------------------------------------------------------------------
+	@ n=1; while [ "$$n" -le "10" ]; do \
+		/usr/bin/time $(PERL) $(COMMANDARGVS) -e $(TOBEEXECUTED) $(SPEEDTESTDIR) > /dev/null; \
+		sleep 2; \
+		n=`expr $$n + 1`; \
+	done
+
+profile:
+	@ uptime
+	$(RUBY) -rprofile $(COMMANDARGVS) -e $(TOBEEXECUTED) $(SPEEDTESTDIR) 2> pf > /dev/null
+	cat ./pf | sed -e 's/^ *//g' | tr -s ' ' | sed -e 's/self self/self  self/' | tr ' ' '\t' > profiling-`date '+%Y-%m-%d-%T'`.txt
+	$(RM) ./pf
+
+loc:
+	@ for v in `find lib -type f -name '*.rb'`; do \
+		x=`wc -l $$v | awk '{ print $$1 }'`; \
+		z=`grep -E '^\s*#|^$$' $$v | wc -l | awk '{ print $$1 }'`; \
+		echo "$$x - $$z" | bc ;\
+	done | awk '{ s += $$1 } END { print s }'
+
+clean:
+	find . -type f -name 'profiling-*' -ctime +1 -delete

data/ChangeLog.md

@@ -3,6 +3,27 @@ RELEASE NOTES for Ruby version of Sisimai
 - releases: "https://github.com/sisimai/rb-Sisimai/releases"
 - download: "https://rubygems.org/gems/sisimai"
 
+v4.22.4
+--------------------------------------------------------------------------------
+- release: "Wed, 14 Feb 2018 10:44:00 +0900 (JST)"
+- version: "4.22.4"
+- changes:
+  - Import commit sisimai/p5-Sisimai@8c6eb33, Add status code 4.7.25 (RFC-7372)
+    as "blocked".
+  - The following performance improvements makes 1.49 times faster.
+    - It makes rb-Sisimai on JRuby 1.16 times faster.
+    - #96 String#+ and sprintf replaced with String#<< at Pull-Request #103.
+    - #98 loop do replaced with while(true) at Pull-Request #104.
+    - #99 String#=~ and regular expressions /\A...\z/, /\A.../ or /...\z/ have
+      been replaced with String#start_with?, String#end_with?, String#include?,
+      Array#include?, or String#== at Pull-Request #105, #107, #108.
+    - #102 String#sub(/...\z/, '...') has been replaced with String#chomp, or
+      String#strip, String#lstrip, String#rstrip at Pull-Request #106.
+    - Import Pull-Request sisimai/p5-Sisimai#258, remove /i modifier from each
+      regular expressions as possible and call String#downcase before matching.
+    - Pull-Request #111, Some Array#each have been replaced with Array#shift in
+      while loop.
+
 v4.22.3
 --------------------------------------------------------------------------------
 - release: "Tue, 26 Dec 2017 09:22:22 +0900 (JST)"
@@ -182,8 +203,8 @@ v4.19.0 - Callback Feature
 - changes:
   - Implement a callback feature at `Sisimai.make()` and `Sisimai.dump()` methods.
     More imformation about the feature are available at the following pages:
-    - http://libsisimai.org/en/usage#callback
-    - http://libsisimai.org/ja/usage#callback
+    - https://libsisimai.org/en/usage#callback
+    - https://libsisimai.org/ja/usage#callback
   - Implement `Sisimai.match()` method: issue #52.
   - Minor bug fix in `Sisimai::MSP::US::AmazonSES.scan()` method.
 

data/Developers.mk

@@ -16,18 +16,25 @@ CP    := cp
 RM    := rm -f
 
 BH_LATESTVER := 2.7.13p3
-MBOXPARSERV0 := /usr/local/bouncehammer/bin/mailboxparser -T
-PERL_SISIMAI := p5-Sisimai
+BOUNCEHAMMER := /usr/local/bouncehammer
+MBOXPARSERV0 := $(BOUNCEHAMMER)/bin/mailboxparser -T
+PERL5SISIMAI := p5-Sisimai
 PRECISIONTAB := ANALYTICAL-PRECISION
-BENCHMARKDIR := tmp/benchmark
 PARSERLOGDIR := var/log
 MAILCLASSDIR := lib/$(NAME)/Bite/Email
 JSONCLASSDIR := lib/$(NAME)/Bite/JSON
 MTARELATIVES := ARF rfc3464 rfc3834
-EMAIL_PARSER := sbin/emparser
-BENCHMARKEMP := sbin/mp
-VELOCITYTEST := tmp/emails-for-velocity-measurement
+
+BENCHMARKDIR := tmp/benchmark
 BENCHMARKSET := tmp/sample
+SPEEDTESTDIR := tmp/emails-for-speed-test
+
+PARSERSCRIPT := $(RUBY) sbin/emparser --delivered
+RELEASEVERMP := $(RUBY) -rsisimai
+DEVELOPVERMP := $(RUBY) -I./lib -rsisimai
+HOWMANYMAILS := $(DEVELOPVERMP) -e 'print Sisimai.make($$*.shift, delivered: true).size' $(SPEEDTESTDIR)
+
+BENCHMARKEMP := sbin/mp
 
 SET_OF_EMAIL := set-of-emails
 PRIVATEMAILS := $(SET_OF_EMAIL)/private
@@ -37,20 +44,17 @@ MACFORMATSET := $(SET_OF_EMAIL)/maildir/mac
 
 INDEX_LENGTH := 24
 DESCR_LENGTH := 50
-BH_CAN_PARSE := courier exim messagingserver postfix sendmail surfcontrol x5 \
-				ezweb kddi yandex messagelabs amazonses aol bigfoot facebook \
-				outlook verizon
-
+BH_CAN_PARSE := Courier Exim OpenSMTPD Postfix qmail Sendmail EZweb KDDI Facebook Google Verizon
 
 # -----------------------------------------------------------------------------
 .PHONY: clean
 
 private-sample:
 	$(RM) -r ./$(PRIVATEMAILS)
-	$(CP) -vRp ../$(PERL_SISIMAI)/$(PRIVATEMAILS) $(SET_OF_EMAIL)
+	$(CP) -vRp ../$(PERL5SISIMAI)/$(PRIVATEMAILS) $(SET_OF_EMAIL)
 
 precision-table:
-	cat ../$(PERL_SISIMAI)/$(PRECISIONTAB) | sed \
+	cat ../$(PERL5SISIMAI)/$(PRECISIONTAB) | sed \
 		-e 's/Email::qmail/Email::Qmail/g' \
 		-e 's/Email::mFILTER/Email::MFILTER/g' > $(PRECISIONTAB)
 
@@ -74,47 +78,50 @@ sample:
 		$(CP) $(PRIVATEMAILS)/$$v/* $(BENCHMARKSET)/$$v/ ;\
 	done
 
-profile: benchmark-mbox
-	$(RUBY) -rprofile $(EMAIL_PARSER) $(BENCHMARKDIR) > /dev/null
-
-velocity-measurement:
-	@ $(MKDIR) $(VELOCITYTEST)
+samples-for-speedtest:
+	@ rm -fr ./$(SPEEDTESTDIR)
+	@ $(MKDIR) $(SPEEDTESTDIR)
 	@ for v in $(BH_CAN_PARSE); do \
-		$(CP) $(PUBLICEMAILS)/email-$$v-*.eml $(VELOCITYTEST)/; \
-		$(CP) $(PRIVATEMAILS)/email-$$v/*.eml $(VELOCITYTEST)/; \
+		$(CP) $(PUBLICEMAILS)/email-`echo $$v | tr '[A-Z]' '[a-z]'`-*.eml $(SPEEDTESTDIR)/; \
+		test -d $(PRIVATEEMAILS) && $(CP) $(PRIVATEMAILS)/email-`echo $$v | tr '[A-Z]' '[a-z]'`/*.eml $(SPEEDTESTDIR)/; \
 	done
+
+velocity-measurement: samples-for-speedtest
 	@ echo -------------------------------------------------------------------
-	@ echo `$(LS) $(VELOCITYTEST) | wc -l` emails in $(VELOCITYTEST)
-	@ echo -n 'Calculating the velocity of 1000 mails: multiply by '
-	@ echo "scale=4; 1000 / `$(LS) $(VELOCITYTEST) | wc -l`" | bc
-	@ echo -n 'Calculating the velocity of 2000 mails: multiply by '
-	@ echo "scale=4; 2000 / `$(LS) $(VELOCITYTEST) | wc -l`" | bc
+	@ echo `$(HOWMANYMAILS)` emails in $(SPEEDTESTDIR)
+	@ echo -n 'Calculating the velocity of parsing 1000 mails: multiply by '
+	@ echo "scale=6; 1000 / `$(HOWMANYMAILS)`" | bc
 	@ echo -------------------------------------------------------------------
-	@ echo 'Sisimai(1)' $(BENCHMARKEMP)
+	@ uptime
+	@ echo -------------------------------------------------------------------
+	@ if [ -x "$(BOUNCEHAMMER)/bin/mailboxparser" ]; then \
+		echo bounceHammer $(BH_LATESTVER); \
+		n=1; while [ $$n -le 5 ]; do \
+			/usr/bin/time $(MBOXPARSERV0) -Fjson $(SPEEDTESTDIR) > /dev/null ;\
+			sleep 1; \
+			n=`expr $$n + 1`; \
+		done; \
+		echo -------------------------------------------------------------------; \
+	fi
+	@ echo 'Sisimai' `$(RELEASEVERMP) -e 'puts Sisimai.version'` $(RELEASEVERMP)
 	@ n=1; while [ $$n -le 5 ]; do \
-		/usr/bin/time $(BENCHMARKEMP) $(VELOCITYTEST) > /dev/null ;\
+		/usr/bin/time $(RELEASEVERMP) -e 'Sisimai.make($$*.shift, deliverd: true)' $(SPEEDTESTDIR) > /dev/null ;\
 		sleep 1; \
 		n=`expr $$n + 1`; \
 	done
 	@ echo -------------------------------------------------------------------
-	@ echo bounceHammer $(BH_LATESTVER)
+	@ echo 'Sisimai' `$(DEVELOPVERMP) -e 'puts Sisimai.version'` $(DEVELOPVERMP)
 	@ n=1; while [ $$n -le 5 ]; do \
-		/usr/bin/time $(MBOXPARSERV0) -Fjson $(VELOCITYTEST) > /dev/null ;\
+		/usr/bin/time $(DEVELOPVERMP) -e 'Sisimai.make($$*.shift, deliverd: true)' $(SPEEDTESTDIR) > /dev/null ;\
 		sleep 1; \
 		n=`expr $$n + 1`; \
 	done
+	@ echo -------------------------------------------------------------------
 
 benchmark-mbox: sample
 	$(MKDIR) -p $(BENCHMARKDIR)
 	$(CP) `find $(BENCHMARKSET) -type f` $(BENCHMARKDIR)/
 
-loc:
-	@ for v in `find lib -type f -name '*.rb'`; do \
-		x=`wc -l $$v | awk '{ print $$1 }'`; \
-		z=`grep -E '^\s*#|^$$' $$v | wc -l | awk '{ print $$1 }'`; \
-		echo "$$x - $$z" | bc ;\
-	done | awk '{ s += $$1 } END { print s }'
-
 clean:
 	$(RM) -r ./$(BENCHMARKSET)
 	$(RM) -r ./$(BENCHMARKDIR)

data/Makefile

@@ -20,6 +20,9 @@ DEPENDENCIES  = bundle rake rspec
 .DEFAULT_GOAL = git-status
 REPOS_TARGETS = git-status git-push git-commit-amend git-tag-list git-diff \
 				git-reset-soft git-rm-cached git-branch
+DEVEL_TARGETS = private-sample
+BENCH_TARGETS = profile speed-test loc
+
 
 # -----------------------------------------------------------------------------
 .PHONY: clean
@@ -70,6 +73,12 @@ patrol:
 $(REPOS_TARGETS):
 	$(MAKE) -f Repository.mk $@
 
+$(DEVEL_TARGETS):
+	$(MAKE) -f Developers.mk $@
+
+$(BENCH_TARGETS):
+	$(MAKE) -f Benchmarks.mk $@
+
 diff push branch:
 	@$(MAKE) git-$@
 fix-commit-message: git-commit-amend
@@ -78,4 +87,5 @@ remove-added-file: git-rm-cached
 
 clean:
 	$(MAKE) -f Repository.mk clean
+	$(MAKE) -f Benchmarks.mk clean
 

data/README-JA.md

@@ -1,4 +1,4 @@
-![](http://libsisimai.org/static/images/logo/sisimai-x01.png)
+![](https://libsisimai.org/static/images/logo/sisimai-x01.png)
 
 [![License](https://img.shields.io/badge/license-BSD%202--Clause-orange.svg)](https://github.com/sisimai/rb-Sisimai/blob/master/LICENSE)
 [![Coverage Status](https://img.shields.io/coveralls/sisimai/rb-Sisimai.svg)](https://coveralls.io/r/sisimai/rb-Sisimai)
@@ -43,7 +43,7 @@ Sisimai(シシマイ)はRFC5322準拠のエラーメールを解析し、解析
 [github.com/sisimai/p5-Sisimai](https://github.com/sisimai/p5-Sisimai/)
 で公開しているPerl版シシマイから移植しました。
 
-![](http://libsisimai.org/static/images/figure/sisimai-overview-1.png)
+![](https://libsisimai.org/static/images/figure/sisimai-overview-1.png)
 
 Key features
 -------------------------------------------------------------------------------
@@ -66,7 +66,7 @@ Setting Up Sisimai
 System requirements
 -------------------------------------------------------------------------------
 Sisimaiの動作環境についての詳細は
-[Sisimai | シシマイを使ってみる](http://libsisimai.org/ja/start)をご覧ください。
+[Sisimai | シシマイを使ってみる](https://libsisimai.org/ja/start/)をご覧ください。
 
 
 * [Ruby 2.1.0 or later](http://www.ruby-lang.org/)
@@ -203,7 +203,7 @@ puts data[0].catch['x-mailer']      # Apple Mail (2.1283)
 ```
 
 コールバック機能のより詳細な使い方は
-[Sisimai | 解析方法 - コールバック機能](http://libsisimai.org/ja/usage/#callback)
+[Sisimai | 解析方法 - コールバック機能](https://libsisimai.org/ja/usage/#callback)
 をご覧ください。
 
 
@@ -216,7 +216,7 @@ $ ruby -rsisimai -e 'puts Sisimai.dump($*.shift)' /path/to/mbox
 
 Output example
 -------------------------------------------------------------------------------
-![](http://libsisimai.org/static/images/demo/sisimai-dump-02.gif)
+![](https://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": "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"}]
@@ -229,17 +229,17 @@ Differences between Ruby version and Perl version
 -------------------------------------------------------------------------------
 公開中のPerl版Sisimai(p5-Sisimai)とRuby版Sisimai(rb-Sisimai)は下記のような違いが
 あります。bounceHammer 2.7.13p3とSisimai(シシマイ)の違いについては
-[Sisimai | 違いの一覧](http://libsisimai.org/ja/diff)をご覧ください。
+[Sisimai | 違いの一覧](https://libsisimai.org/ja/diff/)をご覧ください。
 
 | 機能                                        | Ruby version   | Perl version  |
 |---------------------------------------------|----------------|---------------|
-| 動作環境                                    | Ruby 2.1 - 2.4 | Perl 5.10 -   |
+| 動作環境                                    | Ruby 2.1 - 2.5 | Perl 5.10 -   |
 |                                             | JRuby 9.0.4.0- |               |
 | 解析精度の割合(2000通のメール)[1]           | 1.00           | 1.00          |
-| メール解析速度(1000通のメール)              | 6.70秒         | 2.10秒        |
+| メール解析速度(1000通のメール)              | 5.05秒         | 1.95秒        |
 | インストール方法                            | gem install    | cpanm, cpm    |
 | 依存モジュール数(コアモジュールを除く)      | 1モジュール    | 2モジュール   |
-| LOC:ソースコードの行数                      | 13000行        | 9800行        |
+| LOC:ソースコードの行数                      | 12000行        | 8700行        |
 | テスト件数(spec/,t/,xt/ディレクトリ)        | 213000件       | 230000件      |
 | ライセンス                                  | 二条項BSD      | 二条項BSD     |
 | 開発会社によるサポート契約                  | 準備中         | 提供中        |
@@ -248,9 +248,9 @@ Differences between Ruby version and Perl version
 
 Other spec of Sisimai
 -------------------------------------------------------------------------------
-- [**解析モジュールの一覧**](http://libsisimai.org/ja/engine)
-- [**バウンス理由の一覧**](http://libsisimai.org/ja/reason)
-- [**Sisimai::Dataのデータ構造**](http://libsisimai.org/ja/data)
+- [**解析モジュールの一覧**](https://libsisimai.org/ja/engine/)
+- [**バウンス理由の一覧**](https://libsisimai.org/ja/reason/)
+- [**Sisimai::Dataのデータ構造**](https://libsisimai.org/ja/data/)
 
 Contributing
 ===============================================================================
@@ -271,7 +271,7 @@ Other Information
 Related sites
 -------------------------------------------------------------------------------
 * __@libsisimai__ | [Sisimai on Twitter (@libsisimai)](https://twitter.com/libsisimai)
-* __libSISIMAI.ORG__ | [Sisimai | The successor to bounceHammer, Library to parse bounce mails](http://libsisimai.org/)
+* __libSISIMAI.ORG__ | [Sisimai | The successor to bounceHammer, Library to parse bounce mails](https://libsisimai.org/)
 * __Sisimai Blog__ | [blog.libsisimai.org](http://blog.libsisimai.org/)
 * __Facebook Page__ | [facebook.com/libsisimai](https://www.facebook.com/libsisimai/)
 * __GitHub__ | [github.com/sisimai/rb-Sisimai](https://github.com/sisimai/rb-Sisimai)

data/README.md

@@ -1,4 +1,4 @@
-![](http://libsisimai.org/static/images/logo/sisimai-x01.png)
+![](https://libsisimai.org/static/images/logo/sisimai-x01.png)
 
 [![License](https://img.shields.io/badge/license-BSD%202--Clause-orange.svg)](https://github.com/sisimai/rb-Sisimai/blob/master/LICENSE)
 [![Coverage Status](https://img.shields.io/coveralls/sisimai/rb-Sisimai.svg)](https://coveralls.io/r/sisimai/rb-Sisimai)
@@ -42,7 +42,7 @@ Sisimai is a Ruby library for analyzing RFC5322 bounce emails and generating
 structured data from parsed results. The Ruby version of Sisimai is ported from
 the Perl version of Sisimai at [github.com/sisimai/p5-Sisimai](https://github.com/sisimai/p5-Sisimai/).
 
-![](http://libsisimai.org/static/images/figure/sisimai-overview-1.png)
+![](https://libsisimai.org/static/images/figure/sisimai-overview-1.png)
 
 Key Features
 -------------------------------------------------------------------------------
@@ -63,7 +63,7 @@ Command line demo
 -------------------------------------------------------------------------------
 The following screen shows a demonstration of Sisimai at the command line using
 Ruby(rb-Sisimai) and Perl(p5-Sisimai) version of Sisimai.
-![](http://libsisimai.org/static/images/demo/sisimai-dump-01.gif)
+![](https://libsisimai.org/static/images/demo/sisimai-dump-01.gif)
 
 Setting Up Sisimai
 ===============================================================================
@@ -71,7 +71,7 @@ Setting Up Sisimai
 System requirements
 -------------------------------------------------------------------------------
 More details about system requirements are available at
-[Sisimai | Getting Started](http://libsisimai.org/en/start) page.
+[Sisimai | Getting Started](https://libsisimai.org/en/start/) page.
 
 
 * [Ruby 2.1.0 or later](http://www.ruby-lang.org/)
@@ -207,7 +207,7 @@ puts data[0].catch['x-mailer']      # Apple Mail (2.1283)
 ```
 
 More information about the callback feature is available at
-[Sisimai | How To Parse - Callback](http://libsisimai.org/en/usage/#callback)
+[Sisimai | How To Parse - Callback](https://libsisimai.org/en/usage/#callback)
 Page.
 
 One-Liner
@@ -219,7 +219,7 @@ One-Liner
 
 Output example
 -------------------------------------------------------------------------------
-![](http://libsisimai.org/static/images/demo/sisimai-dump-02.gif)
+![](https://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": "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"}]
@@ -233,17 +233,17 @@ Differences between Ruby version and Perl version
 The following table show the differences between Ruby version of Sisimai
 and Perl version of Sisimai. Information about differences between Sisimai
 and bounceHammer are available at
-[Sisimai | Differences](http://libsisimai.org/en/diff) page.
+[Sisimai | Differences](https://libsisimai.org/en/diff/) page.
 
 | Features                                    | Ruby version   | Perl version  |
 |---------------------------------------------|----------------|---------------|
-| System requirements                         | Ruby 2.1 - 2.4 | Perl 5.10 -   |
+| System requirements                         | Ruby 2.1 - 2.5 | 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)     | 6.70s          | 2.10s         |
+| The speed of parsing email(1000 emails)     | 5.05s          | 1.95s         |
 | How to install                              | gem install    | cpanm, cpm    |
 | Dependencies (Except core modules)          | 1 module       | 2 modules     |
-| LOC:Source lines of code                    | 13000 lines    | 9800 lines    |
+| LOC:Source lines of code                    | 12000 lines    | 8700 lines    |
 | The number of tests(spec/,t/,xt/) directory | 213000 tests   | 230000 tests  |
 | License                                     | BSD 2-Clause   | BSD 2-Clause  |
 | Support Contract provided by Developer      | Coming soon    | Available     |
@@ -252,9 +252,9 @@ and bounceHammer are available at
 
 Other specification of Sisimai
 -------------------------------------------------------------------------------
-- [**Parser Engines**](http://libsisimai.org/en/engine)
-- [**Bounce Reason List**](http://libsisimai.org/en/reason)
-- [**Data Structure of Sisimai::Data**](http://libsisimai.org/en/data)
+- [**Parser Engines**](https://libsisimai.org/en/engine/)
+- [**Bounce Reason List**](https://libsisimai.org/en/reason/)
+- [**Data Structure of Sisimai::Data**](https://libsisimai.org/en/data/)
 
 Contributing
 ===============================================================================
@@ -277,7 +277,7 @@ Other Information
 Related Sites
 -------------------------------------------------------------------------------
 * __@libsisimai__ | [Sisimai on Twitter (@libsisimai)](https://twitter.com/libsisimai)
-* __libSISIMAI.ORG__ | [Sisimai | The successor to bounceHammer, Library to parse bounce mails](http://libsisimai.org/)
+* __libSISIMAI.ORG__ | [Sisimai | The successor to bounceHammer, Library to parse bounce mails](https://libsisimai.org/)
 * __Sisimai Blog__ | [blog.libsisimai.org](http://blog.libsisimai.org/)
 * __Facebook Page__ | [facebook.com/libsisimai](https://www.facebook.com/libsisimai/)
 * __GitHub__ | [github.com/sisimai/rb-Sisimai](https://github.com/sisimai/rb-Sisimai)