wareki 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8be029e4138ca6a683ff52bd0e4070db0bb2e025a9e1024b3a0ad0cd60ca34fa
-  data.tar.gz: e8b300fd9f65529284acdb43e7dfbcd91c3a2e92f07824bcc3500fa78199c2dd
+  metadata.gz: 23992b6b4cd96544832ea1db1e843279eddabc6d205d2a7af87c30e29079fc7b
+  data.tar.gz: 706f0a880da6c9a05a3fa013450aa04dbd15993d5144df7aeef92d9f49b19f4e
 SHA512:
-  metadata.gz: ef1021d0c68056c285c2095c83b66adeb8ce25ed4d7530065f9e06e41ed3129251faf094bb599a4cc5c68506586a996b87ecb67c8d72f59da8c9328c2914c876
-  data.tar.gz: d98a3ed03d156f6a3a04931ec62ad4cce55dc008ffbd3c4529a6a41c0cd2b6e5279fce42246359177072568b22527da75dba637cf9050ff10883075934f33899
+  metadata.gz: d03b898c5bd3efc4087d9a9b6cfdb54526b30c7088e2a051b3bc31ae9c3994acca5607a8920ddd44f6acc1b9331ac4e62a6a82943689e3e41beb5633f165a5bc
+  data.tar.gz: 77d82b574ff6fee3fee4c19f27faf532ac040b2fb933b9c33d86ffd1fd6deb32a6aa9c5a2c08eb4ee039594e60032c97a2a0e95d26a9489b2790d7290480073c

data/ChangeLog

@@ -1,3 +1,57 @@
+2026-07-13  Tatsuki Sugiura  <sugi@nemui.org>
+
+	* Version: 2.0.0
+	* Time.parse now understands Japanese kansuji/zenkaku time notations
+	  (十二時三十四分五十六秒, 午後三時半, 正午, ...) via the patched
+	  Date._parse; Date.parse no longer misreads bare 時分秒 strings
+	* Add %JT* time format directives (%JTf/%JTF/%JTH(k)/%JTM(k)/%JTS(k));
+	  Time#strftime now supports all %J directives and DateTime#strftime
+	  expands %JT too; add Time#to_wareki_date
+	* Strict date validation: nonexistent dates now raise
+	  Wareki::InvalidDate (< ArgumentError) (month/day out of range,
+	  nonexistent leap month, and the Meiji 5 December calendar-switch
+	  gap for all era notations); patched Date.parse re-raises it
+	  instead of falling back to stdlib misinterpretation
+	* README: document that conversion from Date/jd prefers northern court
+	  eras during the Nanboku-cho period (previous statement was wrong;
+	  behavior unchanged from 1.1.0)
+	* Update kyuureki calendar data (regenerated from
+	  manakai/data-locale); corrects month boundaries of some
+	  historical years
+	* Wareki::Date#- returns day count for date-like operands;
+	  #+ raises TypeError for non-numeric operands (stdlib parity)
+	* Support date calculation with ActiveSupport::Duration
+	  (was NotImplementedError)
+	* Add Wareki::Date#hash, #<=>, Comparable and #succ
+	* Invalidate cached jd on attribute writes; writers keep
+	  year/era_year consistent
+	* Freeze era definition structs to prevent accidental mutation
+	  of shared state
+	* Fix imperial_year= setter (sign error)
+	* Parse apostrophe leap-month markers so %Jf/%Jm output round-trips
+	* Fix misokka (晦日) parsing for 皇紀/西暦/紀元前/era-less dates
+	* DateTime#strftime now supports %J directives
+	* Escaped %%J or invalid %J sequences no longer trigger conversion;
+	  Wareki::Date#strftime honors %% escapes too
+	* Fast-path non-wareki strings in patched Date.parse/_parse
+	* Wareki.parse_to_date falls back on UnsupportedDateRange too
+	* Fix deprecated Utils.i_to_kan (was calling undefined method)
+	* gemspec: SPDX license identifier (BSD-2-Clause)
+
+	[ by masa.kunikata <masa.kunikata@gmail.com> ]
+	* Add zero padding format feature
+	* Use zero padded format on default
+
+2019-12-24  Tatsuki Sugiura  <sugi@nemui.org>
+
+	* Version: 1.1.0
+
+	[ by Akinori MUSHA <knu@idaemons.org> ]
+	* Partially traditional kanji variants support
+	* Compatibility fix: Date.parse with no arguement
+	* Provides Date._parse overrides (currently no kansuji
+	  support for time fields at present)
+
 2019-04-15  Tatsuki Sugiura  <sugi@nemui.org>
 
 	* Verion: 1.0.0 🎉, compat with 0.x mostly.

data/README.md

@@ -1,9 +1,10 @@
 # wareki - ruby 和暦ライブラリ
 
 [<img src="https://badge.fury.io/rb/wareki.svg" alt="Gem Version" />](https://badge.fury.io/rb/wareki)
-[<img src="https://travis-ci.org/sugi/wareki.svg?branch=master" alt="Build Status" />](https://travis-ci.org/sugi/wareki)
-[<img src="https://coveralls.io/repos/sugi/wareki/badge.svg?branch=master&service=github" alt="Coverage Status" />](https://coveralls.io/github/sugi/wareki?branch=master)
+[<img src="https://github.com/sugi/wareki/actions/workflows/ci.yml/badge.svg" alt="Build Status" />](https://github.com/sugi/wareki/actions/workflows/ci.yml)
+[<img src="https://coveralls.io/repos/github/sugi/wareki/badge.svg?branch=master" alt="Coverage Status" />](https://coveralls.io/github/sugi/wareki?branch=master)
 [<img src="https://api.codeclimate.com/v1/badges/c9209422700b526d2b45/maintainability" />](https://codeclimate.com/github/sugi/wareki/maintainability)
+[![Codacy Badge](https://app.codacy.com/project/badge/Grade/a5e0b6022b6d485b86a195be7a392da5)](https://app.codacy.com/gh/sugi/wareki/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)
 
 ## 概要
 
@@ -19,10 +20,15 @@
   * 閏月サポート
   * 月の別名のサポート (如月、弥生、師走など)
   * 元年、正月、朔日、晦日、廿一日、卅日 などの特殊な表記の日付サポート
+  * 時刻の漢数字・全角数字表記のサポート (十二時三十四分五十六秒、午後三時半、正午 など)
 * Date クラスの拡張
   * 標準の strftime に和暦へのフォーマット文字列を追加
   * to_wareki_date を追加
   * Date::JAPAN (明治改暦日)の追加
+* Time / DateTime クラスの拡張
+  * strftime に時刻の全角・漢数字フォーマット文字列 (%JT 系) を追加
+  * Time.parse で和暦・漢数字時刻の文字列を解釈 (要 `require 'time'`)
+  * Time#to_wareki_date を追加
 
 ## インストール
 
@@ -70,6 +76,20 @@ Wareki::Date.parse("正嘉元年 うるう3月 １２日") # => Wareki::Date イ
 Wareki::Date.new("明治", 8, 2, 1).to_date   # => 標準 Date インスタンス 1875-02-01
 ```
 
+### 時刻のパースとフォーマット
+
+時刻の漢数字・全角数字表記も透過的に扱えます。時刻には暦のようなマッピングは
+存在しないため、単純な数字変換として処理されます。
+
+```ruby
+require 'time'
+t = Time.parse("平成元年五月四日 午後三時三十四分五十六秒")
+# => 1989-05-04 15:34:56
+t.strftime("%JF %JTF")       # => "平成元年五月四日 十五時三十四分五十六秒"
+t.strftime("%JTf")           # => "15時34分56秒"
+t.strftime("%JTHk時%JTMk分") # => "十五時三十四分"
+```
+
 ### 和暦・旧暦へのフォーマット
 
 日本では明治5年まで、グレゴリオ暦でもユリウス歴でもない旧暦が使われていました。これもフォーマット文字列経由で透過的に扱えます。
@@ -119,6 +139,8 @@ strftime が拡張されるので、 `config/locale/ja.yml` にそのままフ
 
 ## 追加フォーマット文字列一覧
 
+通常の strftime のフォーマット文字列に **加えて**、 以下が使用できます。これ以外のフォーマット文字列に関しては、そのまま strftime へ引き渡され、プラットフォーム依存で解決されます。
+
 * %Jf: "%Je%Jg年%Js%Jl月%Jd日" の略 (例: 平成23年3月12日)
 * %JF: "%Je%JGK年%JLk%JSk月%JDk日" の略 (例: 平成二十三年三月十二日)
 * %Jy: "%Je%Jg" の略 (元号+半角数字年)
@@ -151,6 +173,18 @@ strftime が拡張されるので、 `config/locale/ja.yml` にそのままフ
 * %JDk: 和暦日の漢数字
 * %JDK: 和暦日の漢数字の特殊記法 (朔、晦)
 
+以下の時刻フォーマット文字列は Time / DateTime の strftime でのみ使用できます
+(Date は時刻情報を持たないため展開されません)。
+
+* %JTf: "%JTH時%JTM分%JTS秒" 相当の半角ゼロ埋め複合表記 (例: 15時04分05秒)
+* %JTF: 漢数字の複合表記 (例: 十五時四分五秒)
+* %JTH: 時の全角数字
+* %JTHk: 時の漢数字
+* %JTM: 分の全角数字
+* %JTMk: 分の漢数字
+* %JTS: 秒の全角数字
+* %JTSk: 秒の漢数字
+
 ## 仕様、限界、制限など
 
 * 作者は暦の専門家ではまったくありません。ツッコミお待ちしています。
@@ -159,17 +193,24 @@ strftime が拡張されるので、 `config/locale/ja.yml` にそのままフ
 * 日本暦日原典の対照表が、どの暦法を元にしているのか分かっていません。単にデータだけを利用しています。
 * 内部的には全てユリウス日を経由して変換しています。
 * パース時には元号の存在しない年(例: 霊亀百年)を受け入れます。しかし現状、Date に変換した場合この情報は捨てられ、パース時の元号を復元することはできません。(Wareki::Date を直接扱えば可能です)
-* 改暦による存在しない日(明治5年12月3日〜31日)は基本的に例外(ArgumentError)を上げます。が、現状このチェックは完全ではありません。
-* 北朝の元号も解釈できます。しかし現在の所、北朝の元号で文字列にフォーマットすることはできません。
+* 存在しない日付(月・日の範囲超過、存在しない閏月、改暦により存在しない明治5年12月3日〜31日など)は例外(Wareki::InvalidDate, ArgumentError のサブクラス)を上げます。
+* 南朝・北朝どちらの元号も解釈できます。Date やユリウス日からの変換では、南北朝期は通常の慣例に従い北朝の元号を優先します(元弘・延元など、北朝側の改元前で北朝に固有の元号がない期間は南朝の元号になります)。
+* 元号の開始日より前の日付表記(例: 令和元年1月1日)は受理し、その元号の元年として解釈します。逆変換では実際の元号(平成31年1月1日)になります。
 * 10月の別名は「神無月」しかサポートしていません
 * 将来の日付に関しては、現在の元号がずっと継続しているとみなします
 * 日本でユリウス暦は使われていないので、Date::JAPAN は単にグレゴリオ暦への改暦日の目安、と言うだけです。Date.new で使う意味はほぼありません。
+* 時刻の解釈・出力は単純な数字変換のみで、十二時辰などの伝統的時刻制度との対応はありません
+* 時刻パース時、「午前」は無変換、「午後」は12時未満の時にのみ+12します (午後十二時 → 12:00)
+* 「三時間」「13時代」のような「数字+時」を含む複合語も時刻として解釈されることがあります (このため、従来 Date.parse が数字を日として解釈して成功していた文字列がエラーになる場合があります)
+* 範囲外の時刻 (二十五時など) は ASCII 表記 (25:00) と同様に扱われ、Time.parse では通常 ArgumentError になります
+* 和暦・漢数字時刻のパース対応は Date.parse / Date._parse / Time.parse のみです。DateTime.parse は Ruby 内部のパーサを直接呼ぶため対象外です
 
 ## 参照元データ
 
 作成には以下のデータを参照しました。
 
-* 旧暦: [suikawiki - 旧暦](http://wiki.suikawiki.org/n/%E6%97%A7%E6%9A%A6#section-%E5%AF%BE%E7%85%A7%E8%A1%A8%E3%81%A8%E5%A4%89%E6%8F%9B%E3%83%84%E3%83%BC%E3%83%AB) にある「日本暦日原典」第4版準拠の先発グレゴリオ暦対照表
+* Wakaba 氏による https://github.com/manakai/data-locale のデータを利用しています
+  * 旧暦: [suikawiki - 旧暦](http://wiki.suikawiki.org/n/%E6%97%A7%E6%9A%A6#section-%E5%AF%BE%E7%85%A7%E8%A1%A8%E3%81%A8%E5%A4%89%E6%8F%9B%E3%83%84%E3%83%BC%E3%83%AB) にある「日本暦日原典」第4版準拠の先発グレゴリオ暦対照表
 * 元号: [Wikipedia - 元号一覧_(日本)](https://ja.wikipedia.org/wiki/%E5%85%83%E5%8F%B7%E4%B8%80%E8%A6%A7_%28%E6%97%A5%E6%9C%AC%29) のユリウス歴とグレゴリオ暦表記の物に基づいています
 
 ## ライセンス

data/lib/wareki/calendar_def.rb

@@ -1,15 +1,14 @@
-# frozen_string_literal: true
 module Wareki
   Year = Struct.new(:year, :start, :end, :leap_month, :month_starts, :month_days)
   YEAR_DEFS = [
     Year.new(445, 1883618, 1884001, 5, [1883618, 1883648, 1883677, 1883707, 1883736, 1883766, 1883795, 1883825, 1883854, 1883884, 1883913, 1883943, 1883972], [30, 29, 30, 29, 30, 29, 30, 29, 30, 29, 30, 29, 30]),
     Year.new(446, 1884002, 1884355, nil, [1884002, 1884032, 1884061, 1884091, 1884120, 1884150, 1884179, 1884209, 1884238, 1884268, 1884297, 1884327], [30, 29, 30, 29, 30, 29, 30, 29, 30, 29, 30, 29]),
-    Year.new(447, 1884356, 1884710, nil, [1884356, 1884386, 1884415, 1884445, 1884475, 1884504, 1884534, 1884563, 1884593, 1884622, 1884652, 1884681], [30, 29, 30, 30, 29, 30, 29, 30, 29, 30, 29, 30]),
-    Year.new(448, 1884711, 1885094, 2, [1884711, 1884740, 1884770, 1884799, 1884829, 1884858, 1884888, 1884917, 1884947, 1884977, 1885006, 1885036, 1885065], [29, 30, 29, 30, 29, 30, 29, 30, 30, 29, 30, 29, 30]),
+    Year.new(447, 1884356, 1884710, nil, [1884356, 1884386, 1884415, 1884445, 1884474, 1884504, 1884534, 1884563, 1884593, 1884622, 1884652, 1884681], [30, 29, 30, 29, 30, 30, 29, 30, 29, 30, 29, 30]),
+    Year.new(448, 1884711, 1885094, 2, [1884711, 1884740, 1884770, 1884799, 1884829, 1884858, 1884888, 1884917, 1884947, 1884976, 1885006, 1885036, 1885065], [29, 30, 29, 30, 29, 30, 29, 30, 29, 30, 30, 29, 30]),
     Year.new(449, 1885095, 1885448, nil, [1885095, 1885124, 1885154, 1885183, 1885213, 1885242, 1885272, 1885301, 1885331, 1885360, 1885390, 1885419], [29, 30, 29, 30, 29, 30, 29, 30, 29, 30, 29, 30]),
     Year.new(450, 1885449, 1885832, 10, [1885449, 1885479, 1885508, 1885538, 1885567, 1885597, 1885626, 1885656, 1885685, 1885715, 1885744, 1885774, 1885803], [30, 29, 30, 29, 30, 29, 30, 29, 30, 29, 30, 29, 30]),
-    Year.new(451, 1885833, 1886186, nil, [1885833, 1885862, 1885892, 1885922, 1885951, 1885981, 1886010, 1886040, 1886069, 1886099, 1886128, 1886158], [29, 30, 30, 29, 30, 29, 30, 29, 30, 29, 30, 29]),
-    Year.new(452, 1886187, 1886541, nil, [1886187, 1886217, 1886246, 1886276, 1886305, 1886335, 1886364, 1886394, 1886424, 1886453, 1886483, 1886512], [30, 29, 30, 29, 30, 29, 30, 30, 29, 30, 29, 30]),
+    Year.new(451, 1885833, 1886186, nil, [1885833, 1885862, 1885892, 1885921, 1885951, 1885981, 1886010, 1886040, 1886069, 1886099, 1886128, 1886158], [29, 30, 29, 30, 30, 29, 30, 29, 30, 29, 30, 29]),
+    Year.new(452, 1886187, 1886541, nil, [1886187, 1886217, 1886246, 1886276, 1886305, 1886335, 1886364, 1886394, 1886423, 1886453, 1886483, 1886512], [30, 29, 30, 29, 30, 29, 30, 29, 30, 30, 29, 30]),
     Year.new(453, 1886542, 1886925, 6, [1886542, 1886571, 1886601, 1886630, 1886660, 1886689, 1886719, 1886748, 1886778, 1886807, 1886837, 1886866, 1886896], [29, 30, 29, 30, 29, 30, 29, 30, 29, 30, 29, 30, 30]),
     Year.new(454, 1886926, 1887279, nil, [1886926, 1886955, 1886985, 1887014, 1887044, 1887073, 1887103, 1887132, 1887162, 1887191, 1887221, 1887250], [29, 30, 29, 30, 29, 30, 29, 30, 29, 30, 29, 30]),
     Year.new(455, 1887280, 1887633, nil, [1887280, 1887309, 1887339, 1887369, 1887398, 1887428, 1887457, 1887487, 1887516, 1887546, 1887575, 1887605], [29, 30, 30, 29, 30, 29, 30, 29, 30, 29, 30, 29]),
@@ -255,7 +254,7 @@ module Wareki
     Year.new(695, 1974927, 1975310, 2, [1974927, 1974956, 1974986, 1975015, 1975045, 1975074, 1975104, 1975133, 1975163, 1975192, 1975222, 1975252, 1975281], [29, 30, 29, 30, 29, 30, 29, 30, 29, 30, 30, 29, 30]),
     Year.new(696, 1975311, 1975664, nil, [1975311, 1975340, 1975370, 1975399, 1975429, 1975458, 1975488, 1975517, 1975547, 1975576, 1975606, 1975636], [29, 30, 29, 30, 29, 30, 29, 30, 29, 30, 30, 29]),
     Year.new(697, 1975665, 1976048, 12, [1975665, 1975694, 1975724, 1975753, 1975783, 1975813, 1975842, 1975871, 1975901, 1975931, 1975960, 1975990, 1976020], [29, 30, 29, 30, 30, 29, 29, 30, 30, 29, 30, 30, 29]),
-    Year.new(698, 1976049, 1976403, nil, [1976049, 1976079, 1976108, 1976137, 1976167, 1976196, 1976226, 1976255, 1976285, 1976314, 1976344, 1976374], [30, 29, 29, 30, 29, 30, 29, 30, 29, 30, 30, 30]),
+    Year.new(698, 1976049, 1976403, nil, [1976049, 1976079, 1976108, 1976137, 1976167, 1976196, 1976226, 1976255, 1976285, 1976315, 1976344, 1976374], [30, 29, 29, 30, 29, 30, 29, 30, 30, 29, 30, 30]),
     Year.new(699, 1976404, 1976757, nil, [1976404, 1976433, 1976463, 1976492, 1976521, 1976551, 1976580, 1976609, 1976639, 1976669, 1976698, 1976728], [29, 30, 29, 29, 30, 29, 29, 30, 30, 29, 30, 30]),
     Year.new(700, 1976758, 1977141, 7, [1976758, 1976788, 1976817, 1976847, 1976876, 1976905, 1976935, 1976964, 1976993, 1977023, 1977052, 1977082, 1977112], [30, 29, 30, 29, 29, 30, 29, 29, 30, 29, 30, 30, 30]),
     Year.new(701, 1977142, 1977495, nil, [1977142, 1977171, 1977201, 1977231, 1977260, 1977289, 1977319, 1977348, 1977377, 1977407, 1977436, 1977466], [29, 30, 30, 29, 29, 30, 29, 29, 30, 29, 30, 30]),
@@ -300,7 +299,7 @@ module Wareki
     Year.new(740, 1991375, 1991729, nil, [1991375, 1991405, 1991434, 1991464, 1991493, 1991523, 1991552, 1991582, 1991612, 1991641, 1991671, 1991700], [30, 29, 30, 29, 30, 29, 30, 30, 29, 30, 29, 30]),
     Year.new(741, 1991730, 1992113, 3, [1991730, 1991759, 1991789, 1991818, 1991847, 1991877, 1991906, 1991936, 1991966, 1991995, 1992025, 1992055, 1992084], [29, 30, 29, 29, 30, 29, 30, 30, 29, 30, 30, 29, 30]),
     Year.new(742, 1992114, 1992467, nil, [1992114, 1992143, 1992173, 1992202, 1992231, 1992261, 1992290, 1992320, 1992349, 1992379, 1992409, 1992439], [29, 30, 29, 29, 30, 29, 30, 29, 30, 30, 30, 29]),
-    Year.new(743, 1992468, 1992822, nil, [1992468, 1992498, 1992527, 1992557, 1992586, 1992615, 1992645, 1992674, 1992704, 1992734, 1992763, 1992793], [30, 29, 30, 29, 29, 30, 29, 30, 30, 29, 30, 30]),
+    Year.new(743, 1992468, 1992822, nil, [1992468, 1992498, 1992527, 1992557, 1992586, 1992615, 1992645, 1992674, 1992704, 1992733, 1992763, 1992793], [30, 29, 30, 29, 29, 30, 29, 30, 29, 30, 30, 30]),
     Year.new(744, 1992852, 1993205, 1, [1992823, 1992852, 1992882, 1992911, 1992941, 1992970, 1992999, 1993029, 1993058, 1993087, 1993117, 1993147, 1993176], [29, 30, 29, 30, 29, 29, 30, 29, 29, 30, 30, 29, 30]),
     Year.new(745, 1993206, 1993559, nil, [1993206, 1993236, 1993266, 1993295, 1993325, 1993354, 1993383, 1993413, 1993442, 1993471, 1993501, 1993531], [30, 30, 29, 30, 29, 29, 30, 29, 29, 30, 30, 29]),
     Year.new(746, 1993560, 1993943, 9, [1993560, 1993590, 1993620, 1993649, 1993679, 1993709, 1993738, 1993767, 1993797, 1993826, 1993856, 1993885, 1993915], [30, 30, 29, 30, 30, 29, 29, 30, 29, 30, 29, 30, 29]),
@@ -351,7 +350,7 @@ module Wareki
     Year.new(791, 2010009, 2010362, nil, [2010009, 2010038, 2010068, 2010098, 2010128, 2010157, 2010187, 2010216, 2010245, 2010275, 2010304, 2010334], [29, 30, 30, 30, 29, 30, 29, 29, 30, 29, 30, 29]),
     Year.new(792, 2010363, 2010746, 11, [2010363, 2010393, 2010423, 2010452, 2010481, 2010511, 2010541, 2010570, 2010600, 2010630, 2010659, 2010689, 2010718], [30, 30, 29, 29, 30, 30, 29, 30, 30, 29, 30, 29, 29]),
     Year.new(793, 2010747, 2011101, nil, [2010747, 2010777, 2010806, 2010836, 2010865, 2010895, 2010924, 2010954, 2010984, 2011013, 2011043, 2011072], [30, 29, 30, 29, 30, 29, 30, 30, 29, 30, 29, 30]),
-    Year.new(794, 2011102, 2011456, nil, [2011102, 2011131, 2011161, 2011190, 2011219, 2011249, 2011278, 2011308, 2011338, 2011367, 2011397, 2011427], [29, 30, 29, 29, 30, 29, 30, 30, 29, 30, 30, 30]),
+    Year.new(794, 2011102, 2011456, nil, [2011102, 2011131, 2011161, 2011190, 2011220, 2011249, 2011278, 2011308, 2011338, 2011367, 2011397, 2011427], [29, 30, 29, 30, 29, 29, 30, 30, 29, 30, 30, 30]),
     Year.new(795, 2011457, 2011840, 7, [2011457, 2011486, 2011515, 2011545, 2011574, 2011603, 2011633, 2011662, 2011692, 2011722, 2011751, 2011781, 2011811], [29, 29, 30, 29, 29, 30, 29, 30, 30, 29, 30, 30, 30]),
     Year.new(796, 2011841, 2012194, nil, [2011841, 2011870, 2011899, 2011929, 2011958, 2011987, 2012017, 2012046, 2012076, 2012105, 2012135, 2012165], [29, 29, 30, 29, 29, 30, 29, 30, 29, 30, 30, 30]),
     Year.new(797, 2012195, 2012548, nil, [2012195, 2012224, 2012254, 2012283, 2012313, 2012342, 2012371, 2012401, 2012430, 2012460, 2012489, 2012519], [29, 30, 29, 30, 29, 29, 30, 29, 30, 29, 30, 30]),
@@ -377,7 +376,7 @@ module Wareki
     Year.new(817, 2019488, 2019871, 4, [2019488, 2019518, 2019547, 2019577, 2019607, 2019636, 2019666, 2019695, 2019725, 2019754, 2019784, 2019813, 2019842], [30, 29, 30, 30, 29, 30, 29, 30, 29, 30, 29, 29, 30]),
     Year.new(818, 2019872, 2020226, nil, [2019872, 2019902, 2019931, 2019961, 2019991, 2020020, 2020050, 2020079, 2020109, 2020138, 2020168, 2020197], [30, 29, 30, 30, 29, 30, 29, 30, 29, 30, 29, 30]),
     Year.new(819, 2020227, 2020580, nil, [2020227, 2020256, 2020286, 2020315, 2020345, 2020374, 2020404, 2020433, 2020463, 2020493, 2020522, 2020552], [29, 30, 29, 30, 29, 30, 29, 30, 30, 29, 30, 29]),
-    Year.new(820, 2020611, 2020964, 1, [2020581, 2020611, 2020641, 2020670, 2020699, 2020728, 2020758, 2020788, 2020817, 2020847, 2020877, 2020906, 2020936], [30, 30, 29, 29, 29, 30, 30, 29, 30, 30, 29, 30, 29]),
+    Year.new(820, 2020611, 2020964, 1, [2020581, 2020611, 2020640, 2020670, 2020699, 2020728, 2020758, 2020788, 2020817, 2020847, 2020877, 2020906, 2020936], [30, 29, 30, 29, 29, 30, 30, 29, 30, 30, 29, 30, 29]),
     Year.new(821, 2020965, 2021319, nil, [2020965, 2020995, 2021024, 2021053, 2021083, 2021112, 2021142, 2021171, 2021201, 2021231, 2021260, 2021290], [30, 29, 29, 30, 29, 30, 29, 30, 30, 29, 30, 30]),
     Year.new(822, 2021320, 2021703, 9, [2021320, 2021350, 2021379, 2021408, 2021437, 2021467, 2021496, 2021525, 2021555, 2021585, 2021614, 2021644, 2021674], [30, 29, 29, 29, 30, 29, 29, 30, 30, 29, 30, 30, 30]),
     Year.new(823, 2021704, 2022057, nil, [2021704, 2021733, 2021763, 2021792, 2021821, 2021851, 2021880, 2021909, 2021939, 2021969, 2021998, 2022028], [29, 30, 29, 29, 30, 29, 29, 30, 30, 29, 30, 30]),

data/lib/wareki/common.rb

@@ -9,38 +9,87 @@ module Wareki
   GREGORIAN_START_YEAR = 1873
   IMPERIAL_START = 1_480_041  # Date.new(-660, 2, 11, Date::GREGORIAN).jd
   IMPERIAL_START_YEAR = -660
+  WESTERN_ERA_NAMES = ['', '西暦', '紀元前'].freeze
+  IMPERIAL_ERA_NAMES = %w(皇紀 神武天皇即位紀元).freeze
   DATE_INFINITY = ::Date.new(280_000_000, 12, 31) # Use 280000000 for jruby limitation...
   YEAR_BY_NUM = Hash[*YEAR_DEFS.map { |y| [y.year, y] }.flatten].freeze
-  ERA_BY_NAME = Hash[*(ERA_NORTH_DEFS + ERA_DEFS).map { |g| [g.name, g] }.flatten]
-  ERA_BY_NAME['皇紀'] = ERA_BY_NAME['神武天皇即位紀元'] = Era.new('皇紀', -660, 1_480_041, DATE_INFINITY.jd)
-  ERA_BY_NAME['西暦'] = ERA_BY_NAME[''] = Era.new('西暦', 1, 1_721_424, DATE_INFINITY.jd)
-  ERA_BY_NAME.keys.each do |era_name|
-    alt_era_name = era_name.tr('宝霊神応暦祥寿斎観寛徳禄万福禎国亀令', '寳靈神應曆祥壽斉觀寬德祿萬福禎國龜令')
-    alt_era_name == era_name and next
-    ERA_BY_NAME[alt_era_name] = ERA_BY_NAME[era_name]
-  end
-  {'㍾' => '明治', '㍽' => '大正', '㍼' => '昭和', '㍻' => '平成', '㋿' => '令和'}.each do |short, canon|
-    ERA_BY_NAME[short] = ERA_BY_NAME[canon]
-  end
+  KANJI_VARIANTS = {
+    '宝' => '寳',
+    '霊' => '靈',
+    '神' => '神',
+    '応' => '應',
+    '暦' => '曆',
+    '祥' => '祥',
+    '寿' => '壽',
+    '斎' => '斉',
+    '観' => '觀',
+    '寛' => '寬',
+    '徳' => '德',
+    '禄' => '祿',
+    '万' => '萬',
+    '福' => '福',
+    '禎' => '禎',
+    '国' => '國',
+    '亀' => '龜',
+    '令' => '令',
+  }.freeze
+  SQUARE_ERAS = {
+    '㍾' => '明治',
+    '㍽' => '大正',
+    '㍼' => '昭和',
+    '㍻' => '平成',
+    '㋿' => '令和',
+  }.freeze
+  NORMALIZE_KANJI_VARIANTS_REGEX = Regexp.union(*KANJI_VARIANTS.values)
+  NORMALIZE_KANJI_VARIANTS_HASH = KANJI_VARIANTS.each_with_object({}) { |(n, s), h| s.each_char { |c| h[c] = n } }
+  NORMALIZE_KANJI_VARIANTS = ->(str) { str.gsub(NORMALIZE_KANJI_VARIANTS_REGEX, NORMALIZE_KANJI_VARIANTS_HASH) }
+  ERA_BY_NAME = Hash[*(ERA_NORTH_DEFS + ERA_DEFS).flat_map { |g| [g.name, g] }]
+  ERA_BY_NAME['皇紀'] = ERA_BY_NAME['神武天皇即位紀元'] = Era.new('皇紀', -660, 1_480_041, DATE_INFINITY.jd).freeze
+  ERA_BY_NAME['西暦'] = ERA_BY_NAME[''] = Era.new('西暦', 1, 1_721_424, DATE_INFINITY.jd).freeze
+  ERA_BY_NAME.default_proc = ->(hash, key) { hash.fetch(SQUARE_ERAS[key] || NORMALIZE_KANJI_VARIANTS[key], nil) }
   ERA_BY_NAME.freeze
-  NUM_CHARS = '零壱壹弌弐貳貮参參弎肆伍陸漆質柒捌玖〇一二三四五六七八九十拾什卄廿卅丗卌百陌佰皕阡仟千万萬億兆京垓0123456789０１２３４５６７８９'.freeze
+  ERA_REGEX = Regexp.new(
+    Regexp.union(*ERA_BY_NAME.keys, *SQUARE_ERAS.keys).source.gsub(
+      Regexp.union(*KANJI_VARIANTS.keys),
+      KANJI_VARIANTS.each_with_object({}) { |(canon, variants), h| h[canon] = "[#{canon}#{variants}]" }
+    )
+  )
+  NUM_CHARS = '零壱壹弌弐貳貮参參弎肆伍陸漆質柒捌玖〇一二三四五六七八九十拾什卄廿卅丗卌百陌佰皕阡仟千万萬億兆京垓0123456789０１２３４５６７８９'
   ALT_MONTH_NAME = %w(睦月 如月 弥生 卯月 皐月 水無月 文月 葉月 長月 神無月 霜月 師走).freeze
-  REGEX = %r{^
-    (?<era_name>西暦|紀元前|#{ERA_BY_NAME.keys.join('|')})?
-    (?:(?<year>[元#{NUM_CHARS}]+)年)?
+  REGEX = %r{
+    (?:(?<era_name>紀元前|#{ERA_REGEX})?
+      (?:(?<year>[元#{NUM_CHARS}]+)年))?
     (?:(?<is_leap>閏|潤|うるう)?
-      (?:(?<month>[正#{NUM_CHARS}]+)月 |
+      (?:(?<month>[正#{NUM_CHARS}]+)(?<is_leap_post>['’])?月 |
          (?<alt_month>#{ALT_MONTH_NAME.join('|')})))?
     (?:(?<day>[元朔晦#{NUM_CHARS}]+)日|元旦)?
-  $}x.freeze
+  }x.freeze
+  # REGEX が空でないマッチを返すには 年/月/日/元旦 か、「月」を含まない
+  # 月の別名 (弥生・師走) のいずれかが必要。それ以外は素の Date.parse に
+  # 直行させて monkey patch のオーバーヘッドを避ける。
+  PARSE_QUICK_FILTER = /[年月日]|元旦|弥生|師走/.freeze
+  TIME_REGEX = %r{
+    (?<noon>正午) |
+    (?:(?<ampm>午前|午後)[[:space:]]*)?
+    (?<hour>[#{NUM_CHARS}]+)[[:space:]]*時
+    (?:[[:space:]]*
+      (?:(?<half>半) |
+         (?<min>[#{NUM_CHARS}]+)[[:space:]]*分
+         (?:[[:space:]]*(?<sec>[#{NUM_CHARS}]+)[[:space:]]*秒)?))?
+  }x.freeze
+  # TIME_REGEX が非空マッチしうるのは「時」か「正午」を含む文字列のみ
+  TIME_PARSE_QUICK_FILTER = /時|正午/.freeze
 
   class UnsupportedDateRange < StandardError; end
+  class InvalidDate < ArgumentError; end
 
   module_function
 
   def parse_to_date(str, start = ::Date::ITALY)
     Date.parse(str).to_date(start)
-  rescue ArgumentError
+  rescue InvalidDate
+    raise
+  rescue ArgumentError, UnsupportedDateRange
     ::Date.parse(str, true, start)
   end
 end

data/lib/wareki/date.rb

@@ -8,32 +8,25 @@ require 'wareki/kansuji'
 module Wareki
   # Wareki date handling class, main implementation.
   class Date
-    attr_accessor :year, :month, :day, :era_year, :era_name
+    include Comparable
+
+    attr_reader :year, :month, :day, :era_year, :era_name
 
     def self.today
       jd(::Date.today.jd)
     end
 
-    def self._check_invalid_date(era, year, month, day)
-      month == 12 or return true
-      day > 2 or return true
-      (era == '明治' && year == 5 ||
-       %w(皇紀 神武天皇即位紀元).member?(era) &&
-       year == GREGORIAN_START_YEAR - IMPERIAL_START_YEAR - 1) and
-        return false
-      true
-    end
-
     def self._parse(str)
       str = str.to_s.gsub(/[[:space:]]/, '')
-      match = (!str.empty? && REGEX.match(str)) or
+      match = REGEX.match(str)
+      (match && !match[0].empty?) or
         raise ArgumentError, "Invaild Date: #{str}"
       era = match[:era_name]
       if (era.nil? || era == '') && match[:year].nil?
         year = Date.today.year
       else
-        (year = Utils.k2i(match[:year])) > 0 or
-          raise ArgumentError, "Invalid year: #{str}"
+        year = Utils.k2i(match[:year])
+        year > 0 or raise ArgumentError, "Invalid year: #{str}"
       end
       month = day = 1
 
@@ -47,20 +40,20 @@ module Wareki
       end
 
       month > 12 || month < 1 and
-        raise ArgumentError, "Invalid month: #{str}"
+        raise InvalidDate, "invalid date (month out of range): #{str}"
+
+      is_leap = !!(match[:is_leap] || match[:is_leap_post])
 
       if match[:day]
         if match[:day] == '晦'
-          day = Utils.last_day_of_month(ERA_BY_NAME[era].year + year - 1, month, match[:is_leap])
+          civil_year = Utils.era_year_to_civil(era, year)
+          day = Utils.last_day_of_era_month(era, civil_year, month, is_leap)
         else
           day = Utils.k2i(match[:day])
         end
       end
 
-      _check_invalid_date(era, year, month, day) or
-        raise ArgumentError, "Invaild Date: #{str}"
-
-      {era: era, year: year, month: month, day: day, is_leap: !!match[:is_leap]}
+      {era: era, year: year, month: month, day: day, is_leap: is_leap}
     end
 
     def self.parse(str)
@@ -86,23 +79,13 @@ module Wareki
     end
 
     def initialize(era_name, era_year, month = 1, day = 1, is_leap_month = false)
-      raise ArgumentError, "Undefined era '#{era_name}'" if
-        era_name.to_s != '' && era_name != '紀元前' && !ERA_BY_NAME[era_name]
-
+      @era_name = era_name.to_s
+      @era_year = era_year
       @month = month
       @day = day
       @is_leap_month = is_leap_month
-      @era_name = era_name
-      @era_year = era_year
-      if era_name.to_s == '' || era_name == '西暦'
-        @year = @era_year
-      elsif era_name.to_s == '紀元前'
-        @year = -@era_year
-      elsif %w(皇紀 神武天皇即位紀元).include? era_name
-        @year = era_year + IMPERIAL_START_YEAR
-      else
-        @year = ERA_BY_NAME[era_name].year + era_year - 1
-      end
+      @year = Utils.era_year_to_civil(@era_name, @era_year)
+      _validate_date!
     end
 
     def imperial_year
@@ -110,7 +93,7 @@ module Wareki
     end
 
     def imperial_year=(v)
-      @year = v - IMPERIAL_START_YEAR
+      self.year = v + IMPERIAL_START_YEAR
     end
 
     def leap_month?
@@ -118,28 +101,86 @@ module Wareki
     end
 
     def leap_month=(v)
+      @jd = nil
       @is_leap_month = v
     end
 
+    def year=(v)
+      era_year = Utils.civil_to_era_year(@era_name, v)
+      @jd = nil
+      @year = v
+      @era_year = era_year
+    end
+
+    def month=(v)
+      @jd = nil
+      @month = v
+    end
+
+    def day=(v)
+      @jd = nil
+      @day = v
+    end
+
+    def era_year=(v)
+      year = Utils.era_year_to_civil(@era_name, v)
+      @jd = nil
+      @era_year = v
+      @year = year
+    end
+
+    def era_name=(v)
+      era_name = v.to_s
+      year = Utils.era_year_to_civil(era_name, @era_year)
+      @jd = nil
+      @era_name = era_name
+      @year = year
+    end
+
     def __set_jd(v)
       @jd = v
     end
 
     def month_index
       return month - 1 if
-        ['', '西暦', '紀元前'].include?(@era_name) || @year >= GREGORIAN_START_YEAR
+        WESTERN_ERA_NAMES.include?(@era_name) || @year >= GREGORIAN_START_YEAR
 
       yobj = YEAR_BY_NUM[@year] or
         raise UnsupportedDateRange, "Cannot get year info of #{inspect}"
       idx = month - 1
-      idx += 1 if leap_month? || yobj.leap_month && month > yobj.leap_month
+      idx += 1 if leap_month? || (yobj.leap_month && month > yobj.leap_month)
       idx
     end
 
+    def last_day_of_month
+      Utils.last_day_of_era_month(@era_name, @year, month, leap_month?)
+    end
+
+    def _validate_date!
+      (month.is_a?(Integer) && month >= 1 && month <= 12) or
+        raise InvalidDate, "invalid date (month out of range): #{inspect}"
+      (day.is_a?(Integer) && day >= 1) or
+        raise InvalidDate, "invalid date (day out of range): #{inspect}"
+      if !WESTERN_ERA_NAMES.include?(@era_name) && @year < GREGORIAN_START_YEAR
+        # 暦テーブル外の年は従来どおり jd 変換時の UnsupportedDateRange に委ねる
+        yobj = YEAR_BY_NUM[@year] or return
+        !leap_month? || yobj.leap_month == month or
+          raise InvalidDate, "invalid date (no leap month): #{inspect}"
+        day <= yobj.month_days[month_index] or
+          raise InvalidDate, "invalid date (day out of range): #{inspect}"
+      else
+        leap_month? and
+          raise InvalidDate, "invalid date (no leap month): #{inspect}"
+        day <= last_day_of_month or
+          raise InvalidDate, "invalid date (day out of range): #{inspect}"
+      end
+    end
+
     def jd
       @jd and return @jd
 
-      ['', '西暦', '紀元前'].include?(@era_name) and
+      _validate_date!
+      WESTERN_ERA_NAMES.include?(@era_name) and
         return @jd = ::Date.new(@year, month, day, ::Date::ITALY).jd
 
       @year >= GREGORIAN_START_YEAR and
@@ -158,17 +199,28 @@ module Wareki
       to_date.to_time
     end
 
+    FORMAT_DIRECTIVE_REGEX = /%J(-|[_0]{0,2}[0-9]*|)([fFyYegGoOiImMsSlLdD][kK]?)/.freeze
+    FORMAT_EXPANSION_REGEX = /(?<!%)(?:%%)*\K#{FORMAT_DIRECTIVE_REGEX}/.freeze
+
+    def expand_wareki_format(format_str)
+      format_str.to_str.gsub(FORMAT_EXPANSION_REGEX) { format($2, $1) || $& }
+    end
+
     def strftime(format_str = '%JF')
-      ret = format_str.to_str.gsub(/%J([fFyYegGoOiImMsSlLdD][kK]?)/) { format($1) || $& }
+      ret = expand_wareki_format(format_str)
       ret.index('%') or return ret
       d = to_date
       d.respond_to?(:_wareki_strftime_orig) ? d._wareki_strftime_orig(ret) : d.strftime(ret)
     end
 
-    def format(key)
+    def _number_format(opt)
+      Utils.number_format(opt)
+    end
+
+    def format(key, opt = '')
       case key.to_sym
       when :e  then era_name
-      when :g  then era_name.to_s == '' ? '' : era_year
+      when :g  then era_name.to_s == '' ? '' : Kernel.format(_number_format(opt), era_year)
       when :G  then era_name.to_s == '' ? '' : Utils.i2z(era_year)
       when :Gk then era_name.to_s == '' ? '' : YaKansuji.to_kan(era_year, :simple)
       when :GK
@@ -185,14 +237,14 @@ module Wareki
       when :i  then imperial_year
       when :I  then Utils.i2z(imperial_year)
       when :Ik then YaKansuji.to_kan(imperial_year, :simple)
-      when :s  then month
+      when :s  then Kernel.format(_number_format(opt), month)
       when :S  then Utils.i2z(month)
       when :Sk then YaKansuji.to_kan(month, :simple)
       when :SK then Utils.alt_month_name(month)
       when :l  then leap_month? ? "'" : ''
       when :L  then leap_month? ? '’' : ''
       when :Lk then leap_month? ? '閏' : ''
-      when :d  then day
+      when :d  then Kernel.format(_number_format(opt), day)
       when :D  then Utils.i2z(day)
       when :Dk then YaKansuji.to_kan(day, :simple)
       when :DK
@@ -200,19 +252,19 @@ module Wareki
           '元'
         elsif day == 1
           '朔'
-        elsif day == Utils.last_day_of_month(year, month, leap_month?)
+        elsif day == last_day_of_month
           '晦'
         else
           YaKansuji.to_kan(day, :simple)
         end
-      when :m  then "#{format(:s)}#{format(:l)}"
+      when :m  then "#{format(:s, opt)}#{format(:l)}"
       when :M  then "#{format(:Lk)}#{format(:S)}"
       when :Mk then "#{format(:Lk)}#{format(:Sk)}"
-      when :y  then "#{format(:e)}#{format(:g)}"
+      when :y  then "#{format(:e)}#{format(:g, opt)}"
       when :Y  then "#{format(:e)}#{format(:G)}"
       when :Yk then "#{format(:e)}#{format(:Gk)}"
       when :YK then "#{format(:e)}#{format(:GK)}"
-      when :f  then "#{format(:e)}#{format(:g)}年#{format(:s)}#{format(:l)}月#{format(:d)}日"
+      when :f  then "#{format(:e)}#{format(:g, opt)}年#{format(:s, opt)}#{format(:l)}月#{format(:d, opt)}日"
       when :F  then "#{format(:e)}#{format(:GK)}年#{format(:Lk)}#{format(:Sk)}月#{format(:Dk)}日"
       end
     end
@@ -238,20 +290,48 @@ module Wareki
       true
     end
 
+    def hash
+      [self.class, @era_name, @era_year, @year, @month, @day, leap_month?].hash
+    end
+
+    def <=>(other)
+      ojd = _jd_if_date_like(other)
+      ojd = other if ojd.nil? && other.is_a?(Numeric)
+      ojd.nil? and return nil
+      jd <=> ojd
+    end
+
+    def succ
+      self + 1
+    end
+
     def -(other)
-      self.class.jd jd - _to_jd_for_calc(other)
+      n = _to_days(other)
+      n.nil? or return self.class.jd(jd - n)
+      ojd = _jd_if_date_like(other)
+      ojd and return jd - ojd
+      raise TypeError, "Cannot subtract #{other.inspect} from Wareki::Date"
     end
 
     def +(other)
-      self.class.jd jd + _to_jd_for_calc(other)
+      n = _to_days(other)
+      n.nil? and raise TypeError, "Cannot add #{other.inspect} to Wareki::Date"
+      self.class.jd(jd + n)
     end
 
-    def _to_jd_for_calc(other)
-      other.class.to_s == 'ActiveSupport::Duration' and
-        raise NotImplementedError, 'Date calcration with ActiveSupport::Duration currently is not supported. Please use numeric.'
-      other.respond_to?(:to_date) and other = other.to_date
-      other.respond_to?(:jd) and other = other.jd
-      other
+    def _to_days(other)
+      # rubocop:disable Style/ClassEqualityComparison
+      return other.in_days if other.class.name == 'ActiveSupport::Duration'
+      # rubocop:enable Style/ClassEqualityComparison
+
+      other.is_a?(Numeric) ? other : nil
+    end
+
+    def _jd_if_date_like(other)
+      return other.jd if other.respond_to?(:jd)
+
+      other.respond_to?(:to_date) && !other.is_a?(Numeric) and other = other.to_date
+      other.respond_to?(:jd) ? other.jd : nil
     end
   end
 end

data/lib/wareki/era_def.rb

@@ -252,7 +252,7 @@ module Wareki
     Era.new("昭和", 1926, 2424875, 2447534),
     Era.new("平成", 1989, 2447535, 2458604),
     Era.new("令和", 2019, 2458605, DAY_MAX),
-  ].freeze
+  ].each(&:freeze).freeze
   ERA_NORTH_DEFS = [
     Era.new("大化", 645, 1956842, 1958551),
     Era.new("白雉", 650, 1958551, 1960259),
@@ -502,5 +502,5 @@ module Wareki
     Era.new("昭和", 1926, 2424875, 2447534),
     Era.new("平成", 1989, 2447535, 2458604),
     Era.new("令和", 2019, 2458605, DAY_MAX),
-  ].freeze
+  ].each(&:freeze).freeze
 end

data/lib/wareki/std_ext.rb

@@ -1,10 +1,30 @@
+# frozen_string_literal: true
+
 require 'date'
 require 'wareki/date'
 module Wareki
   # :nodoc:
   module StdExt
+    module_function
+
+    def wareki_directive?(format)
+      !!(format.to_str =~ Wareki::Date::FORMAT_EXPANSION_REGEX)
+    end
+
+    def wareki_time_directive?(format)
+      !!(format.to_str =~ Wareki::Utils::TIME_FORMAT_EXPANSION_REGEX)
+    end
+
+    # %JT 時刻トークンと %J 日付トークンの両方を展開した文字列を返す
+    def expand_all_wareki_formats(format, datetime)
+      ret = format
+      ret = Wareki::Utils.expand_time_format(ret, datetime) if wareki_time_directive?(ret)
+      ret = datetime.to_wareki_date.expand_wareki_format(ret) if wareki_directive?(ret)
+      ret
+    end
   end
 end
+
 # :nodoc:
 class Date
   JAPAN = Wareki::GREGORIAN_START
@@ -15,19 +35,55 @@ class Date
 
   alias _wareki_strftime_orig strftime
   def strftime(format = '%F')
-    if format.index('%J')
-      to_wareki_date.strftime(format)
-    else
-      _wareki_strftime_orig(format)
-    end
+    return _wareki_strftime_orig(format) unless Wareki::StdExt.wareki_directive?(format)
+
+    _wareki_strftime_orig(to_wareki_date.expand_wareki_format(format))
   end
 
   class << self
     alias _wareki_parse_orig parse
-    def parse(str, comp = true, start = ::Date::ITALY)
+    def parse(str = '-4712-01-01', comp = true, start = ::Date::ITALY)
+      str = Wareki::Utils.normalize_time(str)
+      str.to_s =~ Wareki::PARSE_QUICK_FILTER or
+        return ::Date._wareki_parse_orig(str, comp, start)
       Wareki::Date.parse(str).to_date(start)
+    rescue Wareki::InvalidDate
+      raise
     rescue ArgumentError, Wareki::UnsupportedDateRange
       ::Date._wareki_parse_orig(str, comp, start)
     end
+
+    alias _wareki__parse_orig _parse
+    def _parse(str, comp = true)
+      str = Wareki::Utils.normalize_time(str)
+      str.to_s =~ Wareki::PARSE_QUICK_FILTER or
+        return ::Date._wareki__parse_orig(str, comp)
+      di = Wareki::Date._parse(str)
+      wdate = Wareki::Date.new(di[:era], di[:year], di[:month], di[:day], di[:is_leap])
+    rescue ArgumentError, Wareki::UnsupportedDateRange
+      ::Date._wareki__parse_orig(str, comp)
+    else
+      ::Date._wareki__parse_orig(str.sub(Wareki::REGEX, wdate.strftime('%F ')), comp)
+    end
+  end
+end
+
+# :nodoc:
+class DateTime
+  alias _wareki_strftime_orig strftime
+  def strftime(format = '%FT%T%:z')
+    _wareki_strftime_orig(Wareki::StdExt.expand_all_wareki_formats(format, self))
+  end
+end
+
+# :nodoc:
+class Time
+  def to_wareki_date
+    Wareki::Date.jd(to_date.jd)
+  end
+
+  alias _wareki_strftime_orig strftime
+  def strftime(format)
+    _wareki_strftime_orig(Wareki::StdExt.expand_all_wareki_formats(format, self))
   end
 end

data/lib/wareki/utils.rb

@@ -5,6 +5,9 @@ require 'ya_kansuji'
 module Wareki
   # Static utility methods.
   module Utils
+    TIME_FORMAT_DIRECTIVE_REGEX = /%J(-|[_0]{0,2}[0-9]*|)(T(?:[fF]|[HMS]k?))/.freeze
+    TIME_FORMAT_EXPANSION_REGEX = /(?<!%)(?:%%)*\K#{TIME_FORMAT_DIRECTIVE_REGEX}/.freeze
+
     module_function
 
     def last_day_of_month(year, month, is_leap)
@@ -16,25 +19,47 @@ module Wareki
     end
 
     def _last_day_of_month_gregorian(year, month)
-      tmp_y = year
-      tmp_m = month
-      if month == 12
-        tmp_y += 1
-        tmp_m = 1
-      else
-        tmp_m += 1
-      end
-      (::Date.new(tmp_y, tmp_m, 1, ::Date::GREGORIAN) - 1).day
+      ::Date.new(year, month, -1, ::Date::GREGORIAN).day
     end
 
     def _last_day_of_month_from_defs(year, month, is_leap)
       yobj = YEAR_BY_NUM[year] or
-        raise UnsupportedDateRange, "Cannot find year #{inspect}"
+        raise UnsupportedDateRange, "Cannot find year #{year}"
       month_idx = month - 1
-      month_idx += 1 if is_leap || yobj.leap_month && yobj.leap_month < month
+      month_idx += 1 if is_leap || (yobj.leap_month && yobj.leap_month < month)
       yobj.month_days[month_idx]
     end
 
+    def era_year_to_civil(era_name, era_year)
+      era_name = era_name.to_s
+      return era_year if ['', '西暦'].include?(era_name)
+      return -era_year if era_name == '紀元前'
+      return era_year + IMPERIAL_START_YEAR if IMPERIAL_ERA_NAMES.include?(era_name)
+
+      era = ERA_BY_NAME[era_name] or
+        raise ArgumentError, "Undefined era '#{era_name}'"
+      era.year + era_year - 1
+    end
+
+    def civil_to_era_year(era_name, year)
+      era_name = era_name.to_s
+      return year if ['', '西暦'].include?(era_name)
+      return -year if era_name == '紀元前'
+      return year - IMPERIAL_START_YEAR if IMPERIAL_ERA_NAMES.include?(era_name)
+
+      era = ERA_BY_NAME[era_name] or
+        raise ArgumentError, "Undefined era '#{era_name}'"
+      year - era.year + 1
+    end
+
+    def last_day_of_era_month(era_name, civil_year, month, is_leap)
+      if WESTERN_ERA_NAMES.include?(era_name.to_s)
+        ::Date.new(civil_year, month, -1, ::Date::ITALY).day
+      else
+        last_day_of_month(civil_year, month, is_leap)
+      end
+    end
+
     def alt_month_name_to_i(name)
       i = ALT_MONTH_NAME.index(name) or return false
       i + 1
@@ -85,6 +110,7 @@ module Wareki
 
     def find_year(d)
       jd = _to_jd(d)
+      jd < YEAR_DEFS.first.start and return nil
       YEAR_DEFS.bsearch { |y| y.end >= jd }
     end
 
@@ -111,6 +137,59 @@ module Wareki
       end
     end
 
+    # 日本語の時刻表記 (漢数字・全角数字の時分秒、午前/午後、半、正午) を
+    # 等価な "HH:MM(:SS)" 表記へ置換する。値の範囲チェックは行わず、
+    # 妥当性判断は Ruby 標準パーサに委ねる (二十五時 -> "25:00")。
+    def normalize_time(str)
+      str.to_s =~ TIME_PARSE_QUICK_FILTER or return str
+      str.to_s.sub(TIME_REGEX) { _time_match_to_s(Regexp.last_match) }
+    end
+
+    def _time_match_to_s(match)
+      return '12:00' if match[:noon]
+
+      hour = k2i(match[:hour])
+      hour += 12 if match[:ampm] == '午後' && hour < 12
+      min = 0
+      min = 30 if match[:half]
+      min = k2i(match[:min]) if match[:min]
+      return Kernel.format('%<hour>02d:%<min>02d', hour: hour, min: min) unless match[:sec]
+
+      Kernel.format('%<hour>02d:%<min>02d:%<sec>02d', hour: hour, min: min, sec: k2i(match[:sec]))
+    end
+
+    def number_format(opt)
+      case opt
+      when '', '0', '_0' then '%02d'
+      when '-'           then '%d'
+      when /_\Z/         then '%2d'
+      when /0?_/         then "%#{opt.sub(/0?_/, '')}d"
+      when /_?0/         then "%#{opt.sub(/_?0/, '0')}d"
+      else "%0#{opt}d"
+      end
+    end
+
+    def expand_time_format(format_str, time)
+      format_str.to_str.gsub(TIME_FORMAT_EXPANSION_REGEX) { _format_time_directive($2, $1, time) || $& }
+    end
+
+    def _format_time_directive(key, opt, time)
+      case key.to_sym
+      when :Tf
+        nf = number_format(opt)
+        Kernel.format("#{nf}時#{nf}分#{nf}秒", time.hour, time.min, time.sec)
+      when :TF
+        "#{YaKansuji.to_kan(time.hour, :simple)}時#{YaKansuji.to_kan(time.min, :simple)}分" \
+        "#{YaKansuji.to_kan(time.sec, :simple)}秒"
+      when :TH  then i2z(time.hour)
+      when :THk then YaKansuji.to_kan(time.hour, :simple)
+      when :TM  then i2z(time.min)
+      when :TMk then YaKansuji.to_kan(time.min, :simple)
+      when :TS  then i2z(time.sec)
+      when :TSk then YaKansuji.to_kan(time.sec, :simple)
+      end
+    end
+
     # DEPRECATED
     def kan_to_i(*args)
       warn '[DEPRECATED] Wareki::Utils.kan_to_i: Please use ya_kansuji gem to handle kansuji'
@@ -120,7 +199,7 @@ module Wareki
     # DEPRECATED
     def i_to_kan(*args)
       warn '[DEPRECATED] Wareki::Utils.i_to_kan: Please use ya_kansuji gem to handle kansuji'
-      i2k(*args)
+      YaKansuji.to_kan(*args)
     end
   end
 end

data/lib/wareki/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Wareki
-  VERSION = '1.0.0'.freeze
+  VERSION = '2.0.0'
 end

data/lib/wareki.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'wareki/version'
 require 'wareki/date'
 require 'wareki/std_ext'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wareki
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Tatsuki Sugiura
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-04-15 00:00:00.000000000 Z
+date: 2026-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ya_kansuji
@@ -30,48 +30,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.9'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: |
   Pure ruby library of Wareki (Japanese calendar date) that supports string parsing,
   formatting, and bi-directional convertion with standard Date class.
@@ -95,9 +53,10 @@ files:
 - lib/wareki/version.rb
 homepage: https://github.com/sugi/wareki
 licenses:
-- BSD
-metadata: {}
-post_install_message: 
+- BSD-2-Clause
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -112,9 +71,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Pure ruby library of Wareki (Japanese calendar date)
 test_files: []