zakuro 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d08bb0a2c54dc9063ff82a701ea1f37cc9df43a8a4b4fad26d8dd9245ddde625
-  data.tar.gz: 566e821086421324a1ad61752c7e743a0a15d52d06cd3b83c60fb366f8424cbe
+  metadata.gz: fd8b402a7084ab57e0424c65d9851cc72f759b81f6f9b4c7f1e71afcda27d561
+  data.tar.gz: f204f25a8a6addad96556cb9376b406d6c1285375e79c693169d3095b6f5b387
 SHA512:
-  metadata.gz: 759f9d80603988387f6f896fc0d0fcc0800e75879055350aee6ce2c2e862e9f81b4e0e59aacf5b1a84bcf8244ce68db8576eb4562148189fe9d5ce3d6c525d49
-  data.tar.gz: 56e35d9ec9f2445fd063500032d4eec965faed3165d6d04882491a73ccb9b7419a14b5b1e54e801bd8cf6a0130cc1bbd1a7de1ff674f87be9ddd8e271624153c
+  metadata.gz: a7c7c8b0fef50d3da9f45701883ec271f3c000676a4a70e1d0c73ae4b15249e6a2cd57be47bd01a9ad6109da9b6593745ccc348c83d32743a09442bf7a922343
+  data.tar.gz: c5e6aa6ef4b4cc21814859753bf8bfd02be637173011bc6a2eb3dd28f4cfe1505d9faeb6544759f3f92543a8ee35820c73d54811a48d9d47ab645d38a995ed16

data/lib/zakuro/operation/month/parser.rb

@@ -340,7 +340,7 @@ module Zakuro
         Month.new(
           number: create_month_number(yaml_hash: yaml_hash['number']),
           leaped: create_month_leaped(yaml_hash: yaml_hash['leaped']),
-          days: create_month_day(yaml_hash: yaml_hash['days'])
+          is_many_days: create_month_day(yaml_hash: yaml_hash['days'])
         )
       end
       private_class_method :create_month

data/lib/zakuro/operation/month/type.rb

@@ -186,7 +186,7 @@ module Zakuro
       # @return [Leaped] 閏有無
       attr_reader :leaped
       # @return [Days] 月の大小
-      attr_reader :days
+      attr_reader :is_many_days
 
       # :reek:BooleanParameter
 
@@ -197,10 +197,10 @@ module Zakuro
       # @param [Leaped] leaped 閏有無
       # @param [Days] days 月の大小
       #
-      def initialize(number: Number.new, leaped: Leaped.new, days: Days.new)
+      def initialize(number: Number.new, leaped: Leaped.new, is_many_days: Days.new)
         @number = number
         @leaped = leaped
-        @days = days
+        @is_many_days = is_many_days
       end
 
       #
@@ -408,11 +408,6 @@ module Zakuro
       # @return [String] 30日
       BIG = '大'
 
-      # @return [String] 計算
-      attr_reader :calc
-      # @return [String] 運用
-      attr_reader :actual
-
       #
       # 初期化
       #
@@ -430,7 +425,7 @@ module Zakuro
       # @return [True] 大
       # @return [False] 小
       #
-      def many_days_calc?
+      def calc
         @calc == BIG
       end
 
@@ -440,7 +435,7 @@ module Zakuro
       # @return [True] 大
       # @return [False] 小
       #
-      def many_days_actual?
+      def actual
         @actual == BIG
       end
 

data/lib/zakuro/version.rb

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

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

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+
+require_relative './remainder'
+
 # :nodoc:
 module Zakuro
   # :nodoc:
@@ -13,6 +16,9 @@ module Zakuro
       # @return [Remainder] 時刻情報（大余小余）
       attr_reader :remainder
 
+      # @return [Remainder] 気策（24分の1年）
+      SOLAR_TERM_AVERAGE = Remainder.new(day: 15, minute: 1835, second: 5)
+
       # @return [Hash<Integer, Symbol>] 順序
       ORDER = {
         0 => :touji,
@@ -72,6 +78,62 @@ module Zakuro
         (@index == -1 && @remainder.invalid?)
       end
 
+      def index?(index)
+        result = ORDER.fetch(index, -1)
+
+        result != -1
+      end
+
+      #
+      # 次の二十四節気に進める
+      #
+      def next!
+        @index += 1
+        @index = 0 if @index >= ORDER.size
+
+        @remainder.add!(SOLAR_TERM_AVERAGE)
+      end
+
+      #
+      # 指定した連番の二十四節気まで進める
+      #
+      # @param [Integer] index 連番
+      #
+      def next_by_index(index)
+        return ArgumentError.new, 'invalid index' unless index?(index)
+
+        loop do
+          return if @index == index
+
+          next!
+        end
+      end
+
+      #
+      # 指定した連番の二十四節気まで戻す
+      #
+      # @param [Integer] index 連番
+      #
+      def prev_by_index(index)
+        return ArgumentError.new, 'invalid index' unless index?(index)
+
+        loop do
+          return if @index == index
+
+          prev!
+        end
+      end
+
+      #
+      # 前の二十四節気に戻る
+      #
+      def prev!
+        @index -= 1
+        @index = 23 if @index.negative?
+
+        @remainder.sub!(SOLAR_TERM_AVERAGE)
+      end
+
       #
       # ディープコピー
       #

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

@@ -37,12 +37,83 @@ module Zakuro
         @phase_index = phase_index
       end
 
+      # :reek:TooManyStatements { max_statements: 6 }
+
+      #
+      # 現在の二十四節気に合わせて月表示情報を書き換える
+      #
+      def rename_month_label_by_solar_term
+        return ArgumentError.new, 'solar term must not be empty.' if empty_solar_term?
+
+        even = even_term
+
+        is_many_days = month_label.is_many_days
+        if even.invalid?
+          @month_label = MonthLabel.new(
+            number: InitializedMonth.month_number_by_odd_term_index(odd_term.index),
+            leaped: true, is_many_days: is_many_days
+          )
+          return
+        end
+
+        @month_label = MonthLabel.new(
+          number: InitializedMonth.month_number_by_even_term_index(even.index),
+          leaped: false, is_many_days: is_many_days
+        )
+      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
+
       #
       # 一ヶ月戻す
       #
       def back_to_last_month
         @is_last_year = true if month_label.back_to_last_month
       end
+
+      #
+      # 二十四節気の数を返す
+      #
+      # @return [Integer] 二十四節気の数
+      #
+      def solar_term_size
+        solar_terms.size
+      end
     end
   end
 end

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

@@ -59,7 +59,7 @@ module Zakuro
         @average_remainder = WinterSolstice.calc_averaged_last_november_1st(
           western_year: @western_year
         )
-        # 天正冬至
+        # 天正閏余
         winter_solstice_age = \
           WinterSolstice.calc_moon_age(western_year: @western_year)
         # 入定気
@@ -180,7 +180,7 @@ module Zakuro
       # @return [Integer] 太陽運動の補正値
       #
       def correction_solar_value
-        @solar_term = SolarOrbit.calc_solar_term_by_remainder(
+        @solar_term = SolarLocation.get(
           solar_term: @solar_term
         )
         debug("@solar_term.remainder: #{@solar_term.remainder.format(form: '%d-%d.%d')}")

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

@@ -7,6 +7,8 @@ require_relative '../../../operation/operation'
 module Zakuro
   # :nodoc:
   module Senmyou
+    # :reek:TooManyInstanceVariables { max_instance_variables: 5 }
+
     #
     # OperatedMonth 月情報（運用）
     #
@@ -19,13 +21,14 @@ module Zakuro
       #
       # 初期化
       #
+      # @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)
+      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)
         @history = history
         @operated_solar_terms = operated_solar_terms
@@ -47,77 +50,103 @@ module Zakuro
         diff = history.diffs.month
 
         @month_label = MonthLabel.new(
-          number: rewrite_number(diff: diff.number),
-          is_many_days: rewrite_many_days(diff: diff.days),
-          leaped: rewrite_leaped(diff: diff.leaped)
+          number: OperatedMonth.rewrite_month_fields(
+            month_diff: diff, month_label: month_label, name: 'number'
+          ),
+          is_many_days: OperatedMonth.rewrite_month_fields(
+            month_diff: diff, month_label: month_label, name: 'is_many_days'
+          ),
+          leaped: OperatedMonth.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.actual
+      end
+
       #
-      # 月ごとの差分（月）で書き換える
-      #
-      # @param [Operation::Number] diff 差分
-      #
-      # @return [Integer] 月
+      # 二十四節気ごとの差分で書き換える
       #
-      def rewrite_number(diff:)
-        return month_label.number if diff.invalid?
+      def rewrite_solar_terms
+        matched, operated_solar_term = @operated_solar_terms.get(
+          western_date: first_day.western_date
+        )
 
-        diff.actual
+        return unless matched
+
+        @solar_terms = OperatedMonth.create_operated_solar_terms(
+          operated_solar_term: operated_solar_term,
+          solar_terms: solar_terms
+        )
       end
 
       #
-      # 月ごとの差分（月の大小）で書き換える
+      # <Description>
       #
-      # @param [Operation::Days] diff 差分
+      # @param [<Type>] operated_solar_term <description>
+      # @param [Array<SolarTerm>] solar_terms 二十四節気
       #
-      # @return [Integer] 月の大小
+      # @return [Array<SolarTerm>] 二十四節気
       #
-      def rewrite_many_days(diff:)
-        return month_label.is_many_days if diff.invalid?
+      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)
 
-        diff.many_days_actual?
+        return result if used_solar_term?(index: index, solar_terms: solar_terms)
+
+        result.push(operated_solar_term)
+
+        result
       end
 
+      # :reek:ControlParameter
+
       #
-      # 月ごとの差分（閏有無）で書き換える
+      # 二十四節気が使用されているか
       #
-      # @param [Operation::Days] diff 差分
+      # @param [Integer] index 二十四節気番号
+      # @param [Array<SolarTerm>] solar_terms 二十四節気
       #
-      # @return [True] 閏あり
-      # @return [False] 閏なし
+      # @return [True] 使用
+      # @return [False] 未使用
       #
-      def rewrite_leaped(diff:)
-        return month_label.leaped if diff.invalid?
+      def self.used_solar_term?(index:, solar_terms:)
+        solar_terms.each do |solar_term|
+          return true if index == solar_term.index
+        end
 
-        diff.actual
+        false
       end
 
+      # :reek:ControlParameter
+
       #
-      # 二十四節気ごとの差分で書き換える
+      # 対象の二十四節気を除外する
       #
-      def rewrite_solar_terms
-        # TODO: リファクタリング
-        operated_solar_terms = []
-        matched, operated_solar_term = @operated_solar_terms.get(
-          western_date: @first_day.western_date
-        )
-
-        return unless matched
-
-        used = false
-        @solar_terms.each do |solar_term|
-          if operated_solar_term.index == solar_term.index
-            used = true
-            next
-          end
+      # @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
 
-          operated_solar_terms.push(solar_term)
+          result.push(solar_term)
         end
 
-        operated_solar_terms.push(operated_solar_term) unless used
-
-        @solar_terms = operated_solar_terms
+        result
       end
 
       #
@@ -143,7 +172,7 @@ module Zakuro
       # @return [Remainder] 月初日の大余小余
       #
       def rewrite_remainder(days:)
-        remainder = @first_day.remainder.clone
+        remainder = first_day.remainder.clone
         remainder.add!(Remainder.new(day: days, minute: 0, second: 0))
 
         remainder
@@ -157,7 +186,7 @@ module Zakuro
       # @return [Western::Calendar] 月初日の西暦日
       #
       def rewrite_western_date(days:)
-        western_date = @first_day.western_date.clone
+        western_date = first_day.western_date.clone
         western_date += days
 
         western_date