zakuro 0.6.0 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 567799c25255c97ec707d421b465358c1209afeef0d8c2f1c84a9b3bd5e65148
-  data.tar.gz: bff172488e9ea94a8da83d09fa1dc9bd62a28de871ad0cc41217d20ff5dc2b94
+  metadata.gz: fd91623531440c342355fd005938af7cc10d07ae858dfb83d51704c6c1eab92c
+  data.tar.gz: 0a1bfca6ded7403960512c9854c5b22e95b761fb1c8d04fd530cb4806c2eaf66
 SHA512:
-  metadata.gz: daf11f9f9319d23fbba463571cb8f76184aeb7b6133fcde661bd06773113f37bc9684e8680a848c4998a96ea287f371ca123f878a7bb5dbdfb2ed499c434f8a7
-  data.tar.gz: 3624066b34b4271961793f58bbad9509b046a3df967df4513de195352237386ccd5848b9b5f72c8838f6efb944fac1129b494001c570aa2cb5a93440d089e173
+  metadata.gz: 76d1ad94413f1b0101964e6ac292e8e4074e2441418a1e31ad3f46d01397e5dba54afaf4799f1a45b310cb32bc17dc27bcf0d6a76348486dacb8a45ecf0df7e3
+  data.tar.gz: f97b9d72fde20c6bcf991f8136b8c9ee935516c27243f7a46ad60c1c38abe32cecb825a51083f01b605d9f4a00810df7c29be09a6564b2881000dd9ae6713786

data/Makefile

@@ -1,2 +1,5 @@
 binstub:
 	bundle binstubs rspec-core --path exe
+
+count:
+	find . -type f -name "*.rb" | xargs cat | sed "/^\s*\(#\|\$\)/d" | wc -l

data/README.md

@@ -30,7 +30,9 @@ Or install it yourself as:
 
 開発途中です。
 
-下記表で対応済とした暦の1日検索のみ対応しております。
+1日検索/期間検索に対応しております。
+
+下記表で対応済の暦は使用可能です。
 
 |開始日|暦   |計算方法|対応|
 |:----|:----|:----|:----|
@@ -61,8 +63,7 @@ western_date = Date.new(862, 2, 3)
 # 初期化時の設定
 merchant = Zakuro::Merchant.new(condition: { date: western_date })
 puts merchant.commit.to_json
-# => {"data":{"year":{"first_gengou":{"name":"貞観","number":4},"second_gengou":{"name":"","number":-1},"zodiac_name":"壬午","total_days":354},"month":{"number":1,"leaped":false,"days_name":"大","first_day":{"number":1,"zodiac_name":"庚午","remainder":"6-1282","western_date":"0862-02-03"},"odd_solar_terms":[{"index":5,"remainder":"34-5368"}],"even_solar_terms":[{"index":4,"remainder":"19-3532"}]},"day":{"number":1,"zodiac_name":"庚午","remainder":"6-1282","western_date":"0862-02-03"}},"operation":{"operated":false,"month":{"current":{"id":"","western_date":"","page":-1,"number":-1,"annotations":[]},"parent":{"id":"","western_date":"","page":-1,"number":-1,"annotations":[]}},"original":{"year":{"first_gengou":{"name":"貞観","number":4},"second_gengou":{"name":"","number":-1},"zodiac_name":"壬午","total_days":354},"month":{"number":1,"leaped":false,"days_name":"
-大","first_day":{"number":1,"zodiac_name":"庚午","remainder":"6-1282","western_date":"0862-02-03"},"odd_solar_terms":[{"index":5,"remainder":"34-5368"}],"even_solar_terms":[{"index":4,"remainder":"19-3532"}]},"day":{"number":1,"zodiac_name":"庚午","remainder":"6-1282","western_date":"0862-02-03"}}}}
+# => {"data":{"year":{"first_gengou":{"name":"貞観","number":4},"second_gengou":{"name":"","number":-1},"zodiac_name":"壬午","total_days":354},"month":{"number":1,"leaped":false,"days_name":"大","first_day":{"number":1,"zodiac_name":"庚午","remainder":"6-1282","western_date":"0862-02-03"},"odd_solar_terms":[{"index":5,"remainder":"34-5368"}],"even_solar_terms":[{"index":4,"remainder":"19-3532"}]},"day":{"number":1,"zodiac_name":"庚午","remainder":"6-1282","western_date":"0862-02-03"},"options":{}},"operation":{"operated":false,"month":{"current":{"id":"","western_date":"","page":-1,"number":-1,"annotations":[]},"parent":{"id":"","western_date":"","page":-1,"number":-1,"annotations":[]}},"original":{"year":{"first_gengou":{"name":"貞観","number":4},"second_gengou":{"name":"","number":-1},"zodiac_name":"壬午","total_days":354},"month":{"number":1,"leaped":false,"days_name":"大","first_day":{"number":1,"zodiac_name":"庚午","remainder":"6-1282","western_date":"0862-02-03"},"odd_solar_terms":[{"index":5,"remainder":"34-5368"}],"even_solar_terms":[{"index":4,"remainder":"19-3532"}]},"day":{"number":1,"zodiac_name":"庚午","remainder":"6-1282","western_date":"0862-02-03"},"options":{}}}}
 
 western_date = Date.new(1685, 2, 3)
 
@@ -70,7 +71,12 @@ western_date = Date.new(1685, 2, 3)
 # merchant = Zakuro::Merchant.new
 merchant.offer(condition: { date: western_date })
 puts merchant.commit.to_json
-# => {"data":{"year":{"first_gengou":{"name":"貞享","number":1},"second_gengou":{"name":"","number":-1},"zodiac_name":"甲子","total_days":354},"month":{"number":12,"leaped":false,"days_name":"大","first_day":{"number":1,"zodiac_name":"壬辰","remainder":"28-4182","western_date":"1685-01-05"},"odd_solar_terms":[{"index":1,"remainder":"30-890"}],"even_solar_terms":[{"index":2,"remainder":"45-2726"}]},"day":{"number":30,"zodiac_name":"辛酉","remainder":"57-4182","western_date":"1685-02-03"}},"operation":{"operated":false,"month":{"current":{"id":"","western_date":"","page":-1,"number":-1,"annotations":[]},"parent":{"id":"","western_date":"","page":-1,"number":-1,"annotations":[]}},"original":{"year":{"first_gengou":{"name":"貞享","number":1},"second_gengou":{"name":"","number":-1},"zodiac_name":"甲子","total_days":354},"month":{"number":12,"leaped":false,"days_name":"大","first_day":{"number":1,"zodiac_name":"壬辰","remainder":"28-4182","western_date":"1685-01-05"},"odd_solar_terms":[{"index":1,"remainder":"30-890"}],"even_solar_terms":[{"index":2,"remainder":"45-2726"}]},"day":{"number":30,"zodiac_name":"辛酉","remainder":"57-4182","western_date":"1685-02-03"}}}}
+# => {"data":{"year":{"first_gengou":{"name":"貞享","number":1},"second_gengou":{"name":"","number":-1},"zodiac_name":"","total_days":354},"month":{"number":12,"leaped":false,"days_name":"大","first_day":{"number":1,"zodiac_name":"壬辰","remainder":"28-4182","western_date":"1685-01-05"},"odd_solar_terms":[{"index":1,"remainder":"30-890"}],"even_solar_terms":[{"index":2,"remainder":"45-2726"}]},"day":{"number":30,"zodiac_name":"辛酉","remainder":"57-4182","western_date":"1685-02-03"},"options":{}},"operation":{"operated":false,"month":{"current":{"id":"","western_date":"","page":-1,"number":-1,"annotations":[]},"parent":{"id":"","western_date":"","page":-1,"number":-1,"annotations":[]}},"original":{"year":{"first_gengou":{"name":"貞享","number":1},"second_gengou":{"name":"","number":-1},"zodiac_name":"","total_days":354},"month":{"number":12,"leaped":false,"days_name":"大","first_day":{"number":1,"zodiac_name":"壬辰","remainder":"28-4182","western_date":"1685-01-05"},"odd_solar_terms":[{"index":1,"remainder":"30-890"}],"even_solar_terms":[{"index":2,"remainder":"45-2726"}]},"day":{"number":30,"zodiac_name":"辛酉","remainder":"57-4182","western_date":"1685-02-03"},"options":{}}}}
+
+# 期間検索
+merchant = Zakuro::Merchant.new(condition: { range: {start: Date.new(862, 2, 3), last: Date.new(862, 2, 4)}})
+puts merchant.commit.to_json
+# => {"list":[{"data":{"year":{"first_gengou":{"name":"貞観","number":4},"second_gengou":{"name":"","number":-1},"zodiac_name":"壬午","total_days":354},"month":{"number":1,"leaped":false,"days_name":"大","first_day":{"number":1,"zodiac_name":"庚午","remainder":"6-1282","western_date":"0862-02-03"},"odd_solar_terms":[{"index":5,"remainder":"34-5368"}],"even_solar_terms":[{"index":4,"remainder":"19-3532"}]},"day":{"number":1,"zodiac_name":"庚午","remainder":"6-1282","western_date":"0862-02-03"},"options":{}},"operation":{"operated":false,"month":{"current":{"id":"","western_date":"","page":-1,"number":-1,"annotations":[]},"parent":{"id":"","western_date":"","page":-1,"number":-1,"annotations":[]}},"original":{"year":{"first_gengou":{"name":"貞観","number":4},"second_gengou":{"name":"","number":-1},"zodiac_name":"壬午","total_days":354},"month":{"number":1,"leaped":false,"days_name":"大","first_day":{"number":1,"zodiac_name":"庚午","remainder":"6-1282","western_date":"0862-02-03"},"odd_solar_terms":[{"index":5,"remainder":"34-5368"}],"even_solar_terms":[{"index":4,"remainder":"19-3532"}]},"day":{"number":1,"zodiac_name":"庚午","remainder":"6-1282","western_date":"0862-02-03"},"options":{}}}},{"data":{"year":{"first_gengou":{"name":"貞観","number":4},"second_gengou":{"name":"","number":-1},"zodiac_name":"壬午","total_days":354},"month":{"number":1,"leaped":false,"days_name":"大","first_day":{"number":1,"zodiac_name":"庚午","remainder":"6-1282","western_date":"0862-02-03"},"odd_solar_terms":[{"index":5,"remainder":"34-5368"}],"even_solar_terms":[{"index":4,"remainder":"19-3532"}]},"day":{"number":2,"zodiac_name":"辛未","remainder":"7-1282","western_date":"0862-02-04"},"options":{}},"operation":{"operated":false,"month":{"current":{"id":"","western_date":"","page":-1,"number":-1,"annotations":[]},"parent":{"id":"","western_date":"","page":-1,"number":-1,"annotations":[]}},"original":{"year":{"first_gengou":{"name":"貞観","number":4},"second_gengou":{"name":"","number":-1},"zodiac_name":"壬午","total_days":354},"month":{"number":1,"leaped":false,"days_name":"大","first_day":{"number":1,"zodiac_name":"庚午","remainder":"6-1282","western_date":"0862-02-03"},"odd_solar_terms":[{"index":5,"remainder":"34-5368"}],"even_solar_terms":[{"index":4,"remainder":"19-3532"}]},"day":{"number":2,"zodiac_name":"辛未","remainder":"7-1282","western_date":"0862-02-04"},"options":{}}}}]}
 ```
 
 # 条件
@@ -80,26 +86,36 @@ puts merchant.commit.to_json
 | 項目名         | キー名  | hash内キー名 | データ型 | 備考               |
 |----------------|---------|--------------|----------|--------------------|
 | 基準日         | date    |              | Date     | 西暦日             |
-|                |         |              | String   | 和暦日             |
-| 範囲（開始日） | range   | start        | Date     |                    |
-| 範囲（終了日） |         | last         | Date     |                    |
+|                |         |              | String   | 和暦日/西暦日      |
+| 範囲（開始日）   | range   | start        | Date     | 西暦日             |
+|                |         |              | String   | 和暦日/西暦日      |
+| 範囲（終了日）   |         | last         | Date     | 西暦日             |
+|                |         |              | String   | 和暦日/西暦日      |
 | 列             | columns |              | Array    | 取得したい列の列名 |
-| オプション     | options |              | Array    | 取得オプション     |
+| オプション     | options |              | Hash<String, Object>    | 取得オプション     |
 
-現時点では `date` の西暦日のみ対応中です。
+現時点では `date` と `range` のみ対応中です。
 
 ## オプション
 
 | 項目名 | キー名    | データ型 | データ | 備考                   |
 |--------|-----------|----------|--------|------------------------|
-| 単位   | unit      | String   | year   | 年単位                 |
-|        |           |          | month  | 月単位                 |
-|        |           |          | day    | 日単位（デフォルト）   |
-| 没日   | lost_days | TRUE     |        | 没日あり               |
-|        |           | FALSE    |        | 没日なし（デフォルト） |
+| 暦     | version   | String   | Genka |  元嘉暦               |
+|        |           |          | Gihou |  儀鳳暦               |
+|        |           |          | Daien |  大衍暦              |
+|        |           |          | Senmyou | 宣明暦             |
+|        |           |          | Joukyou | 貞享暦             |
+|        |           |          | Kansei |  寛政暦             |
+|        |           |          | Tenpou |  天保暦             |
+|        |           |          | Gregorio | グレゴリオ暦        |
+|        |           |          |         | 指定なし（デフォルト） |
+| 没日   | dropped_days | TRUE     |        | 没日あり            |
+|        |             | FALSE    |        | 没日なし（デフォルト） |
 | 四季   | seasons   | TRUE     |        | 四季あり               |
 |        |           | FALSE    |        | 四季なし（デフォルト） |
 
+現時点では宣明暦の [没日](./doc/dropped_date.md) のみ試験的に対応しております（結果未検証）。
+
 # 期待値
 暦算値は『日本暦日原典』、元号の切り替えは『日本史年表　第5版』を範とします。
 
@@ -119,6 +135,12 @@ puts merchant.commit.to_json
 | 日付情報 | data      |   |   | Zakuro::Result::Data::SingleDay   | -      | 運用値（計算値は運用情報内を参照のこと）|
 | 運用情報 | operation |   |   | Zakuro::Result::Operation::Bundle | -      | -                                     |
 
+### Zakuro::Result::Range
+
+| 項目名   | キー名    | - | - | データ型                               | 参考値 | 備考                                　 |
+|----------|-----------|---|---|---------------------------------------|--------|---------------------------------------|
+| 日リスト | list      |   |   | Array\<Zakuro::Result::Data::Single\>  | -      | 範囲内の日付情報すべて                  |
+
 ### Zakuro::Result::SingleDay
 
 | 項目名                   | キー名 | -                | -            | データ型                        | 参考値     | 備考                       |
@@ -151,6 +173,7 @@ puts merchant.commit.to_json
 | 日の干支                 |        | zodiac_name      |              | String                          | 乙卯       | 日の干支                   |
 | 日の大余小余             |        | remainder        |              | String                          | 51-2479    | 大余小余                   |
 | 西暦日                   |        | western_date     |              | String                          | 0937-02-14 | 西暦日                     |
+| オプション             | options |                  | | Hash<String, Zakuro::Result::Data::Option::AbstractOption>|  | オプション値              |
 
 ### Zakuro::Result::Operation
 
@@ -176,10 +199,24 @@ puts merchant.commit.to_json
 | 月初日の西暦日     |          | western_date | 　          | String                                            | 0937-02-13                                                                                                          | 計算値               |
 | 原文頁数          |          | page         | 　          | Integer                                           | 178                                                                                                                 | 　                   |
 | 原文注釈番号      |          | number       | 　          | Integer                                            | 1                                                                                                                   | 　                   |
-| 注釈              |          | annotations | 　          | Array<Zakuro::Result::Operation::::MonthAnnotation> | 　                                                                                                                  | 　                   |
-| 注釈内容          | 　       |              | description | String                                             | 計算は51乙卯であるが, 日本紀略に甲寅朔とある。正月甲寅朔のユリウス暦日は2月13日となる。（元旦日食 をさけるための変更か） | 　                   |
+| 注釈              |          | annotations | 　          | Array\<Zakuro::Result::Operation::MonthAnnotation\> | 　                                                                                                                  | 　                   |
+| 注釈内容          | 　       |              | description | String                                             | 計算は51乙卯であるが, 日本紀略に甲寅朔とある。<br>正月甲寅朔のユリウス暦日は2月13日となる。（元旦日食 をさけるための変更か） | 　                   |
 | 注釈補記          | 　       |              | note        | String                                             | -                                                                                                                   | 原文訂正             |
 
+### Zakuro::Result::Data::Option::AbstractOption
+
+#### Zakuro::Result::Data::Option::DroppedDate::Option
+
+キー: dropped_date
+
+| 項目名               | キー名      | -          | -         | データ型                                               | 参考値   | 備考               |
+| -------------------- | ----------- | ---------- | --------- | ------------------------------------------------------ | -------- | ------------------ |
+| オプション値有無     | matched     |            |           | True/False                                             | true     |  |
+| 演算値               | calculation |            |           | Zakuro::Result::Data::Option::DroppedDate::Calculation |          |              |
+| 没余                 |             | remainder  |           | String                                                 | 59-34155 |                    |
+| 二十四節気           |             | solar_term |           | Zakuro::Result::Data::Option::DroppedDate::SolarTerm   |          |                    |
+| 二十四節気番号       |             |            | index     | Integer                                                | 6        |                    |
+| 二十四節気の大余小余 |             |            | remainder | String                                                 | 49-7203  |                    |
 
 # 元号
 
@@ -194,6 +231,11 @@ puts merchant.commit.to_json
 
 [宣明暦](./lib/zakuro/version/senmyou/README.md) のみ記載しております。
 
+# 例外
+
+条件不正などで例外が発生します。
+詳細は [例外処理](./doc/error.md) を参照してください。
+
 ## コントリビュート（Contributing）
 
 バグ報告/修正はこちらまで。

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.7.2

data/doc/dropped_date.md

@@ -0,0 +1,93 @@
+# 没日
+没日を端的に説明すると、1太陽年（365.24..日）を360日で表わすために、一定の法則で `存在しない日` として配置された日である
+
+太陽の運行に対応するため、基本的には二十四節気をもとに計算を行う
+
+# 期待値
+「日本暦日便覧」に従う
+
+## 計算
+「長慶宣明暦算法」に従う
+
+下記は該当箇所の引用と、それに対応する計算を示している
+
+```
+◯没日ヲ求ルノ術
+  没日ト云ハ毎日の気盈ノ數ツモリテ統法ノ八千四百ニ満タル日ヲ云其モトメヤウノ法ナリ
+```
+
+```
+常氣ノ小餘六千五百六十四秒三巳上ハ物之ヲ置テ
+  常氣ハ前ノ等法ニテ求メタル二十四氣トナリ其二十四節氣ノ内イツレニモ小余ノ數六千五百六十四秒三ヨリ以上アラハ没日ヲ求メヨトナリ
+  タトヘハ小余ノ數六千五百六十四秒アリテモ秒三ヨリ内ナラハモトムヘラカス秒ノ數ハスクナレトモ小余ノ數多クアラハ求ムヘシ
+  小余ノ一ハ秒ノ八ナレハナリ
+  畢竟ハ小余六千五百六十四秒三アルカ尤モソレヨリ以上アラハ求ムヘシ少シモ以下ナラハ求ムヘカラストナリ
+```
+
+次のパターンのみ求める
+* 常気の小余 >= 6564.3
+
+```
+三百六十ヲ以テ之乗シ別ニ秒ヲ置テ四十五ヲ以テ之乗シ小餘ノ之上ニ加フ
+  常氣ノ小余ノ數ニカクルナリ今立春ノ小余八千二百三十六秒七アリ
+  故に没日ヲ求メントテマツ其立春ノ小余八千二百三十六ニ三百六十ヲカクレハ二百九十六萬四千九百六十トナル
+  又別ニ秒七ヲ置テ是ニ四十五ヲカクレハ三百一十五トナル
+  此ヲ右ノ二百九十六萬四千九百六十ニ加フレハ合セテ二百九十六萬五千二百七十五トナル
+  又秒七ヲ八ニワリテ小余ノ次ニ置テ八千二百三十六八分七厘五毛トツテ子テ是ニ三百六十ヲカクレハ二百九十六萬五千二百七十五トナルモ同シ等法ナリ
+```
+
+ある立春の小余: 8236.7
+* A
+  * 8236 * 360 = 2964960
+  * 7 * 45 = 315
+  * 2964960 + 315 = 2965275
+* B
+  * 8236 + 7/8 = 8236.875 * 360 = 2965275
+
+```
+而ソ章歳ノ三百零六萬八千零五十五ヲ以テ直減シ
+  以ハ用ナリ置テト云心ナルヘシ此章歳ノ數三百零六萬八千零五十五ヲ置テコノ内ヲ右ノ二百九十六萬五千二百七十五去テ残テ一十萬零二千七百八十トナルナリ
+  細注ニ或ハ少ヲ以テ多ニ減ストアレトモ是ハアヤマリナルヘシ
+  タトヘハ常氣ノ小余八千三百九十九秒七アルトキニ右ノ法ノ如クニシテミレハ三百零二萬三千九百五十五トナル
+  コレ章歳ノ數ニ四萬四千一百タラサルナリ
+  然レハ必ラス定テ章歳ノ數ノ内ヲ減スルノ明トシ常氣ノ小余八千三百九十九秒七ヨリ多キクハナキケリ
+```
+章歳: 3068055
+
+* 3068055 - 2965275 = 102780
+  * 負数はない。負数であれば正数にする
+
+```
+残分ヲ置テ通餘ノ四萬四千一零五十五ヲ以テ之ヲ除シ商ヲ以テ日ト為 常氣ノ之大餘ヲ加フ甲子自之ヲ命シ等外ヲ用フ也
+  残分ト云ハ右ノ章歳ヲ減シタル残リ一十萬零二千七百八十トナリ此數ヲ置テ通余ノ四萬四千一零五十五ニテワレハ商ニ不盡一萬四千六百七十アリ
+  サテ此商二ニ常氣立春ノ大余五十六ヲ加レハ五十八トナル
+  コレヲ没日ノ大余ノ數トス
+  サテ右ノ不盡一萬四千六百七十ヲ没日ノ小余トス
+  其大余ノ數モシ六十ニ満ツルトキハハラヒ去リテ其残リヲ用テサテ前ノ二十四氣ニテ攴干ヲ付タル如ク紀法ノ圖ニテ付ヘシ今大余五十八ハ壬戌ニアタルナリ
+  立春一氣ノ内ニ壬戌ノ日アルヲ没日ノ日トス
+  サテ是ハ立春ノ一氣ヲ記セリ
+  二十四氣ノ内イツレニテモ有没日ノ数小余六千五百六十四秒巳上アラハ右ノ如クニシテ求ムヘシ
+```
+
+通余: 44055
+
+* 102780 / 44055 = 2.3329... ≒ 2
+* 102780 % 44055 = 14670
+* 56（立春大余） + 2 = 58
+
+没日: 58-14670
+
+```
+次ヲ求ルノ術
+```
+
+```
+大餘ニ九  小餘ニ二萬八千二百六十
+  二十四氣ノ内ヲ考ヘテイツレニテモ有没日ノ小余六千五百六十四秒三以上アル時ハ右ノ法ノ如ニシテ求ムヘシ
+  又一術アリモトメ得タル没日ノ大余ニ九加エ小余ニ二萬八千二百六十加エテ小余通余ノ四萬四千零五十五ニ満レハ一ニツツメテ其一ヲ大余ニ加ヘ大余六十ニ満レハ去此ノ如ク累加スレハ次々ノ没日ヲ求メ得ルナリ
+  其アル日ハ有没日ノ六千五百六十四秒三以上アル處ノ氣ノ内ニアルトシルヘシ
+
+```
+* 大余 + 9
+* 小余 + 28260
+  * 小余 > 44055 の場合は繰り上げ

data/doc/error.md

@@ -0,0 +1,45 @@
+# 例外処理
+
+## Zakuro::Exception::ZakuroError
+
+例外は `ZakuroError` に集約されます。
+
+```
+merchant = Zakuro::Merchant.new(condition: {})
+merchant.commit
+Traceback (most recent call last):
+        4: from ./bin/console:14:in `<main>'
+        3: from (irb):5
+        2: from /Users/ty/ruby/zakuro/lib/zakuro/merchant.rb:81:in `commit'
+        1: from /Users/ty/ruby/zakuro/lib/zakuro/merchant.rb:132:in `make_uncommitable_error'
+Zakuro::Exception::ZakuroError (an error has occurred:[{"code":"ERROR_0203","message":"検索不可能な日付指定です。"}])
+```
+
+例外に対応したコードとメッセージを取得できます。
+```
+merchant = Zakuro::Merchant.new(condition: {})
+begin
+  merchant.commit
+rescue Zakuro::Exception::ZakuroError => e
+  p e.causes[0].code
+  p e.causes[0].message
+end
+=> "ERROR_0203"
+=> "検索不可能な日付指定です。"
+```
+
+## エラー種別
+
+`Zakuro::Exception::Case::Pattern` の通りです。
+
+|コード|メッセージ|引数長|
+|:----|:----|:----|
+|ERROR_0001|内部エラーです。|0|
+|ERROR_0101|日付の型は文字列/日付です。指定型:%s|1|
+|ERROR_0102|範囲の型はhashです。指定型:%s|1|
+|ERROR_0103|オプションの型はhashです。指定型:%s|1|
+|ERROR_0104|列の型は配列です。指定型:%s|1|
+|ERROR_0105|条件の型は配列です。指定型:%s|1|
+|ERROR_0201|一日検索の日付指定が誤っています。|0|
+|ERROR_0202|範囲検索の日付指定が誤っています。|0|
+|ERROR_0203|検索不可能な日付指定です。|0|

data/doc/operation/transfer.rb

@@ -39,25 +39,25 @@ table.each do |row|
     'diffs' => {
       'month' => {
         'number' => {
-          'calc' => month_str_to_number(row['月（計）']),
-          'actual' => month_str_to_number(row['月（実）'])
+          'src' => month_str_to_number(row['月（計）']),
+          'dest' => month_str_to_number(row['月（実）'])
         },
         'leaped' => {
-          'calc' => month_str_to_leaped(row['月（計）']),
-          'actual' => month_str_to_leaped(row['月（実）'])
+          'src' => month_str_to_leaped(row['月（計）']),
+          'dest' => month_str_to_leaped(row['月（実）'])
         },
         'days' => {
-          'calc' => row['月大小（計）'],
-          'actual' => row['月大小（実）']
+          'src' => row['月大小（計）'],
+          'dest' => row['月大小（実）']
         }
       },
       'solar_term' => {
-        'calc' => {
+        'src' => {
           'index' => row['中気番号（計）'],
           'to' => row['中気移動先'],
           'zodiac_name' => row['中気（計）']
         },
-        'actual' => {
+        'dest' => {
           'index' => row['中気番号（実）'],
           'from' => row['中気移動元'],
           'zodiac_name' => row['中気（実）']

data/lib/zakuro/calculation/base/day.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require_relative '../../era/western/calendar'
+require_relative '../cycle/abstract_remainder'
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Calculation
+    # :nodoc:
+    module Base
+      #
+      # Day 日
+      #
+      class Day
+        # @return [Integer] 不正日
+        INVALID_NUMBER = -1
+
+        # @return [Integer] 日
+        attr_reader :number
+        # @return [Western::Calendar] 西暦日
+        attr_reader :western_date
+        # @return [Cycle::AbstractRemainder] 和暦日
+        attr_reader :remainder
+
+        #
+        # 初期化
+        #
+        # @param [Integer] number 日
+        # @param [Western::Calendar] western_date 西暦日
+        # @param [Cycle::AbstractRemainder] 和暦日
+        #
+        def initialize(number: INVALID_NUMBER, western_date: Western::Calendar.new,
+                       remainder: Cycle::AbstractRemainder.new)
+          @number = number
+          @western_date = western_date
+          @remainder = remainder
+        end
+
+        #
+        # 不正か
+        #
+        # @return [True] 不正
+        # @return [False] 不正なし
+        #
+        def invalid?
+          number == INVALID_NUMBER
+        end
+      end
+    end
+  end
+end

data/lib/zakuro/calculation/base/gengou.rb

@@ -15,7 +15,7 @@ module Zakuro
         # @return [Western::Calendar] 開始日
         attr_reader :start_date
         # @return [Western::Calendar] 終了日
-        attr_reader :end_date
+        attr_reader :last_date
         # @return [Array<LinearGengou>] 1行目元号
         attr_reader :first_line
         # @return [Array<LinearGengou>] 2行目元号
@@ -25,14 +25,14 @@ module Zakuro
         # 初期化
         #
         # @param [Western::Calendar] start_date 開始日
-        # @param [Western::Calendar] end_date 終了日
+        # @param [Western::Calendar] last_date 終了日
         # @param [Array<LinearGengou>] first_line 1行目元号
         # @param [Array<LinearGengou>] second_line 2行目元号
         #
-        def initialize(start_date: Western::Calendar.new, end_date: Western::Calendar.new,
+        def initialize(start_date: Western::Calendar.new, last_date: Western::Calendar.new,
                        first_line: [], second_line: [])
           @start_date = start_date
-          @end_date = end_date
+          @last_date = last_date
           @first_line = first_line
           @second_line = second_line
         end
@@ -67,6 +67,52 @@ module Zakuro
           LinearGengou.new
         end
 
+        #
+        # 元号を取得する
+        #
+        # @param [String] name 元号名
+        #
+        # @return [LinearGengou] 元号
+        #
+        def match_by_name(name:)
+          result = match_first_line_by_name(name: name)
+          return result unless result.invalid?
+
+          result = match_second_line_by_name(name: name)
+
+          result
+        end
+
+        #
+        # 1行目元号を取得する
+        #
+        # @param [String] name 元号名
+        #
+        # @return [LinearGengou] 1行目元号
+        #
+        def match_first_line_by_name(name:)
+          @first_line.each do |line|
+            return line.clone if line.name == name
+          end
+
+          LinearGengou.new
+        end
+
+        #
+        # 2行目元号を取得する
+        #
+        # @param [String] name 元号名
+        #
+        # @return [LinearGengou] 2行目元号
+        #
+        def match_second_line_by_name(name:)
+          @second_line.each do |line|
+            return line.clone if line.name == name
+          end
+
+          LinearGengou.new
+        end
+
         #
         # 不正か
         #

data/lib/zakuro/calculation/base/linear_gengou.rb

@@ -17,7 +17,7 @@ module Zakuro
         # @return [Western::Calendar] 開始日
         attr_reader :start_date
         # @return [Western::Calendar] 終了日
-        attr_reader :end_date
+        attr_reader :last_date
         # @return [String] 元号名
         attr_reader :name
         # @return [Integer] 年
@@ -27,14 +27,14 @@ module Zakuro
         # 初期化
         #
         # @param [Western::Calendar] start_date 開始日
-        # @param [Western::Calendar] end_date 終了日
+        # @param [Western::Calendar] last_date 終了日
         # @param [String] name 元号名
         # @param [Integer] 元号年
         #
-        def initialize(start_date: Western::Calendar.new, end_date: Western::Calendar.new,
+        def initialize(start_date: Western::Calendar.new, last_date: Western::Calendar.new,
                        name: '', year: INVALID_YEAR)
           @start_date = start_date
-          @end_date = end_date
+          @last_date = last_date
           @name = name
           @year = year
         end
@@ -62,11 +62,11 @@ module Zakuro
 
           return false if @start_date.invalid?
 
-          return false if @end_date.invalid?
+          return false if @last_date.invalid?
 
           return false if date < @start_date
 
-          return false if date > @end_date
+          return false if date > @last_date
 
           true
         end

data/lib/zakuro/calculation/base/operated_year.rb

@@ -2,7 +2,7 @@
 
 require_relative './year'
 
-require_relative '../../version/context'
+require_relative '../../context/context'
 
 # :nodoc:
 module Zakuro
@@ -17,11 +17,11 @@ module Zakuro
         #
         # 初期化
         #
-        # @param [Context] context 暦コンテキスト
+        # @param [Context::Context] context 暦コンテキスト
         # @param [Array<OperatedMonth>] months 年内の全ての月
         # @param [Integer] total_days 年の日数
         #
-        def initialize(context: Context.new, months: [], total_days: 0)
+        def initialize(context: Context::Context.new, months: [], total_days: 0)
           super(context: context, months: months, total_days: total_days)
         end
 

data/lib/zakuro/calculation/base/year.rb

@@ -4,7 +4,7 @@ require_relative '../cycle/zodiac'
 
 require_relative '../../era/western/calendar'
 
-require_relative '../../version/context'
+require_relative '../../context/context'
 
 # :nodoc:
 module Zakuro
@@ -16,7 +16,7 @@ module Zakuro
       # Year 年
       #
       class Year
-        # @return [Context] 暦コンテキスト
+        # @return [Context::Context] 暦コンテキスト
         attr_reader :context
         # @return [Array<Month>] 年内の全ての月
         attr_reader :months
@@ -26,11 +26,11 @@ module Zakuro
         #
         # 初期化
         #
-        # @param [Context] context 暦コンテキスト
+        # @param [Context::Context] context 暦コンテキスト
         # @param [Array<Month>] months 年内の全ての月
         # @param [Integer] total_days 年の日数
         #
-        def initialize(context: Context.new, months: [], total_days: 0)
+        def initialize(context: Context::Context.new, months: [], total_days: 0)
           @context = context
           @months = months
           @total_days = total_days

data/lib/zakuro/calculation/cycle/abstract_remainder.rb

@@ -43,16 +43,16 @@ module Zakuro
         # 初期化
         #
         # @param [Integer] base_day 1大余に必要な小余（暦によって基数が異なる）
-        # @param [Integer] base_mitune 1小余に必要な秒（暦によって基数が異なる）
+        # @param [Integer] base_minute 1小余に必要な秒（暦によって基数が異なる）
         # @param [Integer] day 大余（"日"に相当）
         # @param [Integer] minute 小余（"分"に相当）
         # @param [Integer] second 秒
         # @param [Integer] total 繰り上げなしの小余
         #
-        def initialize(base_day: -1, base_mitune: -1, day: -1, minute: -1, second: -1, total: -1)
+        def initialize(base_day: -1, base_minute: -1, day: -1, minute: -1, second: -1, total: -1)
           @base_limit = LIMIT
           @base_day = base_day
-          @base_minute = base_mitune
+          @base_minute = base_minute
           @limited = true
 
           set(day: day, minute: minute, second: second, total: total)
@@ -113,6 +113,8 @@ module Zakuro
         # @return [True] 無効
         # @return [False] 有効
         #
+        # @raise [ArgumentError] 引数エラー
+        #
         def invalid?(param: self)
           raise ArgumentError, 'unmatch parameter type' unless param.is_a?(AbstractRemainder)