zakuro 0.9.0 → 0.9.2

data/lib/zakuro/calculation/summary/internal/option.rb

@@ -3,8 +3,10 @@
 require_relative '../../../context/option'
 require_relative '../../../result/data/option/dropped_date/option'
 require_relative '../../../result/data/solar_term'
+require_relative '../../../result/data/option/vanished_date/option'
 
 require_relative '../../option/dropped_date/location'
+require_relative '../../option/vanished_date/location'
 
 # :nodoc:
 module Zakuro
@@ -26,6 +28,8 @@ module Zakuro
           # @return [Hash<String, Result::Data::Option::AbstractOption>] オプション結果
           #
           def create(month:, day:)
+            # TODO: refactor
+
             options = {}
             context = month.context
 
@@ -38,6 +42,15 @@ module Zakuro
               options[Context::Option::DROPPED_DATE_KEY] = option
             end
 
+            if context.option.vanished_date?
+              remainder = day.remainder
+              average_remainder = month.first_day.average_remainder
+              option = vanished_date(
+                context: context, remainder: remainder, average_remainder: average_remainder
+              )
+              options[Context::Option::VANISHED_DATE_KEY] = option
+            end
+
             options
           end
 
@@ -53,10 +66,7 @@ module Zakuro
           # @return [Result::Data::Option::DroppedDate::Option] 没日
           #
           def dropped_date(context:, remainder:, solar_terms:)
-            option = Result::Data::Option::DroppedDate::Option.new(
-              matched: false,
-              calculation: Result::Data::Option::DroppedDate::Calculation.new
-            )
+            option = Result::Data::Option::DroppedDate::Option.new
 
             return option if remainder.invalid?
 
@@ -68,23 +78,24 @@ module Zakuro
 
             dropped_date = location.get
 
-            return option unless remainder.day == dropped_date.day
-
-            dropped_date_option(location: location)
+            dropped_date_option(
+              matched: remainder.day == dropped_date.day, location: location
+            )
           end
 
           #
           # 没日オプション値を生成する
           #
+          # @param [True, False] matched 没日有無
           # @param [Calculation::Option::DroppedDate::Location] location 没日位置
           #
           # @return [Result::Data::Option::DroppedDate::Option] 没日オプション値
           #
-          def dropped_date_option(location:)
+          def dropped_date_option(matched:, location:)
             dropped_date = location.get
             solar_term = location.solar_term
             Result::Data::Option::DroppedDate::Option.new(
-              matched: true,
+              matched: matched,
               calculation: Result::Data::Option::DroppedDate::Calculation.new(
                 remainder: dropped_date.format,
                 solar_term: Result::Data::SolarTerm.new(
@@ -94,6 +105,57 @@ module Zakuro
               )
             )
           end
+
+          #
+          # 滅日を求める
+          #
+          # @param [Context::Context] context 暦コンテキスト
+          # @param [Cycle::AbstractRemainder] remainder 当日和暦日
+          # @param [Cycle::AbstractRemainder] average_remainder 経朔
+          #
+          # @return [Result::Data::Option::VanishedDate::Option] 滅日オプション値
+          #
+          def vanished_date(context:, remainder:, average_remainder:)
+            return Result::Data::Option::VanishedDate::Option.new if average_remainder.invalid?
+
+            location = Calculation::Option::VanishedDate::Location.new(
+              context: context, average_remainder: average_remainder
+            )
+
+            unless location.exist?
+              # 結果確認のため経朔だけは設定する
+              return Result::Data::Option::VanishedDate::Option.new(
+                calculation: Result::Data::Option::VanishedDate::Calculation.new(
+                  average_remainder: average_remainder
+                )
+              )
+            end
+
+            vanished_date = location.get
+
+            vanished_date_option(
+              matched: remainder.day == vanished_date.day, location: location
+            )
+          end
+
+          #
+          # 滅日オプション値を生成する
+          #
+          # @param [True, False] matched 滅日有無
+          # @param [Calculation::Option::VanishedDate::Location] location 滅日位置
+          #
+          # @return [Result::Data::Option::VanishedDate::Option] 滅日オプション値
+          #
+          def vanished_date_option(matched:, location:)
+            vanished_date = location.get
+            Result::Data::Option::VanishedDate::Option.new(
+              matched: matched,
+              calculation: Result::Data::Option::VanishedDate::Calculation.new(
+                remainder: vanished_date.format,
+                average_remainder: location.average_remainder
+              )
+            )
+          end
         end
       end
     end

data/lib/zakuro/context/option.rb

@@ -16,6 +16,9 @@ module Zakuro
       # @return [String] 没日オプションキー名
       DROPPED_DATE_KEY = 'dropped_date'
 
+      # @return [String] 滅日オプションキー名
+      VANISHED_DATE_KEY = 'vanished_date'
+
       # @return [Hash<String, Object>] オプション値
       attr_reader :hash
       # @return [String] デフォルト暦名
@@ -82,6 +85,20 @@ module Zakuro
         false
       end
 
+      #
+      # 滅日か
+      #
+      # @return [True] 滅日あり
+      # @return [False] 滅日なし
+      #
+      def vanished_date?
+        value = @hash[VANISHED_DATE_KEY]
+
+        return true if value.is_a?(TrueClass)
+
+        false
+      end
+
       class << self
         #
         # 暦名を返す

data/lib/zakuro/context/version_class_resolver.rb

@@ -4,21 +4,25 @@ require_relative '../version/genka/cycle/remainder'
 require_relative '../version/genka/cycle/solar_term'
 require_relative '../version/genka/range/annual_range'
 require_relative '../version/genka/option/dropped_date/parameter'
+require_relative '../version/genka/option/vanished_date/parameter'
 
 require_relative '../version/gihou/cycle/remainder'
 require_relative '../version/gihou/cycle/solar_term'
 require_relative '../version/gihou/range/annual_range'
 require_relative '../version/gihou/option/dropped_date/parameter'
+require_relative '../version/gihou/option/vanished_date/parameter'
 
 require_relative '../version/daien/cycle/remainder'
 require_relative '../version/daien/cycle/solar_term'
 require_relative '../version/daien/range/annual_range'
 require_relative '../version/daien/option/dropped_date/parameter'
+require_relative '../version/daien/option/vanished_date/parameter'
 
 require_relative '../version/senmyou/cycle/remainder'
 require_relative '../version/senmyou/cycle/solar_term'
 require_relative '../version/senmyou/range/annual_range'
 require_relative '../version/senmyou/option/dropped_date/parameter'
+require_relative '../version/senmyou/option/vanished_date/parameter'
 
 # :nodoc:
 module Zakuro
@@ -36,7 +40,8 @@ module Zakuro
         'remainder' => 'Zakuro::$VERSION::Cycle::Remainder',
         'solar_term' => 'Zakuro::$VERSION::Cycle::SolarTerm',
         'annual_range' => 'Zakuro::$VERSION::Range::AnnualRange',
-        'dropped_date_parameter' => 'Zakuro::$VERSION::Option::DroppedDate::Parameter'
+        'dropped_date_parameter' => 'Zakuro::$VERSION::Option::DroppedDate::Parameter',
+        'vanished_date_parameter' => 'Zakuro::$VERSION::Option::VanishedDate::Parameter'
       }.freeze
 
       #
@@ -86,6 +91,17 @@ module Zakuro
         )
       end
 
+      #
+      # 滅日引数を返す
+      #
+      # @return [Class] 没日引数クラス
+      #
+      def vanished_date_parameter
+        self.class.get_class(
+          version_name: @version_name, class_name: 'vanished_date_parameter'
+        )
+      end
+
       class << self
         #
         # 該当の暦のクラスを取得する

data/lib/zakuro/era/japan/calendar.rb

@@ -98,7 +98,7 @@ module Zakuro
         # @return [Calendar] 年月日情報（和暦）
         #
         def parse(regex: FORMAT, text: '')
-          return Calendar.new unless valid_date_string(regex: regex, text: text)
+          return Calendar.new unless valid_date_text(regex: regex, text: text)
 
           matched = text.match(regex)
 
@@ -120,7 +120,7 @@ module Zakuro
         # @return [True] 正しい
         # @return [True] 正しくない
         #
-        def valid_date_string(regex: FORMAT, text: '')
+        def valid_date_text(regex: FORMAT, text: '')
           return false unless text
 
           matched = text.match(regex)

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

@@ -315,7 +315,7 @@ module Zakuro
               # @return [False] 正しくない
               #
               def japan?
-                Japan::Calendar.valid_date_string(text: japan)
+                Japan::Calendar.valid_date_text(text: japan)
               end
 
               #
@@ -325,7 +325,7 @@ module Zakuro
               # @return [False] 正しくない
               #
               def western?
-                Western::Calendar.valid_date_string(text: western)
+                Western::Calendar.valid_date_text(text: western)
               end
             end
           end

data/lib/zakuro/era/western/calendar.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative './date_text'
+
 require 'date'
 
 # :nodoc:
@@ -402,9 +404,7 @@ module Zakuro
         # @raise [ArgumentError] 引数エラー
         #
         def parse(text: '', type: Type::DEFAULT)
-          unless valid_date_string(text: text, type: type)
-            raise ArgumentError, "invalid date string: #{text}"
-          end
+          raise ArgumentError, "invalid date string: #{text}" unless valid_date_text(text: text)
 
           start = DATE_START.fetch(type, DATE_START[Type::DEFAULT])
           date = Date.parse(text, start)
@@ -423,14 +423,8 @@ module Zakuro
         # @return [True] 正しい
         # @return [True] 正しくない
         #
-        def valid_date_string(text: '', type: Type::DEFAULT)
-          start = DATE_START.fetch(type, DATE_START[Type::DEFAULT])
-          begin
-            Date.parse(text, start)
-          rescue ArgumentError => _e
-            return false
-          end
-          true
+        def valid_date_text(text: '')
+          DateText.validate(text: text)
         end
       end
     end

data/lib/zakuro/era/western/date_text.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+# :nodoc:
+module Zakuro
+  #
+  # Western 西暦
+  #
+  module Western
+    #
+    # DateText 日付文字列
+    #
+    module DateText
+      # @return [Regexp] ハイフン区切り
+      HYPHEN = /^[0-9]{1,5}-[0-9]{1,2}-[0-9]{1,2}$/.freeze
+      # @return [Regexp] スラッシュ区切り
+      SLASH = %r{^[0-9]{1,5}/[0-9]{1,2}/[0-9]{1,2}$}.freeze
+
+      #
+      # 有効な日付文字列か検証する
+      #
+      #  * 従来は Date.parse で日付文字列を検証していた
+      #  * [貞観4年3月20日] のような文字列でも有効扱いになっていた
+      #  * [20] [20日] のように2桁の数字が含まれると有効な日付扱いされる
+      #  * 特定のフォーマットのみ受け付けるように改変した
+      #
+      # @param [String] text 文字列
+      #
+      # @return [True] 有効
+      # @return [True] 無効
+      #
+      def self.validate(text: '')
+        return true if HYPHEN.match(text)
+
+        return true if SLASH.match(text)
+
+        false
+      end
+    end
+  end
+end

data/lib/zakuro/gateway/locale/date.rb

@@ -112,12 +112,12 @@ module Zakuro
         # @param [String] text 日付文字列
         #
         def parse_text(text:)
-          if Western::Calendar.valid_date_string(text: text)
+          if Western::Calendar.valid_date_text(text: text)
             @western_date = Western::Calendar.parse(text: text)
             return
           end
 
-          return unless Japan::Calendar.valid_date_string(text: text)
+          return unless Japan::Calendar.valid_date_text(text: text)
 
           @japan_date = Japan::Calendar.parse(text: text)
         end

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

@@ -136,7 +136,13 @@ module Zakuro
           def western_date?(str: '')
             return Western::Calendar.new if str == EMPTY_STRING
 
-            Western::Calendar.valid_date_string(text: str)
+            # 1316-11-16/1317-4-13
+            dates = str.split('/')
+            dates.each do |date|
+              return true if Western::Calendar.valid_date_text(text: date)
+            end
+
+            false
           end
         end
       end

data/lib/zakuro/operation/yaml/month.yaml

@@ -11697,11 +11697,11 @@
   diffs:
     month:
       number:
-        src: "-"
-        dest: "-"
+        src: '8'
+        dest: '7'
       leaped:
-        src: "-"
-        dest: "-"
+        src: 'false'
+        dest: 'true'
       days:
         src: 大
         dest: 小
@@ -11730,11 +11730,11 @@
   diffs:
     month:
       number:
-        src: "-"
-        dest: "-"
+        src: '8'
+        dest: '8'
       leaped:
-        src: "-"
-        dest: "-"
+        src: 'true'
+        dest: 'false'
       days:
         src: 大
         dest: 大
@@ -15070,10 +15070,10 @@
   diffs:
     month:
       number:
-        src: '11'
+        src: '12'
         dest: '11'
       leaped:
-        src: 'true'
+        src: 'false'
         dest: 'false'
       days:
         src: 大
@@ -15102,11 +15102,11 @@
   diffs:
     month:
       number:
-        src: "-"
-        dest: "-"
+        src: '12'
+        dest: '12'
       leaped:
-        src: "-"
-        dest: "-"
+        src: 'true'
+        dest: 'false'
       days:
         src: 大
         dest: 大

data/lib/zakuro/result/data/option/vanished_date/calculation.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+# :nodoc:
+module Zakuro
+  #
+  # Result 演算結果
+  #
+  module Result
+    #
+    # データ部
+    #
+    module Data
+      #
+      # Option オプション
+      #
+      module Option
+        #
+        # VanishedDate 滅日
+        #
+        module VanishedDate
+          #
+          # Calculation 演算値
+          #
+          class Calculation
+            # @return [String] 大余小余（滅余）
+            attr_reader :remainder
+            # @return [String] 経朔
+            attr_reader :average_remainder
+
+            #
+            # 初期化
+            #
+            # @param [String] remainder 大余小余（滅余）
+            # @param [String] average_remainder 経朔
+            #
+            def initialize(remainder: '', average_remainder: '')
+              @remainder = remainder
+              @average_remainder = average_remainder
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/zakuro/result/data/option/vanished_date/option.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require_relative '../abstract_option'
+
+require_relative './calculation'
+
+# :nodoc:
+module Zakuro
+  #
+  # Result 演算結果
+  #
+  module Result
+    #
+    # データ部
+    #
+    module Data
+      #
+      # Option オプション
+      #
+      module Option
+        #
+        # VanishedDate 滅日
+        #
+        module VanishedDate
+          #
+          # Option 滅日集約
+          #
+          class Option < AbstractOption
+            # @return [Calculation] 演算値
+            attr_reader :calculation
+
+            #
+            # 初期化
+            #
+            # @param [True, False] matched オプション値有無
+            # @param [Calculation] calculation 演算値
+            #
+            def initialize(matched: false, calculation: Calculation.new)
+              super(matched: matched)
+              @calculation = calculation
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/zakuro/result/data/single_day.rb

@@ -6,6 +6,8 @@ require_relative './option/abstract_option'
 
 require_relative './option/dropped_date/option'
 
+require_relative './option/vanished_date/option'
+
 require_relative 'year'
 
 require_relative 'month'

data/lib/zakuro/version/daien/const/number.rb

@@ -38,6 +38,8 @@ module Zakuro
           REMAINDER_ALL_YEAR = 15_943
           # @return [Integer] 旬周（60日） DAY * 60
           SIXTY_DAYS = 182_400
+          # @return [Integer] 朔虚分: (30 * 3040) % (29 * 3040 + 1613)
+          REMAINDER_IDEAL_MONTH = 1427
         end
 
         #

data/lib/zakuro/version/daien/const/remainder.rb

@@ -29,6 +29,12 @@ module Zakuro
           #
           # @return [Cycle::Remainder] 弦（1分=80秒）
           QUARTER = Cycle::Remainder.new(day: 7, minute: 1163, second: 6)
+
+          # @return [Cycle::Remainder] 有没判定
+          DROPPED_DATE_LIMIT = Cycle::Remainder.new(day: 0, minute: 2375, second: 17)
+
+          # @return [Cycle::Remainder] 有滅判定
+          VANISHED_DATE_LIMIT = Cycle::Remainder.new(day: 0, minute: 1427, second: 0)
         end
 
         #
@@ -44,8 +50,7 @@ module Zakuro
           #   * 0.25 * 80（1分=80秒） = 20
           #
           # @return [Cycle::LunarRemainder] 弦（1分=80秒）
-          # TODO: 秒が20では通らない。少なくとも0.01247は必要になる
-          QUARTER = Cycle::LunarRemainder.new(day: 7, minute: 1163, second: 20.01247)
+          QUARTER = Cycle::LunarRemainder.new(day: 7, minute: 1163, second: 20)
         end
       end
     end

data/lib/zakuro/version/daien/cycle/remainder.rb

@@ -32,19 +32,6 @@ module Zakuro
           super(base_day: Const::Number::Cycle::DAY, base_minute: MINUTE,
                 day: day, minute: minute, second: second, total: total)
         end
-
-        #
-        # 特定の文字フォーマットにして出力する
-        #
-        # @param [String] form フォーマット（大余、小余、秒それぞれを%dで指定する）
-        #
-        # @return [String] フォーマットした結果
-        #
-        def format(form: '%d-%d')
-          return '' if invalid?
-
-          super(form, @day, @minute, @second)
-        end
       end
 
       #
@@ -66,18 +53,49 @@ module Zakuro
           super(base_day: Const::Number::Cycle::DAY, base_minute: MINUTE,
                 day: day, minute: minute, second: second, total: total)
         end
+      end
+
+      #
+      # DroppedRemainder 没日の計算向け時刻情報（没余）
+      #
+      class DroppedRemainder < Calculation::Cycle::AbstractRemainder
+        # @return [Integer] 分（1分=24秒）
+        MINUTE = 24
 
         #
-        # 特定の文字フォーマットにして出力する
-        #
-        # @param [String] form フォーマット（大余、小余、秒それぞれを%dで指定する）
+        # 初期化
         #
-        # @return [String] フォーマットした結果
+        # @param [Integer] day 大余（"日"に相当）
+        # @param [Integer] minute 小余（"分"に相当）
+        # @param [Integer] second 秒
+        # @param [Integer] total 繰り上げなしの小余
         #
-        def format(form: '%d-%d')
-          return '' if invalid?
+        def initialize(day: -1, minute: -1, second: -1, total: -1)
+          # 小余 = 通余
+          super(base_day: Const::Number::Derivation::REMAINDER_ALL_YEAR, base_minute: MINUTE,
+                day: day, minute: minute, second: second, total: total)
+        end
+      end
+
+      #
+      # VanishedRemainder 滅日の計算向け時刻情報（滅余）
+      #
+      class VanishedRemainder < Calculation::Cycle::AbstractRemainder
+        # @return [Integer] 分（1分=24秒）
+        MINUTE = 24
 
-          super(form, @day, @minute, @second)
+        #
+        # 初期化
+        #
+        # @param [Integer] day 大余（"日"に相当）
+        # @param [Integer] minute 小余（"分"に相当）
+        # @param [Integer] second 秒
+        # @param [Integer] total 繰り上げなしの小余
+        #
+        def initialize(day: -1, minute: -1, second: -1, total: -1)
+          # 小余 = 朔虚分
+          super(base_day: Const::Number::Derivation::REMAINDER_IDEAL_MONTH, base_minute: MINUTE,
+                day: day, minute: minute, second: second, total: total)
         end
       end
     end

data/lib/zakuro/version/daien/monthly/lunar_phase.rb

@@ -64,7 +64,7 @@ module Zakuro
           # NOTE: 大衍暦では進朔しない
           # adjusted.up_on_new_moon!
 
-          debug("result: #{adjusted.format}")
+          debug("result: #{adjusted.format(form: '%d-%d.%.5f')}")
 
           adjusted
         end
@@ -92,9 +92,7 @@ module Zakuro
 
           remainder = lunar_location.adjusted_remainder
 
-          # debug("[lunar]remainder.format: #{remainder.format(form: '%d-%d-%.5f')}")
-          # debug("[lunar]remainder.day: #{remainder.day}")
-          # debug("[lunar]remainder.minute: #{remainder.minute}")
+          debug("[lunar]remainder.format: #{remainder.format(form: '%d-%d-%.5f')}")
 
           Lunar::Value.get(remainder: remainder)
         end

data/lib/zakuro/version/daien/option/dropped_date/parameter.rb

@@ -9,9 +9,9 @@ require_relative '../../cycle/remainder'
 # :nodoc:
 module Zakuro
   # :nodoc:
-  module Senmyou
+  module Daien
     # :nodoc:
-    module Daien
+    module Option
       # :nodoc:
       module DroppedDate
         #
@@ -22,7 +22,9 @@ module Zakuro
           # 初期化
           #
           def initialize
-            super(valid: false)
+            super(valid: true, year: Const::Number::Cycle::YEAR,
+                  limit: Const::Remainder::Solar::DROPPED_DATE_LIMIT,
+                  remainder_class: Cycle::DroppedRemainder)
           end
         end
       end