zakuro 0.5.0 → 0.6.0

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require_relative '../base/gengou'
 require_relative './first_day'
 require_relative './month_label'
 
@@ -21,6 +22,8 @@ module Zakuro
         attr_reader :first_day
         # @return [Array<SolarTerm>] 二十四節気
         attr_reader :solar_terms
+        # @return [Base::Gengou] 元号
+        attr_reader :gengou
 
         #
         # 初期化
@@ -29,13 +32,25 @@ module Zakuro
         # @param [MonthLabel] month_label 月表示名
         # @param [FirstDay] first_day 月初日（朔日）
         # @param [Array<SolarTerm>] solar_terms 二十四節気
+        # @param [Base::Gengou] gengou 元号
         #
-        def initialize(context:, month_label: MonthLabel.new, first_day: FirstDay.new,
-                       solar_terms: [])
+        def initialize(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
           @solar_terms = solar_terms
+          @gengou = gengou
+        end
+
+        #
+        # 不正か
+        #
+        # @return [True] 不正
+        # @return [False] 不正なし
+        #
+        def invalid?
+          @context.invalid?
         end
 
         #
@@ -181,6 +196,38 @@ module Zakuro
         def same?(other:)
           number == other.number && leaped? == other.leaped?
         end
+
+        #
+        # 月の終了日を返す
+        #
+        # @return [Western::Calendar] 月の終了日
+        #
+        def end_date
+          return Western::Calendar.new if western_date.invalid?
+
+          western_date.clone + days - 1
+        end
+
+        #
+        # 範囲内か
+        #
+        # @param [Western::Calendar] date 日付
+        #
+        # @return [True] 範囲内
+        # @return [False] 範囲外
+        #
+        def include?(date:)
+          return false if invalid?
+
+          start_date = western_date
+          return false if start_date.invalid?
+
+          return false if date < start_date
+
+          return false if date > end_date
+
+          true
+        end
       end
     end
   end

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

@@ -34,10 +34,10 @@ module Zakuro
         # @param [Operation::MonthHistory] history 変更履歴（月）
         #
         def initialize(context:, operated_solar_terms:, month_label: MonthLabel.new,
-                       first_day: FirstDay.new, solar_terms: [],
+                       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)
+                solar_terms: solar_terms, gengou: gengou)
           @history = history
           @operated_solar_terms = operated_solar_terms
           @moved = false

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

@@ -1,13 +1,20 @@
 # frozen_string_literal: true
 
-require_relative '../../era/western'
+require_relative '../../version/context'
+
+require_relative '../../era/western/calendar'
 require_relative '../../output/logger'
 
-require_relative '../base/multi_gengou_roller'
+require_relative '../gengou/scroll'
+
+require_relative '../base/gengou'
 require_relative '../base/year'
 
+require_relative '../version/version'
+
 require_relative './transfer/year_boundary'
-require_relative './transfer/western_date_allocation'
+
+require_relative './transfer/gengou_scroller'
 
 # :nodoc:
 module Zakuro
@@ -37,11 +44,7 @@ module Zakuro
         # @return [Western::Calendar] 終了日
         attr_reader :end_date
         # @return [MultiGengouRoller] 改元処理
-        attr_reader :multi_gengou_roller
-        # @return [Western::Calendar] 最過去の元旦
-        attr_reader :new_year_date
-        # @return [Integer] 西暦年
-        attr_reader :western_year
+        attr_reader :scroll
 
         # @return [Output::Logger] ロガー
         LOGGER = Output::Logger.new(location: 'full_range')
@@ -58,12 +61,9 @@ module Zakuro
           @end_date = end_date
           return if invalid?
 
+          # TODO: 現時点では使用していない。特定の暦を指定できるようになった状態で使用する
           @context = context
-          @multi_gengou_roller = Base::MultiGengouRoller.new(
-            start_date: start_date, end_date: end_date
-          )
-          @new_year_date = @multi_gengou_roller.oldest_date.clone
-          @western_year = @new_year_date.year
+          @scroll = Gengou::Scroll.new(start_date: start_date, end_date: end_date)
         end
 
         #
@@ -79,130 +79,92 @@ module Zakuro
         #
         # 完全範囲を取得する
         #
-        # @return [Array<Year>] 完全範囲
+        # @return [Array<Base::Year>] 完全範囲
         #
         def get
           return [] if invalid?
 
-          years = Transfer::YearBoundary.get(
-            context: @context, annual_ranges: annual_ranges
-          )
-          years = update_gengou(years: years)
-
-          Transfer::WesternDateAllocation.update_first_day(
-            context: @context, years: years
-          )
-
-          years
-        end
+          years = version_ranges
 
-        # :reek:TooManyStatements { max_statements: 7 }
-
-        #
-        # 完全範囲内の年データを取得する
-        #
-        # @return [Array<Year>] 年データ（冬至基準）
-        #
-        def annual_ranges
-          oldest_date = @new_year_date
-          newest_date = @multi_gengou_roller.newest_date
-          annual_range = context.resolver.annual_range
+          years.each(&:commit)
 
-          years = []
-          ((oldest_date.year)..(newest_date.year + 2)).each do |year|
-            years.push(
-              annual_range.get(
-                context: @context, western_year: year
-              )
-            )
-          end
+          Transfer::GengouScroller.set(scroll: scroll, years: years)
 
           years
         end
 
-        # :reek:TooManyStatements { max_statements: 8 }
+        private
 
         #
-        # 完全範囲内の年データの元号を開始年基準で更新する
-        #
-        # @param [Array<Year>] years 年データ（元旦基準）
+        # 暦別範囲
         #
-        # @return [Array<Year>] 元号更新済み年データ（元旦基準）
+        # @return [Array<Base::Year>] 完全範囲
         #
-        def update_gengou(years:)
-          updated_years = []
+        def version_ranges
+          result = []
 
-          nearest_end_date = choise_nearest_end_date
+          start_year = @scroll.western_start_year
+          end_year = @scroll.western_end_year
 
-          years.each do |year|
-            next_year(years: updated_years, year: year)
+          versions = Version.get(start_year: start_year, end_year: end_year)
 
-            if @new_year_date > nearest_end_date
-              @multi_gengou_roller.transfer
-              nearest_end_date = choise_nearest_end_date
-            end
-            @multi_gengou_roller.next_year
-          end
-
-          updated_years
-        end
+          versions.each_with_index do |version, index|
+            context = Context.new(version_name: version.name)
+            start_year = version.start_year
+            end_year = version.end_year
+            # 最後の暦だけ1年足す（次の元号の開始年まで計算するケースあり）
+            end_year += 1 if (index + 1) == versions.size
 
-        private
-
-        #
-        # 元号処理対象の年を進める
-        #
-        # @param [Array<Year>] years 元号処理済み年データ（元旦基準）
-        # @param [Year] year 元号処理前の年（元旦基準）
-        #
-        def next_year(years:, year:)
-          updated_year = update_year(year: year)
-
-          years.push(updated_year)
-
-          next_new_year_date(total_days: updated_year.total_days)
+            years = boundary_resolved_ranges(
+              context: context, start_year: start_year, end_year: end_year
+            )
+            result.concat(years)
+          end
 
-          nil
+          result
         end
 
         #
-        # 年の元号を更新する
+        # 年境界解決済みの範囲
         #
-        # @param [Year] year 元号処理前の年（元旦基準）
+        # @param [Context] context 暦コンテキスト
+        # @param [Integer] start_year 開始西暦年
+        # @param [Integer] end_year 終了西暦年
         #
-        # @return [Year] 元号処理済の年（元旦基準）
+        # @return [Array<Base::Year>] 年境界解決済みの範囲
         #
-        def update_year(year:)
-          multi_gengou = @multi_gengou_roller.multi_gengou.clone
-
-          updated_year = Base::Year.new(
-            multi_gengou: multi_gengou, new_year_date: @new_year_date.clone,
-            months: year.months
+        def boundary_resolved_ranges(context:, start_year:, end_year:)
+          ranges = annual_ranges(
+            context: context, start_year: start_year, end_year: end_year
           )
-          updated_year.commit
 
-          updated_year
+          Transfer::YearBoundary.get(
+            context: context, annual_ranges: ranges
+          )
         end
 
         #
-        # 次の年に進める
+        # 完全範囲内の年データを取得する
         #
-        # @param [Integer] total_days 年の日数
+        # @param [Context] context 暦コンテキスト
+        # @param [Integer] start_year 開始西暦年
+        # @param [Integer] end_year 終了西暦年
         #
-        def next_new_year_date(total_days:)
-          @new_year_date += total_days
-          @multi_gengou_roller.next(days: total_days)
+        # @return [Array<Base::Year>] 年データ（冬至基準）
+        #
+        def annual_ranges(context:, start_year:, end_year:)
+          annual_range = context.resolver.annual_range
 
-          nil
-        end
+          years = []
+          (start_year..(end_year + 1)).each do |year|
+            years.push(
+              annual_range.get(
+                context: context, western_year: year
+              )
+            )
+          end
 
-        #
-        # 現在日からみて直近の未来に対する元号の切替前日を求める
-        #
-        # @return [Western::Calendar] 元号の切替前日
-        #
-        def choise_nearest_end_date
-          @multi_gengou_roller.choise_nearest_end_date
+          years
         end
       end
     end

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

@@ -4,6 +4,7 @@ require_relative './operated_solar_terms'
 require_relative '../../operation/operation'
 require_relative '../base/operated_year'
 require_relative '../../calculation/monthly/operated_month'
+require_relative './transfer/gengou_scroller'
 
 # :nodoc:
 module Zakuro
@@ -27,11 +28,15 @@ module Zakuro
         # 初期化
         #
         # @param [Context] context 暦コンテキスト
+        # @param [Western::Calendar] start_date 開始日
+        # @param [Western::Calendar] end_date 終了日
         # @param [Array<Year>] years 年データ（完全範囲）
         #
-        def initialize(context:, years: [])
+        def initialize(context:, start_date: Western::Calendar.new, end_date: Western::Calendar.new,
+                       years: [])
           @context = context
           @years = years
+          @scroll = Gengou::Scroll.new(start_date: start_date, end_date: end_date)
           @operated_solar_terms = OperatedSolarTerms.new(context: context, years: @years)
           @operated_solar_terms.create
         end
@@ -48,6 +53,8 @@ module Zakuro
 
           OperatedRange.commit(operated_years: operated_years)
 
+          Transfer::GengouScroller.set(scroll: @scroll, years: operated_years)
+
           operated_years
         end
 
@@ -61,7 +68,7 @@ module Zakuro
 
           years.each do |year|
             operated_year = OperatedRange.rewrite_year(
-              context: context, year: year,
+              year: year,
               operated_solar_terms: @operated_solar_terms
             )
             operated_years.push(operated_year)
@@ -121,16 +128,14 @@ module Zakuro
         #
         # 年を書き換える
         #
-        # @param [Context] context 暦コンテキスト
         # @param [Year] year 年
         # @param [OperatedSolarTerms] operated_solar_terms 運用時二十四節気
         #
         # @return [OperatedYear] 年
         #
-        def self.rewrite_year(context:, year:, operated_solar_terms:)
-          result = Base::OperatedYear.new(
-            multi_gengou: year.multi_gengou, new_year_date: year.new_year_date
-          )
+        def self.rewrite_year(year:, operated_solar_terms:)
+          context = year.context
+          result = Base::OperatedYear.new(context: context)
           year.months.each do |month|
             result.push(month: resolve_month(
               context: context, month: month,
@@ -175,7 +180,7 @@ module Zakuro
           operated_month = Monthly::OperatedMonth.new(
             context: context,
             month_label: month.month_label, first_day: month.first_day,
-            solar_terms: month.solar_terms, history: history,
+            solar_terms: month.solar_terms, history: history, gengou: month.gengou,
             operated_solar_terms: operated_solar_terms
           )
 

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

@@ -57,6 +57,8 @@ module Zakuro
         # @return [SolarTerm] 二十四節気
         #
         def get(western_date: Western::Calendar.new)
+          context = current_context(western_date: western_date)
+
           solar_term_class = context.resolver.solar_term
           solar_term = @directions.fetch(western_date.format, solar_term_class.new)
 
@@ -68,23 +70,6 @@ module Zakuro
           [true, solar_term]
         end
 
-        #
-        # 二十四節気の移動元/移動先を生成する
-        #
-        # @return [Hash<String, SolarTerm>] 二十四節気の移動元/移動先（西暦日 -> 対応する二十四節気）
-        #
-        def create_directions
-          directions = {}
-
-          years.each do |year|
-            OperatedSolarTerms.create_directions_with_months(
-              context: context, directions: directions, months: year.months
-            )
-          end
-
-          directions
-        end
-
         # :reek:TooManyStatements { max_statements: 6 }
 
         #
@@ -195,6 +180,40 @@ module Zakuro
             index: destination.index
           )
         end
+
+        private
+
+        #
+        # 日付に対応する暦コンテキストを取得する
+        #
+        # @param [Western::Calendar] western_date 西暦日
+        #
+        # @return [Context] 暦コンテキスト
+        #
+        def current_context(western_date: Western::Calendar.new)
+          @years.each do |year|
+            return year.context if western_date >= year.new_year_date
+          end
+
+          Context.new
+        end
+
+        #
+        # 二十四節気の移動元/移動先を生成する
+        #
+        # @return [Hash<String, SolarTerm>] 二十四節気の移動元/移動先（西暦日 -> 対応する二十四節気）
+        #
+        def create_directions
+          directions = {}
+
+          years.each do |year|
+            OperatedSolarTerms.create_directions_with_months(
+              context: year.context, directions: directions, months: year.months
+            )
+          end
+
+          directions
+        end
       end
     end
   end

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

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require_relative '../../monthly/month'
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Calculation
+    # :nodoc:
+    module Range
+      # :nodoc:
+      module Transfer
+        #
+        # GengouScroller 元号スクロール
+        #
+        module GengouScroller
+          #
+          # 元号を年に設定する
+          #
+          # @param [Gengou::Scroll] scroll 元号スクロール
+          # @param [Array<Base::Year>] years 年
+          #
+          def self.set(scroll:, years: [])
+            years.each do |year|
+              update_gengou_year(scroll: scroll, year: year)
+            end
+          end
+
+          #
+          # 年の元号を更新する
+          #
+          # @param [Base::Year] year 年
+          #
+          def self.update_gengou_year(scroll:, year:)
+            year.months.each_with_index do |month, index|
+              scroll.run(month: month)
+              gengou = scroll.to_gengou
+              year.months[index] = Monthly::Month.new(
+                context: month.context,
+                month_label: month.month_label,
+                first_day: Monthly::FirstDay.new(
+                  remainder: month.first_day.remainder,
+                  western_date: gengou.start_date.clone
+                ),
+                solar_terms: month.solar_terms, gengou: gengou
+              )
+            end
+          end
+          private_class_method :update_gengou_year
+        end
+      end
+    end
+  end
+end

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

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../../../calculation/base/multi_gengou_roller'
 require_relative '../../../calculation/base/year'
 
-require_relative '../../../era/western'
+require_relative '../../../era/western/calendar'
 
 # :nodoc:
 module Zakuro
@@ -21,27 +20,30 @@ module Zakuro
           # 年間範囲内の年データの開始月を変更する
           #
           # @param [Context] context 暦コンテキスト
-          # @param [Array<Year>] annual_ranges 年データ（冬至基準）
+          # @param [Array<Base::Year>] annual_ranges 年データ（冬至基準）
           #
-          # @return [Array<Year>] 年データ（元旦基準）
+          # @return [Array<Base::Year>] 年データ（元旦基準）
           #
           def self.get(context:, annual_ranges:)
             categorize(context: context, annual_ranges: annual_ranges)
-            rearranged_years(annual_ranges: annual_ranges)
+            rearranged_years(context: context, annual_ranges: annual_ranges)
           end
 
           #
           # 年間範囲内の年データの開始月を変更する
           #
-          # @param [Array<Year>] annual_ranges 年データ（冬至基準）
+          # @param [Context] context 暦コンテキスト
+          # @param [Array<Base::Year>] annual_ranges 年データ（冬至基準）
           #
-          # @return [Array<Year>] 年データ（元旦基準）
+          # @return [Array<Base::Year>] 年データ（元旦基準）
           #
-          def self.rearranged_years(annual_ranges:)
+          def self.rearranged_years(context:, annual_ranges:)
             years = []
 
             (0..(annual_ranges.size - 2)).each do |index|
-              year = rearranged_year(annual_ranges: annual_ranges, index: index)
+              year = rearranged_year(
+                context: context, annual_ranges: annual_ranges, index: index
+              )
               years.push(year)
             end
 
@@ -53,7 +55,7 @@ module Zakuro
           # 年間範囲を昨年/今年で分類する
           #
           # @param [Context] context 暦コンテキスト
-          # @param [Array<Year>] annual_range 1年データ
+          # @param [Array<Base::Year>] annual_range 1年データ
           #
           def self.categorize(context:, annual_ranges:)
             annual_ranges.each do |annual_range|
@@ -86,16 +88,17 @@ module Zakuro
           #
           # 年データの開始月を変更する
           #
-          # @param [Array<Year>] annual_ranges 年データ（冬至基準）
+          # @param [Context] context 暦コンテキスト
+          # @param [Array<Base::Year>] annual_ranges 年データ（冬至基準）
           # @param [Integer] index 対象年の要素番号
           #
-          # @return [Year] 年データ（元旦基準）
+          # @return [Base::Year] 年データ（元旦基準）
           #
-          def self.rearranged_year(annual_ranges:, index:)
+          def self.rearranged_year(context:, annual_ranges:, index:)
             current_annual_range = annual_ranges[index]
             next_annual_range = annual_ranges[index + 1]
 
-            year = push_current_year(annual_range: current_annual_range)
+            year = push_current_year(context: context, annual_range: current_annual_range)
             push_last_year(annual_range: next_annual_range, year: year)
 
             year
@@ -105,12 +108,13 @@ module Zakuro
           #
           # 当年データを生成する
           #
-          # @param [Array<Year>] annual_ranges 年データ（冬至基準）
-          # @param [Year] year 対象年
+          # @param [Context] context 暦コンテキスト
+          # @param [Array<Month>] annual_range 1年データ
           #
-          # @return [Year] 当年月ありの対象年
+          # @return [Base::Year] 当年月ありの対象年
           #
-          def self.push_current_year(annual_range:, year: Base::Year.new)
+          def self.push_current_year(context:, annual_range:)
+            year = Base::Year.new(context: context)
             annual_range.each do |month|
               next if month.is_last_year
 
@@ -124,10 +128,10 @@ module Zakuro
           #
           # 昨年データを生成する
           #
-          # @param [Array<Year>] annual_ranges 年データ（冬至基準）
-          # @param [Year] year 対象年
+          # @param [Array<Month>] annual_range 1年データ
+          # @param [Base::Year] year 対象年
           #
-          # @return [Year] 昨年月ありの対象年
+          # @return [Base::Year] 昨年月ありの対象年
           #
           def self.push_last_year(annual_range:, year: Base::Year.new)
             annual_range.each do |month|