zakuro 0.7.2 → 0.8.0

data/lib/zakuro/operation/month/validator.rb

@@ -20,122 +20,124 @@ module Zakuro
         EMPTY_STRING = '-'
         BOOLEANS = %w[true false].freeze
 
-        #
-        # 有効文字列か
-        #
-        # @param [String] str 対象文字列
-        #
-        # @return [True] 有効
-        # @return [False] 無効
-        #
-        def self.string?(str: '')
-          return false if str == ''
+        class << self
+          #
+          # 有効文字列か
+          #
+          # @param [String] str 対象文字列
+          #
+          # @return [True] 有効
+          # @return [False] 無効
+          #
+          def string?(str: '')
+            return false if str == ''
 
-          return false unless str
+            return false unless str
 
-          str.is_a?(String)
-        end
+            str.is_a?(String)
+          end
 
-        #
-        # 有効文字列（空文字許容）か
-        #
-        # @param [String] str 対象文字列
-        #
-        # @return [True] 有効
-        # @return [False] 無効
-        #
-        def self.empiable_string?(str: '')
-          return false unless str
+          #
+          # 有効文字列（空文字許容）か
+          #
+          # @param [String] str 対象文字列
+          #
+          # @return [True] 有効
+          # @return [False] 無効
+          #
+          def empiable_string?(str: '')
+            return false unless str
 
-          str.is_a?(String)
-        end
+            str.is_a?(String)
+          end
 
-        #
-        # 正数か
-        #
-        # @param [String] str 対象文字列
-        #
-        # @return [True] 正数
-        # @return [False] 負数
-        #
-        def self.positive?(str: '')
-          return true if str == EMPTY_STRING
+          #
+          # 正数か
+          #
+          # @param [String] str 対象文字列
+          #
+          # @return [True] 正数
+          # @return [False] 負数
+          #
+          def positive?(str: '')
+            return true if str == EMPTY_STRING
 
-          return false unless str
+            return false unless str
 
-          /^[0-9]+$/.match?(str)
-        end
+            /^[0-9]+$/.match?(str)
+          end
 
-        #
-        # 数値か
-        #
-        # @param [String] str 対象文字列
-        #
-        # @return [True] 数値
-        # @return [False] 非数値
-        #
-        def self.num?(str: '')
-          return true if str == EMPTY_STRING
+          #
+          # 数値か
+          #
+          # @param [String] str 対象文字列
+          #
+          # @return [True] 数値
+          # @return [False] 非数値
+          #
+          def num?(str: '')
+            return true if str == EMPTY_STRING
 
-          return false unless str
+            return false unless str
 
-          /^[-0-9]+$/.match?(str)
-        end
+            /^[-0-9]+$/.match?(str)
+          end
 
-        #
-        # booleanか
-        #
-        # @param [String] str 対象文字列
-        #
-        # @return [True] boolean
-        # @return [False] 非boolean
-        #
-        def self.bool?(str: '')
-          BOOLEANS.include?(str)
-        end
+          #
+          # booleanか
+          #
+          # @param [String] str 対象文字列
+          #
+          # @return [True] boolean
+          # @return [False] 非boolean
+          #
+          def bool?(str: '')
+            BOOLEANS.include?(str)
+          end
 
-        #
-        # boolean（空許容）か
-        #
-        # @param [String] str 対象文字列
-        #
-        # @return [True] boolean
-        # @return [False] 非boolean
-        #
-        def self.empiable_bool?(str: '')
-          return true if str == EMPTY_STRING
+          #
+          # boolean（空許容）か
+          #
+          # @param [String] str 対象文字列
+          #
+          # @return [True] boolean
+          # @return [False] 非boolean
+          #
+          def empiable_bool?(str: '')
+            return true if str == EMPTY_STRING
 
-          bool?(str: str)
-        end
+            bool?(str: str)
+          end
 
-        #
-        # 月差分か
-        #
-        # @param [String] str 対象文字列
-        #
-        # @return [True] 有効
-        # @return [False] 無効
-        #
-        def self.month_days?(str: '')
-          return true if str == EMPTY_STRING
+          #
+          # 月差分か
+          #
+          # @param [String] str 対象文字列
+          #
+          # @return [True] 有効
+          # @return [False] 無効
+          #
+          def month_days?(str: '')
+            return true if str == EMPTY_STRING
 
-          return false unless str
+            return false unless str
 
-          /^[大小]$/.match?(str)
-        end
+            /^[大小]$/.match?(str)
+          end
 
-        #
-        # 西暦日か
-        #
-        # @param [String] str 対象文字列
-        #
-        # @return [True] 有効
-        # @return [False] 無効
-        #
-        def self.western_date?(str: '')
-          return Western::Calendar.new if str == EMPTY_STRING
+          #
+          # 西暦日か
+          #
+          # @param [String] str 対象文字列
+          #
+          # @return [True] 有効
+          # @return [False] 無効
+          #
+          def western_date?(str: '')
+            return Western::Calendar.new if str == EMPTY_STRING
 
-          Western::Calendar.valid_date_string(text: str)
+            Western::Calendar.valid_date_string(text: str)
+          end
         end
       end
 
@@ -381,9 +383,9 @@ module Zakuro
 
           prefix = "[#{@index}] invalid"
 
-          failed += @month.validate
+          failed += month.validate
 
-          failed += @solar_term.validate
+          failed += solar_term.validate
 
           failed.push("#{prefix} 'days'. #{@days}") unless days?
 
@@ -432,11 +434,11 @@ module Zakuro
         def validate
           failed = []
 
-          failed += @number.validate
+          failed += number.validate
 
-          failed += @leaped.validate
+          failed += leaped.validate
 
-          failed += @days.validate
+          failed += days.validate
 
           failed
         end
@@ -473,7 +475,7 @@ module Zakuro
           end
 
           def days?
-            Types.positive?(str: @days)
+            Types.positive?(str: days)
           end
 
           # :reek:TooManyStatements { max_statements: 6 }
@@ -488,9 +490,9 @@ module Zakuro
 
             prefix = "[#{index}][solar_term] invalid"
 
-            failed += @source.validate
+            failed += source.validate
 
-            failed += @destination.validate
+            failed += destination.validate
 
             failed.push("#{prefix} 'days'. #{@days}") unless days?
 
@@ -537,27 +539,27 @@ module Zakuro
           def validate
             failed = []
 
-            prefix = "[#{@diff_index}][solar_term.src] invalid"
+            prefix = "[#{diff_index}][solar_term.src] invalid"
 
-            failed.push("#{prefix} 'index'. #{@index}") unless index?
+            failed.push("#{prefix} 'index'. #{index}") unless index?
 
-            failed.push("#{prefix} 'to'. #{@to}") unless to?
+            failed.push("#{prefix} 'to'. #{to}") unless to?
 
-            failed.push("#{prefix} 'zodiac_name'. #{@zodiac_name}") unless zodiac_name?
+            failed.push("#{prefix} 'zodiac_name'. #{zodiac_name}") unless zodiac_name?
 
             failed
           end
 
           def index?
-            Types.positive?(str: @index)
+            Types.positive?(str: index)
           end
 
           def to?
-            Types.western_date?(str: @to)
+            Types.western_date?(str: to)
           end
 
           def zodiac_name?
-            Types.string?(str: @zodiac_name)
+            Types.string?(str: zodiac_name)
           end
         end
 
@@ -600,27 +602,27 @@ module Zakuro
           def validate
             failed = []
 
-            prefix = "[#{@diff_index}][solar_term.dest] invalid"
+            prefix = "[#{diff_index}][solar_term.dest] invalid"
 
-            failed.push("#{prefix} 'index'. #{@index}") unless index?
+            failed.push("#{prefix} 'index'. #{index}") unless index?
 
-            failed.push("#{prefix} 'from'. #{@from}") unless from?
+            failed.push("#{prefix} 'from'. #{from}") unless from?
 
-            failed.push("#{prefix} 'zodiac_name'. #{@zodiac_name}") unless zodiac_name?
+            failed.push("#{prefix} 'zodiac_name'. #{zodiac_name}") unless zodiac_name?
 
             failed
           end
 
           def index?
-            Types.positive?(str: @index)
+            Types.positive?(str: index)
           end
 
           def from?
-            Types.western_date?(str: @from)
+            Types.western_date?(str: from)
           end
 
           def zodiac_name?
-            Types.string?(str: @zodiac_name)
+            Types.string?(str: zodiac_name)
           end
         end
       end
@@ -660,21 +662,21 @@ module Zakuro
         def validate
           failed = []
 
-          prefix = "[#{@index}][#{NAME}] invalid"
+          prefix = "[#{index}][#{NAME}] invalid"
 
-          failed.push("#{prefix} 'src'. #{@src}") unless src?
+          failed.push("#{prefix} 'src'. #{src}") unless src?
 
-          failed.push("#{prefix} 'dest'. #{@dest}") unless dest?
+          failed.push("#{prefix} 'dest'. #{dest}") unless dest?
 
           failed
         end
 
         def src?
-          Types.positive?(str: @src)
+          Types.positive?(str: src)
         end
 
         def dest?
-          Types.positive?(str: @dest)
+          Types.positive?(str: dest)
         end
       end
 
@@ -713,21 +715,21 @@ module Zakuro
         def validate
           failed = []
 
-          prefix = "[#{@index}][#{NAME}] invalid"
+          prefix = "[#{index}][#{NAME}] invalid"
 
-          failed.push("#{prefix} 'src'. #{@src}") unless src?
+          failed.push("#{prefix} 'src'. #{src}") unless src?
 
-          failed.push("#{prefix} 'dest'. #{@dest}") unless dest?
+          failed.push("#{prefix} 'dest'. #{dest}") unless dest?
 
           failed
         end
 
         def src?
-          Types.empiable_bool?(str: @src)
+          Types.empiable_bool?(str: src)
         end
 
         def dest?
-          Types.empiable_bool?(str: @dest)
+          Types.empiable_bool?(str: dest)
         end
       end
 
@@ -766,36 +768,38 @@ module Zakuro
         def validate
           failed = []
 
-          prefix = "[#{@index}][#{NAME}] invalid"
+          prefix = "[#{index}][#{NAME}] invalid"
 
-          failed.push("#{prefix} 'src'. #{@src}") unless src?
+          failed.push("#{prefix} 'src'. #{src}") unless src?
 
-          failed.push("#{prefix} 'dest'. #{@dest}") unless dest?
+          failed.push("#{prefix} 'dest'. #{dest}") unless dest?
 
           failed
         end
 
         def src?
-          Types.month_days?(str: @src)
+          Types.month_days?(str: src)
         end
 
         def dest?
-          Types.month_days?(str: @dest)
+          Types.month_days?(str: dest)
         end
       end
 
       # :reek:TooManyStatements { max_statements: 7 }
 
-      def self.run(yaml_hash: {})
-        failed = []
-        yaml_hash.each_with_index do |history, index|
-          failed += MonthHistory.new(index: index, yaml_hash: history).validate
-          failed += Annotation.new(index: index, yaml_hash: history).validate
-          failed += Reference.new(index: index, yaml_hash: history).validate
-          failed += Diffs.new(index: index, yaml_hash: history['diffs']).validate
-        end
+      class << self
+        def run(yaml_hash: {})
+          failed = []
+          yaml_hash.each_with_index do |history, index|
+            failed += MonthHistory.new(index: index, yaml_hash: history).validate
+            failed += Annotation.new(index: index, yaml_hash: history).validate
+            failed += Reference.new(index: index, yaml_hash: history).validate
+            failed += Diffs.new(index: index, yaml_hash: history['diffs']).validate
+          end
 
-        failed
+          failed
+        end
       end
     end
   end

data/lib/zakuro/operation/operation.rb

@@ -16,51 +16,53 @@ module Zakuro
       __dir__
     ))
 
-    #
-    # 変更履歴（月）を返す
-    #
-    # @return [Array<MonthHistory>] 変更履歴
-    #
-    def self.month_histories
-      MONTH_HISTORIES
-    end
+    class << self
+      #
+      # 変更履歴（月）を返す
+      #
+      # @return [Array<MonthHistory>] 変更履歴
+      #
+      def month_histories
+        MONTH_HISTORIES
+      end
 
-    # :reek:ControlParameter
+      # :reek:ControlParameter
 
-    #
-    # 変更履歴を特定する
-    #
-    # @param [Western::Calendar] western_date 月初日の西暦日
-    #
-    # @return [Operation::MonthHistory] 変更履歴
-    #
-    def self.specify_history(western_date:)
-      month_histroies = Operation.month_histories
+      #
+      # 変更履歴を特定する
+      #
+      # @param [Western::Calendar] western_date 月初日の西暦日
+      #
+      # @return [Operation::MonthHistory] 変更履歴
+      #
+      def specify_history(western_date:)
+        month_histroies = month_histories
+
+        month_histroies.each do |history|
+          return history if western_date == history.western_date
+        end
 
-      month_histroies.each do |history|
-        return history if western_date == history.western_date
+        Operation::MonthHistory.new
       end
 
-      Operation::MonthHistory.new
-    end
+      # :reek:ControlParameter
 
-    # :reek:ControlParameter
+      #
+      # 変更履歴を特定する
+      #
+      # @param [Western::Calendar] id 変更履歴ID
+      #
+      # @return [Operation::MonthHistory] 変更履歴
+      #
+      def specify_history_by_id(id:)
+        month_histroies = month_histories
 
-    #
-    # 変更履歴を特定する
-    #
-    # @param [Western::Calendar] id 変更履歴ID
-    #
-    # @return [Operation::MonthHistory] 変更履歴
-    #
-    def self.specify_history_by_id(id:)
-      month_histroies = Operation.month_histories
+        month_histroies.each do |history|
+          return history if id == history.id
+        end
 
-      month_histroies.each do |history|
-        return history if id == history.id
+        Operation::MonthHistory.new
       end
-
-      Operation::MonthHistory.new
     end
   end
 end