zakuro 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e4972c48d6122814c2ce4f7b671948768cd2f7a8b977071c523cd982098ad35
-  data.tar.gz: d5e5efd67f13ae70c453ff8095fe65c19c2dba8ec5213c3c6cedc166e7dfb7d4
+  metadata.gz: 2b346e15da34df44ce5692780edbd4b73a46161f8ab9c52a0a3b5e11708f60c9
+  data.tar.gz: 664d457a7e3a5a271073633bba9d2b85c94c1edc35d2ceaa5a0649d10c628202
 SHA512:
-  metadata.gz: d7b235556dd510eeaff8b42712211b399c75ac6ce5ef3ac25812f7742f9da90e08c90bba7f4d6ba030c56d26d650df17ce802ed47cc30267874ffd25b97bc7b7
-  data.tar.gz: 80ecbbe5e4b0d2428dc50f7fd8cdbf35e8667e0bbecc91d604541b4ee9dfdf72c2fb29ada37801c127719520f685520e973c3694ad149bc52f63d88b2fb83701
+  metadata.gz: 95779bea84d41f42027b8974742a924050c9b668f258a116d564b94991987ff5ac81554a6d8e518f8d7cc2bcd018eb9f082df6a997819d43fa475bfd3cd6f1bd
+  data.tar.gz: 4624affe06f638a930c36f80c357deb8ce311af730a67e2a296491efab1b3c648e3a5f5473b3f5fbfd6e9e088644bc7a29741204a9aac71517d1b4aef2dc3568

data/lib/zakuro/calculation/cycle/abstract_solar_term.rb

@@ -80,7 +80,15 @@ module Zakuro
           (@index == -1 && @remainder.invalid?)
         end
 
-        def index?(index)
+        #
+        # 有効な二十四節気番号か
+        #
+        # @param [Integer] index 連番
+        #
+        # @return [True] 有効
+        # @return [False] 無効
+        #
+        def self.index?(index)
           result = ORDER.fetch(index, -1)
 
           result != -1
@@ -89,11 +97,18 @@ module Zakuro
         #
         # 次の二十四節気に進める
         #
-        def next!
+        def next_term!
+          @remainder = next_term
+        end
+
+        #
+        # 次の二十四節気に進める
+        #
+        def next_term
           @index += 1
           @index = 0 if @index >= ORDER.size
 
-          @remainder.add!(@average)
+          @remainder.add(@average)
         end
 
         #
@@ -102,7 +117,7 @@ module Zakuro
         # @param [Integer] index 連番
         #
         def next_by_index(index)
-          return ArgumentError.new, 'invalid index' unless index?(index)
+          return ArgumentError.new, 'invalid index' unless AbstractSolarTerm.index?(index)
 
           loop do
             return if @index == index
@@ -117,23 +132,30 @@ module Zakuro
         # @param [Integer] index 連番
         #
         def prev_by_index(index)
-          return ArgumentError.new, 'invalid index' unless index?(index)
+          return ArgumentError.new, 'invalid index' unless AbstractSolarTerm.index?(index)
 
           loop do
             return if @index == index
 
-            prev!
+            prev_term!
           end
         end
 
         #
         # 前の二十四節気に戻る
         #
-        def prev!
+        def prev_term!
+          @remainder = prev_term
+        end
+
+        #
+        # 前の二十四節気に戻る
+        #
+        def prev_term
           @index -= 1
           @index = 23 if @index.negative?
 
-          @remainder.sub!(@average)
+          @remainder.sub(@average)
         end
 
         #

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

@@ -19,24 +19,29 @@ module Zakuro
         # @return [Integer] 月齢（朔月、上弦、望月、下弦）
         attr_reader :phase_index
 
-        # :reek:ControlParameter and :reek:BooleanParameter
+        # :reek:BooleanParameter And :reek:LongParameterList {max_params: 6}
+        # rubocop:disable Metrics/ParameterLists
 
         #
         # 初期化
         #
+        # @param [Context] context 暦コンテキスト
         # @param [MonthLabel] month_label 月表示名
         # @param [Array<SolarTerm>] solar_terms 二十四節気
         # @param [FirstDay] first_day 月初日（朔日）
         # @param [True, False] is_last_year 昨年の月/今年の月
         # @param [Integer] phase_index 月齢（朔月、上弦、望月、下弦）
         #
-        def initialize(month_label: MonthLabel.new, solar_terms: [], first_day: FirstDay.new,
-                       is_last_year: false, phase_index: -1)
-          super(month_label: month_label, solar_terms: solar_terms, first_day: first_day)
+        def initialize(context:, month_label: MonthLabel.new, solar_terms: [],
+                       first_day: FirstDay.new, is_last_year: false, phase_index: -1)
+          super(context: context, month_label: month_label, solar_terms: solar_terms,
+                first_day: first_day)
           @is_last_year = is_last_year
           @phase_index = phase_index
         end
 
+        # rubocop:enable Metrics/ParameterLists
+
         # :reek:TooManyStatements { max_statements: 6 }
 
         #

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative '../cycle/abstract_solar_term'
-
 require_relative './first_day'
 require_relative './month_label'
 
@@ -15,6 +13,8 @@ module Zakuro
       # Month 月情報
       #
       class Month
+        # @return [Context] 暦コンテキスト
+        attr_reader :context
         # @return [MonthLabel] 月表示名
         attr_reader :month_label
         # @return [FirstDay] 月初日（朔日）
@@ -25,11 +25,14 @@ module Zakuro
         #
         # 初期化
         #
+        # @param [Context] context 暦コンテキスト
         # @param [MonthLabel] month_label 月表示名
         # @param [FirstDay] first_day 月初日（朔日）
         # @param [Array<SolarTerm>] solar_terms 二十四節気
         #
-        def initialize(month_label: MonthLabel.new, first_day: FirstDay.new, solar_terms: [])
+        def initialize(context:, month_label: MonthLabel.new, first_day: FirstDay.new,
+                       solar_terms: [])
+          @context = context
           @month_label = month_label
           @first_day = first_day
           @solar_terms = solar_terms
@@ -142,7 +145,7 @@ module Zakuro
             return term if term.index.even?
           end
 
-          Cycle::AbstractSolarTerm.new
+          context.resolver.solar_term.new
         end
 
         #
@@ -155,7 +158,7 @@ module Zakuro
             return term if term.index.odd?
           end
 
-          Cycle::AbstractSolarTerm.new
+          context.resolver.solar_term.new
         end
 
         #

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

@@ -20,22 +20,30 @@ module Zakuro
         # @return [OperatedSolarTerms] 運用時二十四節気
         attr_reader :operated_solar_terms
 
+        # :reek:LongParameterList {max_params: 6}
+        # rubocop:disable Metrics/ParameterLists
+
         #
         # 初期化
         #
+        # @param [Context] context 暦コンテキスト
         # @param [OperatedSolarTerms] operated_solar_terms 運用時二十四節気
         # @param [MonthLabel] month_label 月表示名
         # @param [FirstDay] first_day 月初日（朔日）
         # @param [Array<SolarTerm>] solar_terms 二十四節気
         # @param [Operation::MonthHistory] history 変更履歴（月）
         #
-        def initialize(operated_solar_terms:, month_label: MonthLabel.new, first_day: FirstDay.new,
-                       solar_terms: [], history: Operation::MonthHistory.new)
-          super(month_label: month_label, first_day: first_day, solar_terms: solar_terms)
+        def initialize(context:, operated_solar_terms:, month_label: MonthLabel.new,
+                       first_day: FirstDay.new, solar_terms: [],
+                       history: Operation::MonthHistory.new)
+          super(context: context, month_label: month_label, first_day: first_day,
+                solar_terms: solar_terms)
           @history = history
           @operated_solar_terms = operated_solar_terms
         end
 
+        # rubocop:enable Metrics/ParameterLists
+
         #
         # 書き換える
         #
@@ -176,7 +184,7 @@ module Zakuro
         def rewrite_remainder(days:)
           remainder = first_day.remainder.clone
           remainder.add!(
-            Cycle::AbstractRemainder.new(day: days, minute: 0, second: 0)
+            context.resolver.remainder.new(day: days, minute: 0, second: 0)
           )
 
           remainder

data/lib/zakuro/calculation/range/full_range.rb

@@ -30,6 +30,8 @@ module Zakuro
       #   * この再計算が必要になるのは、元号が切り替わる年のみである
       #
       class FullRange
+        # @return [Context] 暦コンテキスト
+        attr_reader :context
         # @return [Western::Calendar] 開始日
         attr_reader :start_date
         # @return [Western::Calendar] 終了日
@@ -40,8 +42,6 @@ module Zakuro
         attr_reader :new_year_date
         # @return [Integer] 西暦年
         attr_reader :western_year
-        # @return [Context] 暦コンテキスト
-        attr_reader :context
 
         # @return [Output::Logger] ロガー
         LOGGER = Output::Logger.new(location: 'full_range')
@@ -85,12 +85,12 @@ module Zakuro
           return [] if invalid?
 
           years = Transfer::YearBoundary.get(
-            annual_ranges: annual_ranges
+            context: @context, annual_ranges: annual_ranges
           )
           years = update_gengou(years: years)
 
           Transfer::WesternDateAllocation.update_first_day(
-            years: years
+            context: @context, years: years
           )
 
           years
@@ -112,7 +112,7 @@ module Zakuro
           ((oldest_date.year)..(newest_date.year + 2)).each do |year|
             years.push(
               annual_range.collect_annual_range_after_last_november_1st(
-                western_year: year
+                context: @context, western_year: year
               )
             )
           end

data/lib/zakuro/calculation/range/operated_range.rb

@@ -54,7 +54,8 @@ module Zakuro
 
           years.each do |year|
             operated_year = OperatedRange.rewrite_year(
-              year: year, operated_solar_terms: @operated_solar_terms
+              context: context, year: year,
+              operated_solar_terms: @operated_solar_terms
             )
             operated_years.push(operated_year)
           end
@@ -65,18 +66,20 @@ module Zakuro
         #
         # 年を書き換える
         #
+        # @param [Context] context 暦コンテキスト
         # @param [Year] year 年
         # @param [OperatedSolarTerms] operated_solar_terms 運用時二十四節気
         #
         # @return [Year] 年
         #
-        def self.rewrite_year(year:, operated_solar_terms:)
+        def self.rewrite_year(context:, year:, operated_solar_terms:)
           result = Base::Year.new(
             multi_gengou: year.multi_gengou, new_year_date: year.new_year_date
           )
           year.months.each do |month|
             result.push(month: resolve_month(
-              month: month, operated_solar_terms: operated_solar_terms
+              context: context, month: month,
+              operated_solar_terms: operated_solar_terms
             ))
           end
 
@@ -88,34 +91,40 @@ module Zakuro
         #
         # 履歴情報の有無に応じた月にする
         #
+        # @param [Context] context 暦コンテキスト
         # @param [Month] month 月
         # @param [OperatedSolarTerms] operated_solar_terms 運用時二十四節気
         #
         # @return [Month] 月
         #
-        def self.resolve_month(month:, operated_solar_terms:)
+        def self.resolve_month(context:, month:, operated_solar_terms:)
           history = Operation.specify_history(western_date: month.western_date)
 
           return month if history.invalid?
 
           OperatedRange.rewrite_month(
-            month: month, history: history, operated_solar_terms: operated_solar_terms
+            context: context, month: month, history: history,
+            operated_solar_terms: operated_solar_terms
           )
         end
 
+        # :reek:LongParameterList {max_params: 4}
+
         #
         # 月を運用結果に書き換える
         #
+        # @param [Context] context 暦コンテキスト
         # @param [Month] month 月
         # @param [Operation::MonthHistory] history 変更履歴
         # @param [OperatedSolarTerms] operated_solar_terms 運用時二十四節気
         #
         # @return [Month] 月（運用結果）
         #
-        def self.rewrite_month(month:, history:, operated_solar_terms:)
+        def self.rewrite_month(context:, month:, history:, operated_solar_terms:)
           return month unless month.western_date == history.western_date
 
           operated_month = Monthly::OperatedMonth.new(
+            context: context,
             month_label: month.month_label, first_day: month.first_day,
             solar_terms: month.solar_terms, history: history,
             operated_solar_terms: operated_solar_terms
@@ -124,6 +133,7 @@ module Zakuro
           operated_month.rewrite
 
           Monthly::Month.new(
+            context: context,
             month_label: operated_month.month_label, first_day: operated_month.first_day,
             solar_terms: operated_month.solar_terms
           )

data/lib/zakuro/calculation/range/transfer/western_date_allocation.rb

@@ -15,12 +15,13 @@ module Zakuro
           #
           # 月初日の西暦日を更新する
           #
+          # @param [Context] context 暦コンテキスト
           # @param [Array<Year>] years 完全範囲（月初日なし）
           #
           # @return [Array<Year>] 完全範囲（月初日あり）
           #
-          def self.get(years:)
-            update_first_day(years: years)
+          def self.get(context:, years:)
+            update_first_day(context: context, years: years)
 
             years
           end
@@ -28,14 +29,16 @@ module Zakuro
           #
           # 月初日の西暦日を更新する
           #
+          # @param [Context] context 暦コンテキスト
           # @param [Array<Year>] years 完全範囲（月初日なし）
           #
-          def self.update_first_day(years:)
+          def self.update_first_day(context:, years:)
             years.each_with_index do |year, index|
               new_year_date = year.new_year_date.clone
 
               months = year.months
               update_first_day_within_all_months(
+                context: context,
                 new_year_date: new_year_date, months: months
               )
 
@@ -49,13 +52,16 @@ module Zakuro
           #
           # 全ての月で月初日の西暦日を更新する
           #
+          # @param [Context] context 暦コンテキスト
           # @param [Western::Calendar] new_year_date 元旦
           # @param [Array<Month>] months 月データ
           #
-          def self.update_first_day_within_all_months(new_year_date:, months:)
+          def self.update_first_day_within_all_months(context:,
+                                                      new_year_date:, months:)
             date = new_year_date.clone
             months.each_with_index do |month, index|
               updated_month = Monthly::Month.new(
+                context: context,
                 month_label: month.month_label,
                 first_day: Monthly::FirstDay.new(
                   remainder: month.first_day.remainder,

data/lib/zakuro/calculation/range/transfer/year_boundary.rb

@@ -20,12 +20,13 @@ module Zakuro
           #
           # 年間範囲内の年データの開始月を変更する
           #
+          # @param [Context] context 暦コンテキスト
           # @param [Array<Year>] annual_ranges 年データ（冬至基準）
           #
           # @return [Array<Year>] 年データ（元旦基準）
           #
-          def self.get(annual_ranges:)
-            categorize(annual_ranges: annual_ranges)
+          def self.get(context:, annual_ranges:)
+            categorize(context: context, annual_ranges: annual_ranges)
             rearranged_years(annual_ranges: annual_ranges)
           end
 
@@ -51,11 +52,12 @@ module Zakuro
           #
           # 年間範囲を昨年/今年で分類する
           #
+          # @param [Context] context 暦コンテキスト
           # @param [Array<Year>] annual_range 1年データ
           #
-          def self.categorize(annual_ranges:)
+          def self.categorize(context:, annual_ranges:)
             annual_ranges.each do |annual_range|
-              categorize_year(annual_range: annual_range)
+              categorize_year(context: context, annual_range: annual_range)
             end
           end
           private_class_method :categorize
@@ -63,14 +65,16 @@ module Zakuro
           #
           # 各月を昨年/今年で分類する
           #
+          # @param [Context] context 暦コンテキスト
           # @param [Array<Month>] annual_range 1年データ
           #
-          def self.categorize_year(annual_range:)
+          def self.categorize_year(context:, annual_range:)
             is_last_year = true
             annual_range.each_with_index do |month, index|
               is_last_year = false if month.number == 1
 
               annual_range[index] = Monthly::InitializedMonth.new(
+                context: context,
                 month_label: month.month_label, first_day: month.first_day,
                 solar_terms: month.solar_terms, phase_index: month.phase_index,
                 is_last_year: is_last_year

data/lib/zakuro/version.rb

@@ -3,5 +3,5 @@
 # :nodoc:
 module Zakuro
   # @return [String] library version
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

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

@@ -62,12 +62,13 @@ module Zakuro
         #   * 対象年に対して、前年11月-当年11月までを出力する
         #   * 対象年（西暦）と計算年（元号x年）の紐付けは行わない
         #
+        # @param [Context] context 暦コンテキスト
         # @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)
+        def self.collect_annual_range_after_last_november_1st(context:, western_year:)
+          annual_range = initialized_annual_range(context: context, western_year: western_year)
 
           apply_big_and_small_of_the_month(annual_range: annual_range)
 
@@ -111,11 +112,12 @@ module Zakuro
         #
         # 1年データを取得する
         #
+        # @param [Context] context 暦コンテキスト
         # @param [Integer] western_year 西暦年
         #
         # @return [Array<Month>] 1年データ
         #
-        def self.initialized_annual_range(western_year:)
+        def self.initialized_annual_range(context:, western_year:)
           result = []
           lunar_phase = Monthly::LunarPhase.new(western_year: western_year)
 
@@ -125,6 +127,7 @@ module Zakuro
 
             result.push(
               Calculation::Monthly::InitializedMonth.new(
+                context: context,
                 month_label: Calculation::Monthly::MonthLabel.new,
                 first_day: Calculation::Monthly::FirstDay.new(remainder: adjusted),
                 phase_index: 0

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

@@ -162,7 +162,7 @@ module Zakuro
       # 次の二十四節気に移る
       #
       def next_solar_term
-        @solar_term.next!
+        @solar_term.next_term!
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zakuro
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - pldb
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-01 00:00:00.000000000 Z
+date: 2021-05-03 00:00:00.000000000 Z
 dependencies: []
 description: mainly lunar solar calendar
 email: