zakuro 0.7.2 → 0.8.0

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

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

@@ -23,134 +23,132 @@ module Zakuro
         #  * もし元号が存在しない期間があれば、空の元号を生成する
         #
         module EmptyLink
-          #
-          # 空元号で満たす
-          #
-          # @param [Array<Gengou::Counter>] counters 加算元号リスト
-          # @param [Western::Calendar] start_date 開始日
-          # @param [Western::Calendar] last_date 終了日
-          #
-          def self.fill(counters:, start_date: Western::Calendar.new,
-                        last_date: Western::Calendar.new)
-            if counters.size.zero?
-              counters.push(
+          class << self
+            #
+            # 空元号で満たす
+            #
+            # @param [Array<Gengou::Counter>] counters 加算元号リスト
+            # @param [Western::Calendar] start_date 開始日
+            # @param [Western::Calendar] last_date 終了日
+            #
+            def fill(counters:, start_date: Western::Calendar.new,
+                     last_date: Western::Calendar.new)
+              if counters.size.zero?
+                counters.push(
+                  create_empty_counter(
+                    start_date: start_date.clone,
+                    last_date: last_date.clone
+                  )
+                )
+                return counters
+              end
+
+              fill_both_ends(counters: counters, start_date: start_date, last_date: last_date)
+
+              fill_middle(counters: counters)
+            end
+
+            private
+
+            #
+            # リストの両端を空元号で満たす
+            #
+            # @param [Array<Gengou::Counter>] counters 加算元号リスト
+            # @param [Western::Calendar] start_date 開始日
+            # @param [Western::Calendar] last_date 終了日
+            #
+            def fill_both_ends(counters:, start_date: Western::Calendar.new,
+                               last_date: Western::Calendar.new)
+              fill_by_start(counters: counters, start_date: start_date)
+
+              fill_by_last(counters: counters, last_date: last_date)
+            end
+
+            #
+            # 先頭要素の手前を空元号で満たす
+            #
+            # @param [Array<Gengou::Counter>] counters 加算元号リスト
+            # @param [Western::Calendar] start_date 開始日
+            #
+            def fill_by_start(counters:, start_date:)
+              return unless start_date < counters[0].start_date
+
+              counters.unshift(
                 create_empty_counter(
                   start_date: start_date.clone,
+                  last_date: counters[0].start_date.clone - 1
+                )
+              )
+            end
+
+            #
+            # 最終要素の手前を空元号で満たす
+            #
+            # @param [Array<Gengou::Counter>] counters 加算元号リスト
+            # @param [Western::Calendar] last_date 終了日
+            #
+            def fill_by_last(counters:, last_date:)
+              return unless last_date > counters[-1].last_date
+
+              counters.push(
+                create_empty_counter(
+                  start_date: counters[-1].last_date.clone + 1,
                   last_date: last_date.clone
                 )
               )
-              return counters
             end
 
-            fill_both_ends(counters: counters, start_date: start_date, last_date: last_date)
+            #
+            # 元号間を空元号で満たす
+            #
+            # @param [Array<Gengou::Counter>] counters 加算元号リスト
+            #
+            def fill_middle(counters:)
+              return if counters.size.zero?
 
-            fill_middle(counters: counters)
-          end
+              size = counters.size - 1
+              (0..size).reverse_each do |index|
+                break if index <= 0
 
-          #
-          # リストの両端を空元号で満たす
-          #
-          # @param [Array<Gengou::Counter>] counters 加算元号リスト
-          # @param [Western::Calendar] start_date 開始日
-          # @param [Western::Calendar] last_date 終了日
-          #
-          def self.fill_both_ends(counters:, start_date: Western::Calendar.new,
-                                  last_date: Western::Calendar.new)
-            fill_by_start(counters: counters, start_date: start_date)
-
-            fill_by_last(counters: counters, last_date: last_date)
-          end
-          private_class_method :fill_both_ends
-
-          #
-          # 先頭要素の手前を空元号で満たす
-          #
-          # @param [Array<Gengou::Counter>] counters 加算元号リスト
-          # @param [Western::Calendar] start_date 開始日
-          #
-          def self.fill_by_start(counters:, start_date:)
-            return unless start_date < counters[0].start_date
-
-            counters.unshift(
-              create_empty_counter(
-                start_date: start_date.clone,
-                last_date: counters[0].start_date.clone - 1
-              )
-            )
-          end
-          private_class_method :fill_by_start
-
-          #
-          # 最終要素の手前を空元号で満たす
-          #
-          # @param [Array<Gengou::Counter>] counters 加算元号リスト
-          # @param [Western::Calendar] last_date 終了日
-          #
-          def self.fill_by_last(counters:, last_date:)
-            return unless last_date > counters[-1].last_date
-
-            counters.push(
-              create_empty_counter(
-                start_date: counters[-1].last_date.clone + 1,
-                last_date: last_date.clone
-              )
-            )
-          end
-          private_class_method :fill_by_last
+                insert(counters: counters, index: index)
+              end
+            end
 
-          #
-          # 元号間を空元号で満たす
-          #
-          # @param [Array<Gengou::Counter>] counters 加算元号リスト
-          #
-          def self.fill_middle(counters:)
-            return if counters.size.zero?
+            #
+            # 対象要素に空元号を追加する
+            #
+            # @param [Array<Gengou::Counter>] counters 加算元号リスト
+            # @param [Integer] index 要素番号
+            #
+            def insert(counters:, index:)
+              before_last_date = counters[index - 1].last_date.clone
+              current_start_date = counters[index].start_date.clone
 
-            size = counters.size - 1
-            (0..size).reverse_each do |index|
-              break if index <= 0
+              return if (before_last_date.clone + 1) == current_start_date
 
-              insert(counters: counters, index: index)
+              counters.insert(
+                index,
+                create_empty_counter(
+                  start_date: before_last_date + 1, last_date: current_start_date - 1
+                )
+              )
             end
-          end
-          private_class_method :fill_middle
-
-          #
-          # 対象要素に空元号を追加する
-          #
-          # @param [Array<Gengou::Counter>] counters 加算元号リスト
-          # @param [Integer] index 要素番号
-          #
-          def self.insert(counters:, index:)
-            before_last_date = counters[index - 1].last_date.clone
-            current_start_date = counters[index].start_date.clone
-
-            return if (before_last_date.clone + 1) == current_start_date
-
-            counters.insert(
-              index,
-              create_empty_counter(
-                start_date: before_last_date + 1, last_date: current_start_date - 1
+
+            #
+            # 空元号を生成する
+            #
+            # @param [Western::Calendar] start_date 西暦開始日
+            # @param [Western::Calendar] last_date 西暦終了日
+            #
+            # @return [Gengou::Counter] 加算元号（空元号）
+            #
+            def create_empty_counter(start_date:, last_date:)
+              Gengou::Counter.new(
+                gengou: Japan::Gengou::Resource::Gengou.new,
+                start_date: start_date, last_date: last_date
               )
-            )
-          end
-          private_class_method :insert
-
-          #
-          # 空元号を生成する
-          #
-          # @param [Western::Calendar] start_date 西暦開始日
-          # @param [Western::Calendar] last_date 西暦終了日
-          #
-          # @return [Gengou::Counter] 加算元号（空元号）
-          #
-          def self.create_empty_counter(start_date:, last_date:)
-            Gengou::Counter.new(
-              gengou: Japan::Gengou::Resource::Gengou.new,
-              start_date: start_date, last_date: last_date
-            )
+            end
           end
-          private_class_method :create_empty_counter
         end
       end
     end

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

@@ -31,7 +31,7 @@ module Zakuro
             @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)
+            super(index: index, start_date: start_date, last_date: last_date)
           end
 
           private
@@ -71,12 +71,12 @@ module Zakuro
           def choise_start_date(date:)
             return if date.invalid?
 
-            if @start_date.invalid?
+            if start_date.invalid?
               @start_date = date
               return
             end
 
-            return if date > @start_date
+            return if date > start_date
 
             @start_date = date
           end
@@ -89,12 +89,12 @@ module Zakuro
           def choise_last_date(date:)
             return if date.invalid?
 
-            if @last_date.invalid?
+            if last_date.invalid?
               @last_date = date
               return
             end
 
-            return if date < @last_date
+            return if date < last_date
 
             @last_date = date
           end
@@ -107,7 +107,7 @@ module Zakuro
           # @return [Array<Japan::Alignment::LinearGengou>] 元号
           #
           def line_by_name(name:)
-            Japan::Gengou.line_by_name(line: @index, name: name)
+            Japan::Gengou.line_by_name(line: index, name: name)
           end
 
           #

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

@@ -53,20 +53,18 @@ module Zakuro
           # @return [List] 最新の元号
           #
           def newest_list
-            return @first_list if @first_list.invalid?
+            return first_list if invalid_list?
 
-            return @first_list if @second_list.invalid?
+            first_western_date = first_list.western_last_date
+            second_western_date = second_list.western_last_date
 
-            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 first_western_date.invalid?
+            return first_list if second_western_date.invalid?
 
-            return @first_list if second_western_date.invalid?
+            return first_list if first_western_date > second_western_date
 
-            return @first_list if first_western_date > second_western_date
-
-            @second_list
+            second_list
           end
         end
       end

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

@@ -14,26 +14,28 @@ module Zakuro
       # 元号に基づき計算範囲を予約する
       #
       module Reserve
-        #
-        # 予約結果を取得する
-        #
-        #   * 開始日・終了日から計算する範囲を求める
-        #   * 開始日・終了日の範囲内にある元号全てが対象となる
-        #   * 元号に応じて計算範囲は変化する
-        #     * 元号の開始日（改元日）が開始日よりも前であれば、結果開始日は前者になる
-        #     * 元号の終了日（改元前日）が終了日よりも後であれば、結果終了日は前者になる
-        #     * 南北朝のように複数元号に属する場合、より広い範囲の元号に合わせる
-        #   * 属する元号よりもさらに範囲を広げる場合がある
-        #     * 開始日が最初の元号の改元後30日以内の場合、さらに前の元号まで対象にする
-        #     * 終了日が最後の元号の改元前日30日以内の場合、さらに次の元号まで対象にする
-        #
-        # @param [Western::Calendar] start_date 開始日
-        # @param [Western::Calendar] last_date 終了日
-        #
-        # @return [Range] 予約済み計算範囲
-        #
-        def self.get(start_date: Western::Calendar.new, last_date: Western::Calendar.new)
-          DatedRange.new(start_date: start_date, last_date: last_date)
+        class << self
+          #
+          # 予約結果を取得する
+          #
+          #   * 開始日・終了日から計算する範囲を求める
+          #   * 開始日・終了日の範囲内にある元号全てが対象となる
+          #   * 元号に応じて計算範囲は変化する
+          #     * 元号の開始日（改元日）が開始日よりも前であれば、結果開始日は前者になる
+          #     * 元号の終了日（改元前日）が終了日よりも後であれば、結果終了日は前者になる
+          #     * 南北朝のように複数元号に属する場合、より広い範囲の元号に合わせる
+          #   * 属する元号よりもさらに範囲を広げる場合がある
+          #     * 開始日が最初の元号の改元後30日以内の場合、さらに前の元号まで対象にする
+          #     * 終了日が最後の元号の改元前日30日以内の場合、さらに次の元号まで対象にする
+          #
+          # @param [Western::Calendar] start_date 開始日
+          # @param [Western::Calendar] last_date 終了日
+          #
+          # @return [Range] 予約済み計算範囲
+          #
+          def get(start_date: Western::Calendar.new, last_date: Western::Calendar.new)
+            DatedRange.new(start_date: start_date, last_date: last_date)
+          end
         end
       end
     end

data/lib/zakuro/calculation/era/version/internal/crawler.rb

@@ -13,37 +13,54 @@ module Zakuro
       # 暦検索
       #
       module Crawler
-        #
-        # 暦の範囲を取得する
-        #
-        # @param [Integer] start_year 開始西暦年
-        # @param [Integer] last_year 終了西暦年
-        #
-        # @return [Array<Range>] 暦の範囲
-        #
-        def self.get(start_year:, last_year:)
-          ranges = Japan::Version.ranges_with_year(start_year: start_year, last_year: last_year)
-
-          result = []
-
-          ranges.each do |range|
-            next unless range.released
+        class << self
+          #
+          # 暦の範囲を取得する
+          #
+          # @param [Integer] start_year 開始西暦年
+          # @param [Integer] last_year 終了西暦年
+          #
+          # @return [Array<Range>] 暦の範囲
+          #
+          def get(start_year:, last_year:)
+            ranges = Japan::Version.ranges_with_year(start_year: start_year, last_year: last_year)
 
+            result = []
+
+            ranges.each do |range|
+              next unless range.released
+
+              narrowed_range = narrow(range: range, start_year: start_year, last_year: last_year)
+
+              result.push(narrowed_range)
+            end
+
+            result
+          end
+
+          private
+
+          #
+          # 範囲を開始年・終了年に合わせて狭める
+          #
+          # @param [Range] range 範囲
+          # @param [Integer] start_year 開始西暦年
+          # @param [Integer] last_year 終了西暦年
+          #
+          # @return [Range] 範囲
+          #
+          def narrow(range:, start_year:, last_year:)
             range_start_year = range.start_year
             range_start_year = start_year if start_year > range.start_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, last_year: range_last_year
-              )
+            Range.new(
+              name: range.name, start_date: range.start_date.clone,
+              start_year: range_start_year, last_year: range_last_year
             )
           end
-
-          result
         end
       end
     end

data/lib/zakuro/calculation/era/version/version.rb

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