zakuro 0.6.0 → 0.7.2

data/lib/zakuro/calculation/era/gengou/internal/reserve/named_list.rb

@@ -0,0 +1,125 @@
+# frozen_string_literal: true
+
+require_relative './abstract_list'
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Calculation
+    # :nodoc:
+    module Gengou
+      # :nodoc:
+      module Reserve
+        # NamedList
+        #
+        # 予約元号一覧（元号名）
+        #
+        class NamedList < AbstractList
+          # @return [String] 不正元号名
+          INVALID_NAME = Japan::Calendar::EMPTY
+
+          #
+          # 初期化
+          #
+          # @param [True, False] first true:1行目元号, false:2行目元号
+          # @param [String] start_name 開始元号名
+          # @param [String] last_name 終了元号名
+          #
+          def initialize(first: true, start_name: INVALID_NAME, last_name: INVALID_NAME)
+            @index = parse_index(first: first)
+            @start_date = Western::Calendar.new
+            @last_date = Western::Calendar.new
+
+            locate(start_name: start_name, last_name: last_name)
+            super(index: @index, start_date: @start_date, last_date: @last_date)
+          end
+
+          private
+
+          #
+          # 開始日・終了日を配置する
+          #
+          # @param [String] start_name 開始元号名
+          # @param [String] last_name 終了元号名
+          #
+          def locate(start_name:, last_name:)
+            start = start_name
+            last = last_name
+            last = start if last == INVALID_NAME
+
+            return if start == INVALID_NAME
+
+            [start, last].each do |name|
+              gengou_list = line_by_name(name: name)
+
+              next if gengou_list.size.zero?
+
+              choise_start_date(
+                date: gengou_list[0].start_date.clone
+              )
+              choise_last_date(
+                date: gengou_list[-1].last_date.clone
+              )
+            end
+          end
+
+          #
+          # 最古の開始日を選択する
+          #
+          # @param [Western::Calendar] date 西暦日
+          #
+          def choise_start_date(date:)
+            return if date.invalid?
+
+            if @start_date.invalid?
+              @start_date = date
+              return
+            end
+
+            return if date > @start_date
+
+            @start_date = date
+          end
+
+          #
+          # 最新の終了日を選択する
+          #
+          # @param [Western::Calendar] date 西暦日
+          #
+          def choise_last_date(date:)
+            return if date.invalid?
+
+            if @last_date.invalid?
+              @last_date = date
+              return
+            end
+
+            return if date < @last_date
+
+            @last_date = date
+          end
+
+          #
+          # 元号を取得する（元号名）
+          #
+          # @param [String] name 元号名
+          #
+          # @return [Array<Japan::Alignment::LinearGengou>] 元号
+          #
+          def line_by_name(name:)
+            Japan::Gengou.line_by_name(line: @index, name: name)
+          end
+
+          #
+          # 予約元号一覧を更新する
+          #
+          # すでに解決済みの開始日・終了日をそのまま使用する（前後の元号を引き当てない）
+          #
+          def update
+            @list |= line(start_date: start_date, last_date: last_date)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/zakuro/calculation/era/gengou/internal/reserve/named_range.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+require_relative './abstract_range'
+require_relative './named_list'
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Calculation
+    # :nodoc:
+    module Gengou
+      # :nodoc:
+      module Reserve
+        #
+        # NamedRange 予約済み計算範囲（元号名）
+        #
+        class NamedRange < AbstractRange
+          # @return [String] 不正元号名
+          INVALID_NAME = Japan::Calendar::EMPTY
+
+          #
+          # 初期化
+          #
+          # @param [String] start_name 開始元号名
+          # @param [String] last_name 終了元号名
+          #
+          def initialize(start_name: INVALID_NAME, last_name: INVALID_NAME)
+            @first_list = NamedList.new(first: true, start_name: start_name, last_name: last_name)
+            @second_list = NamedList.new(first: false, start_name: start_name, last_name: last_name)
+
+            start_date = western_start_date
+            last_date = western_last_date
+
+            super(start_date: start_date, last_date: last_date)
+          end
+
+          #
+          # 最新の元号から西暦終了日を取得する
+          #
+          # @return [Western::Calendar] 西暦終了日
+          #
+          def western_last_date
+            list = newest_list
+
+            return Western::Calendar.new if list.invalid?
+
+            list.western_last_date
+          end
+
+          #
+          # 最新の元号を取得する
+          #
+          # @return [List] 最新の元号
+          #
+          def newest_list
+            return @first_list if @first_list.invalid?
+
+            return @first_list if @second_list.invalid?
+
+            first_western_date = @first_list.western_last_date
+            second_western_date = @second_list.western_last_date
+
+            return @first_list if first_western_date.invalid?
+
+            return @first_list if second_western_date.invalid?
+
+            return @first_list if first_western_date > second_western_date
+
+            @second_list
+          end
+        end
+      end
+    end
+  end
+end

data/lib/zakuro/calculation/{gengou → era/gengou}/internal/reserve.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../../../era/western/calendar'
-require_relative './reserve/interval'
-require_relative './reserve/list'
+require_relative '../../../../era/western/calendar'
+require_relative './reserve/dated_range'
 
 # :nodoc:
 module Zakuro
@@ -29,12 +28,12 @@ module Zakuro
         #     * 終了日が最後の元号の改元前日30日以内の場合、さらに次の元号まで対象にする
         #
         # @param [Western::Calendar] start_date 開始日
-        # @param [Western::Calendar] end_date 終了日
+        # @param [Western::Calendar] last_date 終了日
         #
-        # @return [Interval] 予約済み計算範囲
+        # @return [Range] 予約済み計算範囲
         #
-        def self.get(start_date: Western::Calendar.new, end_date: Western::Calendar.new)
-          Interval.new(start_date: start_date, end_date: end_date)
+        def self.get(start_date: Western::Calendar.new, last_date: Western::Calendar.new)
+          DatedRange.new(start_date: start_date, last_date: last_date)
         end
       end
     end

data/lib/zakuro/calculation/era/gengou/named_scroll.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require_relative './abstract_scroll'
+require_relative './internal/reserve/named_range'
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Calculation
+    # :nodoc:
+    module Gengou
+      # NamedScroll
+      #
+      # 元号スクロール
+      #
+      class NamedScroll < AbstractScroll
+        #
+        # 初期化
+        #
+        # @param [String] start_name 開始元号名
+        # @param [String] last_name 終了元号名
+        #
+        def initialize(start_name: INVALID_NAME, last_name: INVALID_NAME)
+          range = Reserve::NamedRange.new(start_name: start_name, last_name: last_name)
+          super(range: range)
+        end
+      end
+    end
+  end
+end

data/lib/zakuro/calculation/{version → era/version}/internal/crawler.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../../../era/japan/version'
+require_relative '../../../../era/japan/version'
 require_relative './range'
 
 # :nodoc:
@@ -17,12 +17,12 @@ module Zakuro
         # 暦の範囲を取得する
         #
         # @param [Integer] start_year 開始西暦年
-        # @param [Integer] end_year 終了西暦年
+        # @param [Integer] last_year 終了西暦年
         #
         # @return [Array<Range>] 暦の範囲
         #
-        def self.get(start_year:, end_year:)
-          ranges = Japan::Version.ranges_with_year(start_year: start_year, end_year: end_year)
+        def self.get(start_year:, last_year:)
+          ranges = Japan::Version.ranges_with_year(start_year: start_year, last_year: last_year)
 
           result = []
 
@@ -32,13 +32,13 @@ module Zakuro
             range_start_year = range.start_year
             range_start_year = start_year if start_year > range.start_year
 
-            range_end_year = range.end_year
-            range_end_year = end_year if end_year < range.end_year
+            range_last_year = range.last_year
+            range_last_year = last_year if last_year < range.last_year
 
             result.push(
               Range.new(
                 name: range.name, start_date: range.start_date.clone,
-                start_year: range_start_year, end_year: range_end_year
+                start_year: range_start_year, last_year: range_last_year
               )
             )
           end

data/lib/zakuro/calculation/{version → era/version}/internal/range.rb

@@ -17,7 +17,7 @@ module Zakuro
         # @return [Integer] 開始西暦年
         attr_reader :start_year
         # @return [Integer] 終了西暦年
-        attr_reader :end_year
+        attr_reader :last_year
 
         #
         # 初期化
@@ -25,13 +25,13 @@ module Zakuro
         # @param [String] name 暦名
         # @param [Western::Calendar] start_date 暦の開始日
         # @param [Integer] start_year 開始西暦年
-        # @param [Integer] end_year 終了西暦年
+        # @param [Integer] last_year 終了西暦年
         #
-        def initialize(name:, start_date:, start_year:, end_year:)
+        def initialize(name:, start_date:, start_year:, last_year:)
           @name = name
           @start_date = start_date
           @start_year = start_year
-          @end_year = end_year
+          @last_year = last_year
         end
       end
     end

data/lib/zakuro/calculation/{version → era/version}/version.rb

@@ -12,12 +12,12 @@ module Zakuro
       # 暦の範囲を取得する
       #
       # @param [Integer] start_year 開始西暦年
-      # @param [Integer] end_year 終了西暦年
+      # @param [Integer] last_year 終了西暦年
       #
       # @return [Array<Range>] 暦の範囲
       #
-      def self.get(start_year:, end_year:)
-        Crawler.get(start_year: start_year, end_year: end_year)
+      def self.get(start_year:, last_year:)
+        Crawler.get(start_year: start_year, last_year: last_year)
       end
     end
   end

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

@@ -25,7 +25,7 @@ module Zakuro
         #
         # 初期化
         #
-        # @param [Context] context 暦コンテキスト
+        # @param [Context::Context] context 暦コンテキスト
         # @param [MonthLabel] month_label 月表示名
         # @param [Array<SolarTerm>] solar_terms 二十四節気
         # @param [FirstDay] first_day 月初日（朔日）

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

@@ -14,7 +14,7 @@ module Zakuro
       # Month 月情報
       #
       class Month
-        # @return [Context] 暦コンテキスト
+        # @return [Context::Context] 暦コンテキスト
         attr_reader :context
         # @return [MonthLabel] 月表示名
         attr_reader :month_label
@@ -28,13 +28,13 @@ module Zakuro
         #
         # 初期化
         #
-        # @param [Context] context 暦コンテキスト
+        # @param [Context::Context] context 暦コンテキスト
         # @param [MonthLabel] month_label 月表示名
         # @param [FirstDay] first_day 月初日（朔日）
         # @param [Array<SolarTerm>] solar_terms 二十四節気
         # @param [Base::Gengou] gengou 元号
         #
-        def initialize(context: Context.new, month_label: MonthLabel.new, first_day: FirstDay.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
@@ -202,7 +202,7 @@ module Zakuro
         #
         # @return [Western::Calendar] 月の終了日
         #
-        def end_date
+        def last_date
           return Western::Calendar.new if western_date.invalid?
 
           western_date.clone + days - 1
@@ -224,7 +224,46 @@ module Zakuro
 
           return false if date < start_date
 
-          return false if date > end_date
+          return false if date > last_date
+
+          true
+        end
+
+        #
+        # 範囲内か
+        #
+        # @param [Japan::Calendar] date 日付
+        #
+        # @return [True] 範囲内
+        # @return [False] 範囲外
+        #
+        def include_by_japan_date?(date:)
+          return false if invalid?
+
+          linear_gengou = @gengou.match_by_name(name: date.gengou)
+          return false if linear_gengou.invalid?
+
+          return false unless linear_gengou.name == date.gengou
+
+          return false unless linear_gengou.year == date.year
+
+          same_by_japan_date?(date: date)
+        end
+
+        private
+
+        #
+        # 同一の月情報かを検証する
+        #
+        # @param [Japan::Calendar] date 日付
+        #
+        # @return [True] 同一の月
+        # @return [False] 異なる月
+        #
+        def same_by_japan_date?(date: Japan::Calendar.new)
+          return false unless number == date.month
+
+          return false unless leaped? == date.leaped
 
           true
         end

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

@@ -26,7 +26,7 @@ module Zakuro
         #
         # 初期化
         #
-        # @param [Context] context 暦コンテキスト
+        # @param [Context::Context] context 暦コンテキスト
         # @param [OperatedSolarTerms] operated_solar_terms 運用時二十四節気
         # @param [MonthLabel] month_label 月表示名
         # @param [FirstDay] first_day 月初日（朔日）
@@ -80,7 +80,7 @@ module Zakuro
           default = month_label.send(method_name)
           return default if diff.invalid?
 
-          diff.actual
+          diff.dest
         end
 
         #

data/lib/zakuro/calculation/option/dropped_date/abstract_parameter.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Calculation
+    # :nodoc:
+    module Option
+      # :nodoc:
+      module DroppedDate
+        #
+        # AbstractParameter 没日引数
+        #
+        class AbstractParameter
+          # @return [True] 有効
+          # @return [False] 無効
+          attr_reader :valid
+          # @return [Integer] 年
+          attr_reader :year
+          # @return [Cycle::AbstractRemainder] 「有没之気」判定
+          attr_reader :limit
+          # @return [Class] 没余クラス
+          attr_reader :remainder_class
+
+          #
+          # 初期化
+          #
+          # @param [True, False] valid 有効/無効
+          # @param [Integer] year 年
+          # @param [Cycle::AbstractRemainder] limit 「有没之気」判定
+          # @param [Class] remainder_class 没余クラス
+          #
+          def initialize(valid: false, year: 0, limit: Cycle::AbstractRemainder.new,
+                         remainder_class: Object)
+            @valid = valid
+            @year = year
+            @limit = limit
+            @remainder_class = remainder_class
+          end
+        end
+      end
+    end
+  end
+end

data/lib/zakuro/calculation/option/dropped_date/location.rb

@@ -0,0 +1,135 @@
+# frozen_string_literal: true
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Calculation
+    # :nodoc:
+    module Option
+      # :nodoc:
+      module DroppedDate
+        #
+        # Location 没日位置
+        #
+        class Location
+          # @return [Integer] 理想上の年日数
+          IDEAL_YEAR = 360
+
+          # @return [Context::Context] 暦コンテキスト
+          attr_reader :context
+          # @return [True] 有効
+          # @return [False] 無効
+          attr_reader :valid
+          # @return [Cycle::AbstractRemainder] 「有没之気」判定
+          attr_reader :limit
+          # @return [Integer] 年
+          attr_reader :year
+          # @return [Array<Cycle::AbstractSolarTerm>] 二十四節気
+          attr_reader :solar_terms
+          # @return [Class] 没余クラス
+          attr_reader :remainder_class
+
+          #
+          # 初期化
+          #
+          # @param [Context::Context] context 暦コンテキスト
+          # @param [Array<Cycle::AbstractSolarTerm>] solar_terms 二十四節気
+          #
+          def initialize(context:, solar_terms: [])
+            parameter = context.resolver.dropped_date_parameter.new
+            @context = context
+            @valid = parameter.valid
+            @limit = parameter.limit
+            @year = parameter.year
+            @remainder_class = parameter.remainder_class
+            @solar_terms = solar_terms
+          end
+
+          #
+          # 不正か
+          #
+          # @return [True] 不正
+          # @return [False] 不正なし
+          #
+          def invalid?
+            !@valid
+          end
+
+          #
+          # 没日が存在するか？
+          #
+          # @return [True] 存在あり
+          # @return [False] 存在なし
+          #
+          def exist?
+            !solar_term_remainder.invalid?
+          end
+
+          #
+          # 「没余」を返す
+          #
+          # @return [Cycle::AbstractRemainder] 没余
+          #
+          def get
+            # 1. 二十四節気の大余小余を取り出す
+            remainder = solar_term_remainder
+            # 2. 小余360、秒45（360/8）で乗算する
+            total = multiple_ideal_year(remainder: remainder)
+            # 3. 上記2と章歳（3068055）の差を求める
+            diff = (year - total).abs
+            # 4. 上記3を通余で徐算する
+            result = remainder_class.new(total: diff)
+            # 5. 上記4の商と上記1の大余が没日大余、余りが小余（没余）
+            day = remainder_class.new(day: remainder.day, minute: 0, second: 0)
+
+            day.add(result)
+          end
+
+          #
+          # 該当の二十四節気を取得する
+          #
+          # @return [Cycle::AbstractSolarTerm] 二十四節気
+          #
+          def solar_term
+            solar_terms.each do |solar_term|
+              remainder = solar_term.remainder.clone
+              minute_later = remainder.class.new(
+                day: 0, minute: remainder.minute, second: remainder.second
+              )
+
+              return solar_term if minute_later >= limit
+            end
+
+            context.resolver.solar_term.new
+          end
+
+          private
+
+          #
+          # 二十四節気の大余小余を取得する
+          #
+          # @return [Type::Optional<Cycle::AbstractRemainder>] 大余小余
+          #
+          def solar_term_remainder
+            solar_term.remainder
+          end
+
+          #
+          # 理想上の年数を乗算する
+          #
+          #  宣明暦：小余360、秒45（360/8）で積算する
+          #
+          # @return [Cycle::AbstractRemainder] 大余小余
+          #
+          # @return [Integer] 乗算結果
+          #
+          def multiple_ideal_year(remainder:)
+            minute = remainder.minute * IDEAL_YEAR
+            second = remainder.second * (IDEAL_YEAR / remainder.base_minute)
+            minute + second
+          end
+        end
+      end
+    end
+  end
+end