zakuro 0.6.1 → 0.7.0

data/lib/zakuro/calculation/era/gengou/internal/reserve/named_list.rb

@@ -0,0 +1,125 @@
+# frozen_string_literal: true
+
+require_relative './abstract_list'
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Calculation
+    # :nodoc:
+    module Gengou
+      # :nodoc:
+      module Reserve
+        # NamedList
+        #
+        # 予約元号一覧（元号名）
+        #
+        class NamedList < AbstractList
+          # @return [String] 不正元号名
+          INVALID_NAME = Japan::Calendar::EMPTY
+
+          #
+          # 初期化
+          #
+          # @param [True, False] first true:1行目元号, false:2行目元号
+          # @param [String] start_name 開始元号名
+          # @param [String] last_name 終了元号名
+          #
+          def initialize(first: true, start_name: INVALID_NAME, last_name: INVALID_NAME)
+            @index = parse_index(first: first)
+            @start_date = Western::Calendar.new
+            @last_date = Western::Calendar.new
+
+            locate(start_name: start_name, last_name: last_name)
+            super(index: @index, start_date: @start_date, last_date: @last_date)
+          end
+
+          private
+
+          #
+          # 開始日・終了日を配置する
+          #
+          # @param [String] start_name 開始元号名
+          # @param [String] last_name 終了元号名
+          #
+          def locate(start_name:, last_name:)
+            start = start_name
+            last = last_name
+            last = start if last == INVALID_NAME
+
+            return if start == INVALID_NAME
+
+            [start, last].each do |name|
+              gengou_list = line_by_name(name: name)
+
+              next if gengou_list.size.zero?
+
+              choise_start_date(
+                date: gengou_list[0].start_date.clone
+              )
+              choise_last_date(
+                date: gengou_list[-1].last_date.clone
+              )
+            end
+          end
+
+          #
+          # 最古の開始日を選択する
+          #
+          # @param [Western::Calendar] date 西暦日
+          #
+          def choise_start_date(date:)
+            return if date.invalid?
+
+            if @start_date.invalid?
+              @start_date = date
+              return
+            end
+
+            return if date > @start_date
+
+            @start_date = date
+          end
+
+          #
+          # 最新の終了日を選択する
+          #
+          # @param [Western::Calendar] date 西暦日
+          #
+          def choise_last_date(date:)
+            return if date.invalid?
+
+            if @last_date.invalid?
+              @last_date = date
+              return
+            end
+
+            return if date < @last_date
+
+            @last_date = date
+          end
+
+          #
+          # 元号を取得する（元号名）
+          #
+          # @param [String] name 元号名
+          #
+          # @return [Array<Japan::Alignment::LinearGengou>] 元号
+          #
+          def line_by_name(name:)
+            Japan::Gengou.line_by_name(line: @index, name: name)
+          end
+
+          #
+          # 予約元号一覧を更新する
+          #
+          # すでに解決済みの開始日・終了日をそのまま使用する（前後の元号を引き当てない）
+          #
+          def update
+            @list |= line(start_date: start_date, last_date: last_date)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/zakuro/calculation/era/gengou/internal/reserve/named_range.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+require_relative './abstract_range'
+require_relative './named_list'
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Calculation
+    # :nodoc:
+    module Gengou
+      # :nodoc:
+      module Reserve
+        #
+        # NamedRange 予約済み計算範囲（元号名）
+        #
+        class NamedRange < AbstractRange
+          # @return [String] 不正元号名
+          INVALID_NAME = Japan::Calendar::EMPTY
+
+          #
+          # 初期化
+          #
+          # @param [String] start_name 開始元号名
+          # @param [String] last_name 終了元号名
+          #
+          def initialize(start_name: INVALID_NAME, last_name: INVALID_NAME)
+            @first_list = NamedList.new(first: true, start_name: start_name, last_name: last_name)
+            @second_list = NamedList.new(first: false, start_name: start_name, last_name: last_name)
+
+            start_date = western_start_date
+            last_date = western_last_date
+
+            super(start_date: start_date, last_date: last_date)
+          end
+
+          #
+          # 最新の元号から西暦終了日を取得する
+          #
+          # @return [Western::Calendar] 西暦終了日
+          #
+          def western_last_date
+            list = newest_list
+
+            return Western::Calendar.new if list.invalid?
+
+            list.western_last_date
+          end
+
+          #
+          # 最新の元号を取得する
+          #
+          # @return [List] 最新の元号
+          #
+          def newest_list
+            return @first_list if @first_list.invalid?
+
+            return @first_list if @second_list.invalid?
+
+            first_western_date = @first_list.western_last_date
+            second_western_date = @second_list.western_last_date
+
+            return @first_list if first_western_date.invalid?
+
+            return @first_list if second_western_date.invalid?
+
+            return @first_list if first_western_date > second_western_date
+
+            @second_list
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
 require_relative '../../../../era/western/calendar'
-require_relative './reserve/range'
-require_relative './reserve/list'
+require_relative './reserve/dated_range'
 
 # :nodoc:
 module Zakuro
@@ -34,7 +33,7 @@ module Zakuro
         # @return [Range] 予約済み計算範囲
         #
         def self.get(start_date: Western::Calendar.new, last_date: Western::Calendar.new)
-          Range.new(start_date: start_date, last_date: last_date)
+          DatedRange.new(start_date: start_date, last_date: last_date)
         end
       end
     end

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require_relative './abstract_scroll'
+require_relative './internal/reserve/named_range'
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Calculation
+    # :nodoc:
+    module Gengou
+      # NamedScroll
+      #
+      # 元号スクロール
+      #
+      class NamedScroll < AbstractScroll
+        #
+        # 初期化
+        #
+        # @param [String] start_name 開始元号名
+        # @param [String] last_name 終了元号名
+        #
+        def initialize(start_name: INVALID_NAME, last_name: INVALID_NAME)
+          range = Reserve::NamedRange.new(start_name: start_name, last_name: last_name)
+          super(range: range)
+        end
+      end
+    end
+  end
+end

data/lib/zakuro/calculation/monthly/month.rb

@@ -228,6 +228,45 @@ module Zakuro
 
           true
         end
+
+        #
+        # 範囲内か
+        #
+        # @param [Japan::Calendar] date 日付
+        #
+        # @return [True] 範囲内
+        # @return [False] 範囲外
+        #
+        def include_by_japan_date?(date:)
+          return false if invalid?
+
+          linear_gengou = @gengou.match_by_name(name: date.gengou)
+          return false if linear_gengou.invalid?
+
+          return false unless linear_gengou.name == date.gengou
+
+          return false unless linear_gengou.year == date.year
+
+          same_by_japan_date?(date: date)
+        end
+
+        private
+
+        #
+        # 同一の月情報かを検証する
+        #
+        # @param [Japan::Calendar] date 日付
+        #
+        # @return [True] 同一の月
+        # @return [False] 異なる月
+        #
+        def same_by_japan_date?(date: Japan::Calendar.new)
+          return false unless number == date.month
+
+          return false unless leaped? == date.leaped
+
+          true
+        end
       end
     end
   end

data/lib/zakuro/calculation/monthly/operated_month.rb

@@ -80,7 +80,7 @@ module Zakuro
           default = month_label.send(method_name)
           return default if diff.invalid?
 
-          diff.actual
+          diff.dest
         end
 
         #

data/lib/zakuro/calculation/range/{full_range.rb → abstract_full_range.rb}

@@ -5,7 +5,6 @@ require_relative '../../version/context'
 require_relative '../../era/western/calendar'
 require_relative '../../output/logger'
 
-require_relative '../era/gengou/scroll'
 require_relative '../era/version/version'
 
 require_relative '../base/gengou'
@@ -35,7 +34,7 @@ module Zakuro
       #   * 引き当てたい日付が元旦ではない場合、その月日に従い元号を再度求める
       #   * この再計算が必要になるのは、元号が切り替わる年のみである
       #
-      class FullRange
+      class AbstractFullRange
         # @return [Context] 暦コンテキスト
         attr_reader :context
         # @return [Western::Calendar] 開始日
@@ -52,17 +51,19 @@ module Zakuro
         # 初期化
         #
         # @param [Context] context 暦コンテキスト
+        # @param [Gengou::AbstractScroll] scroll 元号スクロール
         # @param [Western::Calendar] start_date 開始日
         # @param [Western::Calendar] last_date 終了日
         #
-        def initialize(context:, start_date: Western::Calendar.new, last_date: Western::Calendar.new)
+        def initialize(context:, scroll:,
+                       start_date: Western::Calendar.new, last_date: Western::Calendar.new)
           @start_date = start_date
           @last_date = last_date
           return if invalid?
 
           # TODO: 現時点では使用していない。特定の暦を指定できるようになった状態で使用する
           @context = context
-          @scroll = Gengou::Scroll.new(start_date: start_date, last_date: last_date)
+          @scroll = scroll
         end
 
         #

data/lib/zakuro/calculation/range/{operated_range.rb → abstract_operation_range.rb}

@@ -13,10 +13,10 @@ module Zakuro
     # :nodoc:
     module Range
       #
-      # OperatedRange 運用結果範囲
+      # AbstractOperationRange 運用結果範囲
       #
       # 何らかの理由により、計算された暦とは異なる運用結果である場合、その結果に合わせて計算結果を上書きする
-      class OperatedRange
+      class AbstractOperationRange
         # @return [Array<Year>] 年データ（完全範囲）
         attr_reader :years
         # @return [OperatedSolarTerms] 運用時二十四節気
@@ -28,15 +28,13 @@ module Zakuro
         # 初期化
         #
         # @param [Context] context 暦コンテキスト
-        # @param [Western::Calendar] start_date 開始日
-        # @param [Western::Calendar] last_date 終了日
+        # @param [Gengou::AbstractScroll] scroll 元号スクロール
         # @param [Array<Year>] years 年データ（完全範囲）
         #
-        def initialize(context:, start_date: Western::Calendar.new, last_date: Western::Calendar.new,
-                       years: [])
+        def initialize(context:, scroll:, years: [])
           @context = context
           @years = years
-          @scroll = Gengou::Scroll.new(start_date: start_date, last_date: last_date)
+          @scroll = scroll
           @operated_solar_terms = OperatedSolarTerms.new(context: context, years: @years)
           @operated_solar_terms.create
         end
@@ -49,9 +47,9 @@ module Zakuro
         def get
           operated_years = rewrite
 
-          OperatedRange.move(operated_years: operated_years)
+          AbstractOperationRange.move(operated_years: operated_years)
 
-          OperatedRange.commit(operated_years: operated_years)
+          AbstractOperationRange.commit(operated_years: operated_years)
 
           Transfer::GengouScroller.set(scroll: @scroll, years: operated_years)
 
@@ -67,7 +65,7 @@ module Zakuro
           operated_years = []
 
           years.each do |year|
-            operated_year = OperatedRange.rewrite_year(
+            operated_year = AbstractOperationRange.rewrite_year(
               year: year,
               operated_solar_terms: @operated_solar_terms
             )
@@ -157,7 +155,7 @@ module Zakuro
         def self.resolve_month(context:, month:, operated_solar_terms:)
           history = Operation.specify_history(western_date: month.western_date)
 
-          OperatedRange.rewrite_month(
+          AbstractOperationRange.rewrite_month(
             context: context, month: month, history: history,
             operated_solar_terms: operated_solar_terms
           )

data/lib/zakuro/calculation/range/dated_full_range.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require_relative '../era/gengou/dated_scroll'
+require_relative './abstract_full_range'
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Calculation
+    # :nodoc:
+    module Range
+      #
+      # DatedFullRange 完全範囲
+      #
+      class DatedFullRange < AbstractFullRange
+        #
+        # 初期化
+        #
+        # @param [Context] context 暦コンテキスト
+        # @param [Western::Calendar] start_date 開始日
+        # @param [Western::Calendar] last_date 終了日
+        #
+        def initialize(context:,
+                       start_date: Western::Calendar.new, last_date: Western::Calendar.new)
+          scroll = Gengou::DatedScroll.new(start_date: start_date, last_date: last_date)
+
+          super(context: context, scroll: scroll, start_date: start_date, last_date: last_date)
+        end
+      end
+    end
+  end
+end

data/lib/zakuro/calculation/range/dated_operation_range.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require_relative '../era/gengou/dated_scroll'
+
+require_relative './abstract_operation_range'
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Calculation
+    # :nodoc:
+    module Range
+      #
+      # DatedOperationRange 運用結果範囲
+      #
+      class DatedOperationRange < AbstractOperationRange
+        #
+        # 初期化
+        #
+        # @param [Context] context 暦コンテキスト
+        # @param [Western::Calendar] start_date 開始日
+        # @param [Western::Calendar] last_date 終了日
+        # @param [Array<Year>] years 年データ（完全範囲）
+        #
+        def initialize(context:, start_date: Western::Calendar.new,
+                       last_date: Western::Calendar.new, years: [])
+          scroll = Gengou::DatedScroll.new(start_date: start_date, last_date: last_date)
+          super(context: context, scroll: scroll, years: years)
+        end
+      end
+    end
+  end
+end

data/lib/zakuro/calculation/range/named_full_range.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require_relative '../era/gengou/named_scroll'
+require_relative './abstract_full_range'
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Calculation
+    # :nodoc:
+    module Range
+      #
+      # NamedFullRange 完全範囲
+      #
+      class NamedFullRange < AbstractFullRange
+        # @return [String] 不正元号名
+        INVALID_NAME = Japan::Calendar::EMPTY
+
+        #
+        # 初期化
+        #
+        # @param [Context] context 暦コンテキスト
+        # @param [String] start_name 開始元号名
+        # @param [String] last_name 終了元号名
+        #
+        def initialize(context:, start_name: INVALID_NAME, last_name: INVALID_NAME)
+          scroll = Gengou::NamedScroll.new(start_name: start_name, last_name: last_name)
+          range = scroll.range
+
+          super(
+            context: context, scroll: scroll,
+            start_date: range.western_start_date, last_date: range.western_last_date
+          )
+        end
+      end
+    end
+  end
+end

data/lib/zakuro/calculation/range/named_operation_range.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require_relative '../era/gengou/named_scroll'
+
+require_relative './abstract_operation_range'
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Calculation
+    # :nodoc:
+    module Range
+      #
+      # NamedOperationRange 運用結果範囲
+      #
+      class NamedOperationRange < AbstractOperationRange
+        # @return [String] 不正元号名
+        INVALID_NAME = Japan::Calendar::EMPTY
+
+        #
+        # 初期化
+        #
+        # @param [Context] context 暦コンテキスト
+        # @param [String] start_name 開始元号名
+        # @param [String] last_name 終了元号名
+        # @param [Array<Year>] years 年データ（完全範囲）
+        #
+        def initialize(context:, start_name: INVALID_NAME, last_name: INVALID_NAME, years: [])
+          scroll = Gengou::NamedScroll.new(start_name: start_name, last_name: last_name)
+
+          super(context: context, scroll: scroll, years: years)
+        end
+      end
+    end
+  end
+end

data/lib/zakuro/calculation/range/operated_solar_terms.rb

@@ -3,8 +3,6 @@
 require_relative '../../operation/operation'
 require_relative '../monthly/month'
 
-# TODO: solar_termの中はsrc/destだが、yamlはcalc/actual。統一したい。
-
 # :nodoc:
 module Zakuro
   # :nodoc:

data/lib/zakuro/calculation/{specifier → summary}/internal/month.rb

@@ -7,7 +7,7 @@ module Zakuro
   # :nodoc:
   module Calculation
     # :nodoc:
-    module Specifier
+    module Summary
       #
       # Month 特定月
       #