zakuro 0.9.3 → 1.0.0

data/lib/zakuro/calculation/summary/internal/option/dropped_date.rb

@@ -0,0 +1,102 @@
+# frozen_string_literal: true
+
+require_relative '../../../../context/option'
+require_relative '../../../../result/data/option/dropped_date/option'
+require_relative '../../../../result/data/solar_term'
+
+require_relative '../../../option/dropped_date/location'
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Calculation
+    # :nodoc:
+    module Summary
+      #
+      # Option オプション
+      #
+      module Option
+        #
+        # DroppedDate 没日
+        #
+        module DroppedDate
+          class << self
+            #
+            # 没日を取得する
+            #
+            # @param [Calculation::Monthly::Month] month 月情報（各暦のデータ型）
+            # @param [Calculation::Base::Day] day 日情報
+            #
+            # @return [Result::Data::Option::DroppedDate::Option] 没日
+            #
+            def get(month:, day:)
+              context = month.context
+
+              solar_term = month.solar_term_by_day(day: day.remainder.day)
+
+              remainder = day.remainder
+
+              dropped_date(
+                context: context, remainder: remainder, solar_term: solar_term
+              )
+            end
+
+            private
+
+            #
+            # 没日を求める
+            #
+            # @param [Context::Context] context 暦コンテキスト
+            # @param [Cycle::AbstractRemainder] remainder 当日和暦日
+            # @param [Cycle::AbstractSolarTerm] solar_terms 二十四節気
+            #
+            # @return [Result::Data::Option::DroppedDate::Option] 没日
+            #
+            def dropped_date(context:, remainder:, solar_term:)
+              option = Result::Data::Option::DroppedDate::Option.new
+
+              return option if remainder.invalid?
+
+              location = Calculation::Option::DroppedDate::Location.new(
+                context: context, solar_term: solar_term
+              )
+
+              return option if location.invalid?
+
+              return option unless location.exist?
+
+              dropped_date = location.get
+
+              dropped_date_option(
+                matched: remainder.day == dropped_date.day, location: location
+              )
+            end
+
+            #
+            # 没日オプション値を生成する
+            #
+            # @param [True, False] matched 没日有無
+            # @param [Calculation::Option::DroppedDate::Location] location 没日位置
+            #
+            # @return [Result::Data::Option::DroppedDate::Option] 没日オプション値
+            #
+            def dropped_date_option(matched:, location:)
+              dropped_date = location.get
+              solar_term = location.solar_term
+              Result::Data::Option::DroppedDate::Option.new(
+                matched: matched,
+                calculation: Result::Data::Option::DroppedDate::Calculation.new(
+                  remainder: dropped_date.format,
+                  solar_term: Result::Data::SolarTerm.new(
+                    index: solar_term.index,
+                    remainder: solar_term.remainder.format
+                  )
+                )
+              )
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/zakuro/calculation/summary/internal/option/vanished_date.rb

@@ -0,0 +1,111 @@
+# frozen_string_literal: true
+
+require_relative '../../../../context/option'
+require_relative '../../../../result/data/option/vanished_date/option'
+require_relative '../../../../result/data/solar_term'
+
+require_relative '../../../option/vanished_date/location'
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Calculation
+    # :nodoc:
+    module Summary
+      #
+      # Option オプション
+      #
+      module Option
+        #
+        # VanishedDate 滅日
+        #
+        module VanishedDate
+          class << self
+            #
+            # 滅日を取得する
+            #
+            # @param [Calculation::Monthly::Month] month 月情報（各暦のデータ型）
+            # @param [Calculation::Base::Day] day 日情報
+            #
+            # @return [Result::Data::Option::VanishedDate::Option] 滅日オプション値
+            #
+            def get(month:, day:)
+              context = month.context
+
+              remainder = day.remainder
+              average_remainder = month.first_day.average_remainder
+              # p "remainder: #{remainder.format}"
+              # p "last_average_remainder: #{month.meta.last_average_remainder.format}"
+
+              if day.number == 1
+                option = vanished_date(
+                  context: context, remainder: remainder,
+                  average_remainder: month.meta.last_average_remainder
+                )
+
+                return option if option.matched
+              end
+
+              vanished_date(
+                context: context, remainder: remainder, average_remainder: average_remainder
+              )
+            end
+
+            private
+
+            #
+            # 滅日を求める
+            #
+            # @param [Context::Context] context 暦コンテキスト
+            # @param [Cycle::AbstractRemainder] remainder 当日和暦日
+            # @param [Cycle::AbstractRemainder] average_remainder 経朔
+            #
+            # @return [Result::Data::Option::VanishedDate::Option] 滅日オプション値
+            #
+            def vanished_date(context:, remainder:, average_remainder:)
+              return Result::Data::Option::VanishedDate::Option.new if average_remainder.invalid?
+
+              location = Calculation::Option::VanishedDate::Location.new(
+                context: context, average_remainder: average_remainder
+              )
+
+              return Result::Data::Option::VanishedDate::Option.new if location.invalid?
+
+              unless location.exist?
+                # 結果確認のため経朔だけは設定する
+                return Result::Data::Option::VanishedDate::Option.new(
+                  calculation: Result::Data::Option::VanishedDate::Calculation.new(
+                    average_remainder: average_remainder
+                  )
+                )
+              end
+
+              vanished_date = location.get
+
+              vanished_date_option(matched: remainder.day == vanished_date.day, location: location)
+            end
+
+            #
+            # 滅日オプション値を生成する
+            #
+            # @param [True, False] matched 滅日有無
+            # @param [Calculation::Option::VanishedDate::Location] location 滅日位置
+            #
+            # @return [Result::Data::Option::VanishedDate::Option] 滅日オプション値
+            #
+            def vanished_date_option(matched:, location:)
+              vanished_date = location.get
+              Result::Data::Option::VanishedDate::Option.new(
+                matched: matched,
+                calculation: Result::Data::Option::VanishedDate::Calculation.new(
+                  remainder: vanished_date.format,
+                  average_remainder: location.average_remainder
+                )
+              )
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/zakuro/calculation/summary/internal/option.rb

@@ -1,12 +1,9 @@
 # frozen_string_literal: true
 
 require_relative '../../../context/option'
-require_relative '../../../result/data/option/dropped_date/option'
-require_relative '../../../result/data/solar_term'
-require_relative '../../../result/data/option/vanished_date/option'
 
-require_relative '../../option/dropped_date/location'
-require_relative '../../option/vanished_date/location'
+require_relative './option/dropped_date'
+require_relative './option/vanished_date'
 
 # :nodoc:
 module Zakuro
@@ -28,153 +25,23 @@ module Zakuro
           # @return [Hash<String, Result::Data::Option::AbstractOption>] オプション結果
           #
           def create(month:, day:)
-            # TODO: refactor
-
             options = {}
             context = month.context
 
             if context.option.dropped_date?
-              solar_term = month.solar_term_by_day(day: day.remainder.day)
+              option = DroppedDate.get(month: month, day: day)
 
-              remainder = day.remainder
-              option = dropped_date(
-                context: context, remainder: remainder, solar_term: solar_term
-              )
               options[Context::Option::DROPPED_DATE_KEY] = option
             end
 
-            # TODO: refactor
             if context.option.vanished_date?
-              remainder = day.remainder
-              average_remainder = month.first_day.average_remainder
-              # p "remainder: #{remainder.format}"
-              # p "last_average_remainder: #{month.meta.last_average_remainder.format}"
-
-              if day.number == 1
-                option = vanished_date(
-                  context: context, remainder: remainder,
-                  average_remainder: month.meta.last_average_remainder
-                )
-                options[Context::Option::VANISHED_DATE_KEY] = option
-
-                return options if option.matched
-              end
+              option = VanishedDate.get(month: month, day: day)
 
-              option = vanished_date(
-                context: context, remainder: remainder, average_remainder: average_remainder
-              )
               options[Context::Option::VANISHED_DATE_KEY] = option
             end
 
             options
           end
-
-          private
-
-          #
-          # 没日を求める
-          #
-          # @param [Context::Context] context 暦コンテキスト
-          # @param [Cycle::AbstractRemainder] remainder 当日和暦日
-          # @param [Cycle::AbstractSolarTerm] solar_terms 二十四節気
-          #
-          # @return [Result::Data::Option::DroppedDate::Option] 没日
-          #
-          def dropped_date(context:, remainder:, solar_term:)
-            option = Result::Data::Option::DroppedDate::Option.new
-
-            return option if remainder.invalid?
-
-            location = Calculation::Option::DroppedDate::Location.new(
-              context: context, solar_term: solar_term
-            )
-
-            return option if location.invalid?
-
-            return option unless location.exist?
-
-            dropped_date = location.get
-
-            dropped_date_option(
-              matched: remainder.day == dropped_date.day, location: location
-            )
-          end
-
-          #
-          # 没日オプション値を生成する
-          #
-          # @param [True, False] matched 没日有無
-          # @param [Calculation::Option::DroppedDate::Location] location 没日位置
-          #
-          # @return [Result::Data::Option::DroppedDate::Option] 没日オプション値
-          #
-          def dropped_date_option(matched:, location:)
-            dropped_date = location.get
-            solar_term = location.solar_term
-            Result::Data::Option::DroppedDate::Option.new(
-              matched: matched,
-              calculation: Result::Data::Option::DroppedDate::Calculation.new(
-                remainder: dropped_date.format,
-                solar_term: Result::Data::SolarTerm.new(
-                  index: solar_term.index,
-                  remainder: solar_term.remainder.format
-                )
-              )
-            )
-          end
-
-          #
-          # 滅日を求める
-          #
-          # @param [Context::Context] context 暦コンテキスト
-          # @param [Cycle::AbstractRemainder] remainder 当日和暦日
-          # @param [Cycle::AbstractRemainder] average_remainder 経朔
-          #
-          # @return [Result::Data::Option::VanishedDate::Option] 滅日オプション値
-          #
-          def vanished_date(context:, remainder:, average_remainder:)
-            return Result::Data::Option::VanishedDate::Option.new if average_remainder.invalid?
-
-            location = Calculation::Option::VanishedDate::Location.new(
-              context: context, average_remainder: average_remainder
-            )
-
-            return Result::Data::Option::VanishedDate::Option.new if location.invalid?
-
-            unless location.exist?
-              # 結果確認のため経朔だけは設定する
-              return Result::Data::Option::VanishedDate::Option.new(
-                calculation: Result::Data::Option::VanishedDate::Calculation.new(
-                  average_remainder: average_remainder
-                )
-              )
-            end
-
-            vanished_date = location.get
-
-            vanished_date_option(
-              matched: remainder.day == vanished_date.day, location: location
-            )
-          end
-
-          #
-          # 滅日オプション値を生成する
-          #
-          # @param [True, False] matched 滅日有無
-          # @param [Calculation::Option::VanishedDate::Location] location 滅日位置
-          #
-          # @return [Result::Data::Option::VanishedDate::Option] 滅日オプション値
-          #
-          def vanished_date_option(matched:, location:)
-            vanished_date = location.get
-            Result::Data::Option::VanishedDate::Option.new(
-              matched: matched,
-              calculation: Result::Data::Option::VanishedDate::Calculation.new(
-                remainder: vanished_date.format,
-                average_remainder: location.average_remainder
-              )
-            )
-          end
         end
       end
     end

data/lib/zakuro/calculation/summary/japan/range.rb

@@ -48,8 +48,8 @@ module Zakuro
               )
 
               list = create_list(
-                context: context,
-                operated_years: operated_years, years: years, range: range
+                context: context, range: range,
+                operated_years: operated_years, years: years
               )
 
               Result::Range.new(list: list)
@@ -82,14 +82,13 @@ module Zakuro
             # 1日検索結果リストを生成する
             #
             # @param [Context::Context] context 暦コンテキスト
+            # @param [SpecifiedRange] range 特定範囲
             # @param [Array<Base::OperatedYear>] operated_years 運用結果範囲
             # @param [Array<Base::Year>] years 完全範囲
-            # @param [SpecifiedRange] range 特定範囲
             #
             # @return [Array<Result::Single>] 結果リスト
             #
-            def create_list(context:, operated_years: [], years: [],
-                            range:)
+            def create_list(context:, range:, operated_years: [], years: [])
               western_start_date = range.start_date.day.western_date
               western_last_date = range.last_date.day.western_date
 

data/lib/zakuro/calculation/summary/western/range.rb

@@ -35,6 +35,7 @@ module Zakuro
               years = get_full_range_years(
                 context: context, start_date: start_date, last_date: last_date
               )
+
               operated_years = get_operation_range_years(
                 context: context, years: years, start_date: start_date, last_date: last_date
               )
@@ -66,8 +67,14 @@ module Zakuro
             #
             def get_full_range_years(context:, start_date: Western::Calendar.new,
                                      last_date: Western::Calendar.new)
+              # 年情報の再計算
+              # * 元号開始日に計算値と運用値のズレが見られる場合、年情報の範囲が異なる場合がある
+              # * 例：0781-03-01（計算値は前の元号の「宝亀」を含めるが、運用値では含まない）
+              #
+              # 運用値の範囲で日付検索するが、元号開始日は計算値のままで取る
               full_range = Calculation::Range::DatedFullRange.new(
-                context: context, start_date: start_date, last_date: last_date
+                context: context, start_date: start_date, last_date: last_date,
+                operated: true, restored: true
               )
               full_range.get
             end

data/lib/zakuro/calculation/summary/western/single.rb

@@ -4,10 +4,10 @@ require_relative '../../range/dated_operation_range'
 
 require_relative '../../range/dated_full_range'
 
-require_relative './specifier/single_day'
-
 require_relative '../internal/operation'
 
+require_relative './specifier/single_day'
+
 # :nodoc:
 module Zakuro
   # :nodoc:
@@ -53,8 +53,13 @@ module Zakuro
             # @return [Array<Calculation::Base::Year>] 完全範囲
             #
             def get_full_range_years(context:, date: Western::Calendar.new)
+              # 年情報の再計算
+              # * 元号開始日に計算値と運用値のズレが見られる場合、年情報の範囲が異なる場合がある
+              # * 例：0781-03-01（計算値は前の元号の「宝亀」を含めるが、運用値では含まない）
+              #
+              # 運用値の範囲で日付検索するが、元号開始日は計算値のままで取る
               full_range = Calculation::Range::DatedFullRange.new(
-                context: context, start_date: date
+                context: context, start_date: date, operated: true, restored: true
               )
               full_range.get
             end
@@ -93,12 +98,12 @@ module Zakuro
             end
 
             #
-            # 完全範囲を取得する
+            # 運用情報を取得する
             #
             # @param [Array<Calculation::Base::Year>] years 完全範囲
             # @param [Western::Calendar] date 西暦日
             #
-            # @return [Array<Calculation::Base::Year>] 完全範囲
+            # @return [Result::Operation] 運用情報
             #
             def get_operation(years:, date: Western::Calendar.new)
               calc_date = Specifier::SingleDay.get(

data/lib/zakuro/context/version_class_resolver.rb

@@ -37,11 +37,11 @@ module Zakuro
 
       # @return [Hash<String, String>] 関連
       CLASSES = {
-        'remainder' => 'Zakuro::$VERSION::Cycle::Remainder',
-        'solar_term' => 'Zakuro::$VERSION::Cycle::SolarTerm',
-        'annual_range' => 'Zakuro::$VERSION::Range::AnnualRange',
-        'dropped_date_parameter' => 'Zakuro::$VERSION::Option::DroppedDate::Parameter',
-        'vanished_date_parameter' => 'Zakuro::$VERSION::Option::VanishedDate::Parameter'
+        'remainder' => 'Zakuro::Version::$VERSION::Cycle::Remainder',
+        'solar_term' => 'Zakuro::Version::$VERSION::Cycle::SolarTerm',
+        'annual_range' => 'Zakuro::Version::$VERSION::Range::AnnualRange',
+        'dropped_date_parameter' => 'Zakuro::Version::$VERSION::Option::DroppedDate::Parameter',
+        'vanished_date_parameter' => 'Zakuro::Version::$VERSION::Option::VanishedDate::Parameter'
       }.freeze
 
       #

data/lib/zakuro/era/japan/calendar.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../../tools/typeconv'
+require_relative '../../tool/typeconv'
 
 # :nodoc:
 module Zakuro
@@ -104,10 +104,10 @@ module Zakuro
 
           Calendar.new(
             gengou: matched[1],
-            year: Tools::Typeconv.to_i(text: matched[2], default: INVALID),
+            year: Tool::Typeconv.to_i(text: matched[2], default: INVALID),
             leaped: matched[3] ? true : false,
-            month: Tools::Typeconv.to_i(text: matched[4], default: INVALID),
-            day: Tools::Typeconv.to_i(text: matched[5], default: INVALID)
+            month: Tool::Typeconv.to_i(text: matched[4], default: INVALID),
+            day: Tool::Typeconv.to_i(text: matched[5], default: INVALID)
           )
         end
 

data/lib/zakuro/era/japan/gengou/alignment/division.rb

@@ -85,7 +85,7 @@ module Zakuro
             def connect(list: []) # rubocop:disable Metrics/MethodLength
               result = []
               list.each do |linear_gengou|
-                if result.size.zero?
+                if result.empty?
                   result.push(linear_gengou)
                   next
                 end
@@ -145,7 +145,7 @@ module Zakuro
               )
             end
 
-            def shave_gengou(this:, other:) # rubocop:disable Metrics/AbcSize
+            def shave_gengou(this:, other:)
               start = this.start_date
               last = this.last_date
 

data/lib/zakuro/era/japan/gengou/alignment/linear_gengou.rb

@@ -2,7 +2,7 @@
 
 require_relative '../../../western/calendar'
 
-require_relative '../resource/type'
+require_relative '../../type/base/gengou_set'
 
 # :nodoc:
 module Zakuro
@@ -33,7 +33,7 @@ module Zakuro
           # @param [Resource::Gengou] gengou 元号
           #
           def initialize(start_date: Western::Calendar.new, last_date: Western::Calendar.new,
-                         gengou: Resource::Gengou.new)
+                         gengou: Type::Base::Gengou.new)
             @gengou = gengou
             @start_date = start_date.invalid? ? native_start_date : start_date
             @last_date = last_date.invalid? ? native_last_date : last_date

data/lib/zakuro/era/japan/gengou/alignment.rb

@@ -34,15 +34,20 @@ module Zakuro
           # @param [Western::Calendar] start_date 開始日
           # @param [Western::Calendar] last_date 終了日
           # @param [True, False] operated 運用値設定
+          # @param [True, False] restored 運用値から計算値に戻すか
           #
           # @return [Array<LinearGengou>] 元号
           #
           def get(line: FIRST_LINE,
                   start_date: Western::Calendar.new, last_date: Western::Calendar.new,
-                  operated: false)
-
+                  operated: false, restored: false)
             if operated
-              return OPERATED_SUMMARY.get(line: line, start_date: start_date, last_date: last_date)
+              result = OPERATED_SUMMARY.get(
+                line: line, start_date: start_date, last_date: last_date
+              )
+              return result unless restored
+
+              return restore(line: line, list: result)
             end
 
             SUMMARY.get(line: line, start_date: start_date, last_date: last_date)
@@ -51,17 +56,41 @@ module Zakuro
           #
           # 指定した範囲内の元号を取得する（元号名）
           #
-          # @param [Integer] line 行
           # @param [String] name 元号名
+          # @param [Integer] line 行
           # @param [True, False] operated 運用値設定
+          # @param [True, False] restored 運用値から計算値に戻すか
           #
           # @return [Array<LinearGengou>] 元号
           #
-          def get_by_name(line: FIRST_LINE, name:, operated: false)
-            return OPERATED_SUMMARY.get_by_name(line: line, name: name) if operated
+          def get_by_name(name:, line: FIRST_LINE, operated: false, restored: false)
+            if operated
+              result = OPERATED_SUMMARY.get_by_name(line: line, name: name)
+              return result unless restored
+
+              return restore(line: line, list: result)
+            end
 
             SUMMARY.get_by_name(line: line, name: name)
           end
+
+          #
+          # 運用値から計算値に戻す
+          #
+          # @param [Integer] line 行
+          # @param [Array<LinearGengou>] list 元号
+          #
+          # @return [Array<LinearGengou>] 元号
+          #
+          def restore(line: FIRST_LINE, list: [])
+            result = []
+            list.each do |gengou|
+              calc = SUMMARY.get_by_name(line: line, name: gengou.name)
+              result |= calc
+            end
+
+            result
+          end
         end
       end
     end