zakuro 0.8.0 → 0.9.1

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?
 
@@ -94,6 +104,51 @@ module Zakuro
               )
             )
           end
+
+          #
+          # 滅日を求める
+          #
+          # @param [<Type>] context <description>
+          # @param [<Type>] remainder <description>
+          # @param [<Type>] average_remainder <description>
+          #
+          # @return [<Type>] <description>
+          #
+          def vanished_date(context:, remainder:, average_remainder:)
+            option = Result::Data::Option::VanishedDate::Option.new
+
+            return option if average_remainder.invalid?
+
+            location = Calculation::Option::VanishedDate::Location.new(
+              context: context, average_remainder: average_remainder
+            )
+
+            return option unless location.exist?
+
+            vanished_date = location.get
+
+            return option unless remainder.day == vanished_date.day
+
+            vanished_date_option(location: location)
+          end
+
+          #
+          # 滅日オプション値を生成する
+          #
+          # @param [Calculation::Option::DroppedDate::Location] location 滅日位置
+          #
+          # @return [Result::Data::Option::DroppedDate::Option] 滅日オプション値
+          #
+          def vanished_date_option(location:)
+            vanished_date = location.get
+            Result::Data::Option::VanishedDate::Option.new(
+              matched: true,
+              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
         #
         # 該当の暦のクラスを取得する