zakuro 0.9.4 → 1.0.0

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

@@ -3,10 +3,13 @@
 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
@@ -24,8 +27,8 @@ module Zakuro
         attr_reader :month_label
         # @return [FirstDay] 月初日（朔日）
         attr_reader :first_day
-        # @return [Array<Cyle::AbstractSolarTerm>] 二十四節気
-        attr_reader :solar_terms
+        # @return [SolarTermSelector] 二十四節気検索
+        attr_reader :solar_term_selector
         # @return [Base::Gengou] 元号
         attr_reader :gengou
         # @return [Meta] 付加情報
@@ -49,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
@@ -160,7 +163,7 @@ module Zakuro
         # @return [False] 設定あり
         #
         def empty_solar_term?
-          solar_terms.empty?
+          solar_term_selector.empty?
         end
 
         #
@@ -169,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
 
         #
@@ -182,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
 
         #
@@ -195,7 +199,7 @@ module Zakuro
         # @param [SolarTerm] term 二十四節気
         #
         def add_term(term:)
-          solar_terms.push(term)
+          solar_term_selector.add_term(term: term)
         end
 
         #
@@ -232,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
 
         #
@@ -253,46 +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
-
-          same_by_japan_date?(date: date)
+          DateComparer.include_by_japan_date?(
+            date: date, gengou: gengou, month_label: month_label
+          )
         end
 
         #
         # 二十四節気を正しい順序にソートする
         #
         def sort_solar_terms
-          # TODO: refactor
-          sorted = (solar_terms.sort do |termx, termy|
-            termx.index <=> termy.index
-          end)
-
-          unless reset_term?(solar_terms: sorted)
-            @solar_terms = sorted
-            return
-          end
-
-          first = []
-          second = []
-
-          sorted.each do |term|
-            if term.index >= (23 - 2)
-              second.push(term)
-              next
-            end
-
-            first.push(term)
-          end
-
-          # 0以前を先頭にする
-          second += first
-
-          @solar_terms = second
+          solar_term_selector.sort
         end
 
         #
@@ -303,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
 
         #
@@ -338,49 +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
-
-        #
-        # 二十四節気の折り返し（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
       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:
@@ -87,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/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/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
             )

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