zakuro 0.5.0 → 0.6.0

data/zakuro.gemspec

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
-require_relative 'lib/zakuro/version'
-
 Gem::Specification.new do |spec|
   spec.name          = 'zakuro'
-  spec.version       = Zakuro::VERSION
+  spec.version       = File.read(File.expand_path('./VERSION', __dir__)).strip
   spec.authors       = ['pldb']
   spec.email         = ['pldb.github@gmail.com']
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zakuro
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - pldb
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-07 00:00:00.000000000 Z
+date: 2022-01-15 00:00:00.000000000 Z
 dependencies: []
 description: mainly lunar solar calendar
 email:
@@ -26,6 +26,7 @@ files:
 - Makefile
 - README.md
 - Rakefile
+- VERSION
 - bin/console
 - bin/setup
 - doc/gengou.md
@@ -40,13 +41,18 @@ files:
 - images/各月の求め方.png
 - images/太陽と月.png
 - lib/zakuro.rb
-- lib/zakuro/calculation/base/multi_gengou.rb
-- lib/zakuro/calculation/base/multi_gengou_roller.rb
+- lib/zakuro/calculation/base/gengou.rb
+- lib/zakuro/calculation/base/linear_gengou.rb
 - lib/zakuro/calculation/base/operated_year.rb
 - lib/zakuro/calculation/base/year.rb
 - 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/monthly/abstract_lunar_phase.rb
 - lib/zakuro/calculation/monthly/first_day.rb
 - lib/zakuro/calculation/monthly/initialized_month.rb
@@ -57,7 +63,7 @@ files:
 - lib/zakuro/calculation/range/medieval_annual_range.rb
 - lib/zakuro/calculation/range/operated_range.rb
 - lib/zakuro/calculation/range/operated_solar_terms.rb
-- lib/zakuro/calculation/range/transfer/western_date_allocation.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
@@ -67,16 +73,20 @@ files:
 - lib/zakuro/calculation/stella/solar/choukei_value.rb
 - lib/zakuro/calculation/summary/single.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/condition.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/reki.rb
-- lib/zakuro/era/japan/yaml/set-001-until-south.yaml
-- lib/zakuro/era/japan/yaml/set-002-from-north.yaml
-- lib/zakuro/era/japan/yaml/set-003-modern.yaml
-- lib/zakuro/era/western.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/version.rb
+- lib/zakuro/era/western/calendar.rb
 - lib/zakuro/merchant.rb
 - lib/zakuro/operation/month/parser.rb
 - lib/zakuro/operation/month/type.rb
@@ -91,9 +101,8 @@ files:
 - lib/zakuro/result/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.rb
-- lib/zakuro/version/abstract_version.rb
 - lib/zakuro/version/context.rb
 - lib/zakuro/version/daien/const/number.rb
 - lib/zakuro/version/daien/const/remainder.rb
@@ -169,7 +178,6 @@ files:
 - lib/zakuro/version/senmyou/stella/solar/value.rb
 - lib/zakuro/version/tenpou/tenpou.rb
 - lib/zakuro/version/version_class_resolver.rb
-- lib/zakuro/version_factory.rb
 - zakuro.gemspec
 homepage: https://github.com/pldb/zakuro
 licenses:
@@ -179,7 +187,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
@@ -194,8 +202,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/calculation/base/multi_gengou.rb

@@ -1,101 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../../era/japan/gengou'
-require_relative '../../era/western'
-
-# :nodoc:
-module Zakuro
-  # :nodoc:
-  module Calculation
-    # :nodoc:
-    module Base
-      #
-      # MultiGengou 複数元号
-      #
-      class MultiGengou
-        # @return [Japan::Gengou] 元号（1行目）
-        attr_reader :first_line
-        # @return [Japan::Gengou] 元号（2行目）
-        attr_reader :second_line
-        # @return [Western::Calendar] 元旦
-        attr_reader :new_year_date
-
-        def initialize(first_line: Japan::Gengou.new, second_line: Japan::Gengou.new,
-                       new_year_date: Western::Calendar.new)
-          @first_line = first_line
-          @second_line = second_line
-          @new_year_date = new_year_date
-        end
-
-        # :reek:TooManyStatements { max_statements: 7 }
-
-        #
-        # 改元する
-        #
-        # @param [Japan::Gengou] first_line 元号（1行目）
-        # @param [Japan::Gengou] second_line 元号（2行目）
-        #
-        # @return [MultiGengou] 自身
-        #
-        def transfer(first_line: Japan::Gengou.new, second_line: Japan::Gengou.new)
-          cloned_first_line = first_line.clone
-          cloned_second_line = second_line.clone
-
-          if integrated?(first_line: cloned_first_line, second_line: cloned_second_line)
-            @first_line = @second_line.clone
-            @second_line = cloned_second_line
-          end
-
-          @first_line = cloned_first_line if @first_line.name != first_line.name
-          @second_line = cloned_second_line if @second_line.name != second_line.name
-
-          self
-        end
-
-        #
-        # 次年にする
-        #
-        # @param [Japan::Gengou] first_line 元号（1行目）
-        # @param [Japan::Gengou] second_line 元号（2行目）
-        #
-        # @return [MultiGengou] 自身
-        #
-        def next_year
-          @first_line.next_year
-          @second_line.next_year
-
-          self
-        end
-
-        #
-        # ディープコピー
-        #
-        # @param [MultiGengou] obj 自身
-        #
-        def initialize_copy(obj)
-          @first_line = obj.first_line.clone
-          @second_line = obj.second_line.clone
-        end
-
-        private
-
-        #
-        # 複数元号を統一するかどうか
-        #
-        # @param [Japan::Gengou] first_line 元号（1行目）
-        # @param [Japan::Gengou] second_line 元号（2行目）
-        #
-        # @return [True] 統一する
-        # @return [False] 統一しない
-        #
-        def integrated?(first_line: Japan::Gengou.new, second_line: Japan::Gengou.new)
-          return false if @second_line.name != first_line.name
-
-          return false unless second_line.invalid?
-
-          true
-        end
-      end
-    end
-  end
-end

data/lib/zakuro/calculation/base/multi_gengou_roller.rb

@@ -1,218 +0,0 @@
-# frozen_string_literal: true
-
-require_relative './multi_gengou'
-
-require_relative '../../era/japan/gengou'
-
-# :nodoc:
-module Zakuro
-  # :nodoc:
-  module Calculation
-    # :nodoc:
-    module Base
-      #
-      # MultiGengouRoller 改元処理
-      #
-      class MultiGengouRoller
-        # @return [MultiGengou] 複数元号
-        attr_reader :multi_gengou
-        # @return [Western::Calendar] 元旦（元号が2つある場合は再過去の日付になる）
-        attr_reader :oldest_date
-        # @return [Western::Calendar] 元号内での最未来日（元号が2つある場合は再未来の日付になる）
-        attr_reader :newest_date
-        # @return [Western::Calendar] 現在日
-        attr_reader :current_date
-
-        def initialize(start_date: Western::Calendar.new, end_date: Western::Calendar.new)
-          end_date = start_date if end_date.invalid?
-
-          @oldest_date = MultiGengouRoller.choise_oldest_gengou_date(
-            first_line: MultiGengouRoller.first_line(date: start_date),
-            second_line: MultiGengouRoller.second_line(date: start_date)
-          )
-          @current_date = @oldest_date.clone
-          @newest_date = MultiGengouRoller.choise_newest_gengou_date(
-            first_line: MultiGengouRoller.first_line(date: end_date),
-            second_line: MultiGengouRoller.second_line(date: end_date)
-          )
-
-          @multi_gengou = MultiGengou.new(
-            first_line: current_first_line,
-            second_line: current_second_line,
-            new_year_date: @oldest_date
-          )
-        end
-
-        #
-        # 現在日付を未来に進める
-        #
-        # @param [<Type>] days <description>
-        #
-        # @return [<Type>] <description>
-        #
-        def next(days: 0)
-          @current_date += days
-        end
-
-        #
-        # 現在日から元号（1行目）を取得する
-        #
-        # @return [Japan::Gengou] 元号（1行目）
-        #
-        def current_first_line
-          MultiGengouRoller.first_line(date: @current_date)
-        end
-
-        #
-        # 現在日から元号（2行目）を取得する
-        #
-        # @return [Japan::Gengou] 元号（2行目）
-        #
-        def current_second_line
-          MultiGengouRoller.second_line(date: @current_date)
-        end
-
-        #
-        # 改元する
-        #
-        # @return [MultiGengou] 複数元号
-        #
-        def transfer
-          MultiGengouRoller.transfer(multi_gengou: @multi_gengou, date: @current_date)
-        end
-
-        #
-        # 次年にする
-        #
-        # @return [MultiGengou] 複数元号
-        #
-        def next_year
-          @multi_gengou.next_year
-        end
-
-        #
-        # 元号（1行目）を取得する
-        #
-        # @return [Japan::Gengou] 元号（1行目）
-        #
-        def self.first_line(date: Western::Calender.new)
-          Japan::GengouResource.first_line(date: date)
-        end
-
-        #
-        # 元号（2行目）を取得する
-        #
-        # @return [Japan::Gengou] 元号（2行目）
-        #
-        def self.second_line(date: Western::Calender.new)
-          Japan::GengouResource.second_line(date: date)
-        end
-
-        #
-        # 改元する
-        #
-        # @param [MultiGengou] multi_gengou 複数元号
-        # @param [Western::Calendar] date 対象日
-        #
-        # @return [MultiGengou] 改元済み複数元号
-        #
-        def self.transfer(multi_gengou:, date:)
-          multi_gengou.transfer(
-            first_line: first_line(date: date),
-            second_line: second_line(date: date)
-          )
-
-          multi_gengou
-        end
-
-        #
-        # 現在日からみて直近の未来に対する元号の切替前日を求める
-        # @note 2つの元号が重複した場合はより過去の日となる
-        #
-        # @param [Japan::Gengou] first_line 元号（1行目）
-        # @param [Japan::Gengou] second_line 元号（2行目）
-        #
-        # @return [Western::Calendar] 元号の切替前日
-        #
-        def choise_nearest_end_date
-          condition = lambda do |first_date, second_date|
-            first_date < second_date ? first_date : second_date
-          end
-
-          second_line = current_second_line
-
-          MultiGengouRoller.choise_date(condition: condition, second_line: second_line,
-                                        first_date: current_first_line.end_date.clone,
-                                        second_date: second_line.end_date.clone)
-        end
-
-        #
-        # 最過去の元旦を求める
-        # @note 2つの元号が重複した場合はより過去の日となる
-        #
-        # @param [Japan::Gengou] first_line 元号（1行目）
-        # @param [Japan::Gengou] second_line 元号（2行目）
-        #
-        # @return [Western::Calendar] 最過去の元旦
-        #
-        def self.choise_oldest_gengou_date(first_line:, second_line:)
-          condition = lambda do |first_date, second_date|
-            first_date < second_date ? first_date : second_date
-          end
-          choise_date(condition: condition, second_line: second_line,
-                      first_date: first_line.new_year_date.clone,
-                      second_date: second_line.new_year_date.clone)
-        end
-
-        #
-        # 元号内での最未来日を求める
-        # @note 2つの元号が重複した場合はより未来の日となる
-        #
-        # @param [Japan::Gengou] first_line 元号（1行目）
-        # @param [Japan::Gengou] second_line 元号（2行目）
-        #
-        # @return [Western::Calendar] 最未来日
-        #
-        def self.choise_newest_gengou_date(first_line:, second_line:)
-          condition = lambda do |first_date, second_date|
-            first_date > second_date ? first_date : second_date
-          end
-          choise_date(condition: condition, second_line: second_line,
-                      first_date: first_line.end_date.clone,
-                      second_date: second_line.end_date.clone)
-        end
-
-        # :reek:LongParameterList {max_params: 4}
-
-        #
-        # 条件を元に日付を求める
-        #
-        # @param [Proc] condition 比較条件
-        # @param [Japan::Gengou] second_line 元号（2行目）
-        # @param [Western::Calendar] first_date 比較対象（1行目）
-        # @param [Western::Calendar] second_date 比較対象（2行目）
-        #
-        # @return [Western::Calendar] 比較結果
-        #
-        def self.choise_date(condition:, second_line:, first_date:, second_date:)
-          # first_lineは常に存在する
-          return first_date if second_line.invalid?
-
-          condition.call(first_date, second_date)
-        end
-
-        #
-        # ディープコピー
-        #
-        # @param [MultiGengou] obj 自身
-        #
-        def initialize_copy(obj)
-          @oldest_date = obj.oldest_date.clone
-          @current_date = obj.current_date.clone
-          @newest_date = obj.newest_date.clone
-          @multi_gengou = obj.multi_gengou.clone
-        end
-      end
-    end
-  end
-end

data/lib/zakuro/calculation/range/transfer/western_date_allocation.rb

@@ -1,82 +0,0 @@
-# frozen_string_literal: true
-
-# :nodoc:
-module Zakuro
-  # :nodoc:
-  module Calculation
-    # :nodoc:
-    module Range
-      # :nodoc:
-      module Transfer
-        #
-        # WesternDateAllocation 西暦日の割り当て
-        #
-        module WesternDateAllocation
-          #
-          # 月初日の西暦日を更新する
-          #
-          # @param [Context] context 暦コンテキスト
-          # @param [Array<Year>] years 完全範囲（月初日なし）
-          #
-          # @return [Array<Year>] 完全範囲（月初日あり）
-          #
-          def self.get(context:, years:)
-            update_first_day(context: context, years: years)
-
-            years
-          end
-
-          #
-          # 月初日の西暦日を更新する
-          #
-          # @param [Context] context 暦コンテキスト
-          # @param [Array<Year>] years 完全範囲（月初日なし）
-          #
-          def self.update_first_day(context:, years:)
-            years.each_with_index do |year, index|
-              new_year_date = year.new_year_date.clone
-
-              months = year.months
-              update_first_day_within_all_months(
-                context: context,
-                new_year_date: new_year_date, months: months
-              )
-
-              years[index] = Base::Year.new(
-                multi_gengou: year.multi_gengou, new_year_date: new_year_date,
-                months: months, total_days: year.total_days
-              )
-            end
-          end
-
-          #
-          # 全ての月で月初日の西暦日を更新する
-          #
-          # @param [Context] context 暦コンテキスト
-          # @param [Western::Calendar] new_year_date 元旦
-          # @param [Array<Month>] months 月データ
-          #
-          def self.update_first_day_within_all_months(context:,
-                                                      new_year_date:, months:)
-            date = new_year_date.clone
-            months.each_with_index do |month, index|
-              updated_month = Monthly::Month.new(
-                context: context,
-                month_label: month.month_label,
-                first_day: Monthly::FirstDay.new(
-                  remainder: month.first_day.remainder,
-                  western_date: date
-                ),
-                solar_terms: month.solar_terms
-              )
-              months[index] = updated_month
-
-              date = date.clone + updated_month.days
-            end
-          end
-          private_class_method :update_first_day_within_all_months
-        end
-      end
-    end
-  end
-end

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

@@ -1,91 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../western'
-
-# :nodoc:
-module Zakuro
-  #
-  # Japan 和暦
-  #
-  module Japan
-    #
-    # Reki 暦
-    #
-    module Reki
-      #
-      # Range 暦（範囲）
-      #
-      class Range
-        # @return [String] 暦のクラス名
-        #   version 以下を参照
-        attr_reader :class_name
-        # @return [Western::Calendar] 暦の開始日
-        attr_reader :start_date
-
-        #
-        # 初期化
-        #
-        # @param [String] class_name 暦のクラス名
-        # @param [Western::Calendar] start_date 暦の開始日
-        #
-        def initialize(class_name:, start_date:)
-          @class_name = class_name
-          @start_date = start_date
-        end
-      end
-
-      LIST = [
-        Range.new(
-          class_name: 'Zakuro::Genka::Gateway',
-          start_date: Western::Calendar.new(year: 445, month: 1, day: 24)
-        ),
-        Range.new(
-          class_name: 'Zakuro::Gihou::Gateway',
-          start_date: Western::Calendar.new(year: 698, month: 2, day: 16)
-        ),
-        Range.new(
-          class_name: 'Zakuro::Daien::Gateway',
-          start_date: Western::Calendar.new(year: 764, month: 2, day: 7)
-        ),
-        Range.new(
-          class_name: 'Zakuro::Senmyou::Gateway',
-          start_date: Western::Calendar.new(year: 862, month: 2, day: 3)
-        ),
-        Range.new(
-          class_name: 'Zakuro::Joukyou::Gateway',
-          start_date: Western::Calendar.new(year: 1685, month: 2, day: 4)
-        ),
-        Range.new(
-          class_name: 'Zakuro::Houryaku::Gateway',
-          start_date: Western::Calendar.new(year: 1755, month: 2, day: 11)
-        ),
-        Range.new(
-          class_name: 'Zakuro::Kansei::Gateway',
-          start_date: Western::Calendar.new(year: 1798, month: 2, day: 16)
-        ),
-        Range.new(
-          class_name: 'Zakuro::Tenpou::Gateway',
-          start_date: Western::Calendar.new(year: 1844, month: 2, day: 18)
-        ),
-        Range.new(
-          class_name: 'Zakuro::Gregorio::Gateway',
-          start_date: Western::Calendar.new(year: 1872, month: 12, day: 9)
-        )
-      ].freeze
-
-      #
-      # 指定した日付から対象の暦を引き当てる
-      #
-      # @param [Western::Calendar] date 日付
-      #
-      # @return [String] 暦のクラス名
-      #
-      def self.class_name(date: Western::Calendar.new)
-        LIST.reverse_each do |range|
-          return range.class_name if date >= range.start_date
-        end
-        raise ArgumentError, "invalid date: #{date.format}"
-      end
-    end
-  end
-end