zakuro 0.9.1 → 0.9.3

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

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+require_relative '../../monthly/meta/meta_collector'
+
+require_relative '../../../tools/remainder_comparer'
+
 # :nodoc:
 module Zakuro
   # :nodoc:
@@ -42,36 +46,6 @@ module Zakuro
           annual_range
         end
 
-        # :reek:TooManyStatements { max_statements: 7 }
-
-        class << self
-          #
-          # 月内（当月朔日から当月末日（来月朔日の前日）の間）に二十四節気があるか
-          # @note 大余60で一巡するため 以下2パターンがある
-          #   * current_month <= next_month : (二十四節気) >= current_month && (二十四節気) < next_month
-          #   * current_month > next_month  : (二十四節気) >= current_month || (二十四節気) < next_month
-          #
-          # @param [Cycle::AbstractRemainder] solar_term 二十四節気
-          # @param [Cycle::AbstractRemainder] current_month 月初
-          # @param [Cycle::AbstractRemainder] next_month 月末
-          #
-          # @return [True] 対象の二十四節気がある
-          # @return [False] 対象の二十四節気がない
-          #
-          def in_solar_term?(solar_term:, current_month:, next_month:)
-            # 大余で比較する
-            target_time = solar_term.day
-            current_month_time = current_month.day
-            next_month_time = next_month.day
-            current_month_over = (target_time >= current_month_time)
-            next_month_under = (target_time < next_month_time)
-
-            return current_month_over && next_month_under if current_month_time <= next_month_time
-
-            current_month_over || next_month_under
-          end
-        end
-
         private
 
         # :reek:TooManyStatements { max_statements: 8 }
@@ -87,10 +61,10 @@ module Zakuro
           # * 最大試行回数：4回（設定なし => 設定あり => 設定あり => 設定なし）
           # * 閏月は1回しか設定しない
           # * 最大2回設定する（中気・節気）
-          (0..3).each do |_index|
-            in_range = self.class.in_solar_term?(
-              solar_term: solar_term.remainder, current_month: current_month.remainder,
-              next_month: next_month.remainder
+          4.times.each do |_index|
+            in_range = Tools::RemainderComparer.in_range?(
+              target: solar_term.remainder, start: current_month.remainder,
+              last: next_month.remainder
             )
 
             # 範囲外

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

@@ -34,17 +34,32 @@ module Zakuro
             context = month.context
 
             if context.option.dropped_date?
+              solar_term = month.solar_term_by_day(day: day.remainder.day)
+
               remainder = day.remainder
-              solar_terms = month.solar_terms
               option = dropped_date(
-                context: context, remainder: remainder, solar_terms: solar_terms
+                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 = vanished_date(
                 context: context, remainder: remainder, average_remainder: average_remainder
               )
@@ -61,40 +76,43 @@ module Zakuro
           #
           # @param [Context::Context] context 暦コンテキスト
           # @param [Cycle::AbstractRemainder] remainder 当日和暦日
-          # @param [Array<Cycle::AbstractSolarTerm>] solar_terms 二十四節気
+          # @param [Cycle::AbstractSolarTerm] solar_terms 二十四節気
           #
           # @return [Result::Data::Option::DroppedDate::Option] 没日
           #
-          def dropped_date(context:, remainder:, solar_terms:)
+          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_terms: solar_terms
+              context: context, solar_term: solar_term
             )
 
+            return option if location.invalid?
+
             return option unless location.exist?
 
             dropped_date = location.get
 
-            return option unless remainder.day == dropped_date.day
-
-            dropped_date_option(location: location)
+            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(location:)
+          def dropped_date_option(matched:, location:)
             dropped_date = location.get
             solar_term = location.solar_term
             Result::Data::Option::DroppedDate::Option.new(
-              matched: true,
+              matched: matched,
               calculation: Result::Data::Option::DroppedDate::Calculation.new(
                 remainder: dropped_date.format,
                 solar_term: Result::Data::SolarTerm.new(
@@ -108,41 +126,49 @@ module Zakuro
           #
           # 滅日を求める
           #
-          # @param [<Type>] context <description>
-          # @param [<Type>] remainder <description>
-          # @param [<Type>] average_remainder <description>
+          # @param [Context::Context] context 暦コンテキスト
+          # @param [Cycle::AbstractRemainder] remainder 当日和暦日
+          # @param [Cycle::AbstractRemainder] average_remainder 経朔
           #
-          # @return [<Type>] <description>
+          # @return [Result::Data::Option::VanishedDate::Option] 滅日オプション値
           #
           def vanished_date(context:, remainder:, average_remainder:)
-            option = Result::Data::Option::VanishedDate::Option.new
-
-            return option if average_remainder.invalid?
+            return Result::Data::Option::VanishedDate::Option.new if average_remainder.invalid?
 
             location = Calculation::Option::VanishedDate::Location.new(
               context: context, average_remainder: average_remainder
             )
 
-            return option unless location.exist?
+            return Result::Data::Option::VanishedDate::Option.new if location.invalid?
 
-            vanished_date = location.get
+            unless location.exist?
+              # 結果確認のため経朔だけは設定する
+              return Result::Data::Option::VanishedDate::Option.new(
+                calculation: Result::Data::Option::VanishedDate::Calculation.new(
+                  average_remainder: average_remainder
+                )
+              )
+            end
 
-            return option unless remainder.day == vanished_date.day
+            vanished_date = location.get
 
-            vanished_date_option(location: location)
+            vanished_date_option(
+              matched: remainder.day == vanished_date.day, location: location
+            )
           end
 
           #
           # 滅日オプション値を生成する
           #
-          # @param [Calculation::Option::DroppedDate::Location] location 滅日位置
+          # @param [True, False] matched 滅日有無
+          # @param [Calculation::Option::VanishedDate::Location] location 滅日位置
           #
-          # @return [Result::Data::Option::DroppedDate::Option] 滅日オプション値
+          # @return [Result::Data::Option::VanishedDate::Option] 滅日オプション値
           #
-          def vanished_date_option(location:)
+          def vanished_date_option(matched:, location:)
             vanished_date = location.get
             Result::Data::Option::VanishedDate::Option.new(
-              matched: true,
+              matched: matched,
               calculation: Result::Data::Option::VanishedDate::Calculation.new(
                 remainder: vanished_date.format,
                 average_remainder: location.average_remainder

data/lib/zakuro/calculation/summary/western/specifier/single_day.rb

@@ -30,7 +30,7 @@ module Zakuro
               #
               # 取得する
               #
-              # @param [Array<Calculation::Base::Year>] years 範囲
+              # @param [Array<Base::Year>] years 範囲
               # @param [Western::Calendar] date 西暦日
               #
               # @return [Result::Data::SingleDay] 和暦日

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

@@ -98,7 +98,7 @@ module Zakuro
         # @return [Calendar] 年月日情報（和暦）
         #
         def parse(regex: FORMAT, text: '')
-          return Calendar.new unless valid_date_string(regex: regex, text: text)
+          return Calendar.new unless valid_date_text(regex: regex, text: text)
 
           matched = text.match(regex)
 
@@ -120,7 +120,7 @@ module Zakuro
         # @return [True] 正しい
         # @return [True] 正しくない
         #
-        def valid_date_string(regex: FORMAT, text: '')
+        def valid_date_text(regex: FORMAT, text: '')
           return false unless text
 
           matched = text.match(regex)

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

@@ -175,7 +175,7 @@ module Zakuro
           # @return [Western::Calendar]設定された元号の開始日
           #
           def native_start_date
-            gengou.both_start_date.western
+            gengou.start_date.western
           end
 
           #

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

@@ -23,6 +23,9 @@ module Zakuro
         # @return [Aligner] 整列結果
         SUMMARY = Aligner.new(resources: Resource::LIST)
 
+        # @return [Aligner] 整列結果（運用値）
+        OPERATED_SUMMARY = Aligner.new(resources: Resource::OPERATED_LIST)
+
         class << self
           #
           # 指定した範囲内の元号を取得する
@@ -30,11 +33,17 @@ module Zakuro
           # @param [Integer] line 行
           # @param [Western::Calendar] start_date 開始日
           # @param [Western::Calendar] last_date 終了日
+          # @param [True, False] operated 運用値設定
           #
           # @return [Array<LinearGengou>] 元号
           #
           def get(line: FIRST_LINE,
-                  start_date: Western::Calendar.new, last_date: Western::Calendar.new)
+                  start_date: Western::Calendar.new, last_date: Western::Calendar.new,
+                  operated: false)
+
+            if operated
+              return OPERATED_SUMMARY.get(line: line, start_date: start_date, last_date: last_date)
+            end
 
             SUMMARY.get(line: line, start_date: start_date, last_date: last_date)
           end
@@ -44,10 +53,13 @@ module Zakuro
           #
           # @param [Integer] line 行
           # @param [String] name 元号名
+          # @param [True, False] operated 運用値設定
           #
           # @return [Array<LinearGengou>] 元号
           #
-          def get_by_name(line: FIRST_LINE, name:)
+          def get_by_name(line: FIRST_LINE, name:, operated: false)
+            return OPERATED_SUMMARY.get_by_name(line: line, name: name) if operated
+
             SUMMARY.get_by_name(line: line, name: name)
           end
         end

data/lib/zakuro/era/japan/gengou/resource/parser.rb

@@ -30,9 +30,11 @@ module Zakuro
             # @return [String] 元号名
             attr_reader :name
             # @return [Hash<String, String>] 開始年
-            attr_reader :both_start_year
+            attr_reader :start_year
             # @return [Hash<String, String>] 開始日
-            attr_reader :both_start_date
+            attr_reader :start_date
+            # @return [True, False] 運用値
+            attr_reader :operated
 
             #
             # 初期化
@@ -40,11 +42,12 @@ module Zakuro
             # @param [Hash<String, Strin>] hash 元号情報
             # @param [Integer] index （元号セット内での）元号の要素位置
             #
-            def initialize(hash:, index:)
+            def initialize(hash:, index:, operated: false)
               @index = index
               @name = hash['name']
-              @both_start_year = hash['start_year']
-              @both_start_date = hash['start_date']
+              @start_year = hash['start_year']
+              @start_date = hash['start_date']
+              @operated = operated
             end
 
             #
@@ -53,11 +56,11 @@ module Zakuro
             # @return [Gengou] 元号情報
             #
             def create
-              start_year = Both::YearParser.new(hash: both_start_year).create
-              start_date = Both::DateParser.new(hash: both_start_date).create
+              year = Both::YearParser.new(hash: start_year).create
+              date = SwitchDateParser.new(hash: start_date, operated: operated).create
 
-              Gengou.new(name: name, both_start_year: start_year,
-                         both_start_date: start_date)
+              Gengou.new(name: name, start_year: year,
+                         start_date: date)
             end
           end
 
@@ -70,23 +73,27 @@ module Zakuro
             # @return [String] 元号セット名
             attr_reader :name
             # @return [Hash<String, String>] 終了年
-            attr_reader :both_last_year
+            attr_reader :last_year
             # @return [Hash<String, String>] 終了日
-            attr_reader :both_last_date
+            attr_reader :last_date
             # @return [Array<Hash<String, String>>] 元号情報
             attr_reader :list
+            # @return [True, False] 運用値
+            attr_reader :operated
 
             #
             # 初期化
             #
             # @param [Hash<String, Object>] hash 元号セット情報
+            # @param [True, False] operated 運用値設定
             #
-            def initialize(hash:)
+            def initialize(hash:, operated: false)
               @id = hash['id']
               @name = hash['name']
-              @both_last_year = hash['last_year']
-              @both_last_date = hash['last_date']
+              @last_year = hash['last_year']
+              @last_date = hash['last_date']
               @list = hash['list']
+              @operated = operated
             end
 
             #
@@ -95,10 +102,10 @@ module Zakuro
             # @return [Set] 元号セット情報
             #
             def create
-              last_date = Both::DateParser.new(hash: both_last_date).create
+              date = SwitchDateParser.new(hash: last_date, operated: operated).create
               list = create_list
               Set.new(
-                id: id, name: name, both_last_date: last_date, list: list
+                id: id, name: name, last_date: date, list: list
               )
             end
 
@@ -112,7 +119,9 @@ module Zakuro
             def create_list
               result = []
               list.each_with_index do |li, index|
-                gengou = GengouParser.new(hash: li, index: index).create
+                gengou = GengouParser.new(
+                  hash: li, index: index, operated: operated
+                ).create
                 next_index = index + 1
                 gengou = calc_last_date_on_gengou_data(next_index: next_index,
                                                        gengou: gengou)
@@ -136,11 +145,15 @@ module Zakuro
                 return gengou
               end
               next_item = list[next_index]
+              next_start_date = SwitchDateParser.new(
+                hash: next_item['start_date'], operated: operated
+              ).create
+
               gengou.convert_next_start_year_to_last_year(
                 next_start_year: next_item['start_year']['western']
               )
               gengou.convert_next_start_date_to_last_date(
-                next_start_date: next_item['start_date']['western']
+                next_start_date: next_start_date.western
               )
               gengou
             end
@@ -153,9 +166,50 @@ module Zakuro
             # @param [GengouParser] gengou 元号
             #
             def last_gengou_data(gengou:)
-              gengou.write_last_year(last_year: both_last_year['western'])
-              last_date = Western::Calendar.parse(text: both_last_date['western'])
-              gengou.write_last_date(last_date: last_date)
+              gengou.write_last_year(last_year: last_year['western'])
+
+              date = SwitchDateParser.new(hash: last_date, operated: operated).create
+
+              gengou.write_last_date(last_date: date.western)
+            end
+          end
+
+          #
+          # SwitchDateParser 切替日（運用/計算）
+          #
+          class SwitchDateParser
+            # @return [Hash<String, Strin>] 計算値
+            attr_reader :calculation
+            # @return [Hash<String, Strin>] 運用値
+            attr_reader :operation
+            # @return [True, False] 運用値
+            attr_reader :operated
+
+            #
+            # 初期化
+            #
+            # @param [Hash<String, Strin>] hash 切替日（運用/計算）
+            # @param [True, False] operated 運用値設定
+            #
+            def initialize(hash:, operated: false)
+              @calculation = hash['calculation']
+              @operation = hash['operation']
+              @operated = operated
+            end
+
+            #
+            # 切替日（運用/計算）情報を生成する
+            #
+            # @return [SwitchDate] 切替日（運用/計算）情報
+            #
+            def create
+              calculation_date = Both::DateParser.new(hash: calculation).create
+              operation_date = Both::DateParser.new(hash: operation).create
+
+              Japan::Gengou::Resource::SwitchDate.new(
+                calculation: calculation_date, operation: operation_date,
+                operated: operated
+              )
             end
           end
 
@@ -222,8 +276,11 @@ module Zakuro
               # @return [Both::Date] 日情報
               #
               def create
-                japan_date = Japan::Calendar.parse(text: japan)
-                western_date = Western::Calendar.parse(text: western)
+                japan_date = Japan::Calendar.new
+                western_date = Western::Calendar.new
+
+                japan_date = Japan::Calendar.parse(text: japan) unless japan == ''
+                western_date = Western::Calendar.parse(text: western) unless western == ''
 
                 Japan::Gengou::Resource::Both::Date.new(
                   japan: japan_date, western: western_date
@@ -237,19 +294,20 @@ module Zakuro
             # 解析/展開する
             #
             # @param [String] filepath 元号セットファイルパス
+            # @param [True, False] operated 運用値設定
             #
             # @return [Set] 元号セット情報
             #
             # @raise [ArgumentError] 引数エラー
             #
-            def run(filepath: '')
+            def run(filepath: '', operated: false)
               yaml = YAML.load_file(filepath)
 
               failed = Validator.run(yaml_hash: yaml)
 
               raise ArgumentError, failed.join("\n") unless failed.empty?
 
-              parser = SetParser.new(hash: yaml)
+              parser = SetParser.new(hash: yaml, operated: operated)
               parser.create
             end
           end