zakuro 0.7.0 → 0.9.0

data/lib/zakuro/era/japan/gengou/alignment/aligner.rb

@@ -41,7 +41,7 @@ module Zakuro
           def initialize(resources: [])
             @lines = []
             (1..LINE_SIZE).each do |_index|
-              @lines.push(Line.new)
+              lines.push(Line.new)
             end
 
             save(resources: resources)
@@ -68,10 +68,12 @@ module Zakuro
           #
           # @return [Array<LinearGengou>] 元号
           #
+          # @raise [ArgumentError] 引数エラー
+          #
           def get(line:, start_date:, last_date:)
             raise ArgumentError.new, 'invalid line number' unless LINE_INDEXES.include?(line)
 
-            @lines[line].get(start_date: start_date, last_date: last_date)
+            lines[line].get(start_date: start_date, last_date: last_date)
           end
 
           #
@@ -82,10 +84,12 @@ module Zakuro
           #
           # @return [Array<LinearGengou>] 元号
           #
+          # @raise [ArgumentError] 引数エラー
+          #
           def get_by_name(line:, name:)
             raise ArgumentError.new, 'invalid line number' unless LINE_INDEXES.include?(line)
 
-            @lines[line].get_by_name(name: name)
+            lines[line].get_by_name(name: name)
           end
 
           private
@@ -110,7 +114,7 @@ module Zakuro
             rest = [
               LinearGengou.new(gengou: gengou)
             ]
-            @lines.each do |line|
+            lines.each do |line|
               rest = line.push(list: rest)
             end
           end

data/lib/zakuro/era/japan/gengou/alignment/division.rb

@@ -14,153 +14,152 @@ module Zakuro
         # Division 元号区分
         #
         module Division
-          #
-          # 重複した範囲を返す
-          #
-          # @param [LinearGengou] this 残り元号
-          # @param [LinearGengou] other 比較元号
-          #
-          # @return [Array<LinearGengou>] 重複分
-          #
-          def self.match(this:, other:)
-            result = []
-            if other.in?(start_date: this.start_date, last_date: this.last_date)
-              result.push(this)
-              return result
-            end
-
-            if other.out?(start_date: this.start_date, last_date: this.last_date)
-              # 該当なし
-              return result
-            end
+          class << self
+            #
+            # 重複した範囲を返す
+            #
+            # @param [LinearGengou] this 残り元号
+            # @param [LinearGengou] other 比較元号
+            #
+            # @return [Array<LinearGengou>] 重複分
+            #
+            def match(this:, other:)
+              result = []
+              if other.in?(start_date: this.start_date, last_date: this.last_date)
+                result.push(this)
+                return result
+              end
 
-            if other.covered?(start_date: this.start_date, last_date: this.last_date)
-              # 範囲内のみ返す
-              result.push(trim_gengou(this: this, other: other))
-              return result
-            end
+              if other.out?(start_date: this.start_date, last_date: this.last_date)
+                # 該当なし
+                return result
+              end
 
-            result.push(narrow_gengou(this: this, other: other))
+              if other.covered?(start_date: this.start_date, last_date: this.last_date)
+                # 範囲内のみ返す
+                result.push(trim_gengou(this: this, other: other))
+                return result
+              end
 
-            result
-          end
+              result.push(narrow_gengou(this: this, other: other))
 
-          #
-          # 範囲が重複しない差分を返す
-          #
-          # @param [LinearGengou] this 積元号
-          # @param [LinearGengou] other 比較元号
-          #
-          # @return [Array<LinearGengou>] 差分
-          #
-          def self.mismatch(this:, other:)
-            result = []
-            if other.in?(start_date: this.start_date, last_date: this.last_date)
-              # 該当なし
-              return result
+              result
             end
 
-            if other.out?(start_date: this.start_date, last_date: this.last_date)
-              result.push(this)
-              return result
-            end
-
-            if other.covered?(start_date: this.start_date, last_date: this.last_date)
-              result |= split_gengou(this: this, other: other)
-              return result
-            end
+            #
+            # 範囲が重複しない差分を返す
+            #
+            # @param [LinearGengou] this 積元号
+            # @param [LinearGengou] other 比較元号
+            #
+            # @return [Array<LinearGengou>] 差分
+            #
+            def mismatch(this:, other:)
+              result = []
+              if other.in?(start_date: this.start_date, last_date: this.last_date)
+                # 該当なし
+                return result
+              end
 
-            result.push(shave_gengou(this: this, other: other))
-            result
-          end
+              if other.out?(start_date: this.start_date, last_date: this.last_date)
+                result.push(this)
+                return result
+              end
 
-          #
-          # 比較により分離した元号をつなげる
-          #
-          # @param [Array<LinearGengou>] list 元号
-          #
-          # @return [Array<LinearGengou>] 同一元号がつながった元号
-          #
-          def self.connect(list: []) # rubocop:disable Metrics/MethodLength
-            result = []
-            list.each do |linear_gengou|
-              if result.size.zero?
-                result.push(linear_gengou)
-                next
+              if other.covered?(start_date: this.start_date, last_date: this.last_date)
+                result |= split_gengou(this: this, other: other)
+                return result
               end
 
-              before = result[-1]
+              result.push(shave_gengou(this: this, other: other))
+              result
+            end
 
-              if unconnectable?(current: linear_gengou, before: before)
-                result.push(linear_gengou)
-                next
+            #
+            # 比較により分離した元号をつなげる
+            #
+            # @param [Array<LinearGengou>] list 元号
+            #
+            # @return [Array<LinearGengou>] 同一元号がつながった元号
+            #
+            def connect(list: []) # rubocop:disable Metrics/MethodLength
+              result = []
+              list.each do |linear_gengou|
+                if result.size.zero?
+                  result.push(linear_gengou)
+                  next
+                end
+
+                before = result[-1]
+
+                if unconnectable?(current: linear_gengou, before: before)
+                  result.push(linear_gengou)
+                  next
+                end
+
+                result[-1] = LinearGengou.new(
+                  start_date: before.start_date, last_date: linear_gengou.last_date,
+                  gengou: linear_gengou.gengou
+                )
               end
 
-              result[-1] = LinearGengou.new(
-                start_date: before.start_date, last_date: linear_gengou.last_date,
-                gengou: linear_gengou.gengou
-              )
+              result
             end
 
-            result
-          end
+            private
 
-          def self.unconnectable?(current:, before:)
-            return true unless current.gengou.name == before.gengou.name
+            def unconnectable?(current:, before:)
+              return true unless current.gengou.name == before.gengou.name
 
-            return true unless (before.last_date.clone + 1) == current.start_date
+              return true unless (before.last_date.clone + 1) == current.start_date
 
-            false
-          end
-          private_class_method :unconnectable?
+              false
+            end
 
-          def self.split_gengou(this:, other:)
-            [
-              LinearGengou.new(
-                start_date: this.start_date.clone, last_date: other.start_date.clone - 1,
-                gengou: this.gengou
-              ),
+            def split_gengou(this:, other:)
+              [
+                LinearGengou.new(
+                  start_date: this.start_date.clone, last_date: other.start_date.clone - 1,
+                  gengou: this.gengou
+                ),
+                LinearGengou.new(
+                  start_date: other.last_date.clone + 1, last_date: this.last_date.clone,
+                  gengou: this.gengou
+                )
+              ]
+            end
+
+            def trim_gengou(this:, other:)
               LinearGengou.new(
-                start_date: other.last_date.clone + 1, last_date: this.last_date.clone,
+                start_date: other.start_date, last_date: other.last_date,
                 gengou: this.gengou
               )
-            ]
-          end
-          private_class_method :split_gengou
-
-          def self.trim_gengou(this:, other:)
-            LinearGengou.new(
-              start_date: other.start_date, last_date: other.last_date,
-              gengou: this.gengou
-            )
-          end
-          private_class_method :trim_gengou
+            end
 
-          def self.narrow_gengou(this:, other:)
-            start = this.start_date > other.start_date ? this.start_date : other.start_date
-            last = this.last_date < other.last_date ? this.last_date : other.last_date
+            def narrow_gengou(this:, other:)
+              start = this.start_date > other.start_date ? this.start_date : other.start_date
+              last = this.last_date < other.last_date ? this.last_date : other.last_date
 
-            LinearGengou.new(
-              start_date: start.clone, last_date: last.clone, gengou: this.gengou
-            )
-          end
-          private_class_method :narrow_gengou
+              LinearGengou.new(
+                start_date: start.clone, last_date: last.clone, gengou: this.gengou
+              )
+            end
 
-          def self.shave_gengou(this:, other:) # rubocop:disable Metrics/AbcSize
-            start = this.start_date
-            last = this.last_date
+            def shave_gengou(this:, other:) # rubocop:disable Metrics/AbcSize
+              start = this.start_date
+              last = this.last_date
 
-            # 開始日が比較元号の開始日より前の範囲
-            last = other.start_date.clone - 1 if this.start_date < other.start_date
+              # 開始日が比較元号の開始日より前の範囲
+              last = other.start_date.clone - 1 if this.start_date < other.start_date
 
-            # 終了日が比較元号の開始日より後の範囲
-            start = other.last_date.clone + 1 if this.last_date > other.last_date
+              # 終了日が比較元号の開始日より後の範囲
+              start = other.last_date.clone + 1 if this.last_date > other.last_date
 
-            LinearGengou.new(
-              start_date: start.clone, last_date: last.clone, gengou: this.gengou
-            )
+              LinearGengou.new(
+                start_date: start.clone, last_date: last.clone, gengou: this.gengou
+              )
+            end
           end
-          private_class_method :shave_gengou
         end
       end
     end

data/lib/zakuro/era/japan/gengou/alignment/line.rb

@@ -72,7 +72,7 @@ module Zakuro
           #
           def get(start_date:, last_date:)
             result = []
-            @list.each do |gengou|
+            list.each do |gengou|
               next if gengou.out?(start_date: start_date, last_date: last_date)
 
               # 1日でも範囲内であれば対象とみなす
@@ -91,7 +91,7 @@ module Zakuro
           #
           def get_by_name(name:)
             result = []
-            @list.each do |gengou|
+            list.each do |gengou|
               result.push(gengou) if gengou.name == name
             end
 
@@ -110,7 +110,8 @@ module Zakuro
           def rest(list: [])
             result = []
 
-            @list.each do |gengou|
+            inner_list = @list
+            inner_list.each do |gengou|
               result |= and!(rest: list, other: gengou)
             end
 
@@ -123,15 +124,16 @@ module Zakuro
           # @param [Array<LinearGengou>] list 元号
           #
           def insert(list: [])
+            inner_list = @list
             surplus_result = list.clone
-            @list.each do |gengou|
+            inner_list.each do |gengou|
               surplus_result = not!(surplus: surplus_result, other: gengou)
             end
 
             surplus_result = Division.connect(list: surplus_result)
 
             surplus_result.each do |gengou|
-              @list.push(gengou)
+              inner_list.push(gengou)
             end
           end
 

data/lib/zakuro/era/japan/gengou/alignment/linear_gengou.rb

@@ -45,7 +45,7 @@ module Zakuro
           # @return [String] 元号名
           #
           def name
-            @gengou.name
+            gengou.name
           end
 
           #
@@ -55,7 +55,7 @@ module Zakuro
           # @return [False] 不正なし
           #
           def invalid?
-            @gengou.invalid?
+            gengou.invalid?
           end
 
           #
@@ -69,13 +69,13 @@ module Zakuro
           def include?(date: Western::Calendar.new)
             return false if invalid?
 
-            return false if @start_date.invalid?
+            return false if start_date.invalid?
 
-            return false if @last_date.invalid?
+            return false if last_date.invalid?
 
-            return false if date < @start_date
+            return false if date < start_date
 
-            return false if date > @last_date
+            return false if date > last_date
 
             true
           end
@@ -90,7 +90,9 @@ module Zakuro
           # @return [False] 範囲外あり
           #
           def in?(start_date:, last_date:)
-            @start_date <= start_date && last_date <= @last_date
+            inner_start_date = @start_date
+            inner_last_date = @last_date
+            inner_start_date <= start_date && last_date <= inner_last_date
           end
 
           #
@@ -103,11 +105,13 @@ module Zakuro
           # @return [False] 範囲内あり
           #
           def out?(start_date:, last_date:)
+            inner_start_date = @start_date
+            inner_last_date = @last_date
             # 範囲より前
-            return true if start_date < @start_date && last_date < @start_date
+            return true if start_date < inner_start_date && last_date < inner_start_date
 
             # 範囲より後
-            return true if @last_date < start_date && @last_date < last_date
+            return true if inner_last_date < start_date && inner_last_date < last_date
 
             false
           end
@@ -122,7 +126,9 @@ module Zakuro
           # @return [True] 完全超過せず
           #
           def covered?(start_date:, last_date:)
-            start_date < @start_date && @last_date < last_date
+            inner_start_date = @start_date
+            inner_last_date = @last_date
+            start_date < inner_start_date && inner_last_date < last_date
           end
 
           #
@@ -148,7 +154,7 @@ module Zakuro
           def change_start_date?
             return false if invalid?
 
-            @start_date != native_start_date
+            start_date != native_start_date
           end
 
           #
@@ -160,7 +166,7 @@ module Zakuro
           def change_last_date?
             return false if invalid?
 
-            @last_date != native_last_date
+            last_date != native_last_date
           end
 
           #
@@ -169,7 +175,7 @@ module Zakuro
           # @return [Western::Calendar]設定された元号の開始日
           #
           def native_start_date
-            @gengou.both_start_date.western
+            gengou.both_start_date.western
           end
 
           #
@@ -178,7 +184,7 @@ module Zakuro
           # @return [Western::Calendar] 設定された元号の終了日
           #
           def native_last_date
-            @gengou.last_date
+            gengou.last_date
           end
         end
       end

data/lib/zakuro/era/japan/gengou/alignment.rb

@@ -23,31 +23,33 @@ module Zakuro
         # @return [Aligner] 整列結果
         SUMMARY = Aligner.new(resources: Resource::LIST)
 
-        #
-        # 指定した範囲内の元号を取得する
-        #
-        # @param [Integer] line 行
-        # @param [Western::Calendar] start_date 開始日
-        # @param [Western::Calendar] last_date 終了日
-        #
-        # @return [Array<LinearGengou>] 元号
-        #
-        def self.get(line: FIRST_LINE,
-                     start_date: Western::Calendar.new, last_date: Western::Calendar.new)
-
-          SUMMARY.get(line: line, start_date: start_date, last_date: last_date)
-        end
-
-        #
-        # 指定した範囲内の元号を取得する（元号名）
-        #
-        # @param [Integer] line 行
-        # @param [String] name 元号名
-        #
-        # @return [Array<LinearGengou>] 元号
-        #
-        def self.get_by_name(line: FIRST_LINE, name:)
-          SUMMARY.get_by_name(line: line, name: name)
+        class << self
+          #
+          # 指定した範囲内の元号を取得する
+          #
+          # @param [Integer] line 行
+          # @param [Western::Calendar] start_date 開始日
+          # @param [Western::Calendar] last_date 終了日
+          #
+          # @return [Array<LinearGengou>] 元号
+          #
+          def get(line: FIRST_LINE,
+                  start_date: Western::Calendar.new, last_date: Western::Calendar.new)
+
+            SUMMARY.get(line: line, start_date: start_date, last_date: last_date)
+          end
+
+          #
+          # 指定した範囲内の元号を取得する（元号名）
+          #
+          # @param [Integer] line 行
+          # @param [String] name 元号名
+          #
+          # @return [Array<LinearGengou>] 元号
+          #
+          def get_by_name(line: FIRST_LINE, name:)
+            SUMMARY.get_by_name(line: line, name: name)
+          end
         end
       end
     end