zakuro 0.7.2 → 0.8.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zakuro
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - pldb
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-11 00:00:00.000000000 Z
+date: 2022-07-11 00:00:00.000000000 Z
 dependencies: []
 description: mainly lunar solar calendar
 email:
@@ -69,11 +69,13 @@ files:
 - lib/zakuro/calculation/era/version/internal/range.rb
 - lib/zakuro/calculation/era/version/version.rb
 - lib/zakuro/calculation/monthly/abstract_lunar_phase.rb
+- lib/zakuro/calculation/monthly/const.rb
 - lib/zakuro/calculation/monthly/first_day.rb
 - lib/zakuro/calculation/monthly/initialized_month.rb
 - lib/zakuro/calculation/monthly/month.rb
 - lib/zakuro/calculation/monthly/month_label.rb
 - lib/zakuro/calculation/monthly/operated_month.rb
+- lib/zakuro/calculation/monthly/operated_solar_term.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
@@ -83,7 +85,7 @@ files:
 - lib/zakuro/calculation/range/medieval_annual_range.rb
 - lib/zakuro/calculation/range/named_full_range.rb
 - lib/zakuro/calculation/range/named_operation_range.rb
-- lib/zakuro/calculation/range/operated_solar_terms.rb
+- lib/zakuro/calculation/range/operated_solar_term.rb
 - lib/zakuro/calculation/range/transfer/gengou_scroller.rb
 - lib/zakuro/calculation/range/transfer/year_boundary.rb
 - lib/zakuro/calculation/stella/lunar/abstract_location.rb
@@ -98,6 +100,7 @@ files:
 - lib/zakuro/calculation/summary/japan/range.rb
 - lib/zakuro/calculation/summary/japan/single.rb
 - lib/zakuro/calculation/summary/japan/specifier/single_day.rb
+- lib/zakuro/calculation/summary/japan/specifier/specified_range.rb
 - lib/zakuro/calculation/summary/western/range.rb
 - lib/zakuro/calculation/summary/western/single.rb
 - lib/zakuro/calculation/summary/western/specifier/multiple_day.rb
@@ -154,9 +157,9 @@ files:
 - 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.rb
+- lib/zakuro/result/operation/month.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/result.rb
 - lib/zakuro/tools/stringifier.rb
@@ -248,7 +251,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
@@ -263,8 +266,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: japanese calendar library.
 test_files: []

data/lib/zakuro/calculation/range/operated_solar_terms.rb

@@ -1,218 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../../operation/operation'
-require_relative '../monthly/month'
-
-# :nodoc:
-module Zakuro
-  # :nodoc:
-  module Calculation
-    # :nodoc:
-    module Range
-      #
-      # OperatedSolarTerm 運用時二十四節気
-      #
-      class OperatedSolarTerms
-        # @return [Array<Year>] 完全範囲（年データ）
-        attr_reader :years
-        # @return [Hash<String, SolarTerm>] 二十四節気の移動元/移動先（西暦日 -> 対応する二十四節気）
-        #
-        # * 移動元の二十四節気：無効な大余小余あり（削除対象）
-        # * 移動先の二十四節気：移動元からの二十四節気（追加対象）
-        #
-        attr_reader :directions
-        # @return [Context::Context] 暦コンテキスト
-        attr_reader :context
-
-        #
-        # 初期化
-        #
-        # @param [Context::Context] context 暦コンテキスト
-        # @param [Array<Year>] years 完全範囲（年データ）
-        #
-        def initialize(context:, years: [])
-          @context = context
-          @years = years
-          @directions = {}
-        end
-
-        #
-        # データ生成する
-        #
-        # @return [<Type>] <description>
-        #
-        def create
-          @directions = create_directions
-        end
-
-        #
-        # 二十四節気を取得する
-        #
-        # @param [Western::Calendar] western_date 月初日の西暦日
-        #
-        # @return [True] 対象あり
-        # @return [False] 対象なし
-        # @return [SolarTerm] 二十四節気
-        #
-        def get(western_date: Western::Calendar.new)
-          context = current_context(western_date: western_date)
-
-          solar_term_class = context.resolver.solar_term
-          solar_term = @directions.fetch(western_date.format, solar_term_class.new)
-
-          # 合致しない場合
-          return false, solar_term_class.new if solar_term.empty?
-
-          # 合致した上で、二十四節気が移動元（削除対象）の場合
-          # 合致した上で、二十四節気が移動先（追加対象）の場合
-          [true, solar_term]
-        end
-
-        # :reek:TooManyStatements { max_statements: 6 }
-
-        #
-        # 年内の全ての月の移動方向を作成する
-        #
-        # @param [Context::Context] context 暦コンテキスト
-        # @param [Hash<String, SolarTerm>] directions 二十四節気の移動元/移動先（西暦日 -> 対応する二十四節気）
-        # @param [Array<Month>] months 年内の全ての月
-        #
-        def self.create_directions_with_months(context:, directions: {}, months: [])
-          months.each do |month|
-            history = Operation.specify_history(western_date: month.western_date)
-
-            next if history.invalid?
-
-            direction = history.diffs.solar_term
-
-            next if direction.invalid?
-
-            OperatedSolarTerms.create_directions_each_month(
-              context: context, directions: directions, direction: direction, month: month
-            )
-          end
-        end
-
-        # :reek:LongParameterList {max_params: 4}
-
-        #
-        # 月毎の移動方向を作成する
-        #
-        # @param [Context::Context] context 暦コンテキスト
-        # @param [Month] 月
-        # @param [Hash<String, SolarTerm>] directions 二十四節気の移動元/移動先（西暦日 -> 対応する二十四節気）
-        # @param [Operation::SolarTerm::Diretion] 二十四節気（移動）
-        #
-        def self.create_directions_each_month(context:, month:, directions: {},
-                                              direction: Operation::SolarTerm::Diretion.new)
-
-          month.solar_terms.each do |solar_term|
-            OperatedSolarTerms.push_source(context: context, directions: directions,
-                                           direction: direction, solar_term: solar_term)
-          end
-          OperatedSolarTerms.push_destination(context: context, directions: directions,
-                                              destination: direction.destination)
-        end
-
-        # :reek:LongParameterList {max_params: 4}
-
-        #
-        # 移動先に有効な二十四節気（差し替える二十四節気）を指定する
-        #
-        # @param [Context::Context] context 暦コンテキスト
-        # @param [SolarTerm] solar_term 二十四節気（計算値）
-        # @param [Hash<String, SolarTerm>] directions 二十四節気の移動元/移動先（西暦日 -> 対応する二十四節気）
-        # @param [Operation::SolarTerm::Direction] source 二十四節気（移動）
-        #
-        def self.push_source(context:, solar_term:, directions: {},
-                             direction: Operation::SolarTerm::Direction.new)
-          source = direction.source
-
-          return if source.invalid?
-
-          return unless source.index == solar_term.index
-
-          # 移動先に移動元の二十四節気を指定する
-          directions[source.to.format] = OperatedSolarTerms.created_source(
-            context: context, direction: direction, solar_term: solar_term
-          )
-        end
-
-        #
-        # 移動先に有効な二十四節気（差し替える二十四節気）を生成する
-        #
-        # @param [Context::Context] context 暦コンテキスト
-        # @param [SolarTerm] solar_term 二十四節気（計算値）
-        # @param [Operation::SolarTerm::Direction] source 二十四節気（移動）
-        #
-        # @return [SolarTerm] 二十四節気（運用値）
-        #
-        def self.created_source(context:, solar_term:,
-                                direction: Operation::SolarTerm::Direction.new)
-          operated_solar_term = solar_term.clone
-          remainder_class_name = context.resolver.remainder
-
-          unless direction.invalid_days?
-            # 二十四節気の大余をずらす
-            operated_solar_term.remainder.add!(
-              remainder_class_name.new(day: direction.days, minute: 0, second: 0)
-            )
-          end
-
-          operated_solar_term
-        end
-
-        #
-        # 移動元に無効な二十四節気（連番のみ指定）を指定する
-        #
-        # @param [Context::Context] context 暦コンテキスト
-        # @param [Hash<String, SolarTerm>] directions 二十四節気の移動元/移動先（西暦日 -> 対応する二十四節気）
-        # @param [Operation::SolarTerm::Destination] destination 二十四節気（移動先）
-        #
-        def self.push_destination(context:, directions: {},
-                                  destination: Operation::SolarTerm::Destination.new)
-          return if destination.invalid?
-
-          solar_term_class = context.resolver.solar_term
-          directions[destination.from.format] = solar_term_class.new(
-            index: destination.index
-          )
-        end
-
-        private
-
-        #
-        # 日付に対応する暦コンテキストを取得する
-        #
-        # @param [Western::Calendar] western_date 西暦日
-        #
-        # @return [Context::Context] 暦コンテキスト
-        #
-        def current_context(western_date: Western::Calendar.new)
-          @years.each do |year|
-            return year.context if western_date >= year.new_year_date
-          end
-
-          Context::Context.new
-        end
-
-        #
-        # 二十四節気の移動元/移動先を生成する
-        #
-        # @return [Hash<String, SolarTerm>] 二十四節気の移動元/移動先（西暦日 -> 対応する二十四節気）
-        #
-        def create_directions
-          directions = {}
-
-          years.each do |year|
-            OperatedSolarTerms.create_directions_with_months(
-              context: year.context, directions: directions, months: year.months
-            )
-          end
-
-          directions
-        end
-      end
-    end
-  end
-end

data/lib/zakuro/result/operation/bundle.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../data/single_day'
-
-require_relative './month/bundle'
-
-# :nodoc:
-module Zakuro
-  #
-  # Result 演算結果
-  #
-  module Result
-    #
-    # 運用情報
-    #
-    module Operation
-      #
-      # Bundle 運用情報
-      #
-      class Bundle
-        # @return [True] 運用あり
-        # @return [False] 運用なし
-        attr_reader :operated
-        # @return [Month::Bundle] 月別履歴情報
-        attr_reader :month
-        # @return [Data::SingleDay] 計算値
-        attr_reader :original
-
-        #
-        # 初期化
-        #
-        # @param [True, False] operated 運用有無
-        # @param [Month::Bundle] month 月別履歴情報
-        # @param [Data::SingleDay] original 計算値
-        #
-        def initialize(operated:, month:, original:)
-          @operated = operated
-          @month = month
-          @original = original
-        end
-      end
-    end
-  end
-end

data/lib/zakuro/result/operation/month/bundle.rb

@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-require_relative './history'
-
-# :nodoc:
-module Zakuro
-  #
-  # Result 演算結果
-  #
-  module Result
-    #
-    # 運用情報
-    #
-    module Operation
-      #
-      # Month 運用情報（月）
-      #
-      module Month
-        #
-        # Bundle 月履歴集約情報
-        #
-        class Bundle
-          # @return [History] 月別履歴情報（当月）
-          attr_reader :current
-          # @return [History] 月別履歴情報（影響を与えた月）
-          attr_reader :parent
-
-          def initialize(current: History.new, parent: History.new)
-            @current = current
-            @parent = parent
-          end
-        end
-      end
-    end
-  end
-end