zakuro 0.5.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47e40b8ff5fd4b60fffed41193862d39a4d0569facec9c12f0aef65391bb4103
-  data.tar.gz: a411cb2f43e952c52892ba4b5505ada7c96706effd2f4dae4019e0f39f409c01
+  metadata.gz: 294b07e6f6f82cad6ed7d5332d96a0c147ee1cbcbb842faa745918f1d8fbac2e
+  data.tar.gz: 41341f57aab606cea9a86c75aa4dbef8a8d247421d7428ddf5f1e442afc1b8db
 SHA512:
-  metadata.gz: 640e6519e03854a38da45e19dbbf589762a4f24b89c55b683383eb56e88471f4469ee41cde88fb3a1d3f91862091d323f820a9e46b9a9b3297826d62f40d5159
-  data.tar.gz: 0c9d510a3ffac317b74286013f6fd0e476074ab1a8de2b7368d710d91e1a9f10f114340eb8a66f88b3e28795865bf5a483ce1a8aa49ae8382bee40104fb85a3b
+  metadata.gz: 9f3aee8d972a13e41ae98cb6b600f2032e833380a845513b2a738bf045e7d36a719a2e31161fd90f23194bdee4e0a690dc931934ad30ab0940742f20ea0f7bc7
+  data.tar.gz: 8c8ea9c23b11c28910cbfcdad25dec4720f919a1bbb0551737f8cf82cc62cd59621dcdd4770580d81c7a4a1c8d8859765e3ae7cd39592369a25dd89e1da9932d

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日検索/期間検索に対応しております。
+
+下記表で対応済の暦は使用可能です。
 
 |開始日|暦   |計算方法|対応|
 |:----|:----|:----|:----|
@@ -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"}}}}]}
 ```
 
 # 条件
@@ -80,13 +87,15 @@ 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    | 取得オプション     |
 
-現時点では `date` の西暦日のみ対応中です。
+現時点では `date` と `range` のみ対応中です。
 
 ## オプション
 
@@ -119,6 +128,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 +191,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

@@ -0,0 +1 @@
+0.7.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/gengou.rb

@@ -0,0 +1,128 @@
+# frozen_string_literal: true
+
+require_relative '../../era/western/calendar'
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Calculation
+    # :nodoc:
+    module Base
+      #
+      # Gengou 元号
+      #
+      class Gengou
+        # @return [Western::Calendar] 開始日
+        attr_reader :start_date
+        # @return [Western::Calendar] 終了日
+        attr_reader :last_date
+        # @return [Array<LinearGengou>] 1行目元号
+        attr_reader :first_line
+        # @return [Array<LinearGengou>] 2行目元号
+        attr_reader :second_line
+
+        #
+        # 初期化
+        #
+        # @param [Western::Calendar] start_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, last_date: Western::Calendar.new,
+                       first_line: [], second_line: [])
+          @start_date = start_date
+          @last_date = last_date
+          @first_line = first_line
+          @second_line = second_line
+        end
+
+        #
+        # 1行目元号を取得する
+        #
+        # @param [Western::Calendar] date 西暦日
+        #
+        # @return [LinearGengou] 1行目元号
+        #
+        def match_first_line(date: Western::Calendar)
+          @first_line.each do |line|
+            return line.clone if line.include?(date: date)
+          end
+
+          LinearGengou.new
+        end
+
+        #
+        # 2行目元号を取得する
+        #
+        # @param [Western::Calendar] date 西暦日
+        #
+        # @return [LinearGengou] 2行目元号
+        #
+        def match_second_line(date: Western::Calendar)
+          @second_line.each do |line|
+            return line.clone if line.include?(date: date)
+          end
+
+          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
+
+        #
+        # 不正か
+        #
+        # @return [True] 不正
+        # @return [False] 不正なし
+        #
+        def invalid?
+          @first_line.size.zero? && @second_line.size.zero?
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+require_relative '../../era/western/calendar'
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Calculation
+    # :nodoc:
+    module Base
+      #
+      # LinearGengou 直列元号
+      #
+      class LinearGengou
+        INVALID_YEAR = -1
+
+        # @return [Western::Calendar] 開始日
+        attr_reader :start_date
+        # @return [Western::Calendar] 終了日
+        attr_reader :last_date
+        # @return [String] 元号名
+        attr_reader :name
+        # @return [Integer] 年
+        attr_reader :year
+
+        #
+        # 初期化
+        #
+        # @param [Western::Calendar] start_date 開始日
+        # @param [Western::Calendar] last_date 終了日
+        # @param [String] name 元号名
+        # @param [Integer] 元号年
+        #
+        def initialize(start_date: Western::Calendar.new, last_date: Western::Calendar.new,
+                       name: '', year: INVALID_YEAR)
+          @start_date = start_date
+          @last_date = last_date
+          @name = name
+          @year = year
+        end
+
+        #
+        # 不正か
+        #
+        # @return [True] 不正
+        # @return [False] 不正なし
+        #
+        def invalid?
+          @name == '' || @year == INVALID_YEAR
+        end
+
+        #
+        # 範囲内か
+        #
+        # @param [Western::Calendar] date 西暦日
+        #
+        # @return [True] 範囲内
+        # @return [False] 範囲外
+        #
+        def include?(date: Western::Calendar.new)
+          return false if invalid?
+
+          return false if @start_date.invalid?
+
+          return false if @last_date.invalid?
+
+          return false if date < @start_date
+
+          return false if date > @last_date
+
+          true
+        end
+      end
+    end
+  end
+end

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

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 require_relative './year'
-require_relative './multi_gengou'
+
+require_relative '../../version/context'
 
 # :nodoc:
 module Zakuro
@@ -16,23 +17,12 @@ module Zakuro
         #
         # 初期化
         #
-        # @param [Gengou] multi_gengou 元号
+        # @param [Context] context 暦コンテキスト
         # @param [Array<OperatedMonth>] months 年内の全ての月
         # @param [Integer] total_days 年の日数
-        # @param [Western::Calendar] new_year_date 元旦
         #
-        def initialize(multi_gengou: MultiGengou.new, new_year_date: Western::Calendar.new,
-                       months: [], total_days: 0)
-          super(multi_gengou: multi_gengou, new_year_date: new_year_date,
-                months: months, total_days: total_days)
-        end
-
-        def commit
-          super
-
-          return if months.empty?
-
-          @new_year_date = months[0].first_day.western_date
+        def initialize(context: Context.new, months: [], total_days: 0)
+          super(context: context, months: months, total_days: total_days)
         end
 
         #

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

@@ -2,6 +2,10 @@
 
 require_relative '../cycle/zodiac'
 
+require_relative '../../era/western/calendar'
+
+require_relative '../../version/context'
+
 # :nodoc:
 module Zakuro
   # :nodoc:
@@ -12,28 +16,23 @@ module Zakuro
       # Year 年
       #
       class Year
-        # @return [Gengou] 元号
-        attr_reader :multi_gengou
+        # @return [Context] 暦コンテキスト
+        attr_reader :context
         # @return [Array<Month>] 年内の全ての月
         attr_reader :months
         # @return [Integer] 年の日数
         attr_reader :total_days
-        # @return [Western::Calendar] 元旦
-        attr_reader :new_year_date
 
         #
         # 初期化
         #
-        # @param [Gengou] multi_gengou 元号
+        # @param [Context] context 暦コンテキスト
         # @param [Array<Month>] months 年内の全ての月
         # @param [Integer] total_days 年の日数
-        # @param [Western::Calendar] new_year_date 元旦
         #
-        def initialize(multi_gengou: MultiGengou.new, new_year_date: Western::Calendar.new,
-                       months: [], total_days: 0)
-          @multi_gengou = multi_gengou
+        def initialize(context: Context.new, months: [], total_days: 0)
+          @context = context
           @months = months
-          @new_year_date = new_year_date
           @total_days = total_days
         end
 
@@ -58,21 +57,34 @@ module Zakuro
         # @return [MultiGengou] 自身
         #
         def next_year
-          @multi_gengou.next_year
-
-          @new_year_date += @total_days
           @total_days = 0
 
           self
         end
 
+        #
+        # 年初を取得する
+        #
+        # @return [Western::Calendar] 年初
+        #
+        def new_year_date
+          return Western::Calendar.new unless months
+
+          return Western::Calendar.new if months.size.zero?
+
+          @months[0].western_date
+        end
+
         #
         # 十干十二支を取得する
         #
         # @return [String] 十干十二支
         #
         def zodiac_name
-          Cycle::Zodiac.year_name(western_year: @new_year_date.year)
+          date = new_year_date
+          return '' if date.invalid?
+
+          Cycle::Zodiac.year_name(western_year: date.year)
         end
 
         #

data/lib/zakuro/calculation/era/gengou/abstract_scroll.rb

@@ -0,0 +1,209 @@
+# frozen_string_literal: true
+
+require_relative '../../../era/western/calendar'
+require_relative '../../base/gengou'
+require_relative '../../base/linear_gengou'
+require_relative './internal/connector'
+require_relative './internal/publisher'
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Calculation
+    # :nodoc:
+    module Gengou
+      # AbstractScroll
+      #
+      # 元号スクロール
+      #
+      class AbstractScroll
+        # @return [Western::Calendar] 月初日
+        attr_reader :monthly_start_date
+        # @return [Western::Calendar] 月末日
+        attr_reader :monthly_last_date
+        # @return [Reserve::AbstractRange] 予約範囲
+        attr_reader :range
+        # @return [Array<Counte>] 1行目元号
+        attr_reader :first_gengou
+        # @return [Array<Counte>] 2行目元号
+        attr_reader :second_gengou
+        # @return [Connector] 行変更済元号
+        attr_reader :connector
+
+        #
+        # 初期化
+        #
+        # @param [Reserve::AbstractRange] range 予約範囲
+        #
+        def initialize(range:)
+          @monthly_start_date = Western::Calendar.new
+          @monthly_last_date = Western::Calendar.new
+          @range = range
+          @first_gengou = []
+          @second_gengou = []
+          @ignited = false
+          @connector = Connector.new
+        end
+
+        #
+        # 進める
+        #
+        # @param [Monthly::Month] month 月
+        #
+        def run(month:)
+          unless @ignited
+            # 開始日の検索を行う
+            @ignited = ignite(month: month)
+            return
+          end
+
+          # 時間を進める
+          advance(month: month)
+        end
+
+        #
+        # 元号開始を試みる
+        #
+        # @param [Monthly::Month] month 月
+        #
+        # @return [True] 開始あり
+        # @return [False] 開始なし
+        #
+        def ignite(month:)
+          return false unless ignitable?(month: month)
+
+          japan_start_date = @range.japan_start_date
+
+          western_start_date = @range.western_start_date
+
+          # 今月初日（和暦日が1月2日であれば、開始日の1日前が初日）
+          @monthly_start_date = western_start_date.clone - japan_start_date.day + 1
+
+          # 今月末
+          @monthly_last_date = @monthly_start_date.clone + month.days - 1
+
+          update_current_gengou
+
+          true
+        end
+
+        #
+        # 進める
+        #
+        # @param [Monthly::Month] month 月
+        #
+        def advance(month:)
+          @monthly_start_date = @monthly_last_date.clone + 1
+
+          @monthly_last_date = @monthly_start_date.clone + month.days - 1
+
+          next_year if month.number == 1 && !month.leaped?
+
+          update_current_gengou
+        end
+
+        #
+        # 共通の元号に変換する
+        #
+        # @return [Base::Gengou] 元号
+        #
+        def to_gengou
+          start_date = @monthly_start_date.clone
+          last_date = @monthly_last_date.clone
+
+          # 行を超えた元号切り替え処理
+          continue_year
+
+          Publisher.run(
+            start_date: start_date, last_date: last_date,
+            first_gengou: @first_gengou, second_gengou: @second_gengou
+          )
+        end
+
+        #
+        # 開始西暦年を取得する
+        #
+        # @return [Integer] 開始西暦年
+        #
+        def western_start_year
+          @range.western_start_year
+        end
+
+        #
+        # 終了西暦年を取得する
+        #
+        # @return [Integer] 終了西暦年
+        #
+        def western_last_year
+          @range.western_last_year
+        end
+
+        private
+
+        #
+        # 行を跨ぐ元号年を継続させる
+        #
+        def continue_year
+          @connector.update(lines: [@first_gengou, @second_gengou])
+        end
+
+        #
+        # 現在月に合わせて元号を更新する
+        #
+        def update_current_gengou
+          start_date = @monthly_start_date
+          last_date = @monthly_last_date
+          first_gengou = @range.collect_first(start_date: start_date, last_date: last_date)
+          second_gengou = @range.collect_second(start_date: start_date,
+                                                last_date: last_date)
+
+          @first_gengou = replace_gengou(source: @first_gengou, destination: first_gengou)
+          @second_gengou = replace_gengou(source: @second_gengou, destination: second_gengou)
+        end
+
+        #
+        # 元号を差し替える
+        #
+        # @param [Array<Counter>] source 元の元号
+        # @param [Array<Counter>] destination 次の元号
+        #
+        # @return [Array<Counter>] 差し替え結果
+        #
+        def replace_gengou(source: [], destination: [])
+          return destination if destination.size.zero?
+
+          return destination if source.size.zero?
+
+          last = source[-1]
+          destination[0] = last if destination[0].name == last.name
+
+          destination
+        end
+
+        #
+        # 開始可能か
+        #
+        # @param [Monthly::Month] month 月
+        #
+        # @return [True] 開始可
+        # @return [True] 開始不可
+        #
+        def ignitable?(month:)
+          return false unless @monthly_start_date.invalid?
+
+          japan_start_date = @range.japan_start_date
+
+          japan_start_date.same_month?(leaped: month.leaped?, month: month.number)
+        end
+
+        #
+        # 次年にする
+        #
+        def next_year
+          @first_gengou.each(&:next_year)
+          @second_gengou.each(&:next_year)
+        end
+      end
+    end
+  end
+end