zakuro 0.0.1 → 0.1.2

data/lib/zakuro/version/senmyou/stella/solar_orbit.rb

@@ -13,79 +13,6 @@ module Zakuro
       # @return [Integer] 統法（1日=8400分）
       DAY = 8400
 
-      #
-      # Interval 入気定日加減数（二十四節気の間隔）
-      #
-      module Interval
-        # @return [Hash<Symbol, Remainder>] 一覧
-        LIST = {
-          # 冬至（とうじ）・大雪（たいせつ）
-          touji: Remainder.new(day: 14, minute: 4235, second: 5),
-          taisetsu: Remainder.new(day: 14, minute: 4235, second: 5),
-          # 小寒（しょうかん）・小雪（しょうせつ）
-          shoukan: Remainder.new(day: 14, minute: 5235, second: 5),
-          shousetsu: Remainder.new(day: 14, minute: 5235, second: 5),
-          # 大寒（だいかん）・立冬（りっとう）
-          daikan: Remainder.new(day: 14, minute: 6235, second: 5),
-          rittou: Remainder.new(day: 14, minute: 6235, second: 5),
-          # 立春（りっしゅん）・霜降（そうこう）
-          risshun: Remainder.new(day: 14, minute: 7235, second: 5),
-          soukou: Remainder.new(day: 14, minute: 7235, second: 5),
-          # 雨水（うすい）・寒露（かんろ）
-          usui: Remainder.new(day: 15, minute: 35, second: 5),
-          kanro: Remainder.new(day: 15, minute: 35, second: 5),
-          # 啓蟄（けいちつ）・秋分（しゅうぶん）
-          keichitsu: Remainder.new(day: 15, minute: 1235, second: 5),
-          shuubun: Remainder.new(day: 15, minute: 1235, second: 5),
-          # 春分（しゅんぶん）・白露（はくろ）
-          shunbun: Remainder.new(day: 15, minute: 2435, second: 5),
-          hakuro: Remainder.new(day: 15, minute: 2435, second: 5),
-          # 清明（せいめい）・処暑（しょしょ）
-          seimei: Remainder.new(day: 15, minute: 3635, second: 5),
-          shosho: Remainder.new(day: 15, minute: 3635, second: 5),
-          # 穀雨（こくう）・立秋（りっしゅう）
-          kokuu: Remainder.new(day: 15, minute: 4835, second: 5),
-          risshuu: Remainder.new(day: 15, minute: 4835, second: 5),
-          # 立夏（りっか）・大暑（たいしょ）
-          rikka: Remainder.new(day: 15, minute: 5835, second: 5),
-          taisho: Remainder.new(day: 15, minute: 5835, second: 5),
-          # 小満（しょうまん）・小暑（しょうしょ）
-          shouman: Remainder.new(day: 15, minute: 6835, second: 5),
-          shousho: Remainder.new(day: 15, minute: 6835, second: 5),
-          # 芒種（ぼうしゅ）・夏至（げし）
-          boushu: Remainder.new(day: 15, minute: 7835, second: 5),
-          geshi: Remainder.new(day: 15, minute: 7835, second: 5)
-        }.freeze
-
-        # @return [Array<Remainder>] 索引
-        INDEXES = [
-          LIST[:touji],      #  0
-          LIST[:shoukan],    #  1
-          LIST[:daikan],     #  2
-          LIST[:risshun],    #  3
-          LIST[:usui],       #  4
-          LIST[:keichitsu],  #  5
-          LIST[:shunbun],    #  6
-          LIST[:seimei],     #  7
-          LIST[:kokuu],      #  8
-          LIST[:rikka],      #  9
-          LIST[:shouman],    # 10
-          LIST[:boushu],     # 11
-          LIST[:geshi],      # 12
-          LIST[:shousho],    # 13
-          LIST[:taisho],     # 14
-          LIST[:risshuu],    # 15
-          LIST[:shosho],     # 16
-          LIST[:hakuro],     # 17
-          LIST[:shuubun],    # 18
-          LIST[:kanro],      # 19
-          LIST[:soukou],     # 20
-          LIST[:rittou],     # 21
-          LIST[:shousetsu],  # 22
-          LIST[:taisetsu]    # 23
-        ].freeze
-      end
-
       #
       # 24気損益眺朒（ちょうじく）数
       #
@@ -153,118 +80,10 @@ module Zakuro
         }.freeze
       end
 
-      #
-      # 二十四節気 と 補正値 を計算する
-      #
-      # @param [SolarTerm] solar_term 二十四節気
-      #
-      # @return [SolarTerm] 二十四節気
-      # @return [Integer] 補正値
-      #
-      def self.calc_term_and_orbit_value(solar_term:)
-        remainder = calc_solar_term_by_remainder(
-          solar_term: solar_term
-        )
-        value = calc_sun_orbit_value(
-          solar_term: remainder
-        )
-        [remainder, value]
-      end
-
-      # :reek:ControlParameter and :reek:BooleanParameter
-
-      #
-      # 二十四節気を計算する
-      #
-      # @param [SolarTerm] solar_term 二十四節気
-      #
-      # @return [SolarTerm] 二十四節気
-      #
-      def self.calc_solar_term_by_remainder(solar_term:)
-        if solar_term.index.negative?
-          return calc_first_solar_term(
-            winter_solstice_age: solar_term.remainder
-          )
-        end
-
-        calc_next_solar_term_recursively(
-          solar_term: solar_term
-        )
-      end
-
-      # :reek:TooManyStatements { max_statements: 8 }
-
-      #
-      # 入定気（定気の開始点からの日時）と属する定気を計算する
-      #
-      # @param [Remainder] winter_solstice_age 天正冬至
-      #
-      # @return [SolarTerm] 二十四節気
-      #   SolarTerm.remainder : 入定気（定気の開始点からの日時）
-      #   SolarTerm.index : 定気
-      #
-      def self.calc_first_solar_term(winter_solstice_age:)
-        # 入定気の起算方法
-        # 概要:
-        #  * 太陽の運行による補正値は、二十四節気の気ごとに定められる
-        #  * 11月経朔の前にある気を求め、それから11月経朔との間隔を求める
-        #  * 気ごとの補正値と、気から11月経朔までにかかる補正値を求める
-        # 前提:
-        #  * 11月経朔に関わる二十四節気は、時系列から順に、小雪・大雪・冬至である
-        #  * 小雪〜大雪の間隔は小雪定数で、大雪〜冬至の間隔は大雪定数で決められている（24気損益眺朒（ちょうじく）数のこと）
-        #  * 11月経朔は、この小雪〜冬至の間のいずれかにある
-        # 計算:
-        # 2パターンある
-        #  (a) 大雪〜冬至にある場合
-        #   *「大雪定数 >= 天正閏余」の場合を指す
-        #   * * NOTE 資料では「より大きい（>）」とされるが、大雪そのものの場合は大雪から起算すべき
-        #   * この場合は、大雪〜経朔の間隔を求める
-        #  (b) 小雪〜大雪にある場合
-        #   *「大雪定数 < 天正閏余」の場合を指す
-        #   * この場合は、小雪〜経朔の間隔を求める
-        taisetsu = 23
-        taisetsu_interval = Interval::INDEXES[taisetsu]
-
-        if winter_solstice_age > taisetsu_interval
-          # (b)
-          shousetsu = 22
-          diff = winter_solstice_age.sub(taisetsu_interval)
-
-          return SolarTerm.new(remainder: Interval::INDEXES[shousetsu].sub(diff),
-                               index: shousetsu)
-        end
-        # (a)
-        SolarTerm.new(remainder: taisetsu_interval.sub(winter_solstice_age),
-                      index: taisetsu)
-      end
-
-      # :reek:TooManyStatements { max_statements: 8 }
-
-      #
-      # 次の二十四節気を計算する
-      #
-      # @param [SolarTerm] solar_term 今回の二十四節気
-      #
-      # @return [SolarTerm] 次回の二十四節気
-      #
-      def self.calc_next_solar_term_recursively(solar_term:)
-        remainder = solar_term.remainder
-        index = solar_term.index
-        interval = Interval::INDEXES[index]
-        return solar_term if remainder < interval
-
-        remainder.sub!(interval)
-        index += 1
-        index = 0 if index >= Interval::INDEXES.size
-        calc_next_solar_term_recursively(
-          solar_term: SolarTerm.new(remainder: remainder, index: index)
-        )
-      end
-
       #
       # 太陽の運行による補正値を算出する
       #
-      # @param [SolarTerm] solar_term 二十四節気
+      # @param [SolarTerm] solar_term 入定気
       #
       # @return [Integer] 補正値
       #
@@ -302,10 +121,8 @@ module Zakuro
         per_day = adjustment.per_day
         sign, ratio = calc_ratio(day: remainder.day, per_term: per_term, per_day: per_day)
 
-        day_stack = calc_day_stack_from_ratio(sign: sign, ratio: ratio,
-                                              minute: remainder.minute)
-
-        day_stack
+        calc_day_stack_from_ratio(sign: sign, ratio: ratio,
+                                  minute: remainder.minute)
       end
       private_class_method :calc_day_stack
 
@@ -388,9 +205,7 @@ module Zakuro
         month_stack = stack + day * per_term + \
                       (1 / 2.0) * (day * (day - 1) * per_day)
         # 切り捨て（プラスマイナスに関わらず小数点以下切り捨て）
-        month_stack = month_stack.negative? ? month_stack.ceil : month_stack.floor
-
-        month_stack
+        month_stack.negative? ? month_stack.ceil : month_stack.floor
       end
       private_class_method :calc_month_stack
     end

data/lib/zakuro/version/senmyou/summary/single.rb

@@ -0,0 +1,125 @@
+# frozen_string_literal: true
+
+require File.expand_path('../../../../../' \
+                        'lib/zakuro/version/senmyou/specifier/single_day_specifier',
+                         __dir__)
+
+require File.expand_path('../../../../../' \
+                         'lib/zakuro/version/senmyou/range/full_range',
+                         __dir__)
+
+require File.expand_path('../../../../../' \
+                         'lib/zakuro/version/senmyou/range/operated_range',
+                         __dir__)
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Senmyou
+    #
+    # Single 一日
+    #
+    module Single
+      #
+      # 生成する
+      #
+      # @param [Western::Calendar] date 西暦日
+      #
+      # @return [Result::Single] 一日検索結果（和暦日）
+      #
+      def self.get(date: Western::Calendar.new)
+        full_range = FullRange.new(start_date: date)
+        years = full_range.get
+
+        calc_date = SingleDaySpecifier.get(years: years, date: date)
+
+        operated_range = OperatedRange.new(years: years)
+
+        Result::Single.new(
+          data: SingleDaySpecifier.get(years: operated_range.get, date: date),
+          operation: create_operation(calc_date: calc_date)
+        )
+      end
+
+      #
+      # 運用情報を生成する
+      #
+      # @param [Result::Data::SingleDay] calc_date 和暦日（計算値）
+      #
+      # @return [Result::Operation::Bundle] 運用情報
+      #
+      def self.create_operation(calc_date: Result::Data::SingleDay.new)
+        first_day = calc_date.month.first_day.western_date
+        operation_history = Operation.specify_history(western_date: first_day)
+
+        operation_month = create_operation_month(operation_history: operation_history)
+
+        Result::Operation::Bundle.new(
+          operated: !operation_history.invalid?, month: operation_month, original: calc_date
+        )
+      end
+      private_class_method :create_operation
+
+      #
+      # 月履歴集約情報を生成する
+      #
+      # @param [Operation::MonthHistory] operation_history 変更履歴（月）
+      #
+      # @return [Result::Operation::Month::Bundle] 月履歴集約情報
+      #
+      def self.create_operation_month(operation_history: Operation::MonthHistory.new)
+        return Result::Operation::Month::Bundle.new if operation_history.invalid?
+
+        parent_operation_history = Operation.specify_history_by_id(id: operation_history.parent_id)
+
+        Result::Operation::Month::Bundle.new(
+          current: create_operation_month_history(operation_history: operation_history),
+          parent: create_operation_month_history(operation_history: parent_operation_history)
+        )
+      end
+      private_class_method :create_operation_month
+
+      #
+      # 月別履歴情報を生成する
+      #
+      # @param [Operation::MonthHistory] operation_history 変更履歴（月）
+      #
+      # @return [Result::Operation::Month::History] 月別履歴情報
+      #
+      def self.create_operation_month_history(operation_history: Operation::MonthHistory.new)
+        return Result::Operation::Month::History.new if operation_history.invalid?
+
+        annotations = create_annnotations(operation_history: operation_history)
+
+        reference = operation_history.reference
+        Result::Operation::Month::History.new(
+          id: operation_history.id, western_date: operation_history.western_date.format,
+          page: reference.page, number: reference.number, annotations: annotations
+        )
+      end
+      private_class_method :create_operation_month_history
+
+      #
+      # 注釈情報を生成する
+      #
+      # @param [Operation::MonthHistory] operation_history 変更履歴（月）
+      #
+      # @return [Array<Result::Operation::Month::Annotation>] 注釈
+      #
+      def self.create_annnotations(operation_history: Operation::MonthHistory.new)
+        annotations = []
+        operation_history.annotations.each do |annotation|
+          annotations.push(
+            Result::Operation::Month::Annotation.new(
+              description: annotation.description,
+              note: annotation.note
+            )
+          )
+        end
+
+        annotations
+      end
+      private_class_method :create_annnotations
+    end
+  end
+end

data/lib/zakuro/version_factory.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative './era/japan'
+require_relative './era/japan/reki'
 require_relative './era/western'
 require_relative './version/genka/genka'
 require_relative './version/gihou/gihou'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zakuro
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.2
 platform: ruby
 authors:
 - pldb
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-01 00:00:00.000000000 Z
+date: 2021-04-29 00:00:00.000000000 Z
 dependencies: []
 description: mainly lunar solar calendar
 email:
@@ -23,10 +23,16 @@ files:
 - ".rubocop.yml"
 - Gemfile
 - LICENSE.txt
+- Makefile
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
+- doc/gengou.md
+- doc/operation.md
+- doc/operation/csv/month.csv
+- doc/operation/operation.xlsx
+- doc/operation/transfer.rb
 - images/12月以降の入定気.png
 - images/12月以降の月の進退.png
 - images/source/description.numbers
@@ -37,17 +43,30 @@ files:
 - lib/zakuro/condition.rb
 - lib/zakuro/cycle/abstract_remainder.rb
 - lib/zakuro/cycle/zodiac.rb
-- lib/zakuro/era/gengou/set-001-until-south.yaml
-- lib/zakuro/era/gengou/set-002-from-north.yaml
-- lib/zakuro/era/gengou/set-003-modern.yaml
-- lib/zakuro/era/japan.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/merchant.rb
+- lib/zakuro/operation/month/parser.rb
+- lib/zakuro/operation/month/type.rb
+- lib/zakuro/operation/month/validator.rb
+- lib/zakuro/operation/operation.rb
+- lib/zakuro/operation/yaml/month.yaml
 - lib/zakuro/output/error.rb
 - lib/zakuro/output/logger.rb
 - lib/zakuro/output/response.rb
-- lib/zakuro/output/result.rb
-- lib/zakuro/output/stringifier.rb
+- lib/zakuro/result/core.rb
+- lib/zakuro/result/data.rb
+- lib/zakuro/result/operation.rb
+- lib/zakuro/result/result.rb
+- lib/zakuro/tools/stringifier.rb
+- lib/zakuro/tools/typeof.rb
 - lib/zakuro/version.rb
 - lib/zakuro/version/abstract_version.rb
 - lib/zakuro/version/genka/genka.rb
@@ -58,19 +77,31 @@ files:
 - lib/zakuro/version/kansei/kansei.rb
 - lib/zakuro/version/senmyou/README.md
 - lib/zakuro/version/senmyou/base/era.rb
-- lib/zakuro/version/senmyou/base/gengou.rb
+- lib/zakuro/version/senmyou/base/multi_gengou.rb
+- lib/zakuro/version/senmyou/base/multi_gengou_roller.rb
 - lib/zakuro/version/senmyou/base/remainder.rb
 - lib/zakuro/version/senmyou/base/solar_term.rb
 - lib/zakuro/version/senmyou/base/year.rb
+- lib/zakuro/version/senmyou/monthly/first_day.rb
+- lib/zakuro/version/senmyou/monthly/initialized_month.rb
 - lib/zakuro/version/senmyou/monthly/lunar_phase.rb
 - lib/zakuro/version/senmyou/monthly/month.rb
+- lib/zakuro/version/senmyou/monthly/month_label.rb
+- lib/zakuro/version/senmyou/monthly/operated_month.rb
+- lib/zakuro/version/senmyou/range/annual_range.rb
+- lib/zakuro/version/senmyou/range/full_range.rb
+- lib/zakuro/version/senmyou/range/operated_range.rb
+- lib/zakuro/version/senmyou/range/operated_solar_terms.rb
+- lib/zakuro/version/senmyou/range/western_date_allocation.rb
+- lib/zakuro/version/senmyou/range/year_boundary.rb
 - lib/zakuro/version/senmyou/senmyou.rb
+- lib/zakuro/version/senmyou/specifier/single_day_specifier.rb
 - lib/zakuro/version/senmyou/stella/lunar_orbit.rb
 - lib/zakuro/version/senmyou/stella/solar_average.rb
+- lib/zakuro/version/senmyou/stella/solar_location.rb
 - lib/zakuro/version/senmyou/stella/solar_orbit.rb
 - lib/zakuro/version/senmyou/stella/winter_solstice.rb
-- lib/zakuro/version/senmyou/summary/annual_data.rb
-- lib/zakuro/version/senmyou/summary/gengou_data.rb
+- lib/zakuro/version/senmyou/summary/single.rb
 - lib/zakuro/version/taien/taien.rb
 - lib/zakuro/version/tenpou/tenpou.rb
 - lib/zakuro/version_factory.rb
@@ -83,7 +114,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
@@ -98,8 +129,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: japanese calendar library.
 test_files: []