zakuro 0.9.4 → 1.0.0

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/single.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative '../../../tools/gengou_range_comparer'
-
 require_relative '../../range/dated_operation_range'
 
 require_relative '../../range/dated_full_range'

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

@@ -42,7 +42,9 @@ module Zakuro
                   start_date: Western::Calendar.new, last_date: Western::Calendar.new,
                   operated: false, restored: false)
             if operated
-              result = 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)
@@ -54,14 +56,14 @@ 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, restored: false)
+          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

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative '../../../western/calendar'
-require_relative './type'
+require_relative '../../type/base/gengou_set'
 require_relative './validator'
 require 'yaml'
 
@@ -41,6 +41,7 @@ module Zakuro
             #
             # @param [Hash<String, Strin>] hash 元号情報
             # @param [Integer] index （元号セット内での）元号の要素位置
+            # @param [True, False] operated 運用値設定
             #
             def initialize(hash:, index:, operated: false)
               @index = index
@@ -53,21 +54,21 @@ module Zakuro
             #
             # 元号情報を生成する
             #
-            # @return [Gengou] 元号情報
+            # @return [Type::Base::Gengou] 元号情報
             #
             def create
               year = Both::YearParser.new(hash: start_year).create
               date = SwitchDateParser.new(hash: start_date, operated: operated).create
 
-              Gengou.new(name: name, start_year: year,
-                         start_date: date)
+              Type::Base::Gengou.new(name: name, start_year: year,
+                                     start_date: date)
             end
           end
 
           #
-          # SetParser 元号セット情報の検証/展開
+          # GengouSetParser 元号セット情報の検証/展開
           #
-          class SetParser
+          class GengouSetParser
             # @return [String] 元号セットID
             attr_reader :id
             # @return [String] 元号セット名
@@ -99,12 +100,12 @@ module Zakuro
             #
             # 元号セット情報を生成する
             #
-            # @return [Set] 元号セット情報
+            # @return [Type::Base::GengouSet] 元号セット情報
             #
             def create
               date = SwitchDateParser.new(hash: last_date, operated: operated).create
               list = create_list
-              Set.new(
+              Type::Base::GengouSet.new(
                 id: id, name: name, last_date: date, list: list
               )
             end
@@ -114,7 +115,7 @@ module Zakuro
             #
             # 元号情報を生成する
             #
-            # @return [Array<Gengou>] 元号情報
+            # @return [Array<Type::Base::Gengou>] 元号情報
             #
             def create_list
               result = []
@@ -200,13 +201,13 @@ module Zakuro
             #
             # 切替日（運用/計算）情報を生成する
             #
-            # @return [SwitchDate] 切替日（運用/計算）情報
+            # @return [Type::Base::SwitchDate] 切替日（運用/計算）情報
             #
             def create
               calculation_date = Both::DateParser.new(hash: calculation).create
               operation_date = Both::DateParser.new(hash: operation).create
 
-              Japan::Gengou::Resource::SwitchDate.new(
+              Type::Base::SwitchDate.new(
                 calculation: calculation_date, operation: operation_date,
                 operated: operated
               )
@@ -245,7 +246,7 @@ module Zakuro
                 japan_year = japan.to_i
                 western_year = western.to_i
 
-                Japan::Gengou::Resource::Both::Year.new(
+                Type::Base::Both::Year.new(
                   japan: japan_year, western: western_year
                 )
               end
@@ -273,7 +274,7 @@ module Zakuro
               #
               # 日情報を生成する
               #
-              # @return [Both::Date] 日情報
+              # @return [Type::Base::Both::Date] 日情報
               #
               def create
                 japan_date = Japan::Calendar.new
@@ -282,7 +283,7 @@ module Zakuro
                 japan_date = Japan::Calendar.parse(text: japan) unless japan == ''
                 western_date = Western::Calendar.parse(text: western) unless western == ''
 
-                Japan::Gengou::Resource::Both::Date.new(
+                Type::Base::Both::Date.new(
                   japan: japan_date, western: western_date
                 )
               end
@@ -296,7 +297,7 @@ module Zakuro
             # @param [String] filepath 元号セットファイルパス
             # @param [True, False] operated 運用値設定
             #
-            # @return [Set] 元号セット情報
+            # @return [Type::Base::GengouSet] 元号セット情報
             #
             # @raise [ArgumentError] 引数エラー
             #
@@ -307,7 +308,7 @@ module Zakuro
 
               raise ArgumentError, failed.join("\n") unless failed.empty?
 
-              parser = SetParser.new(hash: yaml, operated: operated)
+              parser = GengouSetParser.new(hash: yaml, operated: operated)
               parser.create
             end
           end