zakuro 0.7.0 → 0.9.0

data/lib/zakuro/calculation/era/gengou/internal/connector.rb

@@ -60,7 +60,7 @@ module Zakuro
         #
         def replace(gengou:)
           matched_index = -1
-          @unsolved_list.each_with_index do |unsolved, index|
+          unsolved_list.each_with_index do |unsolved, index|
             next unless unsolved.name == gengou.name
 
             matched_index = index
@@ -68,18 +68,18 @@ module Zakuro
           end
 
           if matched_index == -1
-            @unsolved_list.push(gengou)
+            unsolved_list.push(gengou)
             return gengou
           end
 
-          matched = @unsolved_list[matched_index]
+          matched = unsolved_list[matched_index]
 
           result = recreate(gengou: gengou, unsolved: matched)
 
           @unsolved_list[matched_index] = result
 
           # 分離した元号の末尾まで到達した
-          @unsolved_list.delete_at(matched_index) unless result.change_last_date?
+          unsolved_list.delete_at(matched_index) unless result.change_last_date?
 
           result
         end

data/lib/zakuro/calculation/era/gengou/internal/counter.rb

@@ -56,9 +56,9 @@ module Zakuro
         # @return [Japan::Calendar] 和暦開始日
         #
         def japan_start_date
-          return Japan::Calendar.new if @gengou.invalid?
+          return Japan::Calendar.new if gengou.invalid?
 
-          @gengou.both_start_date.japan
+          gengou.both_start_date.japan
         end
 
         #
@@ -67,9 +67,9 @@ module Zakuro
         # @return [Western::Calendar] 西暦開始日
         #
         def western_start_date
-          return Western::Calendar.new if @gengou.invalid?
+          return Western::Calendar.new if gengou.invalid?
 
-          @start_date
+          start_date
         end
 
         #
@@ -78,9 +78,9 @@ module Zakuro
         # @return [Western::Calendar] 西暦終了日
         #
         def western_last_date
-          return Western::Calendar.new if @gengou.invalid?
+          return Western::Calendar.new if gengou.invalid?
 
-          @last_date
+          last_date
         end
 
         #
@@ -103,7 +103,7 @@ module Zakuro
         def name
           return '' unless @gengou
 
-          @gengou.name
+          gengou.name
         end
 
         #
@@ -113,7 +113,7 @@ module Zakuro
         # @return [False] 不正なし
         #
         def invalid?
-          @gengou.invalid? || @japan_year == INVALID_YEAR || @western_year == INVALID_YEAR
+          gengou.invalid? || japan_year == INVALID_YEAR || western_year == INVALID_YEAR
         end
 
         #
@@ -125,7 +125,7 @@ module Zakuro
         # @return [False] 含まれない
         #
         def include?
-          @gengou.include?
+          gengou.include?
         end
 
         #
@@ -151,7 +151,7 @@ module Zakuro
         def change_start_date?
           return false if invalid?
 
-          @start_date != native_start_date
+          start_date != native_start_date
         end
 
         #
@@ -163,7 +163,7 @@ module Zakuro
         def change_last_date?
           return false if invalid?
 
-          @last_date != native_last_date
+          last_date != native_last_date
         end
 
         #
@@ -185,10 +185,10 @@ module Zakuro
         # 有効な日付範囲を選択する
         #
         def select_valid_date
-          return if @gengou.invalid?
+          return if gengou.invalid?
 
-          @start_date = @gengou.both_start_date.western.clone if @start_date.invalid?
-          @last_date = @gengou.last_date.clone if @last_date.invalid?
+          @start_date = gengou.both_start_date.western.clone if start_date.invalid?
+          @last_date = gengou.last_date.clone if last_date.invalid?
         end
 
         #
@@ -197,7 +197,7 @@ module Zakuro
         # @return [Western::Calendar]設定された元号の開始日
         #
         def native_start_date
-          @gengou.both_start_date.western
+          gengou.both_start_date.western
         end
 
         #
@@ -206,7 +206,7 @@ module Zakuro
         # @return [Western::Calendar] 設定された元号の終了日
         #
         def native_last_date
-          @gengou.last_date
+          gengou.last_date
         end
       end
     end

data/lib/zakuro/calculation/era/gengou/internal/publisher.rb

@@ -14,89 +14,91 @@ module Zakuro
       # 元号発行
       #
       module Publisher
-        #
-        # 発行する
-        #
-        # @param [Western::Calendar] start_date 西暦開始日
-        # @param [Western::Calendar] last_date 西暦終了日
-        # @param [Array<Counter>] first_gengou 1行目元号
-        # @param [Array<Counter>] second_gengou 2行目元号
-        #
-        # @return [Base::Gengou] 元号
-        #
-        def self.run(start_date: Western::Calendar.new, last_date: Western::Calendar.new,
-                     first_gengou: [], second_gengou: [])
+        class << self
+          #
+          # 発行する
+          #
+          # @param [Western::Calendar] start_date 西暦開始日
+          # @param [Western::Calendar] last_date 西暦終了日
+          # @param [Array<Counter>] first_gengou 1行目元号
+          # @param [Array<Counter>] second_gengou 2行目元号
+          #
+          # @return [Base::Gengou] 元号
+          #
+          def run(start_date: Western::Calendar.new, last_date: Western::Calendar.new,
+                  first_gengou: [], second_gengou: [])
 
-          Base::Gengou.new(
-            start_date: start_date,
-            last_date: last_date,
-            first_line: to_linear_gengou(
-              start_date: start_date, last_date: last_date, gengou_list: first_gengou
-            ),
-            second_line: to_linear_gengou(
-              start_date: start_date, last_date: last_date, gengou_list: second_gengou
+            Base::Gengou.new(
+              start_date: start_date,
+              last_date: last_date,
+              first_line: to_linear_gengou(
+                start_date: start_date, last_date: last_date, gengou_list: first_gengou
+              ),
+              second_line: to_linear_gengou(
+                start_date: start_date, last_date: last_date, gengou_list: second_gengou
+              )
             )
-          )
-        end
+          end
+
+          #
+          # 直列元号に変換する
+          #
+          #   * 最初の元号：開始日～その元号の終了日
+          #   * 中間の元号：その元号の開始日～その元号の終了日
+          #   * 最後の元号：その元号の開始日～終了日
+          #
+          # @param [Western::Calendar] start_date 西暦開始日
+          # @param [Western::Calendar] last_date 西暦終了日
+          # @param [Array<Counter>] gengou_list 元号リスト
+          #
+          # @return [Array<Base::LinearGengou>] 元号リスト
+          #
+          def to_linear_gengou(start_date:, last_date:, gengou_list: [])
+            return [] if gengou_list.size.zero?
 
-        #
-        # 直列元号に変換する
-        #
-        #   * 最初の元号：開始日～その元号の終了日
-        #   * 中間の元号：その元号の開始日～その元号の終了日
-        #   * 最後の元号：その元号の開始日～終了日
-        #
-        # @param [Western::Calendar] start_date 西暦開始日
-        # @param [Western::Calendar] last_date 西暦終了日
-        # @param [Array<Counter>] gengou_list 元号リスト
-        #
-        # @return [Array<Base::LinearGengou>] 元号リスト
-        #
-        def self.to_linear_gengou(start_date:, last_date:, gengou_list: [])
-          return [] if gengou_list.size.zero?
+            result = []
 
-          result = []
+            gengou_list.each do |gengou|
+              if gengou.invalid?
+                # 無効元号は無効のままにする
+                result.push(Base::LinearGengou.new)
+                next
+              end
 
-          gengou_list.each do |gengou|
-            if gengou.invalid?
-              # 無効元号は無効のままにする
-              result.push(Base::LinearGengou.new)
-              next
+              linear_gengou = to_limited_linear_gengou(
+                start_date: start_date,
+                last_date: last_date,
+                gengou: gengou
+              )
+              result.push(linear_gengou)
             end
 
-            linear_gengou = to_limited_linear_gengou(
-              start_date: start_date,
-              last_date: last_date,
-              gengou: gengou
-            )
-            result.push(linear_gengou)
+            result
           end
 
-          result
-        end
-
-        #
-        # 範囲を限定した直列元号に変換する
-        #
-        # * 開始日・終了日により範囲を狭める
-        #
-        # @param [Western::Calendar] start_date 西暦開始日
-        # @param [Western::Calendar] last_date 西暦終了日
-        # @param [Counter] gengou 加算元号
-        #
-        # @return [Base::LinearGengou] 元号
-        #
-        def self.to_limited_linear_gengou(start_date:, last_date:, gengou:)
-          gengou_start_date = gengou.western_start_date.clone
-          gengou_last_date = gengou.western_last_date.clone
+          #
+          # 範囲を限定した直列元号に変換する
+          #
+          # * 開始日・終了日により範囲を狭める
+          #
+          # @param [Western::Calendar] start_date 西暦開始日
+          # @param [Western::Calendar] last_date 西暦終了日
+          # @param [Counter] gengou 加算元号
+          #
+          # @return [Base::LinearGengou] 元号
+          #
+          def to_limited_linear_gengou(start_date:, last_date:, gengou:)
+            gengou_start_date = gengou.western_start_date.clone
+            gengou_last_date = gengou.western_last_date.clone
 
-          gengou_start_date = start_date.clone if start_date > gengou_start_date
-          gengou_last_date = last_date.clone if last_date < gengou_last_date
+            gengou_start_date = start_date.clone if start_date > gengou_start_date
+            gengou_last_date = last_date.clone if last_date < gengou_last_date
 
-          Base::LinearGengou.new(
-            start_date: gengou_start_date, last_date: gengou_last_date,
-            name: gengou.name, year: gengou.japan_year
-          )
+            Base::LinearGengou.new(
+              start_date: gengou_start_date, last_date: gengou_last_date,
+              name: gengou.name, year: gengou.japan_year
+            )
+          end
         end
       end
     end

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

@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: true
 
 require_relative '../../../../../era/japan/gengou/resource'
 require_relative '../../../../../era/japan/gengou'
@@ -61,7 +61,7 @@ module Zakuro
           # @return [Gengou::Counter] 加算元号
           #
           def get(western_date: Western::Calendar.new)
-            @list.each do |linear_gengou|
+            list.each do |linear_gengou|
               next if linear_gengou.out?(start_date: western_date, last_date: western_date)
 
               Gengou::Counter.new(gengou: linear_gengou.gengou).clone
@@ -81,7 +81,7 @@ module Zakuro
           def collect(start_date: Western::Calendar.new, last_date: Western::Calendar.new)
             result = []
 
-            @list.each do |linear_gengou|
+            list.each do |linear_gengou|
               next if linear_gengou.out?(start_date: start_date, last_date: last_date)
 
               result.push(
@@ -106,7 +106,7 @@ module Zakuro
           def japan_start_date
             return Japan::Calendar.new if invalid?
 
-            @list[0].gengou.both_start_date.japan.clone
+            list[0].gengou.both_start_date.japan.clone
           end
 
           #
@@ -117,7 +117,7 @@ module Zakuro
           def western_start_date
             return Western::Calendar.new if invalid?
 
-            @list[0].gengou.both_start_date.western.clone
+            list[0].gengou.both_start_date.western.clone
           end
 
           #
@@ -128,7 +128,7 @@ module Zakuro
           def western_last_date
             return Western::Calendar.new if invalid?
 
-            @list[-1].gengou.last_date.clone
+            list[-1].gengou.last_date.clone
           end
 
           #
@@ -139,7 +139,7 @@ module Zakuro
           def western_start_year
             return INVALID_YEAR if invalid?
 
-            @list[0].gengou.both_start_year.western.clone
+            list[0].gengou.both_start_year.western.clone
           end
 
           #
@@ -150,9 +150,9 @@ module Zakuro
           def western_last_year
             return INVALID_YEAR if invalid?
 
-            return INVALID_YEAR if @list.size.zero?
+            return INVALID_YEAR if list.size.zero?
 
-            @list[-1].gengou.last_year
+            list[-1].gengou.last_year
           end
 
           #
@@ -162,9 +162,9 @@ module Zakuro
           # @return [False] 不正なし
           #
           def invalid?
-            return true unless @list
+            return true unless list
 
-            return true if @list.size.zero?
+            return true if list.size.zero?
 
             false
           end
@@ -175,9 +175,9 @@ module Zakuro
           # @return [Western::Calendar]設定された元号の開始日
           #
           def native_start_date
-            return Western::Calendar.new if @list.size.zero?
+            return Western::Calendar.new if list.size.zero?
 
-            @list[0].native_start_date
+            list[0].native_start_date
           end
 
           #
@@ -187,9 +187,9 @@ module Zakuro
           # @return [False] 同一
           #
           def change_start_date?
-            return false if @list.size.zero?
+            return false if list.size.zero?
 
-            @list[0].change_start_date?
+            list[0].change_start_date?
           end
 
           private
@@ -210,7 +210,7 @@ module Zakuro
           # @return [Array<Japan::Alignment::LinearGengou>] 元号
           #
           def line(start_date:, last_date:)
-            Japan::Gengou.line(line: @index, start_date: start_date, last_date: last_date)
+            Japan::Gengou.line(line: index, start_date: start_date, last_date: last_date)
           end
 
           #

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

@@ -43,25 +43,13 @@ module Zakuro
           # @param [Western::Calendar] last_date 西暦終了日
           #
           def renew(last_date: Western::Calendar.new)
-            native_start_date = Western::Calendar.new
-            [@first_list, @second_list].each do |list|
-              next unless list.change_start_date?
-
-              if native_start_date.invalid?
-                native_start_date = list.native_start_date.clone
-                next
-              end
-
-              next if native_start_date <= list.native_start_date
-
-              native_start_date = list.native_start_date.clone
-            end
+            start_date = native_start_date
 
-            return if native_start_date.invalid?
+            return if start_date.invalid?
 
-            @first_list = DatedList.new(first: true, start_date: native_start_date,
+            @first_list = DatedList.new(first: true, start_date: start_date,
                                         last_date: last_date)
-            @second_list = DatedList.new(first: false, start_date: native_start_date,
+            @second_list = DatedList.new(first: false, start_date: start_date,
                                          last_date: last_date)
           end
 
@@ -72,7 +60,7 @@ module Zakuro
           # @return [False] 不正なし
           #
           def invalid?
-            @first_list.invalid?
+            first_list.invalid?
           end
 
           #
@@ -85,7 +73,7 @@ module Zakuro
           #
           def collect_first(start_date: Western::Calendar.new,
                             last_date: Western::Calendar.new)
-            @first_list.collect(start_date: start_date, last_date: last_date)
+            first_list.collect(start_date: start_date, last_date: last_date)
           end
 
           #
@@ -98,7 +86,7 @@ module Zakuro
           #
           def collect_second(start_date: Western::Calendar.new,
                              last_date: Western::Calendar.new)
-            @second_list.collect(start_date: start_date, last_date: last_date)
+            second_list.collect(start_date: start_date, last_date: last_date)
           end
 
           #
@@ -133,12 +121,12 @@ module Zakuro
           # @return [Integer] 開始西暦年
           #
           def western_start_year
-            first_start_year = @first_list.western_start_year
-            second_start_year = @second_list.western_start_year
+            first_start_year = first_list.western_start_year
+            second_start_year = second_list.western_start_year
 
-            return first_start_year if @first_list.invalid?
+            return first_start_year if first_list.invalid?
 
-            return first_start_year if @second_list.invalid?
+            return first_start_year if second_list.invalid?
 
             return first_start_year if first_start_year < second_start_year
 
@@ -151,12 +139,12 @@ module Zakuro
           # @return [Integer] 終了西暦年
           #
           def western_last_year
-            first_last_year = @first_list.western_last_year
-            second_last_year = @second_list.western_last_year
+            first_last_year = first_list.western_last_year
+            second_last_year = second_list.western_last_year
 
-            return first_last_year if @first_list.invalid?
+            return first_last_year if first_list.invalid?
 
-            return first_last_year if @second_list.invalid?
+            return first_last_year if second_list.invalid?
 
             return first_last_year if first_last_year > second_last_year
 
@@ -165,26 +153,61 @@ module Zakuro
 
           private
 
+          #
+          # 設定された元号の開始日を取得する
+          #
+          # @return [Western::Calendar] 設定された元号の開始日
+          #
+          def native_start_date
+            result = Western::Calendar.new
+            [first_list, second_list].each do |list|
+              next unless list.change_start_date?
+
+              if result.invalid?
+                result = list.native_start_date.clone
+                next
+              end
+
+              next if result <= list.native_start_date
+
+              result = list.native_start_date.clone
+            end
+
+            result
+          end
+
           #
           # 最古の元号を取得する
           #
           # @return [List] 最古の元号
           #
           def oldest_list
-            return @first_list if @first_list.invalid?
+            return first_list if invalid_list?
+
+            first_western_date = first_list.western_start_date
+            second_western_date = second_list.western_start_date
 
-            return @first_list if @second_list.invalid?
+            return first_list if first_western_date.invalid?
 
-            first_western_date = @first_list.western_start_date
-            second_western_date = @second_list.western_start_date
+            return first_list if second_western_date.invalid?
 
-            return @first_list if first_western_date.invalid?
+            return first_list if first_western_date < second_western_date
 
-            return @first_list if second_western_date.invalid?
+            second_list
+          end
+
+          #
+          # 元号リストが不正か
+          #
+          # @return [True] 不正
+          # @return [False] 不正なし
+          #
+          def invalid_list?
+            return true if first_list.invalid?
 
-            return @first_list if first_western_date < second_western_date
+            return true if second_list.invalid?
 
-            @second_list
+            false
           end
         end
       end

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

@@ -35,11 +35,11 @@ module Zakuro
           #
           def update
             # 開始日の30日前に前の元号がある場合は、前の元号を設定する
-            start_date = @start_date.clone - (MAX_MONTH_DAYS + 1)
+            start = start_date.clone - (MAX_MONTH_DAYS + 1)
             # 開始日の30日後に次の元号がある場合は、次の元号を設定する
-            last_date = @last_date.clone + (MAX_MONTH_DAYS + 1)
+            last = last_date.clone + (MAX_MONTH_DAYS + 1)
 
-            @list |= line(start_date: start_date, last_date: last_date)
+            @list |= line(start_date: start, last_date: last)
           end
         end
       end