zakuro 0.3.0 → 0.4.0

data/lib/zakuro/calculation/base/operated_year.rb

@@ -0,0 +1,114 @@
+# frozen_string_literal: true
+
+require_relative './year'
+require_relative './multi_gengou'
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Calculation
+    # :nodoc:
+    module Base
+      #
+      # OperatedYear 年（運用）
+      #
+      class OperatedYear < Year
+        #
+        # 初期化
+        #
+        # @param [Gengou] multi_gengou 元号
+        # @param [Array<OperatedMonth>] months 年内の全ての月
+        # @param [Integer] total_days 年の日数
+        # @param [Western::Calendar] new_year_date 元旦
+        #
+        def initialize(multi_gengou: MultiGengou.new, new_year_date: Western::Calendar.new,
+                       months: [], total_days: 0)
+          super(multi_gengou: multi_gengou, new_year_date: new_year_date,
+                months: months, total_days: total_days)
+        end
+
+        def commit
+          super
+
+          return if months.empty?
+
+          @new_year_date = months[0].first_day.western_date
+        end
+
+        #
+        # 引数を月の先頭に加える
+        #
+        # @param [Array<OperatedMonth>] first_months 先頭の月
+        #
+        def unshift_months(first_months)
+          # 逆順で加える
+          first_months.reverse_each do |month|
+            month.moved
+            months.unshift(month)
+          end
+        end
+
+        #
+        # 引数を月の最後に加える
+        #
+        # @param [Array<OperatedMonth>] last_months 最後の月
+        #
+        def push_months(last_months)
+          last_months.each do |month|
+            month.moved
+            months.push(month)
+          end
+        end
+
+        #
+        # 昨年に属する月を取り出す
+        #
+        # @return [Array<OperatedMonth>] 昨年に属する月
+        #
+        def shift_last_year_months
+          result, @months = OperatedYear.devide_with(method: :last_year?, arr: months)
+
+          result
+        end
+
+        #
+        # 来年に属する月を取り出す
+        #
+        # @return [Array<OperatedMonth>] 来年に属する月
+        #
+        def pop_next_year_months
+          result, @months = OperatedYear.devide_with(method: :next_year?, arr: months)
+
+          result
+        end
+
+        # :reek:TooManyStatements { max_statements: 8 }
+
+        #
+        # メソッドで配列を分離する
+        #
+        # @param [Symbol] method 条件メソッド
+        # @param [Array<Object>] arr 配列
+        #
+        # @return [Array<Object>] 一致配列
+        # @return [Array<Object>] 不一致配列
+        #
+        def self.devide_with(method:, arr: [])
+          match = []
+          unmatch = []
+
+          arr.each do |item|
+            if !item.moved? && item.send(method)
+              match.push(item)
+              next
+            end
+
+            unmatch.push(item)
+          end
+
+          [match, unmatch]
+        end
+      end
+    end
+  end
+end

data/lib/zakuro/calculation/base/year.rb

@@ -25,6 +25,9 @@ module Zakuro
         # 初期化
         #
         # @param [Gengou] multi_gengou 元号
+        # @param [Array<Month>] months 年内の全ての月
+        # @param [Integer] total_days 年の日数
+        # @param [Western::Calendar] new_year_date 元旦
         #
         def initialize(multi_gengou: MultiGengou.new, new_year_date: Western::Calendar.new,
                        months: [], total_days: 0)

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

@@ -23,7 +23,7 @@ module Zakuro
         # @param [Remainder] remainder 西暦日
         # @param [Western::Calendar] western_date 大余小余
         #
-        def initialize(western_date: Western::Calendar.new, remainder: Remainder.new)
+        def initialize(western_date: Western::Calendar.new, remainder:)
           # 西暦日
           @western_date = western_date
           # 大余小余

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

@@ -9,7 +9,7 @@ module Zakuro
   module Calculation
     # :nodoc:
     module Monthly
-      # :reek:TooManyInstanceVariables { max_instance_variables: 5 }
+      # :reek:TooManyInstanceVariables { max_instance_variables: 6 }
 
       #
       # OperatedMonth 月情報（運用）
@@ -40,6 +40,7 @@ module Zakuro
                 solar_terms: solar_terms)
           @history = history
           @operated_solar_terms = operated_solar_terms
+          @moved = false
         end
 
         # rubocop:enable Metrics/ParameterLists
@@ -99,9 +100,9 @@ module Zakuro
         end
 
         #
-        # <Description>
+        # 運用情報によって改変した二十四節気を作成する
         #
-        # @param [<Type>] operated_solar_term <description>
+        # @param [<Type>] operated_solar_term 運用情報（二十四節気）
         # @param [Array<SolarTerm>] solar_terms 二十四節気
         #
         # @return [Array<SolarTerm>] 二十四節気
@@ -203,6 +204,49 @@ module Zakuro
 
           western_date
         end
+
+        #
+        # 運用情報では昨年の月か
+        #
+        # @return [True] 昨年の月
+        # @return [False] 今年/来年の月
+        #
+        def last_year?
+          history_month_number.last_year?
+        end
+
+        #
+        # 運用情報では来年の月か
+        #
+        # @return [True] 来年の月
+        # @return [False] 今年/昨年の月
+        #
+        def next_year?
+          history_month_number.next_year?
+        end
+
+        #
+        # 別の年に移動したか
+        #
+        # @return [True] 移動済
+        # @return [False] 移動なし
+        #
+        def moved?
+          @moved
+        end
+
+        #
+        # 移動済とする
+        #
+        def moved
+          @moved = true
+        end
+
+        private
+
+        def history_month_number
+          @history.diffs.month.number
+        end
       end
     end
   end

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

@@ -2,6 +2,7 @@
 
 require_relative './operated_solar_terms'
 require_relative '../../operation/operation'
+require_relative '../base/operated_year'
 require_relative '../../calculation/monthly/operated_month'
 
 # :nodoc:
@@ -41,13 +42,19 @@ module Zakuro
         # @return [Array<Year>] 運用結果範囲
         #
         def get
-          rewrite
+          operated_years = rewrite
+
+          OperatedRange.move(operated_years: operated_years)
+
+          OperatedRange.commit(operated_years: operated_years)
+
+          operated_years
         end
 
         #
         # 運用結果に書き換える
         #
-        # @return [Array<Year>] 運用結果範囲
+        # @return [Array<OperatedYear>] 運用結果範囲
         #
         def rewrite
           operated_years = []
@@ -63,6 +70,54 @@ module Zakuro
           operated_years
         end
 
+        #
+        # 運用情報で年を跨ぐ月をその年に寄せる
+        #
+        # @param [Array<OperatedYear>] operated_years 運用結果範囲
+        #
+        def self.move(operated_years:)
+          # FIXME: この方式は完全ではない。範囲の1年前/1年後が必要
+          move_into_next_year(operated_years: operated_years)
+          move_into_last_year(operated_years: operated_years)
+        end
+
+        #
+        # 運用情報では来年に属する月を来年に寄せる
+        #
+        # @param [Array<OperatedYear>] operated_years 運用結果範囲
+        #
+        def self.move_into_next_year(operated_years:)
+          operated_years.each_cons(2) do |current_year, next_year|
+            months = current_year.pop_next_year_months
+
+            next_year.unshift_months(months)
+          end
+        end
+
+        #
+        # 運用情報では昨年に属する月を昨年に寄せる
+        #
+        # @param [Array<OperatedYear>] operated_years 運用結果範囲
+        #
+        def self.move_into_last_year(operated_years:)
+          rerversed_year = operated_years.reverse!
+          rerversed_year.each_cons(2) do |current_year, last_year|
+            months = current_year.shift_last_year_months
+            last_year.push_months(months)
+          end
+
+          rerversed_year.reverse!
+        end
+
+        #
+        # 年を確定させる
+        #
+        # @param [Array<OperatedYear>] operated_years 運用結果範囲
+        #
+        def self.commit(operated_years:)
+          operated_years.each(&:commit)
+        end
+
         #
         # 年を書き換える
         #
@@ -70,10 +125,10 @@ module Zakuro
         # @param [Year] year 年
         # @param [OperatedSolarTerms] operated_solar_terms 運用時二十四節気
         #
-        # @return [Year] 年
+        # @return [OperatedYear] 年
         #
         def self.rewrite_year(context:, year:, operated_solar_terms:)
-          result = Base::Year.new(
+          result = Base::OperatedYear.new(
             multi_gengou: year.multi_gengou, new_year_date: year.new_year_date
           )
           year.months.each do |month|
@@ -83,8 +138,6 @@ module Zakuro
             ))
           end
 
-          result.commit
-
           result
         end
 
@@ -100,8 +153,6 @@ module Zakuro
         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(
             context: context, month: month, history: history,
             operated_solar_terms: operated_solar_terms
@@ -121,8 +172,6 @@ module Zakuro
         # @return [Month] 月（運用結果）
         #
         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,
@@ -130,13 +179,9 @@ module Zakuro
             operated_solar_terms: operated_solar_terms
           )
 
-          operated_month.rewrite
+          operated_month.rewrite unless history.invalid?
 
-          Monthly::Month.new(
-            context: context,
-            month_label: operated_month.month_label, first_day: operated_month.first_day,
-            solar_terms: operated_month.solar_terms
-          )
+          operated_month
         end
       end
     end

data/lib/zakuro/era/japan/yaml/set-001-until-south.yaml

@@ -3,103 +3,103 @@ name: "南北朝前+南朝"
 # 元中9年閏10月4日
 end_date: "1392-11-18"
 list:
-  - name: "允恭"
+  - name: "允恭天皇"
     # 34年1月1日
     start_year: 34
     start_date: "445-1-24"
     new_year_date: "445-1-24"
     note: ""
-  - name: "安康"
+  - name: "安康天皇"
     # 1年1月1日
     start_year: 1
     start_date: "454-2-14"
     new_year_date: "454-2-14"
     note: ""
-  - name: "雄略"
+  - name: "雄略天皇"
     # 1年1月1日
     start_year: 1
     start_date: "457-2-10"
     new_year_date: "457-2-10"
     note: ""
-  - name: "清寧"
+  - name: "清寧天皇"
     # 1年1月1日
     start_year: 1
     start_date: "480-1-28"
     new_year_date: "480-1-28"
     note: ""
-  - name: "顕宗"
+  - name: "顕宗天皇"
     # 1年1月1日
     start_year: 1
     start_date: "485-2-1"
     new_year_date: "485-2-1"
     note: ""
-  - name: "仁賢"
+  - name: "仁賢天皇"
     # 1年1月1日
     start_year: 1
     start_date: "488-1-29"
     new_year_date: "488-1-29"
     note: ""
-  - name: "武烈"
+  - name: "武烈天皇"
     # 1年1月1日
     start_year: 1
     start_date: "499-1-28"
     new_year_date: "499-1-28"
     note: ""
-  - name: "継体"
+  - name: "継体天皇"
     # 1年1月1日
     start_year: 1
     start_date: "507-1-29"
     new_year_date: "507-1-29"
     note: ""
-  - name: "安閑"
+  - name: "安閑天皇"
     # 1年1月1日
     start_year: 1
     start_date: "534-1-30"
     new_year_date: "534-1-30"
     note: ""
-  - name: "宣化"
+  - name: "宣化天皇"
     # 1年1月1日
     start_year: 1
     start_date: "536-2-8"
     new_year_date: "536-2-8"
     note: ""
-  - name: "欽明"
+  - name: "欽明天皇"
     # 1年1月1日
     start_year: 1
     start_date: "540-1-25"
     new_year_date: "540-1-25"
     note: ""
-  - name: "敏達"
+  - name: "敏達天皇"
     # 1年1月1日
     start_year: 1
     start_date: "572-1-31"
     new_year_date: "572-1-31"
     note: ""
-  - name: "用明"
+  - name: "用明天皇"
     # 1年1月1日
     start_year: 1
     start_date: "586-1-25"
     new_year_date: "586-1-25"
     note: ""
-  - name: "崇峻"
+  - name: "崇峻天皇"
     # 1年1月1日
     start_year: 1
     start_date: "588-2-3"
     new_year_date: "588-2-3"
     note: ""
-  - name: "推古"
+  - name: "推古天皇"
     # 1年1月1日
     start_year: 1
     start_date: "593-2-7"
     new_year_date: "593-2-7"
     note: ""
-  - name: "舒明"
+  - name: "舒明天皇"
     # 1年1月1日
     start_year: 1
     start_date: "629-1-30"
     new_year_date: "629-1-30"
     note: ""
-  - name: "皇極"
+  - name: "皇極天皇"
     # 1年1月1日
     start_year: 1
     start_date: "642-2-5"
@@ -117,19 +117,19 @@ list:
     start_date: "650-3-22"
     new_year_date: "650-2-7"
     note: ""
-  - name: "斉明"
+  - name: "斉明天皇"
     # 1年1月1日
     start_year: 1
     start_date: "655-2-12"
     new_year_date: "655-2-12"
     note: ""
-  - name: "天智"
+  - name: "天智天皇"
     # 1年1月1日
     start_year: 1
     start_date: "662-1-25"
     new_year_date: "662-1-25"
     note: ""
-  - name: "天武"
+  - name: "天武天皇"
     # 1年1月1日
     start_year: 1
     start_date: "672-2-4"
@@ -141,13 +141,13 @@ list:
     start_date: "686-8-14"
     new_year_date: "686-1-30"
     note: ""
-  - name: "持統"
+  - name: "持統天皇"
     # 1年1月1日
     start_year: 1
     start_date: "687-2-18"
     new_year_date: "687-2-18"
     note: ""
-  - name: "文武"
+  - name: "文武天皇"
     # 1年1月1日
     start_year: 1
     start_date: "697-1-28"