zakuro 0.7.0 → 0.7.2

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

@@ -2,6 +2,10 @@
 
 require_relative '../core'
 
+require_relative './option/abstract_option'
+
+require_relative './option/dropped_date/option'
+
 require_relative 'year'
 
 require_relative 'month'
@@ -28,6 +32,8 @@ module Zakuro
         attr_reader :month
         # @return [Day] 日
         attr_reader :day
+        # @return [Hash<String, Option::AbstractOption>] オプション
+        attr_reader :options
 
         #
         # 初期化
@@ -35,12 +41,14 @@ module Zakuro
         # @param [Year] year 年
         # @param [Month] month 月
         # @param [Day] day 日
+        # @param [Hash<String, Option::AbstractOption>] options オプション
         #
-        def initialize(year:, month:, day:)
+        def initialize(year:, month:, day:, options: {})
           super
           @year = year
           @month = month
           @day = day
+          @options = options
         end
       end
     end

data/lib/zakuro/result/result.rb

@@ -4,7 +4,7 @@ require 'json'
 
 require_relative './data/single_day'
 
-require_relative './operation/operation'
+require_relative './operation/bundle'
 
 require_relative './core'
 

data/lib/zakuro/tools/stringifier.rb

@@ -17,6 +17,7 @@ module Zakuro
       #
       # @param [Object] obj 対象インスタンス
       # @param [String] class_prefix インスタンス内でハッシュ変換するクラスのプレフィックス
+      # @param [True, False] formatted 整形有無
       #
       # @return [Hash<String, Objcet>] ハッシュ
       #
@@ -31,13 +32,12 @@ module Zakuro
         hash
       end
 
-      # :reek:TooManyStatements { max_statements: 7 }
-
       #
       # 対象インスタンスをハッシュ化する（再帰処理）
       #
       # @param [Object] obj 対象インスタンス
       # @param [String] class_prefix インスタンス内でハッシュ変換するクラスのプレフィックス
+      # @param [True, False] formatted 整形有無
       #
       # @return [Hash<String, Objcet>] ハッシュ
       #
@@ -52,6 +52,20 @@ module Zakuro
           return to_h(obj: obj, class_prefix: class_prefix, formatted: formatted)
         end
 
+        general_value_to_hash(obj: obj, class_prefix: class_prefix, formatted: formatted)
+      end
+      private_class_method :value_to_hash
+
+      #
+      # ライブラリを問わない標準的な値をハッシュ化する（再帰処理）
+      #
+      # @param [Object] obj 対象インスタンス
+      # @param [String] class_prefix インスタンス内でハッシュ変換するクラスのプレフィックス
+      # @param [True, False] formatted 整形有無
+      #
+      # @return [Objcet] ハッシュ変換可能な値
+      #
+      def self.general_value_to_hash(obj:, class_prefix:, formatted:)
         # 配列は要素一つずつで再帰する
         if obj.is_a?(Array)
           arr = []
@@ -61,9 +75,18 @@ module Zakuro
           return arr
         end
 
+        # ハッシュはキーごとに再帰する
+        if obj.is_a?(Hash)
+          hash = {}
+          obj.each do |key, value|
+            hash[key] = to_h(obj: value, class_prefix: class_prefix, formatted: formatted)
+          end
+          return hash
+        end
+
         obj
       end
-      private_class_method :value_to_hash
+      private_class_method :general_value_to_hash
     end
   end
 end

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

@@ -29,7 +29,7 @@ module Zakuro
         # @param [Integer] total 繰り上げなしの小余
         #
         def initialize(day: -1, minute: -1, second: -1, total: -1)
-          super(base_day: Const::Number::Cycle::DAY, base_mitune: MINUTE,
+          super(base_day: Const::Number::Cycle::DAY, base_minute: MINUTE,
                 day: day, minute: minute, second: second, total: total)
         end
 
@@ -63,7 +63,7 @@ module Zakuro
         # @param [Integer] total 繰り上げなしの小余
         #
         def initialize(day: -1, minute: -1, second: -1, total: -1)
-          super(base_day: Const::Number::Cycle::DAY, base_mitune: MINUTE,
+          super(base_day: Const::Number::Cycle::DAY, base_minute: MINUTE,
                 day: day, minute: minute, second: second, total: total)
         end
 

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require_relative '../../../../calculation/option/dropped_date/abstract_parameter'
+
+require_relative '../../const/number'
+require_relative '../../const/remainder'
+require_relative '../../cycle/remainder'
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Senmyou
+    # :nodoc:
+    module Daien
+      # :nodoc:
+      module DroppedDate
+        #
+        # Parameter 引数
+        #
+        class Parameter < Calculation::Option::DroppedDate::AbstractParameter
+          #
+          # 初期化
+          #
+          def initialize
+            super(valid: false)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/zakuro/version/daien/range/annual_range.rb

@@ -20,7 +20,7 @@ module Zakuro
         #   * 対象年に対して、前年11月-当年11月までを出力する
         #   * 対象年（西暦）と計算年（元号x年）の紐付けは行わない
         #
-        # @param [Context] context 暦コンテキスト
+        # @param [Context::Context] context 暦コンテキスト
         # @param [Integer] western_year 西暦年
         #
         # @return [Array<Month>] 1年データ

data/lib/zakuro/version/daien/stella/lunar/adjustment.rb

@@ -206,6 +206,8 @@ module Zakuro
         #
         # @return [Row] 補正値
         #
+        # @raise [ArgumentError] 引数エラー
+        #
         def self.specify(day:, minute:)
           LIST.each do |row|
             # NOTE: 範囲が重複している場合、最初に引き当てたほうを優先する

data/lib/zakuro/version/daien/stella/lunar/value.rb

@@ -63,6 +63,8 @@ module Zakuro
         # @return [True] 正しい（月の位相計算に使う大余小余）
         # @return [True] 正しくない
         #
+        # @raise [ArgumentError] 引数エラー
+        #
         def self.valid?(remainder:)
           return if remainder.is_a?(Cycle::LunarRemainder)
 

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

@@ -30,7 +30,7 @@ module Zakuro
         # @param [Integer] total 繰り上げなしの小余
         #
         def initialize(day: -1, minute: -1, second: -1, total: -1)
-          super(base_day: Const::Number::Cycle::DAY, base_mitune: MINUTE,
+          super(base_day: Const::Number::Cycle::DAY, base_minute: MINUTE,
                 day: day, minute: minute, second: second, total: total)
         end
 
@@ -67,7 +67,7 @@ module Zakuro
         # @param [Integer] total 繰り上げなしの小余
         #
         def initialize(day: -1, minute: -1, second: -1, total: -1)
-          super(base_day: Const::Number::Cycle::TERM_DAY, base_mitune: MINUTE,
+          super(base_day: Const::Number::Cycle::TERM_DAY, base_minute: MINUTE,
                 day: day, minute: minute, second: second, total: total)
         end
 

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require_relative '../../../../calculation/option/dropped_date/abstract_parameter'
+
+require_relative '../../const/number'
+require_relative '../../const/remainder'
+require_relative '../../cycle/remainder'
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Genka
+    # :nodoc:
+    module Option
+      # :nodoc:
+      module DroppedDate
+        #
+        # Parameter 引数
+        #
+        class Parameter < Calculation::Option::DroppedDate::AbstractParameter
+          #
+          # 初期化
+          #
+          def initialize
+            super(valid: false)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/zakuro/version/genka/range/annual_range.rb

@@ -24,7 +24,7 @@ module Zakuro
         #   * 対象年に対して、当年1月-翌年1月までを出力する
         #   * 対象年（西暦）と計算年（元号x年）の紐付けは行わない
         #
-        # @param [Context] context 暦コンテキスト
+        # @param [Context::Context] context 暦コンテキスト
         # @param [Integer] western_year 西暦年
         #
         # @return [Array<Month>] 1年データ

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

@@ -26,7 +26,7 @@ module Zakuro
         # @param [Integer] total 繰り上げなしの小余
         #
         def initialize(day: -1, minute: -1, second: -1, total: -1)
-          super(base_day: Const::Number::Cycle::DAY, base_mitune: MINUTE,
+          super(base_day: Const::Number::Cycle::DAY, base_minute: MINUTE,
                 day: day, minute: minute, second: second, total: total)
         end
 
@@ -60,7 +60,7 @@ module Zakuro
         # @param [Integer] total 繰り上げなしの小余
         #
         def initialize(day: -1, minute: -1, second: -1, total: -1)
-          super(base_day: Const::Number::Cycle::DAY, base_mitune: MINUTE,
+          super(base_day: Const::Number::Cycle::DAY, base_minute: MINUTE,
                 day: day, minute: minute, second: second, total: total)
         end
 

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require_relative '../../../../calculation/option/dropped_date/abstract_parameter'
+
+require_relative '../../const/number'
+require_relative '../../const/remainder'
+require_relative '../../cycle/remainder'
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Gihou
+    # :nodoc:
+    module Option
+      # :nodoc:
+      module DroppedDate
+        #
+        # Parameter 引数
+        #
+        class Parameter < Calculation::Option::DroppedDate::AbstractParameter
+          #
+          # 初期化
+          #
+          def initialize
+            super(valid: false)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/zakuro/version/gihou/range/annual_range.rb

@@ -20,7 +20,7 @@ module Zakuro
         #   * 対象年に対して、前年11月-当年11月までを出力する
         #   * 対象年（西暦）と計算年（元号x年）の紐付けは行わない
         #
-        # @param [Context] context 暦コンテキスト
+        # @param [Context::Context] context 暦コンテキスト
         # @param [Integer] western_year 西暦年
         #
         # @return [Array<Month>] 1年データ

data/lib/zakuro/version/gihou/stella/lunar/adjustment.rb

@@ -216,6 +216,8 @@ module Zakuro
         #
         # @return [Row] 補正値
         #
+        # @raise [ArgumentError] 引数エラー
+        #
         def self.specify(day:, minute:)
           LIST.each do |row|
             # NOTE: 範囲が重複している場合、最初に引き当てたほうを優先する

data/lib/zakuro/version/gihou/stella/lunar/value.rb

@@ -63,6 +63,8 @@ module Zakuro
         # @return [True] 正しい（月の位相計算に使う大余小余）
         # @return [True] 正しくない
         #
+        # @raise [ArgumentError] 引数エラー
+        #
         def self.valid?(remainder:)
           return if remainder.is_a?(Cycle::LunarRemainder)
 

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

@@ -25,6 +25,11 @@ module Zakuro
           #
           # @return [Cycle::Remainder] 弦（1分=8秒）
           QUARTER = Cycle::Remainder.new(day: 7, minute: 3214, second: 2)
+
+          # @return [Cycle::Remainder] 有没判定
+          # * 中盈（小余3671秒2）/ 2 = 小余1835秒5
+          # * 日（小余8400） - 小余1835秒5 = 小余6564秒3
+          DROPPED_DATE_LIMIT = Cycle::Remainder.new(day: 0, minute: 6564, second: 3)
         end
 
         #

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

@@ -26,7 +26,7 @@ module Zakuro
         # @param [Integer] total 繰り上げなしの小余
         #
         def initialize(day: -1, minute: -1, second: -1, total: -1)
-          super(base_day: Const::Number::Cycle::DAY, base_mitune: MINUTE,
+          super(base_day: Const::Number::Cycle::DAY, base_minute: MINUTE,
                 day: day, minute: minute, second: second, total: total)
         end
 
@@ -60,7 +60,42 @@ module Zakuro
         # @param [Integer] total 繰り上げなしの小余
         #
         def initialize(day: -1, minute: -1, second: -1, total: -1)
-          super(base_day: Const::Number::Cycle::DAY, base_mitune: MINUTE,
+          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
+
+      #
+      # DroppedRemainder 没日の計算向け時刻情報（没余）
+      #
+      class DroppedRemainder < Calculation::Cycle::AbstractRemainder
+        # @return [Integer] 分（1分=8秒）
+        MINUTE = 8
+
+        #
+        # 初期化
+        #
+        # @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_ALL_YEAR, base_minute: MINUTE,
                 day: day, minute: minute, second: second, total: total)
         end
 

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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require_relative '../../../../calculation/option/dropped_date/abstract_parameter'
+
+require_relative '../../const/number'
+require_relative '../../const/remainder'
+require_relative '../../cycle/remainder'
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Senmyou
+    # :nodoc:
+    module Option
+      # :nodoc:
+      module DroppedDate
+        #
+        # Parameter 引数
+        #
+        class Parameter < Calculation::Option::DroppedDate::AbstractParameter
+          #
+          # 初期化
+          #
+          def initialize
+            super(valid: true, year: Const::Number::Cycle::YEAR,
+                  limit: Const::Remainder::Solar::DROPPED_DATE_LIMIT,
+                  remainder_class: Cycle::DroppedRemainder)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/zakuro/version/senmyou/range/annual_range.rb

@@ -20,7 +20,7 @@ module Zakuro
         #   * 対象年に対して、前年11月-当年11月までを出力する
         #   * 対象年（西暦）と計算年（元号x年）の紐付けは行わない
         #
-        # @param [Context] context 暦コンテキスト
+        # @param [Context::Context] context 暦コンテキスト
         # @param [Integer] western_year 西暦年
         #
         # @return [Array<Month>] 1年データ

data/lib/zakuro/version/senmyou/stella/lunar/adjustment.rb

@@ -205,6 +205,8 @@ module Zakuro
         #
         # @return [Row] 補正値
         #
+        # @raise [ArgumentError] 引数エラー
+        #
         def self.specify(forward:, day:, minute:)
           LIST.each do |row|
             # NOTE: 範囲が重複している場合、最初に引き当てたほうを優先する

data/lib/zakuro/version/senmyou/stella/lunar/value.rb

@@ -55,6 +55,8 @@ module Zakuro
         # @return [True] 正しい（月の位相計算に使う大余小余）
         # @return [True] 正しくない
         #
+        # @raise [ArgumentError] 引数エラー
+        #
         def self.valid?(remainder:)
           return if remainder.is_a?(Cycle::LunarRemainder)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zakuro
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.2
 platform: ruby
 authors:
 - pldb
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-18 00:00:00.000000000 Z
+date: 2022-06-11 00:00:00.000000000 Z
 dependencies: []
 description: mainly lunar solar calendar
 email:
@@ -29,6 +29,8 @@ files:
 - VERSION
 - bin/console
 - bin/setup
+- doc/dropped_date.md
+- doc/error.md
 - doc/gengou.md
 - doc/operation.md
 - doc/operation/csv/month.csv
@@ -41,6 +43,7 @@ files:
 - images/各月の求め方.png
 - images/太陽と月.png
 - lib/zakuro.rb
+- lib/zakuro/calculation/base/day.rb
 - lib/zakuro/calculation/base/gengou.rb
 - lib/zakuro/calculation/base/linear_gengou.rb
 - lib/zakuro/calculation/base/operated_year.rb
@@ -71,6 +74,8 @@ files:
 - lib/zakuro/calculation/monthly/month.rb
 - lib/zakuro/calculation/monthly/month_label.rb
 - lib/zakuro/calculation/monthly/operated_month.rb
+- lib/zakuro/calculation/option/dropped_date/abstract_parameter.rb
+- lib/zakuro/calculation/option/dropped_date/location.rb
 - lib/zakuro/calculation/range/abstract_full_range.rb
 - lib/zakuro/calculation/range/abstract_operation_range.rb
 - lib/zakuro/calculation/range/dated_full_range.rb
@@ -86,8 +91,10 @@ files:
 - lib/zakuro/calculation/stella/solar/abstract_average.rb
 - lib/zakuro/calculation/stella/solar/abstract_location.rb
 - lib/zakuro/calculation/stella/solar/choukei_value.rb
+- lib/zakuro/calculation/summary/internal/day.rb
 - lib/zakuro/calculation/summary/internal/month.rb
 - lib/zakuro/calculation/summary/internal/operation.rb
+- lib/zakuro/calculation/summary/internal/option.rb
 - lib/zakuro/calculation/summary/japan/range.rb
 - lib/zakuro/calculation/summary/japan/single.rb
 - lib/zakuro/calculation/summary/japan/specifier/single_day.rb
@@ -96,7 +103,11 @@ files:
 - lib/zakuro/calculation/summary/western/specifier/multiple_day.rb
 - lib/zakuro/calculation/summary/western/specifier/single_day.rb
 - lib/zakuro/calculation/type/old_float.rb
+- lib/zakuro/calculation/type/optional.rb
 - lib/zakuro/condition.rb
+- lib/zakuro/context/context.rb
+- lib/zakuro/context/option.rb
+- lib/zakuro/context/version_class_resolver.rb
 - lib/zakuro/era/japan/calendar.rb
 - lib/zakuro/era/japan/gengou.rb
 - lib/zakuro/era/japan/gengou/alignment.rb
@@ -136,24 +147,28 @@ files:
 - lib/zakuro/result/data/day.rb
 - lib/zakuro/result/data/gengou.rb
 - lib/zakuro/result/data/month.rb
+- lib/zakuro/result/data/option/abstract_option.rb
+- lib/zakuro/result/data/option/dropped_date/calculation.rb
+- lib/zakuro/result/data/option/dropped_date/option.rb
+- lib/zakuro/result/data/option/dropped_date/solar_term.rb
 - lib/zakuro/result/data/single_day.rb
 - lib/zakuro/result/data/solar_term.rb
 - lib/zakuro/result/data/year.rb
+- lib/zakuro/result/operation/bundle.rb
 - lib/zakuro/result/operation/month/annotation.rb
 - lib/zakuro/result/operation/month/bundle.rb
 - lib/zakuro/result/operation/month/history.rb
-- lib/zakuro/result/operation/operation.rb
 - lib/zakuro/result/result.rb
 - lib/zakuro/tools/stringifier.rb
 - lib/zakuro/tools/typeconv.rb
 - lib/zakuro/tools/typeof.rb
-- lib/zakuro/version/context.rb
 - lib/zakuro/version/daien/const/number.rb
 - lib/zakuro/version/daien/const/remainder.rb
 - lib/zakuro/version/daien/cycle/remainder.rb
 - lib/zakuro/version/daien/cycle/solar_term.rb
 - lib/zakuro/version/daien/daien.rb
 - lib/zakuro/version/daien/monthly/lunar_phase.rb
+- lib/zakuro/version/daien/option/dropped_date/parameter.rb
 - lib/zakuro/version/daien/range/annual_range.rb
 - lib/zakuro/version/daien/stella/lunar/adjustment.rb
 - lib/zakuro/version/daien/stella/lunar/localization.rb
@@ -173,6 +188,7 @@ files:
 - lib/zakuro/version/genka/cycle/solar_term.rb
 - lib/zakuro/version/genka/genka.rb
 - lib/zakuro/version/genka/monthly/lunar_phase.rb
+- lib/zakuro/version/genka/option/dropped_date/parameter.rb
 - lib/zakuro/version/genka/range/annual_range.rb
 - lib/zakuro/version/genka/stella/origin/first_term.rb
 - lib/zakuro/version/genka/stella/origin/january.rb
@@ -183,6 +199,7 @@ files:
 - lib/zakuro/version/gihou/cycle/solar_term.rb
 - lib/zakuro/version/gihou/gihou.rb
 - lib/zakuro/version/gihou/monthly/lunar_phase.rb
+- lib/zakuro/version/gihou/option/dropped_date/parameter.rb
 - lib/zakuro/version/gihou/range/annual_range.rb
 - lib/zakuro/version/gihou/stella/lunar/adjustment.rb
 - lib/zakuro/version/gihou/stella/lunar/localization.rb
@@ -206,6 +223,7 @@ files:
 - lib/zakuro/version/senmyou/cycle/remainder.rb
 - lib/zakuro/version/senmyou/cycle/solar_term.rb
 - lib/zakuro/version/senmyou/monthly/lunar_phase.rb
+- lib/zakuro/version/senmyou/option/dropped_date/parameter.rb
 - lib/zakuro/version/senmyou/range/annual_range.rb
 - lib/zakuro/version/senmyou/senmyou.rb
 - lib/zakuro/version/senmyou/stella/lunar/adjustment.rb
@@ -221,7 +239,6 @@ files:
 - lib/zakuro/version/senmyou/stella/solar/location.rb
 - lib/zakuro/version/senmyou/stella/solar/value.rb
 - lib/zakuro/version/tenpou/tenpou.rb
-- lib/zakuro/version/version_class_resolver.rb
 - zakuro.gemspec
 homepage: https://github.com/pldb/zakuro
 licenses:
@@ -231,7 +248,7 @@ metadata:
   homepage_uri: https://github.com/pldb/zakuro
   source_code_uri: https://github.com/pldb/zakuro
   changelog_uri: https://github.com/pldb/zakuro
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -246,8 +263,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.1.4
+signing_key: 
 specification_version: 4
 summary: japanese calendar library.
 test_files: []

data/lib/zakuro/version/context.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-require_relative './version_class_resolver'
-
-# :nodoc:
-module Zakuro
-  #
-  # Context 暦コンテキスト
-  #
-  class Context
-    # @return [String] 暦名
-    attr_reader :version_name
-    # @return [VersionClassResolver] 暦リゾルバー
-    attr_reader :resolver
-
-    # @return [Array<String>] 暦名
-    VERSION_NAMES = %w[Genka Gihou Daien Senmyou Joukyou Kansei Tenpou Gregorio].freeze
-
-    #
-    # 初期化
-    #
-    # @param [String] version_name 暦名
-    #
-    def initialize(version_name: '')
-      @version_name = version_name
-
-      if !invalid? && !VERSION_NAMES.include?(version_name)
-        raise ArgumentError.new, 'invalid version'
-      end
-
-      @resolver = VersionClassResolver.new(version_name: version_name)
-    end
-
-    #
-    # 不正か
-    #
-    # @return [True] 不正
-    # @return [False] 不正なし
-    #
-    def invalid?
-      @version_name.empty?
-    end
-  end
-end