zakuro 0.6.1 → 0.8.0

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

@@ -6,98 +6,117 @@ require_relative './line'
 
 # :nodoc:
 module Zakuro
-  #
-  # Japan 和暦
-  #
+  # :nodoc:
   module Japan
-    #
-    # Alignment 整列
-    #
-    module Alignment
+    # :nodoc:
+    module Gengou
       #
-      # Aligner 元号整列
+      # Alignment 整列
       #
-      class Aligner
-        # @return [Integer] 1行目元号
-        FIRST_LINE = 0
+      module Alignment
+        #
+        # Aligner 元号整列
+        #
+        class Aligner
+          # @return [Integer] 1行目元号
+          FIRST_LINE = 0
 
-        # @return [Integer] 2行目元号
-        SECOND_LINE = 1
+          # @return [Integer] 2行目元号
+          SECOND_LINE = 1
 
-        # @return [Array<Integer>] 元号リスト
-        LINE_INDEXES = [FIRST_LINE, SECOND_LINE].freeze
+          # @return [Array<Integer>] 元号リスト
+          LINE_INDEXES = [FIRST_LINE, SECOND_LINE].freeze
 
-        # @return [Integer] 行数
-        LINE_SIZE = LINE_INDEXES.size
+          # @return [Integer] 行数
+          LINE_SIZE = LINE_INDEXES.size
 
-        # @return [Array<Line>] 行元号
-        attr_reader :lines
+          # @return [Array<Line>] 行元号
+          attr_reader :lines
 
-        #
-        # 初期化
-        #
-        # @param [Array<Set>] resources 元号解析結果
-        #
-        def initialize(resources: [])
-          @lines = []
-          (1..LINE_SIZE).each do |_index|
-            @lines.push(Line.new)
+          #
+          # 初期化
+          #
+          # @param [Array<Set>] resources 元号解析結果
+          #
+          def initialize(resources: [])
+            @lines = []
+            (1..LINE_SIZE).each do |_index|
+              lines.push(Line.new)
+            end
+
+            save(resources: resources)
           end
 
-          save(resources: resources)
-        end
+          #
+          # 行元号に追加する
+          #
+          # @param [Set] set 元号セット
+          #
+          def push(set:)
+            list = set.list
+            list.each do |gengou|
+              push_gengou(gengou: gengou)
+            end
+          end
 
-        #
-        # 行元号に追加する
-        #
-        # @param [Set] set 元号セット
-        #
-        def push(set:)
-          list = set.list
-          list.each do |gengou|
-            push_gengou(gengou: gengou)
+          #
+          # 指定した範囲内の元号を取得する
+          #
+          # @param [Integer] line 行
+          # @param [Western::Calendar] start_date 開始日
+          # @param [Western::Calendar] last_date 終了日
+          #
+          # @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)
           end
-        end
 
-        #
-        # 指定した範囲内の元号を取得する
-        #
-        # @param [Integer] line 行
-        # @param [Western::Calendar] start_date 開始日
-        # @param [Western::Calendar] last_date 終了日
-        #
-        # @return [Array<LinearGengou>] 元号
-        #
-        def get(line:, start_date:, last_date:)
-          raise ArgumentError.new, 'invalid line number' unless LINE_INDEXES.include?(line)
+          #
+          # 指定した範囲内の元号を取得する（元号名）
+          #
+          # @param [Integer] line 行
+          # @param [String] name 元号名
+          #
+          # @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(start_date: start_date, last_date: last_date)
-        end
+            lines[line].get_by_name(name: name)
+          end
 
-        private
+          private
 
-        #
-        # 保存する
-        #
-        # @param [Array<Set>] resources 元号解析結果
-        #
-        def save(resources: [])
-          resources.each do |set|
-            push(set: set)
+          #
+          # 保存する
+          #
+          # @param [Array<Set>] resources 元号解析結果
+          #
+          def save(resources: [])
+            resources.each do |set|
+              push(set: set)
+            end
           end
-        end
 
-        #
-        # 元号を追加する
-        #
-        # @param [Gengou] gengou 元号
-        #
-        def push_gengou(gengou:)
-          rest = [
-            LinearGengou.new(gengou: gengou)
-          ]
-          @lines.each do |line|
-            rest = line.push(list: rest)
+          #
+          # 元号を追加する
+          #
+          # @param [Gengou] gengou 元号
+          #
+          def push_gengou(gengou:)
+            rest = [
+              LinearGengou.new(gengou: gengou)
+            ]
+            lines.each do |line|
+              rest = line.push(list: rest)
+            end
           end
         end
       end

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

@@ -7,158 +7,160 @@ module Zakuro
   # :nodoc:
   module Japan
     # :nodoc:
-    module Alignment
-      #
-      # Division 元号区分
-      #
-      module Division
+    module Gengou
+      # :nodoc:
+      module Alignment
         #
-        # 重複した範囲を返す
+        # 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
-
-          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.push(narrow_gengou(this: this, other: other))
-
-          result
-        end
-
-        #
-        # 範囲が重複しない差分を返す
-        #
-        # @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
-          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
-
-          result.push(shave_gengou(this: this, other: other))
-          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
+        module Division
+          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.out?(start_date: this.start_date, last_date: this.last_date)
+                # 該当なし
+                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
+
+              result.push(narrow_gengou(this: this, other: other))
+
+              result
             end
 
-            before = result[-1]
+            #
+            # 範囲が重複しない差分を返す
+            #
+            # @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
+
+              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
+
+              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
             end
 
-            result[-1] = LinearGengou.new(
-              start_date: before.start_date, last_date: linear_gengou.last_date,
-              gengou: linear_gengou.gengou
-            )
-          end
+            private
 
-          result
-        end
+            def unconnectable?(current:, before:)
+              return true unless current.gengou.name == before.gengou.name
 
-        def self.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
 
-          false
-        end
-        private_class_method :unconnectable?
-
-        def self.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
-        private_class_method :split_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 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
+            def trim_gengou(this:, other:)
+              LinearGengou.new(
+                start_date: other.start_date, last_date: other.last_date,
+                gengou: this.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
         end
-        private_class_method :shave_gengou
       end
     end
   end