zakuro 0.6.1 → 0.7.0

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

@@ -7,158 +7,161 @@ 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
+        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
 
-          result.push(narrow_gengou(this: this, other: other))
+            if other.out?(start_date: this.start_date, last_date: this.last_date)
+              # 該当なし
+              return result
+            end
 
-          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
 
-        #
-        # 範囲が重複しない差分を返す
-        #
-        # @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
+            result.push(narrow_gengou(this: this, other: other))
 
-          if other.out?(start_date: this.start_date, last_date: this.last_date)
-            result.push(this)
-            return result
+            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 self.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 self.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
-
-        def self.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
-        private_class_method :unconnectable?
+            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 self.split_gengou(this:, other:)
-          [
-            LinearGengou.new(
-              start_date: this.start_date.clone, last_date: other.start_date.clone - 1,
-              gengou: this.gengou
-            ),
+          def self.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
+          private_class_method :trim_gengou
 
-        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 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
 
-          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
+          private_class_method :narrow_gengou
 
-        def self.shave_gengou(this:, other:) # rubocop:disable Metrics/AbcSize
-          start = this.start_date
-          last = this.last_date
+          def self.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
+          private_class_method :shave_gengou
         end
-        private_class_method :shave_gengou
       end
     end
   end

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

@@ -9,146 +9,165 @@ module Zakuro
   # :nodoc:
   module Japan
     # :nodoc:
-    module Alignment
-      #
-      # Line 行
-      #
-      class Line
-        # @return [Array<LinearGengou>] 元号
-        attr_reader :list
-
+    module Gengou
+      # :nodoc:
+      module Alignment
         #
-        # 初期化
+        # Line 行
         #
-        def initialize
-          @list = []
-        end
+        class Line
+          # @return [Array<LinearGengou>] 元号
+          attr_reader :list
 
-        #
-        # 追加する
-        #
-        # 下記のパターンが存在し、戻り値は重複分となる
-        #
-        # 1. 完全に範囲外（開始日より前）
-        #   [@list]:      |-------|-------|
-        #   [list]:  |---|
-        # 2. 前半のみ範囲外
-        #   [@list]:      |-------|-------|
-        #   [list]:  |------|
-        # 3. 範囲内
-        #   [@list]: |-------|-------|
-        #   [list]:  |------|
-        # 4. 後半のみ範囲外
-        #   [@list]: |-------|-------|
-        #   [list]:              |------|
-        # 5. 完全に範囲外（開始日より後）
-        #   [@list]: |-------|-------|
-        #   [list]:                   |----|
-        # 6. 両端が範囲外
-        #   [@list]:   |-------|-------|
-        #   [list]:  |--------------------|
-        #
-        # @param [Array<LinearGengou>] list 元号
-        #
-        # @return [Array<LinearGengou>] 未登録元号
-        #
-        def push(list: [])
-          rest = rest(list: list)
-
-          insert(list: list)
-
-          rest
-        end
-
-        #
-        # 範囲内の元号を取得する
-        #
-        # @param [Western::Calendar] start_date 開始日
-        # @param [Western::Calendar] last_date 終了日
-        #
-        # @return [Array<LinearGengou>] 元号
-        #
-        def get(start_date:, last_date:)
-          result = []
-          @list.each do |gengou|
-            next if gengou.out?(start_date: start_date, last_date: last_date)
-
-            # 1日でも範囲内であれば対象とみなす
-            result.push(gengou)
+          #
+          # 初期化
+          #
+          def initialize
+            @list = []
           end
 
-          result
-        end
-
-        private
+          #
+          # 追加する
+          #
+          # 下記のパターンが存在し、戻り値は重複分となる
+          #
+          # 1. 完全に範囲外（開始日より前）
+          #   [@list]:      |-------|-------|
+          #   [list]:  |---|
+          # 2. 前半のみ範囲外
+          #   [@list]:      |-------|-------|
+          #   [list]:  |------|
+          # 3. 範囲内
+          #   [@list]: |-------|-------|
+          #   [list]:  |------|
+          # 4. 後半のみ範囲外
+          #   [@list]: |-------|-------|
+          #   [list]:              |------|
+          # 5. 完全に範囲外（開始日より後）
+          #   [@list]: |-------|-------|
+          #   [list]:                   |----|
+          # 6. 両端が範囲外
+          #   [@list]:   |-------|-------|
+          #   [list]:  |--------------------|
+          #
+          # @param [Array<LinearGengou>] list 元号
+          #
+          # @return [Array<LinearGengou>] 未登録元号
+          #
+          def push(list: [])
+            rest = rest(list: list)
+
+            insert(list: list)
+
+            rest
+          end
 
-        #
-        # 重複分（空きがないため追加できない範囲の元号）を返す
-        #
-        # @param [Array<LinearGengou>] list 元号
-        #
-        # @return [Array<LinearGengou>] 重複分元号
-        #
-        def rest(list: [])
-          result = []
+          #
+          # 範囲内の元号を取得する
+          #
+          # @param [Western::Calendar] start_date 開始日
+          # @param [Western::Calendar] last_date 終了日
+          #
+          # @return [Array<LinearGengou>] 元号
+          #
+          def get(start_date:, last_date:)
+            result = []
+            @list.each do |gengou|
+              next if gengou.out?(start_date: start_date, last_date: last_date)
+
+              # 1日でも範囲内であれば対象とみなす
+              result.push(gengou)
+            end
+
+            result
+          end
 
-          @list.each do |gengou|
-            result |= and!(rest: list, other: gengou)
+          #
+          # 範囲内の元号を取得する（元号名）
+          #
+          # @param [String] name 元号名
+          #
+          # @return [Array<LinearGengou>] 元号
+          #
+          def get_by_name(name:)
+            result = []
+            @list.each do |gengou|
+              result.push(gengou) if gengou.name == name
+            end
+
+            result
           end
 
-          Division.connect(list: result)
-        end
+          private
 
-        #
-        # 空き範囲に元号を登録する
-        #
-        # @param [Array<LinearGengou>] list 元号
-        #
-        def insert(list: [])
-          surplus_result = list.clone
-          @list.each do |gengou|
-            surplus_result = not!(surplus: surplus_result, other: gengou)
-          end
+          #
+          # 重複分（空きがないため追加できない範囲の元号）を返す
+          #
+          # @param [Array<LinearGengou>] list 元号
+          #
+          # @return [Array<LinearGengou>] 重複分元号
+          #
+          def rest(list: [])
+            result = []
 
-          surplus_result = Division.connect(list: surplus_result)
+            @list.each do |gengou|
+              result |= and!(rest: list, other: gengou)
+            end
 
-          surplus_result.each do |gengou|
-            @list.push(gengou)
+            Division.connect(list: result)
           end
-        end
 
-        #
-        # 重複した範囲を返す
-        #
-        # @param [Array<LinearGengou>] rest 残り元号
-        # @param [LinearGengou] other 比較元号
-        #
-        # @return [Array<LinearGengou>] 重複分
-        #
-        def and!(rest:, other:)
-          result = []
-          rest.each do |gengou|
-            result |= Division.match(this: gengou, other: other)
+          #
+          # 空き範囲に元号を登録する
+          #
+          # @param [Array<LinearGengou>] list 元号
+          #
+          def insert(list: [])
+            surplus_result = list.clone
+            @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)
+            end
           end
 
-          result
-        end
-
-        #
-        # 範囲が重複しない差分を返す
-        #
-        # @param [Array<LinearGengou>] surplus 積元号
-        # @param [LinearGengou] other 比較元号
-        #
-        # @return [Array<LinearGengou>] 差分
-        #
-        def not!(surplus:, other:)
-          result = []
-          surplus.each do |gengou|
-            result |= Division.mismatch(this: gengou, other: other)
+          #
+          # 重複した範囲を返す
+          #
+          # @param [Array<LinearGengou>] rest 残り元号
+          # @param [LinearGengou] other 比較元号
+          #
+          # @return [Array<LinearGengou>] 重複分
+          #
+          def and!(rest:, other:)
+            result = []
+            rest.each do |gengou|
+              result |= Division.match(this: gengou, other: other)
+            end
+
+            result
           end
 
-          result
+          #
+          # 範囲が重複しない差分を返す
+          #
+          # @param [Array<LinearGengou>] surplus 積元号
+          # @param [LinearGengou] other 比較元号
+          #
+          # @return [Array<LinearGengou>] 差分
+          #
+          def not!(surplus:, other:)
+            result = []
+            surplus.each do |gengou|
+              result |= Division.mismatch(this: gengou, other: other)
+            end
+
+            result
+          end
         end
       end
     end