zakuro 0.1.2 → 0.1.3

data/lib/zakuro/version/senmyou/range/annual_range.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 require_relative '../../../output/logger'
-require_relative '../base/remainder'
-require_relative '../monthly/initialized_month'
-require_relative '../base/solar_term'
+require_relative '../cycle/remainder'
+require_relative '../cycle/solar_term'
+require_relative '../../../calculation/monthly/initialized_month'
 require_relative '../monthly/lunar_phase'
 require_relative '../stella/solar_orbit'
 require_relative '../stella/solar_average'
@@ -14,146 +14,151 @@ require_relative '../stella/lunar_orbit'
 module Zakuro
   # :nodoc:
   module Senmyou
-    #
-    # AnnualRange 年間範囲
-    #
-    module AnnualRange
-      # @return [Logger] ロガー
-      LOGGER = Logger.new(location: 'annual_range')
-
-      # :reek:TooManyStatements { max_statements: 6 }
+    # :nodoc:
+    module Range
+      #
+      # AnnualRange 年間範囲
+      #
+      module AnnualRange
+        # @return [Output::Logger] ロガー
+        LOGGER = Output::Logger.new(location: 'annual_range')
+
+        # :reek:TooManyStatements { max_statements: 6 }
+
+        #
+        # 11月定朔（冬至が含まれる月の1日：補正済）を求める
+        #
+        # @param [Integer] western_year 西暦年
+        #
+        # @return [Remainder] 11月定朔
+        #
+        def self.calc_last_november_1st(western_year:)
+          # 天正閏余
+          winter_solstice_age = \
+            WinterSolstice.calc_moon_age(western_year: western_year)
+          # 11月経朔
+          november_1st = \
+            WinterSolstice.calc_averaged_last_november_1st(western_year: western_year)
+          # 11月定朔
+
+          # 補正
+          correction_value = correction_value_on_last_november_1st(
+            winter_solstice_age: winter_solstice_age,
+            western_year: western_year
+          )
 
-      #
-      # 11月定朔（冬至が含まれる月の1日：補正済）を求める
-      #
-      # @param [Integer] western_year 西暦年
-      #
-      # @return [Remainder] 11月定朔
-      #
-      def self.calc_last_november_1st(western_year:)
-        # 天正閏余
-        winter_solstice_age = \
-          WinterSolstice.calc_moon_age(western_year: western_year)
-        # 11月経朔
-        november_1st = \
-          WinterSolstice.calc_averaged_last_november_1st(western_year: western_year)
-        # 11月定朔
-
-        # 補正
-        correction_value = correction_value_on_last_november_1st(
-          winter_solstice_age: winter_solstice_age,
-          western_year: western_year
-        )
-
-        result = november_1st.add(Remainder.new(day: 0, minute: correction_value,
-                                                second: 0))
-        # 進朔
-        result.up_on_new_moon!
-        result
-      end
+          result = november_1st.add(Cycle::Remainder.new(day: 0, minute: correction_value,
+                                                         second: 0))
+          # 進朔
+          result.up_on_new_moon!
+          result
+        end
 
-      # :reek:TooManyStatements { max_statements: 6 }
+        # :reek:TooManyStatements { max_statements: 6 }
 
-      #
-      # 一覧取得する
-      #
-      #   * 対象年に対して、前年11月-当年11月までを出力する
-      #   * 対象年（西暦）と計算年（元号x年）の紐付けは行わない
-      #
-      # @param [Integer] western_year 西暦年
-      #
-      # @return [Array<Month>] 1年データ
-      #
-      def self.collect_annual_range_after_last_november_1st(western_year:)
-        annual_range = initialized_annual_range(western_year: western_year)
+        #
+        # 一覧取得する
+        #
+        #   * 対象年に対して、前年11月-当年11月までを出力する
+        #   * 対象年（西暦）と計算年（元号x年）の紐付けは行わない
+        #
+        # @param [Integer] western_year 西暦年
+        #
+        # @return [Array<Month>] 1年データ
+        #
+        def self.collect_annual_range_after_last_november_1st(western_year:)
+          annual_range = initialized_annual_range(western_year: western_year)
 
-        apply_big_and_small_of_the_month(annual_range: annual_range)
+          apply_big_and_small_of_the_month(annual_range: annual_range)
 
-        solar_average = SolarAverage.new(western_year: western_year)
-        solar_average.set(annual_range: annual_range)
+          solar_average = SolarAverage.new(western_year: western_year)
+          solar_average.set(annual_range: annual_range)
 
-        # 月間隔を取得するためだけの末尾要素を削除
-        annual_range.pop
+          # 月間隔を取得するためだけの末尾要素を削除
+          annual_range.pop
 
-        initialize_month_label(annual_range: annual_range)
-      end
+          initialize_month_label(annual_range: annual_range)
+        end
 
-      #
-      # 11月定朔の補正値を求める
-      #
-      # @param [Remainder] winter_solstice_age 天正閏余
-      # @param [Integer] western_year 西暦年
-      #
-      # @return [Integer] 補正値
-      #
-      def self.correction_value_on_last_november_1st(winter_solstice_age:, western_year:)
-        # 補正
-        solar_term = SolarTerm.new(
-          remainder: winter_solstice_age
-        )
-        solar_term = \
-          SolarLocation.get(
-            solar_term: solar_term
+        #
+        # 11月定朔の補正値を求める
+        #
+        # @param [Remainder] winter_solstice_age 天正閏余
+        # @param [Integer] western_year 西暦年
+        #
+        # @return [Integer] 補正値
+        #
+        def self.correction_value_on_last_november_1st(winter_solstice_age:, western_year:)
+          # 補正
+          solar_term = Cycle::SolarTerm.new(
+            remainder: winter_solstice_age
           )
+          solar_term = \
+            SolarLocation.get(
+              solar_term: solar_term
+            )
 
-        moon_remainder, is_forward = LunarOrbit.calc_moon_point(
-          remainder: winter_solstice_age, western_year: western_year
-        )
-
-        SolarOrbit.calc_sun_orbit_value(solar_term: solar_term) +
-          LunarOrbit.calc_moon_orbit_value(remainder_month: moon_remainder,
-                                           is_forward: is_forward)
-      end
-      private_class_method :correction_value_on_last_november_1st
-
-      #
-      # 1年データを取得する
-      #
-      # @param [Integer] western_year 西暦年
-      #
-      # @return [Array<Month>] 1年データ
-      #
-      def self.initialized_annual_range(western_year:)
-        result = []
-        lunar_phase = LunarPhase.new(western_year: western_year)
-
-        # 14ヶ月分を生成する（閏年で最大13ヶ月 + 末月の大小/二十四節気を求めるために必要な月）
-        (0..13).each do |_index|
-          adjusted = lunar_phase.next_month
-
-          result.push(
-            InitializedMonth.new(month_label: MonthLabel.new,
-                                 first_day: FirstDay.new(remainder: adjusted),
-                                 phase_index: 0)
+          moon_remainder, is_forward = LunarOrbit.calc_moon_point(
+            remainder: winter_solstice_age, western_year: western_year
           )
-        end
 
-        result
-      end
-      private_class_method :initialized_annual_range
-
-      #
-      # 1年データの各月に月の大小を設定する
-      #
-      # @param [Array<Month>] annual_range 1年データ
-      #
-      def self.apply_big_and_small_of_the_month(annual_range:)
-        # NOTE: 最後の月は処理できない（=計算外の余分な月が最後に必要である）
-        annual_range.each_cons(2) do |(current_month, next_month)|
-          current_month.eval_many_days(next_month_day: next_month.remainder.day)
+          SolarOrbit.calc_sun_orbit_value(solar_term: solar_term) +
+            LunarOrbit.calc_moon_orbit_value(remainder_month: moon_remainder,
+                                             is_forward: is_forward)
         end
+        private_class_method :correction_value_on_last_november_1st
+
+        #
+        # 1年データを取得する
+        #
+        # @param [Integer] western_year 西暦年
+        #
+        # @return [Array<Month>] 1年データ
+        #
+        def self.initialized_annual_range(western_year:)
+          result = []
+          lunar_phase = Monthly::LunarPhase.new(western_year: western_year)
+
+          # 14ヶ月分を生成する（閏年で最大13ヶ月 + 末月の大小/二十四節気を求めるために必要な月）
+          (0..13).each do |_index|
+            adjusted = lunar_phase.next_month
+
+            result.push(
+              Calculation::Monthly::InitializedMonth.new(
+                month_label: Calculation::Monthly::MonthLabel.new,
+                first_day: Calculation::Monthly::FirstDay.new(remainder: adjusted),
+                phase_index: 0
+              )
+            )
+          end
+
+          result
+        end
+        private_class_method :initialized_annual_range
+
+        #
+        # 1年データの各月に月の大小を設定する
+        #
+        # @param [Array<Month>] annual_range 1年データ
+        #
+        def self.apply_big_and_small_of_the_month(annual_range:)
+          # NOTE: 最後の月は処理できない（=計算外の余分な月が最後に必要である）
+          annual_range.each_cons(2) do |(current_month, next_month)|
+            current_month.eval_many_days(next_month_day: next_month.remainder.day)
+          end
+        end
+        private_class_method :apply_big_and_small_of_the_month
+
+        #
+        # 月表示情報を更新する
+        #
+        # @param [Array<Month>] annual_range 1年データ
+        #
+        def self.initialize_month_label(annual_range:)
+          annual_range.each(&:rename_month_label_by_solar_term)
+        end
+        private_class_method :initialize_month_label
       end
-      private_class_method :apply_big_and_small_of_the_month
-
-      #
-      # 月表示情報を更新する
-      #
-      # @param [Array<Month>] annual_range 1年データ
-      #
-      def self.initialize_month_label(annual_range:)
-        annual_range.each(&:rename_month_label_by_solar_term)
-      end
-      private_class_method :initialize_month_label
     end
   end
 end

data/lib/zakuro/version/senmyou/senmyou.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
 require 'date'
-require_relative '../abstract_version'
 require_relative '../../era/western'
-require_relative 'summary/single'
+require_relative '../abstract_version'
+require_relative '../context'
+require_relative '../../calculation/summary/single'
 
 # :nodoc:
 module Zakuro
@@ -18,16 +19,21 @@ module Zakuro
       # @return [True] リリースあり
       RELEASE = true
 
+      # @return [String] 暦クラス名
+      VERSION_NAME = 'Senmyou'
+
       #
       # 西暦日から和暦日に変換する
       #
       # @param [Date] western_date 西暦日
       #
-      # @return [Result::SingleDay] 和暦日
+      # @return [Result::Single] 和暦日
       #
       def self.to_japan_date(western_date:)
         date = Western::Calendar.create(date: western_date)
-        Single.get(date: date)
+
+        context = Context.new(version_name: VERSION_NAME)
+        Calculation::Summary::Single.get(context: context, date: date)
       end
     end
   end

data/lib/zakuro/version/senmyou/stella/lunar_orbit.rb

@@ -13,7 +13,7 @@ module Zakuro
       # @return [Integer] 暦中日
       # @note ANOMALISTIC_MONTH の半分に相当する
       HALF_ANOMALISTIC_MONTH = \
-        LunarRemainder.new(day: 13, minute: 6529, second: 9.5)
+        Cycle::LunarRemainder.new(day: 13, minute: 6529, second: 9.5)
 
       #
       # Adjustment 補正値情報
@@ -122,7 +122,7 @@ module Zakuro
       # @return [True] 正しくない
       #
       def self.valid?(remainder:)
-        return if remainder.is_a?(LunarRemainder)
+        return if remainder.is_a?(Cycle::LunarRemainder)
 
         raise ArgumentError, "unmatch parameter type: #{remainder.class}"
       end
@@ -272,14 +272,14 @@ module Zakuro
           total_year * WinterSolstice::YEAR - winter_solstice_age.to_minute
 
         remainder_month = \
-          LunarRemainder.new(total: (total_day % ANOMALISTIC_MONTH))
+          Cycle::LunarRemainder.new(total: (total_day % ANOMALISTIC_MONTH))
 
         remainder_month, is_forward = decrease_moon_point(
           remainder_month: remainder_month,
           remainder_limit: HALF_ANOMALISTIC_MONTH, is_forward: true
         )
 
-        remainder_month.add!(Remainder.new(day: 1, minute: 0, second: 0))
+        remainder_month.add!(Cycle::Remainder.new(day: 1, minute: 0, second: 0))
 
         [remainder_month, is_forward]
       end
@@ -302,7 +302,7 @@ module Zakuro
         remainder_month, is_forward = \
           decrease_moon_point(
             remainder_month: remainder,
-            remainder_limit: Remainder.new(day: 14, minute: 6529, second: 0),
+            remainder_limit: Cycle::Remainder.new(day: 14, minute: 6529, second: 0),
             is_forward: is_forward
           )
 

data/lib/zakuro/version/senmyou/stella/solar_average.rb

@@ -9,7 +9,7 @@ module Zakuro
     #
     class SolarAverage
       # @return [Remainder] 気策（24分の1年）
-      SOLAR_TERM_AVERAGE = Remainder.new(day: 15, minute: 1835, second: 5)
+      SOLAR_TERM_AVERAGE = Cycle::Remainder.new(day: 15, minute: 1835, second: 5)
 
       #
       # 初期化
@@ -52,7 +52,7 @@ module Zakuro
         winter_solstice = WinterSolstice.calc(western_year: western_year)
 
         # 二十四節気（冬至）
-        solar_term = SolarTerm.new(index: 0, remainder: winter_solstice)
+        solar_term = Cycle::SolarTerm.new(index: 0, remainder: winter_solstice)
 
         first_solar_term_index = SolarAverage.calc_fist_solar_term_index(western_year: western_year)
 
@@ -81,13 +81,13 @@ module Zakuro
 
         # 入定気を求める
         solar_location = SolarLocation.get(
-          solar_term: SolarTerm.new(remainder: winter_solstice_age)
+          solar_term: Cycle::SolarTerm.new(remainder: winter_solstice_age)
         )
 
         solar_term_index = solar_location.index
 
         # 入定気の一つ後の二十四節気まで戻す（ただし11月経朔が二十四節気上にある場合は戻さない）
-        solar_term_index += 1 unless solar_location.remainder == Remainder.new(total: 0)
+        solar_term_index += 1 unless solar_location.remainder == Cycle::Remainder.new(total: 0)
 
         solar_term_index
       end

data/lib/zakuro/version/senmyou/stella/solar_location.rb

@@ -17,41 +17,41 @@ module Zakuro
         # @return [Hash<Symbol, Remainder>] 一覧
         LIST = {
           # 冬至（とうじ）・大雪（たいせつ）
-          touji: Remainder.new(day: 14, minute: 4235, second: 5),
-          taisetsu: Remainder.new(day: 14, minute: 4235, second: 5),
+          touji: Cycle::Remainder.new(day: 14, minute: 4235, second: 5),
+          taisetsu: Cycle::Remainder.new(day: 14, minute: 4235, second: 5),
           # 小寒（しょうかん）・小雪（しょうせつ）
-          shoukan: Remainder.new(day: 14, minute: 5235, second: 5),
-          shousetsu: Remainder.new(day: 14, minute: 5235, second: 5),
+          shoukan: Cycle::Remainder.new(day: 14, minute: 5235, second: 5),
+          shousetsu: Cycle::Remainder.new(day: 14, minute: 5235, second: 5),
           # 大寒（だいかん）・立冬（りっとう）
-          daikan: Remainder.new(day: 14, minute: 6235, second: 5),
-          rittou: Remainder.new(day: 14, minute: 6235, second: 5),
+          daikan: Cycle::Remainder.new(day: 14, minute: 6235, second: 5),
+          rittou: Cycle::Remainder.new(day: 14, minute: 6235, second: 5),
           # 立春（りっしゅん）・霜降（そうこう）
-          risshun: Remainder.new(day: 14, minute: 7235, second: 5),
-          soukou: Remainder.new(day: 14, minute: 7235, second: 5),
+          risshun: Cycle::Remainder.new(day: 14, minute: 7235, second: 5),
+          soukou: Cycle::Remainder.new(day: 14, minute: 7235, second: 5),
           # 雨水（うすい）・寒露（かんろ）
-          usui: Remainder.new(day: 15, minute: 35, second: 5),
-          kanro: Remainder.new(day: 15, minute: 35, second: 5),
+          usui: Cycle::Remainder.new(day: 15, minute: 35, second: 5),
+          kanro: Cycle::Remainder.new(day: 15, minute: 35, second: 5),
           # 啓蟄（けいちつ）・秋分（しゅうぶん）
-          keichitsu: Remainder.new(day: 15, minute: 1235, second: 5),
-          shuubun: Remainder.new(day: 15, minute: 1235, second: 5),
+          keichitsu: Cycle::Remainder.new(day: 15, minute: 1235, second: 5),
+          shuubun: Cycle::Remainder.new(day: 15, minute: 1235, second: 5),
           # 春分（しゅんぶん）・白露（はくろ）
-          shunbun: Remainder.new(day: 15, minute: 2435, second: 5),
-          hakuro: Remainder.new(day: 15, minute: 2435, second: 5),
+          shunbun: Cycle::Remainder.new(day: 15, minute: 2435, second: 5),
+          hakuro: Cycle::Remainder.new(day: 15, minute: 2435, second: 5),
           # 清明（せいめい）・処暑（しょしょ）
-          seimei: Remainder.new(day: 15, minute: 3635, second: 5),
-          shosho: Remainder.new(day: 15, minute: 3635, second: 5),
+          seimei: Cycle::Remainder.new(day: 15, minute: 3635, second: 5),
+          shosho: Cycle::Remainder.new(day: 15, minute: 3635, second: 5),
           # 穀雨（こくう）・立秋（りっしゅう）
-          kokuu: Remainder.new(day: 15, minute: 4835, second: 5),
-          risshuu: Remainder.new(day: 15, minute: 4835, second: 5),
+          kokuu: Cycle::Remainder.new(day: 15, minute: 4835, second: 5),
+          risshuu: Cycle::Remainder.new(day: 15, minute: 4835, second: 5),
           # 立夏（りっか）・大暑（たいしょ）
-          rikka: Remainder.new(day: 15, minute: 5835, second: 5),
-          taisho: Remainder.new(day: 15, minute: 5835, second: 5),
+          rikka: Cycle::Remainder.new(day: 15, minute: 5835, second: 5),
+          taisho: Cycle::Remainder.new(day: 15, minute: 5835, second: 5),
           # 小満（しょうまん）・小暑（しょうしょ）
-          shouman: Remainder.new(day: 15, minute: 6835, second: 5),
-          shousho: Remainder.new(day: 15, minute: 6835, second: 5),
+          shouman: Cycle::Remainder.new(day: 15, minute: 6835, second: 5),
+          shousho: Cycle::Remainder.new(day: 15, minute: 6835, second: 5),
           # 芒種（ぼうしゅ）・夏至（げし）
-          boushu: Remainder.new(day: 15, minute: 7835, second: 5),
-          geshi: Remainder.new(day: 15, minute: 7835, second: 5)
+          boushu: Cycle::Remainder.new(day: 15, minute: 7835, second: 5),
+          geshi: Cycle::Remainder.new(day: 15, minute: 7835, second: 5)
         }.freeze
 
         # @return [Array<Remainder>] 索引
@@ -171,14 +171,14 @@ module Zakuro
         interval = Interval::INDEXES[index]
         if winter_solstice_age > interval
           # 入定気が確定しない（さらに前の定気まで遡れる）
-          return SolarTerm.new(
+          return Cycle::SolarTerm.new(
             remainder: winter_solstice_age.sub(interval),
             index: -1
           )
         end
 
         # 入定気が確定する
-        SolarTerm.new(
+        Cycle::SolarTerm.new(
           remainder: interval.sub(winter_solstice_age),
           index: index
         )
@@ -204,7 +204,7 @@ module Zakuro
         index += 1
         index = 0 if index >= Interval::INDEXES.size
         calc_next_solar_term_recursively(
-          solar_term: SolarTerm.new(remainder: remainder, index: index)
+          solar_term: Cycle::SolarTerm.new(remainder: remainder, index: index)
         )
       end
       private_class_method :calc_next_solar_term_recursively