zakuro 0.7.2 → 0.8.0

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

@@ -2,6 +2,8 @@
 
 require_relative '../../output/logger'
 
+require_relative './const'
+
 # :nodoc:
 module Zakuro
   # :nodoc:
@@ -16,8 +18,10 @@ module Zakuro
         LOGGER = Output::Logger.new(location: 'lunar_phase')
 
         # @return [Array<String>] 月内の弦
-        PHASE_INDEXES = %w[朔日 上弦 望月 下弦].freeze
+        PHASE_INDEXES = Const::PHASE_INDEXES
 
+        # @return [Cycle::AbstractRemainder] 弦
+        attr_reader :quarter
         # @return [Cycle::AbstractRemainder] 経
         attr_reader :average_remainder
         # @return [Solar::AbstractLocation] 入定気
@@ -30,14 +34,14 @@ module Zakuro
         #
         # 初期化
         #
-        # @param [Cycle::AbstractRemainder] quater 弦
+        # @param [Cycle::AbstractRemainder] quarter 弦
         # @param [Solar::AbstractLocation] average_remainder 経
         # @param [Solar::AbstractLocation] solar_location 入定気
         # @param [Lunar::AbstractLocation] lunar_location 入暦
         #
-        def initialize(quater:, average_remainder:, solar_location:, lunar_location:)
+        def initialize(quarter:, average_remainder:, solar_location:, lunar_location:)
           # 弦
-          @quarter = quater
+          @quarter = quarter
           # 経
           @average_remainder = average_remainder
           # 入定気
@@ -87,7 +91,7 @@ module Zakuro
         #
         def next_index
           @index += 1
-          @index = 0 if @index >= PHASE_INDEXES.size
+          @index = 0 if index >= PHASE_INDEXES.size
           @index
         end
 
@@ -98,7 +102,7 @@ module Zakuro
         # @return [False] 朔月ではない
         #
         def first_phase?
-          @index.zero?
+          index.zero?
         end
 
         #
@@ -157,9 +161,9 @@ module Zakuro
         end
 
         def add_quarter_moon_size
-          @average_remainder.add!(@quarter)
-          @solar_location.add_quarter
-          @lunar_location.add_quarter
+          average_remainder.add!(quarter)
+          solar_location.add_quarter
+          lunar_location.add_quarter
 
           next_index
         end

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

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Calculation
+    # :nodoc:
+    module Monthly
+      #
+      # Const 定数
+      #
+      module Const
+        # @return [Array<String>] 月内の弦
+        PHASE_INDEXES = %w[朔日 上弦 望月 下弦].freeze
+      end
+    end
+  end
+end

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

@@ -67,43 +67,6 @@ module Zakuro
           )
         end
 
-        #
-        # 中気の連番に合わせて月を返す
-        #
-        # @example
-        #   20: 9月
-        #   22: 10月
-        #   0: 11月
-        #   2: 12月
-        #   4: 1月
-        #
-        # @param [Integer] index 中気番号
-        #
-        # @return [Integer] 月
-        #
-        def self.month_number_by_even_term_index(index)
-          half_index = index / 2
-
-          # 11月、12月
-          return half_index + 11 if half_index < 2
-
-          # 1月～10月
-          half_index - 1
-        end
-
-        #
-        # 節気の連番に合わせて月を返す
-        #
-        # @param [Integer] index 節気番号
-        #
-        # @return [Integer] 月
-        #
-        def self.month_number_by_odd_term_index(index)
-          even_index = index - 1
-
-          month_number_by_even_term_index(even_index)
-        end
-
         #
         # 一ヶ月戻す
         #
@@ -119,6 +82,45 @@ module Zakuro
         def solar_term_size
           solar_terms.size
         end
+
+        class << self
+          #
+          # 中気の連番に合わせて月を返す
+          #
+          # @example
+          #   20: 9月
+          #   22: 10月
+          #   0: 11月
+          #   2: 12月
+          #   4: 1月
+          #
+          # @param [Integer] index 中気番号
+          #
+          # @return [Integer] 月
+          #
+          def month_number_by_even_term_index(index)
+            half_index = index / 2
+
+            # 11月、12月
+            return half_index + 11 if half_index < 2
+
+            # 1月～10月
+            half_index - 1
+          end
+
+          #
+          # 節気の連番に合わせて月を返す
+          #
+          # @param [Integer] index 節気番号
+          #
+          # @return [Integer] 月
+          #
+          def month_number_by_odd_term_index(index)
+            even_index = index - 1
+
+            month_number_by_even_term_index(even_index)
+          end
+        end
       end
     end
   end

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

@@ -34,8 +34,8 @@ module Zakuro
         # @param [Array<SolarTerm>] solar_terms 二十四節気
         # @param [Base::Gengou] gengou 元号
         #
-        def initialize(context: Context::Context.new, month_label: MonthLabel.new, first_day: FirstDay.new,
-                       solar_terms: [], gengou: Base::Gengou.new)
+        def initialize(context: Context::Context.new, month_label: MonthLabel.new,
+                       first_day: FirstDay.new, solar_terms: [], gengou: Base::Gengou.new)
           @context = context
           @month_label = month_label
           @first_day = first_day
@@ -50,7 +50,7 @@ module Zakuro
         # @return [False] 不正なし
         #
         def invalid?
-          @context.invalid?
+          context.invalid?
         end
 
         #
@@ -68,7 +68,7 @@ module Zakuro
         # @return [Western::Calendar] 西暦日
         #
         def western_date
-          @first_day.western_date
+          first_day.western_date
         end
 
         #
@@ -77,7 +77,7 @@ module Zakuro
         # @return [Remainder] 大余小余
         #
         def remainder
-          @first_day.remainder
+          first_day.remainder
         end
 
         #
@@ -87,7 +87,7 @@ module Zakuro
         # @return [False] 小の月（29日）
         #
         def many_days?
-          @month_label.is_many_days
+          month_label.is_many_days
         end
 
         #
@@ -96,7 +96,7 @@ module Zakuro
         # @return [Integer] 日数
         #
         def days
-          @month_label.days
+          month_label.days
         end
 
         #
@@ -105,7 +105,7 @@ module Zakuro
         # @return [String] 月の名前（大小）
         #
         def days_name
-          @month_label.days_name
+          month_label.days_name
         end
 
         #
@@ -114,7 +114,7 @@ module Zakuro
         # @return [Integer] 月（xx月のxx）
         #
         def number
-          @month_label.number
+          month_label.number
         end
 
         #
@@ -124,7 +124,7 @@ module Zakuro
         # @return [False] 平月
         #
         def leaped?
-          @month_label.leaped
+          month_label.leaped
         end
 
         #
@@ -147,7 +147,7 @@ module Zakuro
         # @return [False] 設定あり
         #
         def empty_solar_term?
-          @solar_terms.empty?
+          solar_terms.empty?
         end
 
         #
@@ -156,7 +156,7 @@ module Zakuro
         # @return [SolarTerm] 中気
         #
         def even_term
-          @solar_terms.each do |term|
+          solar_terms.each do |term|
             return term if term.index.even?
           end
 
@@ -169,7 +169,7 @@ module Zakuro
         # @return [SolarTerm] 節気
         #
         def odd_term
-          @solar_terms.each do |term|
+          solar_terms.each do |term|
             return term if term.index.odd?
           end
 
@@ -182,7 +182,7 @@ module Zakuro
         # @param [SolarTerm] term 二十四節気
         #
         def add_term(term:)
-          @solar_terms.push(term)
+          solar_terms.push(term)
         end
 
         #
@@ -240,7 +240,7 @@ module Zakuro
         def include_by_japan_date?(date:)
           return false if invalid?
 
-          linear_gengou = @gengou.match_by_name(name: date.gengou)
+          linear_gengou = gengou.match_by_name(name: date.gengou)
           return false if linear_gengou.invalid?
 
           return false unless linear_gengou.name == date.gengou

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

@@ -43,7 +43,7 @@ module Zakuro
         # @return [Integer] 日数
         #
         def days
-          @is_many_days ? 30 : 29
+          is_many_days ? 30 : 29
         end
 
         #
@@ -52,7 +52,7 @@ module Zakuro
         # @return [String] 月の名前（大小）
         #
         def days_name
-          @is_many_days ? '大' : '小'
+          is_many_days ? '大' : '小'
         end
 
         #
@@ -64,7 +64,7 @@ module Zakuro
         def back_to_last_month
           @number -= 1
 
-          return false if @number.positive?
+          return false if number.positive?
 
           @number = 12
 
@@ -80,7 +80,7 @@ module Zakuro
         # @return [False] 異なる月
         #
         def same?(other:)
-          @number == other.number && @leaped == other.leaped
+          number == other.number && leaped == other.leaped
         end
       end
     end

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

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
-require_relative './month'
 require_relative '../../operation/operation'
+require_relative './operated_solar_term'
+require_relative './month'
 
 # :nodoc:
 module Zakuro
@@ -17,8 +18,8 @@ module Zakuro
       class OperatedMonth < Month
         # @return [Operation::MonthHistory] 変更履歴（月）
         attr_reader :history
-        # @return [OperatedSolarTerms] 運用時二十四節気
-        attr_reader :operated_solar_terms
+        # @return [OperatedSolarTerm] 運用時二十四節気
+        attr_reader :operated_solar_term
 
         # :reek:LongParameterList {max_params: 6}
         # rubocop:disable Metrics/ParameterLists
@@ -27,19 +28,19 @@ module Zakuro
         # 初期化
         #
         # @param [Context::Context] context 暦コンテキスト
-        # @param [OperatedSolarTerms] operated_solar_terms 運用時二十四節気
+        # @param [OperatedSolarTerm] operated_solar_term 運用時二十四節気
         # @param [MonthLabel] month_label 月表示名
         # @param [FirstDay] first_day 月初日（朔日）
         # @param [Array<SolarTerm>] solar_terms 二十四節気
         # @param [Operation::MonthHistory] history 変更履歴（月）
         #
-        def initialize(context:, operated_solar_terms:, month_label: MonthLabel.new,
+        def initialize(context:, operated_solar_term:, month_label: MonthLabel.new,
                        first_day: FirstDay.new, solar_terms: [], gengou: Base::Gengou.new,
                        history: Operation::MonthHistory.new)
           super(context: context, month_label: month_label, first_day: first_day,
                 solar_terms: solar_terms, gengou: gengou)
           @history = history
-          @operated_solar_terms = operated_solar_terms
+          @operated_solar_term = operated_solar_term
           @moved = false
         end
 
@@ -61,110 +62,39 @@ module Zakuro
           diff = history.diffs.month
 
           @month_label = MonthLabel.new(
-            number: OperatedMonth.rewrite_month_fields(
+            number: self.class.rewrite_month_fields(
               month_diff: diff, month_label: month_label, name: 'number'
             ),
-            is_many_days: OperatedMonth.rewrite_month_fields(
+            is_many_days: self.class.rewrite_month_fields(
               month_diff: diff, month_label: month_label, name: 'is_many_days'
             ),
-            leaped: OperatedMonth.rewrite_month_fields(
+            leaped: self.class.rewrite_month_fields(
               month_diff: diff, month_label: month_label, name: 'leaped'
             )
           )
         end
 
-        def self.rewrite_month_fields(month_diff:, month_label:, name:)
-          method_name = name.intern
-
-          diff = month_diff.send(method_name)
-          default = month_label.send(method_name)
-          return default if diff.invalid?
-
-          diff.dest
-        end
-
         #
         # 二十四節気ごとの差分で書き換える
         #
         def rewrite_solar_terms
-          matched, operated_solar_term = @operated_solar_terms.get(
+          matched, solar_term = operated_solar_term.get(
             western_date: first_day.western_date
           )
 
           return unless matched
 
-          @solar_terms = OperatedMonth.create_operated_solar_terms(
-            operated_solar_term: operated_solar_term,
+          @solar_terms = OperatedSolarTerm.create_operated_solar_term(
+            operated_solar_term: solar_term,
             solar_terms: solar_terms
           )
         end
 
-        #
-        # 運用情報によって改変した二十四節気を作成する
-        #
-        # @param [<Type>] operated_solar_term 運用情報（二十四節気）
-        # @param [Array<SolarTerm>] solar_terms 二十四節気
-        #
-        # @return [Array<SolarTerm>] 二十四節気
-        #
-        def self.create_operated_solar_terms(operated_solar_term:, solar_terms:)
-          index = operated_solar_term.index
-
-          # 別の月に移動する二十四節気。割り当てない。
-          result = remove_solar_term(index: index, solar_terms: solar_terms)
-
-          return result if used_solar_term?(index: index, solar_terms: solar_terms)
-
-          result.push(operated_solar_term)
-
-          result
-        end
-
-        # :reek:ControlParameter
-
-        #
-        # 二十四節気が使用されているか
-        #
-        # @param [Integer] index 二十四節気番号
-        # @param [Array<SolarTerm>] solar_terms 二十四節気
-        #
-        # @return [True] 使用
-        # @return [False] 未使用
-        #
-        def self.used_solar_term?(index:, solar_terms:)
-          solar_terms.each do |solar_term|
-            return true if index == solar_term.index
-          end
-
-          false
-        end
-
-        # :reek:ControlParameter
-
-        #
-        # 対象の二十四節気を除外する
-        #
-        # @param [Integer] index 二十四節気番号
-        # @param [Array<SolarTerm>] solar_terms 二十四節気
-        #
-        # @return [Array<SolarTerm>] 二十四節気（対象除外済）
-        #
-        def self.remove_solar_term(index:, solar_terms:)
-          result = []
-          solar_terms.each do |solar_term|
-            next if index == solar_term.index
-
-            result.push(solar_term)
-          end
-
-          result
-        end
-
         #
         # 月初日ごとの差分で書き換える
         #
         def rewrite_first_day
-          diffs = @history.diffs
+          diffs = history.diffs
           return if diffs.invalid_days?
 
           days = diffs.days
@@ -242,10 +172,31 @@ module Zakuro
           @moved = true
         end
 
+        class << self
+          #
+          # 計算結果を該当のフィールドの運用情報に書き換える
+          #
+          # @param [Operation::Diffs] month_diff 月差分
+          # @param [MonthLabel] month_label 月表示情報
+          # @param [String] name フィールド名
+          #
+          # @return [Object] 運用情報
+          #
+          def rewrite_month_fields(month_diff:, month_label:, name:)
+            method_name = name.intern
+
+            diff = month_diff.send(method_name)
+            default = month_label.send(method_name)
+            return default if diff.invalid?
+
+            diff.dest
+          end
+        end
+
         private
 
         def history_month_number
-          @history.diffs.month.number
+          history.diffs.month.number
         end
       end
     end

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

@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Calculation
+    # :nodoc:
+    module Monthly
+      #
+      # OperatedSolarTerm 運用二十四節気
+      #
+      module OperatedSolarTerm
+        class << self
+          #
+          # 運用情報によって改変した二十四節気を作成する
+          #
+          # @param [<Type>] operated_solar_term 運用情報（二十四節気）
+          # @param [Array<SolarTerm>] solar_terms 二十四節気
+          #
+          # @return [Array<SolarTerm>] 二十四節気
+          #
+          def create_operated_solar_term(operated_solar_term:, solar_terms:)
+            index = operated_solar_term.index
+
+            # 別の月に移動する二十四節気。割り当てない。
+            result = remove_solar_term(index: index, solar_terms: solar_terms)
+
+            return result if used_solar_term?(index: index, solar_terms: solar_terms)
+
+            result.push(operated_solar_term)
+
+            result
+          end
+
+          private
+
+          # :reek:ControlParameter
+
+          #
+          # 二十四節気が使用されているか
+          #
+          # @param [Integer] index 二十四節気番号
+          # @param [Array<SolarTerm>] solar_terms 二十四節気
+          #
+          # @return [True] 使用
+          # @return [False] 未使用
+          #
+          def used_solar_term?(index:, solar_terms:)
+            solar_terms.each do |solar_term|
+              return true if index == solar_term.index
+            end
+
+            false
+          end
+
+          # :reek:ControlParameter
+
+          #
+          # 対象の二十四節気を除外する
+          #
+          # @param [Integer] index 二十四節気番号
+          # @param [Array<SolarTerm>] solar_terms 二十四節気
+          #
+          # @return [Array<SolarTerm>] 二十四節気（対象除外済）
+          #
+          def remove_solar_term(index:, solar_terms:)
+            result = []
+            solar_terms.each do |solar_term|
+              next if index == solar_term.index
+
+              result.push(solar_term)
+            end
+
+            result
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -72,7 +72,7 @@ module Zakuro
         # @return [False] 有効
         #
         def invalid?
-          @start_date.invalid?
+          start_date.invalid?
         end
 
         #
@@ -100,30 +100,13 @@ module Zakuro
         # @return [Array<Base::Year>] 完全範囲
         #
         def version_ranges
-          result = []
-
-          start_year = @scroll.western_start_year
-          last_year = @scroll.western_last_year
+          start_year = scroll.western_start_year
+          last_year = scroll.western_last_year
 
           # TODO: context にデフォルト暦名が設定されている場合は使用しない
           versions = Version.get(start_year: start_year, last_year: last_year)
 
-          versions.each_with_index do |version, index|
-            specified_context = Context::Context.new(
-              version: version.name, options: context.option.hash
-            )
-            start_year = version.start_year
-            last_year = version.last_year
-            # 最後の暦だけ1年足す（次の元号の開始年まで計算するケースあり）
-            last_year += 1 if (index + 1) == versions.size
-
-            years = boundary_resolved_ranges(
-              context: specified_context, start_year: start_year, last_year: last_year
-            )
-            result.concat(years)
-          end
-
-          result
+          collect_version_ranges(versions: versions, start_year: start_year, last_year: last_year)
         end
 
         #
@@ -168,6 +151,36 @@ module Zakuro
 
           years
         end
+
+        #
+        # 暦別範囲を収集する
+        #
+        # @param [Array<Version::Range>] versions 暦の範囲
+        # @param [Integer] start_year 開始西暦年
+        # @param [Integer] last_year 終了西暦年
+        #
+        # @return [Array<Base::Year>] 完全範囲
+        #
+        def collect_version_ranges(versions:, start_year:, last_year:)
+          result = []
+
+          versions.each_with_index do |version, index|
+            specified_context = Context::Context.new(
+              version: version.name, options: context.option.hash
+            )
+            start_year = version.start_year
+            last_year = version.last_year
+            # 最後の暦だけ1年足す（次の元号の開始年まで計算するケースあり）
+            last_year += 1 if (index + 1) == versions.size
+
+            years = boundary_resolved_ranges(
+              context: specified_context, start_year: start_year, last_year: last_year
+            )
+            result.concat(years)
+          end
+
+          result
+        end
       end
     end
   end