zakuro 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 567799c25255c97ec707d421b465358c1209afeef0d8c2f1c84a9b3bd5e65148
-  data.tar.gz: bff172488e9ea94a8da83d09fa1dc9bd62a28de871ad0cc41217d20ff5dc2b94
+  metadata.gz: b3e4e967b105b46ffc94cc792328a5020aa0535f797dbf5bc5bc1a8eb2786cd8
+  data.tar.gz: 71f0fce3e9592469062df9ef667b2e146754c79bde93647a020c942b21cf3fb1
 SHA512:
-  metadata.gz: daf11f9f9319d23fbba463571cb8f76184aeb7b6133fcde661bd06773113f37bc9684e8680a848c4998a96ea287f371ca123f878a7bb5dbdfb2ed499c434f8a7
-  data.tar.gz: 3624066b34b4271961793f58bbad9509b046a3df967df4513de195352237386ccd5848b9b5f72c8838f6efb944fac1129b494001c570aa2cb5a93440d089e173
+  metadata.gz: d4acc827cebcebad50f33b3c255a23b28ebab62b05fc322ec0e304fa7d738df9479f3aded5e776e6d741d31f2c8812a30bde7ee777f3841eb140be3f44479ce8
+  data.tar.gz: c3a8304e0afdd13b2bc31d7107594816d185114bd7b67701bc3d2f1a395cc7dfeb7c19ff653febe57fc654f8f0feaac0857a0fa2ba2db6aba5d48f2ae87231f8

data/README.md

@@ -30,7 +30,9 @@ Or install it yourself as:
 
 開発途中です。
 
-下記表で対応済とした暦の1日検索のみ対応しております。
+1日検索/期間検索に対応しております。
+
+下記表で対応済の暦は使用可能です。
 
 |開始日|暦   |計算方法|対応|
 |:----|:----|:----|:----|
@@ -71,6 +73,11 @@ western_date = Date.new(1685, 2, 3)
 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"}}}}
+
+# 期間検索
+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"}},"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":2,"zodiac_name":"辛未","remainder":"7-1282","western_date":"0862-02-04"}},"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"}}}}]}
 ```
 
 # 条件
@@ -119,6 +126,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
 
 | 項目名                   | キー名 | -                | -            | データ型                        | 参考値     | 備考                       |
@@ -176,8 +189,8 @@ 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                                             | -                                                                                                                   | 原文訂正             |
 
 

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.6.1

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

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/era/gengou/internal/connector.rb

@@ -0,0 +1,107 @@
+# frozen_string_literal: true
+
+require_relative '../../../../era/japan/gengou/resource'
+require_relative '../../../../era/japan/calendar'
+require_relative '../../../../era/western/calendar'
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Calculation
+    # :nodoc:
+    module Gengou
+      #
+      # Connector 元号接続器
+      #
+      # 現在は"明徳"のみを解決している
+      #   元中1年4月28日                  元中9年閏10月4日        明徳5年7月4日
+      #   1384-05-18                     1392-11-18              1394-8-1
+      #  [1] |-------------元中---------------|---------明徳------------|
+      #  [2]            |---------明徳--------|
+      #             明徳1年3月26日
+      #             1390-04-12
+      #
+      #  * 明徳は2行目元号から始まる
+      #  * 1392-11-19より1行目元号に移行する
+      #  * 移行のタイミングで元号年を引き継げるようにする
+      #
+      class Connector
+        # @return [Array<Counter>] 未解決元号
+        attr_reader :unsolved_list
+
+        #
+        # 初期化
+        #
+        def initialize
+          @unsolved_list = []
+        end
+
+        #
+        # 元号を更新する
+        #
+        # @param [Array<Array<Counter>>] lines 全行元号
+        #
+        def update(lines: [])
+          lines.each do |line|
+            line.each_with_index do |gengou, index|
+              next unless gengou.changed?
+
+              line[index] = replace(gengou: gengou)
+            end
+          end
+        end
+
+        #
+        # 元号を年を更新した元号に入れ替える
+        #
+        # @param [Counter] gengou 元号
+        #
+        # @return [Counter] 元号/更新済元号
+        #
+        def replace(gengou:)
+          matched_index = -1
+          @unsolved_list.each_with_index do |unsolved, index|
+            next unless unsolved.name == gengou.name
+
+            matched_index = index
+            break
+          end
+
+          if matched_index == -1
+            @unsolved_list.push(gengou)
+            return gengou
+          end
+
+          matched = @unsolved_list[matched_index]
+
+          result = recreate(gengou: gengou, unsolved: matched)
+
+          @unsolved_list[matched_index] = result
+
+          # 分離した元号の末尾まで到達した
+          @unsolved_list.delete_at(matched_index) unless result.change_last_date?
+
+          result
+        end
+
+        #
+        # 年を更新した元号を生成する
+        #
+        # @param [Counter] gengou 元号
+        # @param [Counter] unsolved 未解決元号
+        #
+        # @return [Counter] 更新済元号
+        #
+        def recreate(gengou:, unsolved:)
+          japan_year = gengou.japan_year
+          japan_year = unsolved.japan_year if unsolved.japan_year > gengou.japan_year
+
+          Counter.new(
+            gengou: gengou.gengou, start_date: gengou.start_date,
+            last_date: gengou.last_date, japan_year: japan_year
+          )
+        end
+      end
+    end
+  end
+end

data/lib/zakuro/calculation/era/gengou/internal/counter.rb

@@ -0,0 +1,214 @@
+# frozen_string_literal: true
+
+require_relative '../../../../era/japan/gengou/resource'
+require_relative '../../../../era/japan/calendar'
+require_relative '../../../../era/western/calendar'
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Calculation
+    # :nodoc:
+    module Gengou
+      #
+      # Counter 加算元号
+      #
+      class Counter
+        # @return [Integer] 不正値
+        INVALID_YEAR = -1
+
+        # @return [Japan::Resource::Gengou] 元号
+        attr_reader :gengou
+        # @return [Integer] 元号年
+        attr_reader :japan_year
+        # @return [Integer] 西暦年
+        attr_reader :western_year
+        # @return [Western::Calendar] 西暦開始年
+        attr_reader :start_date
+        # @return [Western::Calendar] 西暦終了年
+        attr_reader :last_date
+
+        #
+        # 初期化
+        #
+        # @param [Japan::Resource::Gengou] gengou 元号
+        # @param [Western::Calendar] start_date 西暦開始年
+        # @param [Western::Calendar] last_date 西暦終了年
+        # @param [Integer] japan_year 和暦年
+        #
+        def initialize(gengou: Japan::Resource::Gengou.new,
+                       start_date: Western::Calendar.new, last_date: Western::Calendar.new,
+                       japan_year: INVALID_YEAR)
+          @gengou = gengou
+          @japan_year = japan_year
+          @japan_year = gengou.both_start_year.japan if @japan_year == INVALID_YEAR
+          @western_year = gengou.both_start_year.western
+
+          @start_date = start_date.clone
+          @last_date = last_date.clone
+
+          select_valid_date
+        end
+
+        #
+        # 和暦開始日を取得する
+        #
+        # @return [Japan::Calendar] 和暦開始日
+        #
+        def japan_start_date
+          return Japan::Calendar.new if @gengou.invalid?
+
+          @gengou.both_start_date.japan
+        end
+
+        #
+        # 西暦開始日を取得する
+        #
+        # @return [Western::Calendar] 西暦開始日
+        #
+        def western_start_date
+          return Western::Calendar.new if @gengou.invalid?
+
+          @start_date
+        end
+
+        #
+        # 西暦終了日を取得する
+        #
+        # @return [Western::Calendar] 西暦終了日
+        #
+        def western_last_date
+          return Western::Calendar.new if @gengou.invalid?
+
+          @last_date
+        end
+
+        #
+        # 次年にする
+        #
+        # @return [MultiGengou] 自身
+        #
+        def next_year
+          @japan_year += 1
+          @western_year += 1
+
+          self
+        end
+
+        #
+        # 元号名を取得する
+        #
+        # @return [String] 元号名
+        #
+        def name
+          return '' unless @gengou
+
+          @gengou.name
+        end
+
+        #
+        # 不正か
+        #
+        # @return [True] 不正
+        # @return [False] 不正なし
+        #
+        def invalid?
+          @gengou.invalid? || @japan_year == INVALID_YEAR || @western_year == INVALID_YEAR
+        end
+
+        #
+        # 指定した日が元号に含まれるか
+        #
+        # @param [Western::Calendar] date 日
+        #
+        # @return [True] 含まれる
+        # @return [False] 含まれない
+        #
+        def include?
+          @gengou.include?
+        end
+
+        #
+        # 元は1繋ぎであった元号が別の行に存在するか（設定値から変更されているか）？
+        #
+        # @return [True] 存在する
+        # @return [False] 存在しない
+        #
+        def changed?
+          return true if change_start_date?
+
+          return true if change_last_date?
+
+          false
+        end
+
+        #
+        # 開始日が設定された開始日と異なるか（行が変更されているか）
+        #
+        # @return [True] 異なる
+        # @return [False] 同一
+        #
+        def change_start_date?
+          return false if invalid?
+
+          @start_date != native_start_date
+        end
+
+        #
+        # 終了日が設定された終了日と異なるか（行が変更されているか）
+        #
+        # @return [True] 異なる
+        # @return [False] 同一
+        #
+        def change_last_date?
+          return false if invalid?
+
+          @last_date != native_last_date
+        end
+
+        #
+        # ディープコピー
+        #
+        # @param [MultiGengou] obj 自身
+        #
+        def initialize_copy(obj)
+          @gengou = obj.gengou.clone
+          @japan_year = obj.japan_year
+          @western_year = obj.western_year
+          @start_date = obj.start_date.clone
+          @last_date = obj.last_date.clone
+        end
+
+        private
+
+        #
+        # 有効な日付範囲を選択する
+        #
+        def select_valid_date
+          return if @gengou.invalid?
+
+          @start_date = @gengou.both_start_date.western.clone if @start_date.invalid?
+          @last_date = @gengou.last_date.clone if @last_date.invalid?
+        end
+
+        #
+        # 設定された元号の開始日を取得する
+        #
+        # @return [Western::Calendar]設定された元号の開始日
+        #
+        def native_start_date
+          @gengou.both_start_date.western
+        end
+
+        #
+        # 設定された元号の終了日を取得する
+        #
+        # @return [Western::Calendar] 設定された元号の終了日
+        #
+        def native_last_date
+          @gengou.last_date
+        end
+      end
+    end
+  end
+end

data/lib/zakuro/calculation/era/gengou/internal/publisher.rb

@@ -0,0 +1,104 @@
+# frozen_string_literal: true
+
+require_relative '../../../../era/western/calendar'
+require_relative '../../../base/linear_gengou'
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Calculation
+    # :nodoc:
+    module Gengou
+      # Publisher
+      #
+      # 元号発行
+      #
+      module Publisher
+        #
+        # 発行する
+        #
+        # @param [Western::Calendar] start_date 西暦開始日
+        # @param [Western::Calendar] last_date 西暦終了日
+        # @param [Array<Counter>] first_gengou 1行目元号
+        # @param [Array<Counter>] second_gengou 2行目元号
+        #
+        # @return [Base::Gengou] 元号
+        #
+        def self.run(start_date: Western::Calendar.new, last_date: Western::Calendar.new,
+                     first_gengou: [], second_gengou: [])
+
+          Base::Gengou.new(
+            start_date: start_date,
+            last_date: last_date,
+            first_line: to_linear_gengou(
+              start_date: start_date, last_date: last_date, gengou_list: first_gengou
+            ),
+            second_line: to_linear_gengou(
+              start_date: start_date, last_date: last_date, gengou_list: second_gengou
+            )
+          )
+        end
+
+        #
+        # 直列元号に変換する
+        #
+        #   * 最初の元号：開始日～その元号の終了日
+        #   * 中間の元号：その元号の開始日～その元号の終了日
+        #   * 最後の元号：その元号の開始日～終了日
+        #
+        # @param [Western::Calendar] start_date 西暦開始日
+        # @param [Western::Calendar] last_date 西暦終了日
+        # @param [Array<Counter>] gengou_list 元号リスト
+        #
+        # @return [Array<Base::LinearGengou>] 元号リスト
+        #
+        def self.to_linear_gengou(start_date:, last_date:, gengou_list: [])
+          return [] if gengou_list.size.zero?
+
+          result = []
+
+          gengou_list.each do |gengou|
+            if gengou.invalid?
+              # 無効元号は無効のままにする
+              result.push(Base::LinearGengou.new)
+              next
+            end
+
+            linear_gengou = to_limited_linear_gengou(
+              start_date: start_date,
+              last_date: last_date,
+              gengou: gengou
+            )
+            result.push(linear_gengou)
+          end
+
+          result
+        end
+
+        #
+        # 範囲を限定した直列元号に変換する
+        #
+        # * 開始日・終了日により範囲を狭める
+        #
+        # @param [Western::Calendar] start_date 西暦開始日
+        # @param [Western::Calendar] last_date 西暦終了日
+        # @param [Counter] gengou 加算元号
+        #
+        # @return [Base::LinearGengou] 元号
+        #
+        def self.to_limited_linear_gengou(start_date:, last_date:, gengou:)
+          gengou_start_date = gengou.western_start_date.clone
+          gengou_last_date = gengou.western_last_date.clone
+
+          gengou_start_date = start_date.clone if start_date > gengou_start_date
+          gengou_last_date = last_date.clone if last_date < gengou_last_date
+
+          Base::LinearGengou.new(
+            start_date: gengou_start_date, last_date: gengou_last_date,
+            name: gengou.name, year: gengou.japan_year
+          )
+        end
+      end
+    end
+  end
+end