zakuro 0.9.3 → 1.0.0

data/lib/zakuro/calculation/monthly/internal/date_comparer.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Calculation
+    # :nodoc:
+    module Monthly
+      #
+      # DateComparer 日付比較
+      #
+      module DateComparer
+        class << self
+          #
+          # 範囲内か
+          #
+          # @param [Western::Calendar] date 日付
+          # @param [Western::Calendar] start_date 開始日
+          # @param [Western::Calendar] last_date 終了日
+          #
+          # @return [True] 範囲内
+          # @return [False] 範囲外
+          #
+          def include?(date:, start_date:, last_date:)
+            return false if start_date.invalid?
+
+            return false if date < start_date
+
+            return false if date > last_date
+
+            true
+          end
+
+          #
+          # 範囲内か
+          #
+          # @param [Japan::Calendar] date 日付
+          # @param [Base::Gengou] gengou 元号
+          # @param [MonthLabel] month_label 月表示名
+          #
+          # @return [True] 範囲内
+          # @return [False] 範囲外
+          #
+          def include_by_japan_date?(date:, gengou:, month_label:)
+            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?(month_label: month_label, date: date)
+          end
+
+          private
+
+          #
+          # 同一の月情報かを検証する
+          #
+          # @param [MonthLabel] month_label 月表示名
+          # @param [Japan::Calendar] date 日付
+          #
+          # @return [True] 同一の月
+          # @return [False] 異なる月
+          #
+          def same_by_japan_date?(month_label:, date: Japan::Calendar.new)
+            return false unless month_label.number == date.month
+
+            return false unless month_label.leaped == date.leaped
+
+            true
+          end
+        end
+      end
+    end
+  end
+end

data/lib/zakuro/calculation/monthly/{meta → internal/meta}/all_solar_term.rb

@@ -48,7 +48,7 @@ module Zakuro
 
             first = all_solar_terms[0].clone
 
-            return all_solar_terms if before_solar_terms.size.zero?
+            return all_solar_terms if before_solar_terms.empty?
 
             # 最初の二十四節気が月初日と同日であれば何もしない
             return all_solar_terms if first.remainder.day == remainder.day

data/lib/zakuro/calculation/monthly/{meta → internal/meta}/meta_collector.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../../../era/western/calendar'
+require_relative '../../../../era/western/calendar'
 
-require_relative '../month'
+require_relative '../../month'
 
 require_relative './all_solar_term'
 

data/lib/zakuro/calculation/monthly/{first_day.rb → internal/part/first_day.rb}

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../../era/western/calendar'
+require_relative '../../../../era/western/calendar'
 
-require_relative '../cycle/abstract_remainder'
+require_relative '../../../cycle/abstract_remainder'
 
 # :nodoc:
 module Zakuro

data/lib/zakuro/calculation/monthly/{meta.rb → internal/part/meta.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../cycle/abstract_remainder'
+require_relative '../../../cycle/abstract_remainder'
 
 # :nodoc:
 module Zakuro

data/lib/zakuro/calculation/monthly/internal/solar_term_selector.rb

@@ -0,0 +1,203 @@
+# frozen_string_literal: true
+
+require_relative '../../cycle/abstract_solar_term'
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Calculation
+    # :nodoc:
+    module Monthly
+      #
+      # SolarTermSelector 二十四節気検索
+      #
+      class SolarTermSelector
+        # @return [Integer] 月最後の二十四節気を検索する大余の範囲上限
+        LAST_DAY_LIMIT = 20
+
+        # @return [Context::Context] 暦コンテキスト
+        attr_reader :context
+        # @return [Array<Cyle::AbstractSolarTerm>] 二十四節気
+        attr_reader :solar_terms
+
+        #
+        # 初期化
+        #
+        # @param [Context::Context] context 暦コンテキスト
+        # @param [Array<Cyle::AbstractSolarTerm>] solar_terms 二十四節気
+        #
+        def initialize(context: Context::Context.new, solar_terms: [])
+          @context = context
+          @solar_terms = solar_terms
+        end
+
+        #
+        # 二十四節気が未設定かどうかを検証する
+        #
+        # @return [True] 設定なし
+        # @return [False] 設定あり
+        #
+        def empty?
+          solar_terms.empty?
+        end
+
+        #
+        # 中気を返す
+        #
+        # @return [Cycle::AbstractSolarTerm] 中気
+        #
+        def even_term
+          solar_terms.each do |term|
+            return term if term.index.even?
+          end
+
+          context.resolver.solar_term.new
+        end
+
+        #
+        # 節気を返す
+        #
+        # @return [Cycle::AbstractSolarTerm] 節気
+        #
+        def odd_term
+          solar_terms.each do |term|
+            return term if term.index.odd?
+          end
+
+          context.resolver.solar_term.new
+        end
+
+        #
+        # 二十四節気を追加する
+        #
+        # @param [Cycle::AbstractSolarTerm] term 二十四節気
+        #
+        def add_term(term:)
+          solar_terms.push(term)
+        end
+
+        #
+        # 二十四節気を正しい順序にソートする
+        #
+        def sort
+          sorted = (solar_terms.sort do |termx, termy|
+            termx.index <=> termy.index
+          end)
+
+          unless reset_term?(solar_terms: sorted)
+            @solar_terms = sorted
+            return
+          end
+
+          @solar_terms = reset(terms: sorted)
+        end
+
+        #
+        # 大余に対応する二十四節気
+        #
+        # @param [Integer] day 大余
+        #
+        # @return [Cycle::AbstractSolarTerm] 二十四節気
+        #
+
+        #
+        # 大余に対応する二十四節気
+        #
+        # @param [Integer] day 大余
+        # @param [Meta] meta メタ情報
+        #
+        # @return [Cycle::AbstractSolarTerm] 二十四節気
+        #
+        def solar_term_by_day(day:, meta:)
+          target = context.resolver.remainder.new(day: day, minute: 0, second: 0)
+
+          meta.all_solar_terms.each_cons(2) do |current_solar_term, next_solar_term|
+            in_range = Tool::RemainderComparer.in_range?(
+              target: target, start: current_solar_term.remainder, last: next_solar_term.remainder
+            )
+            return current_solar_term if in_range
+          end
+
+          last_solar_term(target: target, meta: meta)
+        end
+
+        private
+
+        #
+        # 二十四節気の折り返し（23 -> 0）があるか
+        #
+        # @param [Array<Cyle::AbstractSolarTerm>] solar_terms 二十四節気
+        #
+        # @return [True] 折り返しあり
+        # @return [False] 折り返しなし
+        #
+        def reset_term?(solar_terms: [])
+          first = false
+          last = false
+
+          solar_terms.each do |term|
+            index = term.index
+            case index
+            when Cycle::AbstractSolarTerm::FIRST_INDEX
+              first = true
+            when Cycle::AbstractSolarTerm::LAST_INDEX
+              last = true
+            end
+          end
+
+          first && last
+        end
+
+        #
+        # 二十四節気を終端で折り返す
+        #
+        # @param [Array<Cyle::AbstractSolarTerm>] terms 二十四節気
+        #
+        # @return [Array<Cyle::AbstractSolarTerm>] 折り返し済みの二十四節気
+        #
+        def reset(terms: [])
+          first = []
+          second = []
+
+          terms.each do |term|
+            # NOTE: 二十四節気は最大3つとすると、 「23, 0」「22, 23, 0」「23, 0, 1」 での折り返しが考えられる
+            if term.index >= (Cycle::AbstractSolarTerm::LAST_INDEX - 2)
+              second.push(term)
+              next
+            end
+
+            first.push(term)
+          end
+
+          # 0以前を先頭にする
+          second += first
+
+          second
+        end
+
+        #
+        # 最後の二十四節気を返す
+        #
+        # @param [Cycle::AbstractRemainder] target 対象の大余情報
+        # @param [Meta] meta メタ情報
+        #
+        # @return [Cycle::AbstractSolarTerm] 二十四節気
+        #
+        def last_solar_term(target:, meta:)
+          last = meta.all_solar_terms[-1]
+
+          empty_solar_term = context.resolver.solar_term.new
+
+          return empty_solar_term unless last
+
+          if Tool::RemainderComparer.in_limit?(target: target, start: last.remainder,
+                                               limit: LAST_DAY_LIMIT)
+            return last
+          end
+
+          empty_solar_term
+        end
+      end
+    end
+  end
+end

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

@@ -1,10 +1,15 @@
 # frozen_string_literal: true
 
+require_relative '../cycle/abstract_solar_term'
+
 require_relative '../base/gengou'
-require_relative './first_day'
-require_relative './meta'
-require_relative './month_label'
-require_relative './meta/meta_collector'
+require_relative './internal/part/first_day'
+require_relative './internal/part/meta'
+require_relative './internal/part/month_label'
+require_relative './internal/meta/meta_collector'
+
+require_relative './internal/solar_term_selector'
+require_relative './internal/date_comparer'
 
 # :nodoc:
 module Zakuro
@@ -22,8 +27,8 @@ module Zakuro
         attr_reader :month_label
         # @return [FirstDay] 月初日（朔日）
         attr_reader :first_day
-        # @return [Array<AbstractSolarTerm>] 二十四節気
-        attr_reader :solar_terms
+        # @return [SolarTermSelector] 二十四節気検索
+        attr_reader :solar_term_selector
         # @return [Base::Gengou] 元号
         attr_reader :gengou
         # @return [Meta] 付加情報
@@ -37,7 +42,7 @@ module Zakuro
         # @param [Context::Context] context 暦コンテキスト
         # @param [MonthLabel] month_label 月表示名
         # @param [FirstDay] first_day 月初日（朔日）
-        # @param [Array<AbstractSolarTerm>] solar_terms 二十四節気
+        # @param [Array<Cyle::AbstractSolarTerm>] solar_terms 二十四節気
         # @param [Base::Gengou] gengou 元号
         # @param [Meta] meta 付加情報
         #
@@ -47,7 +52,7 @@ module Zakuro
           @context = context
           @month_label = month_label
           @first_day = first_day
-          @solar_terms = solar_terms
+          @solar_term_selector = SolarTermSelector.new(context: context, solar_terms: solar_terms)
           @gengou = gengou
           @meta = meta
         end
@@ -158,7 +163,7 @@ module Zakuro
         # @return [False] 設定あり
         #
         def empty_solar_term?
-          solar_terms.empty?
+          solar_term_selector.empty?
         end
 
         #
@@ -167,11 +172,7 @@ module Zakuro
         # @return [Cycle::AbstractSolarTerm] 中気
         #
         def even_term
-          solar_terms.each do |term|
-            return term if term.index.even?
-          end
-
-          context.resolver.solar_term.new
+          solar_term_selector.even_term
         end
 
         #
@@ -180,11 +181,16 @@ module Zakuro
         # @return [Cycle::AbstractSolarTerm] 節気
         #
         def odd_term
-          solar_terms.each do |term|
-            return term if term.index.odd?
-          end
+          solar_term_selector.odd_term
+        end
 
-          context.resolver.solar_term.new
+        #
+        # 二十四節気を返す
+        #
+        # @return [Array<Cyle::AbstractSolarTerm>] 二十四節気
+        #
+        def solar_terms
+          solar_term_selector.solar_terms
         end
 
         #
@@ -193,7 +199,7 @@ module Zakuro
         # @param [SolarTerm] term 二十四節気
         #
         def add_term(term:)
-          solar_terms.push(term)
+          solar_term_selector.add_term(term: term)
         end
 
         #
@@ -230,14 +236,9 @@ module Zakuro
         def include?(date:)
           return false if invalid?
 
-          start_date = western_date
-          return false if start_date.invalid?
-
-          return false if date < start_date
-
-          return false if date > last_date
-
-          true
+          DateComparer.include?(
+            date: date, start_date: western_date, last_date: last_date
+          )
         end
 
         #
@@ -251,14 +252,16 @@ module Zakuro
         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
+          DateComparer.include_by_japan_date?(
+            date: date, gengou: gengou, month_label: month_label
+          )
+        end
 
-          same_by_japan_date?(date: date)
+        #
+        # 二十四節気を正しい順序にソートする
+        #
+        def sort_solar_terms
+          solar_term_selector.sort
         end
 
         #
@@ -269,28 +272,7 @@ module Zakuro
         # @return [Cycle::AbstractSolarTerm] 二十四節気
         #
         def solar_term_by_day(day:)
-          # TODO: refactor
-          target = context.resolver.remainder.new(day: day, minute: 0, second: 0)
-
-          meta.all_solar_terms.each_cons(2) do |current_solar_term, next_solar_term|
-            in_range = Tools::RemainderComparer.in_range?(
-              target: target, start: current_solar_term.remainder, last: next_solar_term.remainder
-            )
-            return current_solar_term if in_range
-          end
-
-          last_solar_term = meta.all_solar_terms[-1]
-
-          empty_solar_term = context.resolver.solar_term.new
-
-          return empty_solar_term unless last_solar_term
-          # NOTE: 大余20を上限として範囲チェックする
-          if Tools::RemainderComparer.in_limit?(target: target, start: last_solar_term.remainder,
-                                                limit: 20)
-            return last_solar_term
-          end
-
-          empty_solar_term
+          solar_term_selector.solar_term_by_day(day: day, meta: meta)
         end
 
         #
@@ -304,24 +286,6 @@ module Zakuro
             current_month: self
           )
         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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative '../../operation/operation'
-require_relative './operated_solar_term'
+require_relative './internal/operated_solar_term'
 require_relative './month'
 
 # :nodoc:
@@ -54,6 +54,8 @@ module Zakuro
           rewrite_month
           rewrite_solar_terms
           rewrite_first_day
+
+          sort_solar_terms
         end
 
         #
@@ -85,10 +87,13 @@ module Zakuro
 
           return unless matched
 
-          @solar_terms = OperatedSolarTerm.create_operated_solar_term(
+          operated_solar_terms = OperatedSolarTerm.create_operated_solar_term(
             operated_solar_term: solar_term,
             solar_terms: solar_terms
           )
+          @solar_term_selector = SolarTermSelector.new(
+            context: context, solar_terms: operated_solar_terms
+          )
         end
 
         #

data/lib/zakuro/calculation/option/dropped_date/location.rb

@@ -62,7 +62,14 @@ module Zakuro
           # @return [False] 存在なし
           #
           def exist?
-            !solar_term_remainder.invalid?
+            remainder = solar_term_remainder
+
+            return false if remainder.invalid?
+
+            minute_later = remainder.class.new(
+              day: 0, minute: remainder.minute, second: remainder.second
+            )
+            minute_later >= limit
           end
 
           #

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

@@ -19,11 +19,14 @@ module Zakuro
         # @param [Context::Context] context 暦コンテキスト
         # @param [Western::Calendar] start_date 開始日
         # @param [Western::Calendar] last_date 終了日
+        # @param [True, False] operated 運用値設定
+        # @param [True, False] restored 運用値から計算値に戻すか
         #
-        def initialize(context:,
-                       start_date: Western::Calendar.new, last_date: Western::Calendar.new)
+        def initialize(context:, start_date: Western::Calendar.new,
+                       last_date: Western::Calendar.new, operated: false, restored: false)
           scroll = Gengou::DatedScroll.new(
-            start_date: start_date, last_date: last_date, operated: false
+            start_date: start_date, last_date: last_date, operated: operated,
+            restored: restored
           )
 
           super(context: context, scroll: scroll, start_date: start_date, last_date: last_date)

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

@@ -25,7 +25,8 @@ module Zakuro
         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, operated: true
+            start_date: start_date, last_date: last_date, operated: true,
+            restored: false
           )
           super(context: context, scroll: scroll, years: years)
         end

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

@@ -2,8 +2,6 @@
 
 require_relative '../../output/logger'
 require_relative '../monthly/initialized_month'
-require_relative '../monthly/month_label'
-require_relative '../monthly/first_day'
 
 # :nodoc:
 module Zakuro

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

@@ -25,7 +25,7 @@ module Zakuro
         #
         def initialize(context:, start_name: INVALID_NAME, last_name: INVALID_NAME)
           scroll = Gengou::NamedScroll.new(
-            start_name: start_name, last_name: last_name, operated: false
+            start_name: start_name, last_name: last_name, operated: false, restored: false
           )
           range = scroll.range
 

data/lib/zakuro/calculation/range/transfer/gengou_scroller.rb

@@ -38,19 +38,33 @@ module Zakuro
               year.months.each_with_index do |month, index|
                 scroll.run(month: month)
                 gengou = scroll.to_gengou
-                year.months[index] = Monthly::Month.new(
-                  context: month.context,
-                  month_label: month.month_label,
-                  first_day: Monthly::FirstDay.new(
-                    remainder: month.first_day.remainder,
-                    average_remainder: month.first_day.average_remainder,
-                    western_date: gengou.start_date.clone
-                  ),
-                  solar_terms: month.solar_terms, gengou: gengou,
-                  meta: month.meta
+                year.months[index] = replace_gengou(
+                  month: month, gengou: gengou
                 )
               end
             end
+
+            #
+            # 月情報のうち元号を差し替える
+            #
+            # @param [Monthly::Month] month 月情報
+            # @param [Base::Gengou] gengou 元号
+            #
+            # @return [Monthly::Month] 月情報
+            #
+            def replace_gengou(month:, gengou:)
+              Monthly::Month.new(
+                context: month.context,
+                month_label: month.month_label,
+                first_day: Monthly::FirstDay.new(
+                  remainder: month.first_day.remainder,
+                  average_remainder: month.first_day.average_remainder,
+                  western_date: gengou.start_date.clone
+                ),
+                solar_terms: month.solar_terms, gengou: gengou,
+                meta: month.meta
+              )
+            end
           end
         end
       end

data/lib/zakuro/calculation/stella/solar/abstract_average.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../../monthly/meta/meta_collector'
+require_relative '../../monthly/internal/meta/meta_collector'
 
-require_relative '../../../tools/remainder_comparer'
+require_relative '../../../tool/remainder_comparer'
 
 # :nodoc:
 module Zakuro
@@ -62,7 +62,7 @@ module Zakuro
           # * 閏月は1回しか設定しない
           # * 最大2回設定する（中気・節気）
           4.times.each do |_index|
-            in_range = Tools::RemainderComparer.in_range?(
+            in_range = Tool::RemainderComparer.in_range?(
               target: solar_term.remainder, start: current_month.remainder,
               last: next_month.remainder
             )