zakuro 0.6.0 → 0.7.2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zakuro
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.2
 platform: ruby
 authors:
 - pldb
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-15 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
@@ -48,45 +51,89 @@ files:
 - lib/zakuro/calculation/cycle/abstract_remainder.rb
 - lib/zakuro/calculation/cycle/abstract_solar_term.rb
 - lib/zakuro/calculation/cycle/zodiac.rb
-- lib/zakuro/calculation/gengou/internal/counter.rb
-- lib/zakuro/calculation/gengou/internal/reserve.rb
-- lib/zakuro/calculation/gengou/internal/reserve/interval.rb
-- lib/zakuro/calculation/gengou/internal/reserve/list.rb
-- lib/zakuro/calculation/gengou/scroll.rb
+- lib/zakuro/calculation/era/gengou/abstract_scroll.rb
+- lib/zakuro/calculation/era/gengou/dated_scroll.rb
+- lib/zakuro/calculation/era/gengou/internal/connector.rb
+- lib/zakuro/calculation/era/gengou/internal/counter.rb
+- lib/zakuro/calculation/era/gengou/internal/publisher.rb
+- lib/zakuro/calculation/era/gengou/internal/reserve.rb
+- lib/zakuro/calculation/era/gengou/internal/reserve/abstract_list.rb
+- lib/zakuro/calculation/era/gengou/internal/reserve/abstract_range.rb
+- lib/zakuro/calculation/era/gengou/internal/reserve/dated_list.rb
+- lib/zakuro/calculation/era/gengou/internal/reserve/dated_range.rb
+- lib/zakuro/calculation/era/gengou/internal/reserve/empty_link.rb
+- lib/zakuro/calculation/era/gengou/internal/reserve/named_list.rb
+- lib/zakuro/calculation/era/gengou/internal/reserve/named_range.rb
+- lib/zakuro/calculation/era/gengou/named_scroll.rb
+- lib/zakuro/calculation/era/version/internal/crawler.rb
+- 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/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/range/full_range.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
+- lib/zakuro/calculation/range/dated_operation_range.rb
 - lib/zakuro/calculation/range/medieval_annual_range.rb
-- lib/zakuro/calculation/range/operated_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/transfer/gengou_scroller.rb
 - lib/zakuro/calculation/range/transfer/year_boundary.rb
-- lib/zakuro/calculation/specifier/single_day.rb
 - lib/zakuro/calculation/stella/lunar/abstract_location.rb
 - lib/zakuro/calculation/stella/lunar/choukei_value.rb
 - 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/single.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
+- lib/zakuro/calculation/summary/western/range.rb
+- lib/zakuro/calculation/summary/western/single.rb
+- 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/version/internal/crawler.rb
-- lib/zakuro/calculation/version/internal/range.rb
-- lib/zakuro/calculation/version/version.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/parser.rb
-- lib/zakuro/era/japan/gengou/type.rb
-- lib/zakuro/era/japan/gengou/validator.rb
-- lib/zakuro/era/japan/gengou/yaml/set-001-until-south.yaml
-- lib/zakuro/era/japan/gengou/yaml/set-002-from-north.yaml
-- lib/zakuro/era/japan/gengou/yaml/set-003-modern.yaml
+- lib/zakuro/era/japan/gengou/alignment.rb
+- lib/zakuro/era/japan/gengou/alignment/aligner.rb
+- lib/zakuro/era/japan/gengou/alignment/division.rb
+- lib/zakuro/era/japan/gengou/alignment/line.rb
+- lib/zakuro/era/japan/gengou/alignment/linear_gengou.rb
+- lib/zakuro/era/japan/gengou/resource.rb
+- lib/zakuro/era/japan/gengou/resource/parser.rb
+- lib/zakuro/era/japan/gengou/resource/type.rb
+- lib/zakuro/era/japan/gengou/resource/validator.rb
+- lib/zakuro/era/japan/gengou/resource/yaml/set-001-until-south.yaml
+- lib/zakuro/era/japan/gengou/resource/yaml/set-002-from-north.yaml
+- lib/zakuro/era/japan/gengou/resource/yaml/set-003-modern.yaml
 - lib/zakuro/era/japan/version.rb
 - lib/zakuro/era/western/calendar.rb
+- lib/zakuro/exception/case/pattern.rb
+- lib/zakuro/exception/case/preset.rb
+- lib/zakuro/exception/case/template.rb
+- lib/zakuro/exception/cause.rb
+- lib/zakuro/exception/exception.rb
+- lib/zakuro/exception/zakuro_error.rb
+- lib/zakuro/gateway/locale/date.rb
+- lib/zakuro/gateway/locale/range.rb
+- lib/zakuro/gateway/range.rb
+- lib/zakuro/gateway/single.rb
 - lib/zakuro/merchant.rb
 - lib/zakuro/operation/month/parser.rb
 - lib/zakuro/operation/month/type.rb
@@ -97,19 +144,31 @@ files:
 - lib/zakuro/output/logger.rb
 - lib/zakuro/output/response.rb
 - lib/zakuro/result/core.rb
-- lib/zakuro/result/data.rb
-- lib/zakuro/result/operation.rb
+- 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/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
@@ -129,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
@@ -139,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
@@ -162,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
@@ -177,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:

data/lib/zakuro/calculation/gengou/internal/counter.rb

@@ -1,129 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../../../era/japan/gengou'
-require_relative '../../../era/japan/calendar'
-require_relative '../../../era/western/calendar'
-
-# :nodoc:
-module Zakuro
-  # :nodoc:
-  module Calculation
-    # :nodoc:
-    module Gengou
-      #
-      # Counter 加算元号
-      #
-      class Counter
-        # @return [Integer] 不正値
-        INVALID_YEAR = -1
-
-        # @return [Japan::Gengou] 元号
-        attr_reader :gengou
-        # @return [Integer] 元号年
-        attr_reader :japan_year
-        # @return [Integer] 西暦年
-        attr_reader :western_year
-
-        #
-        # 初期化
-        #
-        # @param [Japan::Gengou] gengou 元号
-        #
-        def initialize(gengou: Japan::Gengou.new)
-          @gengou = gengou
-          @japan_year = gengou.both_start_year.japan
-          @western_year = gengou.both_start_year.western
-        end
-
-        #
-        # 和暦開始日を取得する
-        #
-        # @return [Japan::Calendar] 和暦開始日
-        #
-        def japan_start_date
-          return Japan::Calendar.new if @gengou.invalid?
-
-          @gengou.both_start_date.japan
-        end
-
-        #
-        # 西暦開始日を取得する
-        #
-        # @return [Western::Calendar] 西暦開始日
-        #
-        def western_start_date
-          return Western::Calendar.new if @gengou.invalid?
-
-          @gengou.both_start_date.western
-        end
-
-        #
-        # 西暦終了日を取得する
-        #
-        # @return [Western::Calendar] 西暦終了日
-        #
-        def western_end_date
-          return Western::Calendar.new if @gengou.invalid?
-
-          @gengou.end_date
-        end
-
-        #
-        # 次年にする
-        #
-        # @return [MultiGengou] 自身
-        #
-        def next_year
-          @japan_year += 1
-          @western_year += 1
-
-          self
-        end
-
-        #
-        # 元号名を取得する
-        #
-        # @return [String] 元号名
-        #
-        def name
-          return '' unless @gengou
-
-          @gengou.name
-        end
-
-        #
-        # 不正か
-        #
-        # @return [True] 不正
-        # @return [False] 不正なし
-        #
-        def invalid?
-          @gengou.invalid? || @japan_year == INVALID_YEAR || @western_year == INVALID_YEAR
-        end
-
-        #
-        # 指定した日が元号に含まれるか
-        #
-        # @param [Western::Calendar] date 日
-        #
-        # @return [True] 含まれる
-        # @return [False] 含まれない
-        #
-        def include?
-          @gengou.include?
-        end
-
-        #
-        # ディープコピー
-        #
-        # @param [MultiGengou] obj 自身
-        #
-        def initialize_copy(obj)
-          @gengou = obj.gengou.clone
-          @japan_year = obj.japan_year
-          @western_year = obj.western_year
-        end
-      end
-    end
-  end
-end

data/lib/zakuro/calculation/gengou/internal/reserve/interval.rb

@@ -1,183 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../../../../era/western/calendar'
-
-require_relative './list'
-
-# :nodoc:
-module Zakuro
-  # :nodoc:
-  module Calculation
-    # :nodoc:
-    module Gengou
-      # :nodoc:
-      module Reserve
-        # Interval
-        #
-        # 予約済み計算範囲
-        #
-        class Interval
-          # @return [List] 1行目元号
-          attr_reader :first_gengou
-          # @return [List] 2行目元号
-          attr_reader :second_gengou
-
-          #
-          # 初期化
-          #
-          # @param [Western::Calendar] start_date 西暦開始日
-          # @param [Western::Calendar] end_date 西暦終了日
-          #
-          def initialize(start_date: Western::Calendar.new, end_date: Western::Calendar.new)
-            @first_gengou = List.new(first: true, start_date: start_date, end_date: end_date)
-            @second_gengou = List.new(first: false, start_date: start_date, end_date: end_date)
-          end
-
-          #
-          # 不正か
-          #
-          # @return [True] 不正
-          # @return [False] 不正なし
-          #
-          def invalid?
-            @first_gengou.invalid?
-          end
-
-          #
-          # 1行目元号を取得する
-          #
-          # @param [Western::Calendar] western_date 西暦日
-          #
-          # @return [Gengou::Counter] 加算元号
-          #
-          def match_first_gengou(western_date: Western::Calendar.new)
-            @first_gengou.get(western_date: western_date)
-          end
-
-          #
-          # 2行目元号を取得する
-          #
-          # @param [Western::Calendar] western_date 西暦日
-          #
-          # @return [Gengou::Counter] 加算元号
-          #
-          def match_second_gengou(western_date: Western::Calendar.new)
-            @second_gengou.get(western_date: western_date)
-          end
-
-          #
-          # 範囲内元号（1行目元号）を取得する
-          #
-          # @param [Western::Calendar] start_date 西暦開始日
-          # @param [Western::Calendar] end_date 西暦終了日
-          #
-          # @return [Array<Gengou::Counter>] 範囲内元号（1行目元号）
-          #
-          def collect_first_gengou(start_date: Western::Calendar.new,
-                                   end_date: Western::Calendar.new)
-            @first_gengou.collect(start_date: start_date, end_date: end_date)
-          end
-
-          #
-          # 範囲内元号（2行目元号）を取得する
-          #
-          # @param [Western::Calendar] start_date 西暦開始日
-          # @param [Western::Calendar] end_date 西暦終了日
-          #
-          # @return [Array<Gengou::Counter>] 範囲内元号（2行目元号）
-          #
-          def collect_second_gengou(start_date: Western::Calendar.new,
-                                    end_date: Western::Calendar.new)
-            @second_gengou.collect(start_date: start_date, end_date: end_date)
-          end
-
-          #
-          # 最古の元号から和暦開始日を取得する
-          #
-          # @return [Japan::Calendar] 和暦開始日
-          #
-          def japan_start_date
-            gengou = oldest_gengou
-
-            return Japan::Calendar.new if gengou.invalid?
-
-            gengou.japan_start_date
-          end
-
-          #
-          # 最古の元号から西暦開始日を取得する
-          #
-          # @return [Western::Calendar] 西暦開始日
-          #
-          def western_start_date
-            gengou = oldest_gengou
-
-            return Western::Calendar.new if gengou.invalid?
-
-            gengou.western_start_date
-          end
-
-          #
-          # 開始西暦年を取得する
-          #
-          # @return [Integer] 開始西暦年
-          #
-          def western_start_year
-            first_start_year = @first_gengou.western_start_year
-            second_start_year = @second_gengou.western_start_year
-
-            return first_start_year if @first_gengou.invalid?
-
-            return first_start_year if @second_gengou.invalid?
-
-            return first_start_year if first_start_year < second_start_year
-
-            second_start_year
-          end
-
-          #
-          # 終了西暦年を取得する
-          #
-          # @return [Integer] 終了西暦年
-          #
-          def western_end_year
-            first_end_year = @first_gengou.western_end_year
-            second_end_year = @second_gengou.western_end_year
-
-            return first_end_year if @first_gengou.invalid?
-
-            return first_end_year if @second_gengou.invalid?
-
-            return first_end_year if first_end_year > second_end_year
-
-            second_end_year
-          end
-
-          private
-
-          #
-          # 最古の元号を取得する
-          #
-          # @return [Japan::Gengou] 最古の元号
-          #
-          def oldest_gengou
-            return @first_gengou if @first_gengou.invalid?
-
-            return @first_gengou if @second_gengou.invalid?
-
-            first_western_date = @first_gengou.western_start_date
-            second_western_date = @second_gengou.western_start_date
-
-            return @first_gengou if first_western_date.invalid?
-
-            return @first_gengou if second_western_date.invalid?
-
-            return @first_gengou if first_western_date < second_western_date
-
-            @second_gengou
-          end
-        end
-      end
-    end
-  end
-end