zakuro 0.9.1 → 0.9.3

data/lib/zakuro/era/japan/gengou/resource/type.rb

@@ -21,9 +21,9 @@ module Zakuro
           # @return [String] 元号名
           attr_reader :name
           # @return [Both::Year] 開始年（和暦/西暦）
-          attr_reader :both_start_year
-          # @return [Both::Date] 開始日（和暦/西暦）
-          attr_reader :both_start_date
+          attr_reader :start_year
+          # @return [SwitchDate] 開始日（和暦/西暦）
+          attr_reader :start_date
           # @return [Integer] 終了年
           attr_reader :last_year
           # @return [Western::Calendar] 終了日
@@ -33,18 +33,18 @@ module Zakuro
           # 初期化
           #
           # @param [String] name 元号名
-          # @param [Both::Year] both_start_year 開始年（和暦/西暦）
-          # @param [Both::Date] both_start_date 開始日（和暦/西暦）
+          # @param [Both::Year] start_year 開始年（和暦/西暦）
+          # @param [SwitchDate] start_date 開始日（和暦/西暦）
           # @param [Integer] last_date 終了年
           # @param [Western::Calendar] last_date 終了日
           #
-          def initialize(name: '', both_start_year: Both::Year.new,
-                         both_start_date: Both::Date.new,
+          def initialize(name: '', start_year: Both::Year.new,
+                         start_date: SwitchDate.new,
                          last_date: Western::Calendar.new,
                          last_year: Both::Year::INVALID)
             @name = name
-            @both_start_year = both_start_year
-            @both_start_date = both_start_date
+            @start_year = start_year
+            @start_date = start_date
             @last_year = last_year
             @last_date = last_date
           end
@@ -86,7 +86,7 @@ module Zakuro
           # @param [Integer] next_start_year 次回開始年
           #
           def convert_next_start_year_to_last_year(next_start_year:)
-            if both_start_year.western >= next_start_year
+            if start_year.western >= next_start_year
               @last_year = next_start_year
               return
             end
@@ -99,15 +99,14 @@ module Zakuro
           #
           # 次の元号の開始日から、元号の終了日に変換する
           #
-          # @param [String] next_start_date 次回開始日
+          # @param [Western::Calendar] next_start_date 次回開始日
           #
           # @raise [ArgumentError] 引数エラー
           #
-          def convert_next_start_date_to_last_date(next_start_date: '')
-            raise ArgumentError, 'empty string cannot convert' if next_start_date.empty?
+          def convert_next_start_date_to_last_date(next_start_date: Western::Calendar.new)
+            raise ArgumentError, 'invalid value. cannot convert' if next_start_date.invalid?
 
-            start_date = Western::Calendar.parse(text: next_start_date)
-            @last_date = start_date - 1
+            @last_date = next_start_date.clone - 1
 
             nil
           end
@@ -121,7 +120,7 @@ module Zakuro
           # @return [False] 含まれない
           #
           def include?(date:)
-            date >= both_start_date.western && date <= last_date
+            date >= start_date.western && date <= last_date
           end
 
           #
@@ -131,8 +130,8 @@ module Zakuro
           # @return [False] 不正なし
           #
           def invalid?
-            both_start_year.japan == -1 || both_start_year.invalid? ||
-              both_start_date.invalid? || last_date.invalid?
+            start_year.japan == -1 || start_year.invalid? ||
+              start_date.invalid? || last_date.invalid?
           end
 
           #
@@ -144,8 +143,8 @@ module Zakuro
           # end
 
           def to_s
-            "name: #{@name}, both_start_year: #{both_start_year.format}, " \
-            "both_start_date: #{both_start_date.format}, last_date: #{last_date.format}"
+            "name: #{@name}, start_year: #{start_year.format}, " \
+            "start_date: #{start_date.format}, last_date: #{last_date.format}"
           end
 
           class << self
@@ -190,9 +189,9 @@ module Zakuro
           # @return [String] 元号セット名
           attr_reader :name
           # @return [Both::Date] 元号セットでの終了年
-          attr_reader :both_last_year
+          attr_reader :last_year
           # @return [Both::Date] 元号セットでの終了日
-          attr_reader :both_last_date
+          attr_reader :last_date
           # @return [Array<Gengou>] 元号リスト
           attr_reader :list
 
@@ -204,12 +203,12 @@ module Zakuro
           # @param [Western::Calendar] last_date 元号セットでの終了日
           # @param [Array<Gengou>] list 元号リスト
           #
-          def initialize(id: INVALID, name: '', both_last_year: Both::Year.new,
-                         both_last_date: Both::Date.new, list: [])
+          def initialize(id: INVALID, name: '', last_year: Both::Year.new,
+                         last_date: Both::Date.new, list: [])
             @id = id
             @name = name
-            @both_last_year = both_last_year
-            @both_last_date = both_last_date
+            @last_year = last_year
+            @last_date = last_date
             @list = list
           end
 
@@ -239,6 +238,62 @@ module Zakuro
           end
         end
 
+        #
+        # SwitchDate 切替日（運用/計算）
+        #
+        class SwitchDate
+          # @return [Both::Date] 計算値
+          attr_reader :calculation
+          # @return [Both::Date] 運用値
+          attr_reader :operation
+          # @return [True, False] 運用値
+          attr_reader :operated
+          # @return [Japan::Calendar] 和暦日
+          attr_reader :japan
+          # @return [Western::Calendar] 西暦日
+          attr_reader :western
+
+          #
+          # 初期化
+          #
+          # @param [Both::Date] calculation 計算値
+          # @param [Both::Date] operation 運用値
+          # @param [True, False] operated 運用値設定
+          #
+          def initialize(calculation: Both::Date.new, operation: Both::Date.new, operated: false)
+            @calculation = calculation
+            @operation = operation
+            @operated = operated
+
+            select
+          end
+
+          #
+          # 不正か
+          #
+          # @return [True] 不正
+          # @return [False] 不正なし
+          #
+          def invalid?
+            japan.invalid? || western.invalid?
+          end
+
+          private
+
+          def select
+            @japan = operation.japan
+            @western = operation.western
+
+            return if operated
+
+            calc_japan = calculation.japan
+            calc_western = calculation.western
+
+            @japan = calc_japan unless calc_japan.invalid?
+            @western = calc_western unless calc_western.invalid?
+          end
+        end
+
         #
         # 和暦/西暦
         #

data/lib/zakuro/era/japan/gengou/resource/validator.rb

@@ -28,9 +28,9 @@ module Zakuro
             # @return [String] 元号セット名
             attr_reader :name
             # @return [Hash<String, String>] 終了年
-            attr_reader :both_last_year
+            attr_reader :last_year
             # @return [Hash<String, String>] 終了日
-            attr_reader :both_last_date
+            attr_reader :last_date
             # @return [Array<Hash<String, String>>] 元号情報
             attr_reader :list
 
@@ -42,8 +42,8 @@ module Zakuro
             def initialize(hash:)
               @id = hash['id']
               @name = hash['name']
-              @both_last_year = hash['last_year']
-              @both_last_date = hash['last_date']
+              @last_year = hash['last_year']
+              @last_date = hash['last_date']
               @list = hash['list']
             end
 
@@ -58,9 +58,9 @@ module Zakuro
 
               failed.push("invalid name. #{name}") unless name?
 
-              failed |= validate_both_last_year
+              failed |= validate_last_year
 
-              failed |= validate_both_last_date
+              failed |= validate_last_date
 
               failed |= validate_list
               failed
@@ -95,8 +95,8 @@ module Zakuro
             #
             # @return [Array<String>] 不正メッセージ
             #
-            def validate_both_last_year
-              Both::Year.new(hash: both_last_year).validate
+            def validate_last_year
+              Both::Year.new(hash: last_year).validate
             end
 
             #
@@ -104,8 +104,8 @@ module Zakuro
             #
             # @return [Array<String>] 不正メッセージ
             #
-            def validate_both_last_date
-              Both::Date.new(hash: both_last_date).validate
+            def validate_last_date
+              SwitchDate.new(hash: last_date).validate
             end
 
             #
@@ -145,9 +145,9 @@ module Zakuro
             # @return [String] 元号名
             attr_reader :name
             # @return [Hash<String, String>] 開始年
-            attr_reader :both_start_year
+            attr_reader :start_year
             # @return [Hash<String, String>] 開始日
-            attr_reader :both_start_date
+            attr_reader :start_date
 
             #
             # 初期化
@@ -158,8 +158,8 @@ module Zakuro
             def initialize(hash:, index:)
               @index = index
               @name = hash['name']
-              @both_start_year = hash['start_year']
-              @both_start_date = hash['start_date']
+              @start_year = hash['start_year']
+              @start_date = hash['start_date']
             end
 
             #
@@ -173,9 +173,9 @@ module Zakuro
 
               failed.push(prefix + "invalid name. #{name}") unless name?
 
-              failed |= validate_both_start_year
+              failed |= validate_start_year
 
-              failed |= validate_both_start_date
+              failed |= validate_start_date
 
               failed
             end
@@ -197,8 +197,8 @@ module Zakuro
             #
             # @return [Array<String>] 不正メッセージ
             #
-            def validate_both_start_year
-              Both::Year.new(hash: both_start_year).validate
+            def validate_start_year
+              Both::Year.new(hash: start_year).validate
             end
 
             #
@@ -206,8 +206,63 @@ module Zakuro
             #
             # @return [Array<String>] 不正メッセージ
             #
-            def validate_both_start_date
-              Both::Date.new(hash: both_start_date).validate
+            def validate_start_date
+              SwitchDate.new(hash: start_date).validate
+            end
+          end
+
+          #
+          # SwitchDate 切替日（運用/計算）
+          #
+          class SwitchDate
+            # @return [Hash<String, Strin>] 計算値
+            attr_reader :calculation
+            # @return [Hash<String, Strin>] 運用値
+            attr_reader :operation
+
+            #
+            # 初期化
+            #
+            # @param [Hash<String, Strin>] hash 切替日（運用/計算）
+            #
+            def initialize(hash:)
+              @calculation = hash['calculation']
+              @operation = hash['operation']
+            end
+
+            #
+            # 検証する
+            #
+            # @return [Array<String>] 不正メッセージ
+            #
+            def validate
+              failed = []
+
+              failed |= validate_calculation_date
+
+              failed |= validate_operation_date
+
+              failed
+            end
+
+            private
+
+            #
+            # 日（計算値）を検証する
+            #
+            # @return [Array<String>] 不正メッセージ
+            #
+            def validate_calculation_date
+              Both::Date.new(hash: calculation, optional: true).validate
+            end
+
+            #
+            # 日（運用値）を検証する
+            #
+            # @return [Array<String>] 不正メッセージ
+            #
+            def validate_operation_date
+              Both::Date.new(hash: operation).validate
             end
           end
 
@@ -282,15 +337,19 @@ module Zakuro
               attr_reader :japan
               # @return [String] 西暦日
               attr_reader :western
+              # @return [True] 省略可
+              # @return [False] 省略不可
+              attr_reader :optional
 
               #
               # 初期化
               #
               # @param [Hash<String, Strin>] hash 日情報
               #
-              def initialize(hash:)
+              def initialize(hash:, optional: false)
                 @japan = hash['japan']
                 @western = hash['western']
+                @optional = optional
               end
 
               #
@@ -315,7 +374,9 @@ module Zakuro
               # @return [False] 正しくない
               #
               def japan?
-                Japan::Calendar.valid_date_string(text: japan)
+                return true if optional?(text: japan)
+
+                Japan::Calendar.valid_date_text(text: japan)
               end
 
               #
@@ -325,7 +386,25 @@ module Zakuro
               # @return [False] 正しくない
               #
               def western?
-                Western::Calendar.valid_date_string(text: western)
+                return true if optional?(text: western)
+
+                Western::Calendar.valid_date_text(text: western)
+              end
+
+              #
+              # 省略可で省略されているか
+              #
+              # @param [String] text 文字列
+              #
+              # @return [True] 省略あり
+              # @return [False] 省略なし
+              #
+              def optional?(text: '')
+                return false unless optional
+
+                return true if text == ''
+
+                false
               end
             end
           end