zakuro 0.0.0 → 0.1.1

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

@@ -302,10 +302,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 +386,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.0
+  version: 0.1.1
 platform: ruby
 authors:
 - pldb
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-01 00:00:00.000000000 Z
+date: 2021-04-18 00:00:00.000000000 Z
 dependencies: []
 description: mainly lunar solar calendar
 email:
@@ -21,13 +21,18 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.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
@@ -38,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
@@ -59,19 +77,28 @@ 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/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_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
@@ -99,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: japanese calendar library.

data/.travis.yml

@@ -1,6 +0,0 @@
----
-language: ruby
-cache: bundler
-rvm:
-  - 2.6.6
-before_install: gem install bundler -v 2.1.4

data/lib/zakuro/era/gengou/set-001-until-south.yaml

@@ -1,375 +0,0 @@
-id: 1
-name: "南北朝前+南朝"
-end_date: "1393-2-11"
-list:
-  - name: "允恭"
-    start_date: "445-1-24"
-    start_year: 34
-  - name: "安康"
-    start_date: "454-2-14"
-  - name: "雄略"
-    start_date: "457-2-10"
-  - name: "清寧"
-    start_date: "480-1-28"
-  - name: "顕宗"
-    start_date: "485-2-1"
-  - name: "仁賢"
-    start_date: "488-1-29"
-  - name: "武烈"
-    start_date: "499-1-28"
-  - name: "継体"
-    start_date: "507-1-29"
-  - name: "安閑"
-    start_date: "534-1-30"
-  - name: "宣化"
-    start_date: "536-2-8"
-  - name: "欽明"
-    start_date: "540-1-25"
-  - name: "敏達"
-    start_date: "572-1-31"
-  - name: "用明"
-    start_date: "586-1-25"
-  - name: "崇峻"
-    start_date: "588-2-3"
-  - name: "推古"
-    start_date: "593-2-7"
-  - name: "舒明"
-    start_date: "629-1-30"
-  - name: "皇極"
-    start_date: "642-2-5"
-  - name: "大化"
-    start_date: "645-2-2"
-  - name: "白雉"
-    start_date: "650-2-7"
-  - name: "斉明"
-    start_date: "655-2-12"
-  - name: "天智"
-    start_date: "662-1-25"
-  - name: "天武"
-    start_date: "672-2-4"
-  - name: "朱鳥"
-    start_date: "686-1-30"
-  - name: "持統"
-    start_date: "687-2-18"
-  - name: "文武"
-    start_date: "697-1-28"
-  - name: "大宝"
-    start_date: "701-2-13"
-  - name: "慶雲"
-    start_date: "704-2-10"
-  - name: "和銅"
-    start_date: "708-1-28"
-  - name: "霊亀"
-    start_date: "715-2-9"
-  - name: "養老"
-    start_date: "717-2-16"
-  - name: "神亀"
-    start_date: "724-1-31"
-  - name: "天平"
-    start_date: "729-2-3"
-  - name: "天平勝宝"
-    start_date: "749-1-23"
-  - name: "天平宝字"
-    start_date: "757-1-24"
-  - name: "天平神護"
-    start_date: "765-1-26"
-  - name: "神護景雲"
-    start_date: "767-2-4"
-  - name: "宝亀"
-    start_date: "770-2-1"
-  - name: "天応"
-    start_date: "781-1-29"
-  - name: "延暦"
-    start_date: "782-1-18"
-  - name: "大同"
-    start_date: "806-1-23"
-  - name: "弘仁"
-    start_date: "810-2-8"
-  - name: "天長"
-    start_date: "824-2-4"
-  - name: "承和"
-    start_date: "834-2-12"
-  - name: "嘉祥"
-    start_date: "848-2-9"
-  - name: "仁寿"
-    start_date: "851-2-5"
-  - name: "斎衡"
-    start_date: "854-2-1"
-  - name: "天安"
-    start_date: "857-1-29"
-  - name: "貞観"
-    start_date: "859-2-7"
-  - name: "元慶"
-    start_date: "877-1-18"
-  - name: "仁和"
-    start_date: "885-1-20"
-  - name: "寛平"
-    start_date: "889-2-4"
-  - name: "昌泰"
-    start_date: "898-1-26"
-  - name: "延喜"
-    start_date: "901-1-23"
-  - name: "延長"
-    start_date: "923-1-20"
-  - name: "承平"
-    start_date: "931-1-22"
-  - name: "天慶"
-    start_date: "938-2-3"
-  - name: "天暦"
-    start_date: "947-1-25"
-  - name: "天徳"
-    start_date: "957-2-3"
-  - name: "応和"
-    start_date: "961-1-20"
-  - name: "康保"
-    start_date: "964-2-16"
-  - name: "安和"
-    start_date: "968-2-2"
-  - name: "天禄"
-    start_date: "970-2-9"
-  - name: "天延"
-    start_date: "973-2-6"
-  - name: "貞元"
-    start_date: "976-2-3"
-  - name: "天元"
-    start_date: "978-2-10"
-  - name: "永観"
-    start_date: "983-2-16"
-  - name: "寛和"
-    start_date: "985-1-24"
-  - name: "永延"
-    start_date: "987-2-1"
-  - name: "永祚"
-    start_date: "989-2-9"
-  - name: "正暦"
-    start_date: "990-1-30"
-  - name: "長徳"
-    start_date: "995-2-3"
-  - name: "長保"
-    start_date: "999-1-20"
-  - name: "寛弘"
-    start_date: "1004-1-25"
-  - name: "長和"
-    start_date: "1012-1-26"
-  - name: "寛仁"
-    start_date: "1017-1-31"
-  - name: "治安"
-    start_date: "1021-2-15"
-  - name: "万寿"
-    start_date: "1024-2-13"
-  - name: "長元"
-    start_date: "1028-1-30"
-  - name: "長暦"
-    start_date: "1037-1-19"
-  - name: "長久"
-    start_date: "1040-2-15"
-  - name: "寛徳"
-    start_date: "1044-2-2"
-  - name: "永承"
-    start_date: "1046-2-9"
-  - name: "天喜"
-    start_date: "1053-1-23"
-  - name: "康平"
-    start_date: "1058-1-27"
-  - name: "治暦"
-    start_date: "1065-2-8"
-  - name: "延久"
-    start_date: "1069-1-26"
-  - name: "承保"
-    start_date: "1074-1-30"
-  - name: "承暦"
-    start_date: "1077-1-27"
-  - name: "永保"
-    start_date: "1081-2-12"
-  - name: "応徳"
-    start_date: "1084-2-9"
-  - name: "寛治"
-    start_date: "1087-2-6"
-  - name: "嘉保"
-    start_date: "1094-1-19"
-  - name: "永長"
-    start_date: "1096-1-28"
-  - name: "承徳"
-    start_date: "1097-1-16"
-  - name: "康和"
-    start_date: "1099-1-24"
-  - name: "長治"
-    start_date: "1104-1-30"
-  - name: "嘉承"
-    start_date: "1106-2-6"
-  - name: "天仁"
-    start_date: "1108-2-14"
-  - name: "天永"
-    start_date: "1110-1-22"
-  - name: "永久"
-    start_date: "1113-1-20"
-  - name: "元永"
-    start_date: "1118-1-24"
-  - name: "保安"
-    start_date: "1120-2-1"
-  - name: "天治"
-    start_date: "1124-1-19"
-  - name: "大治"
-    start_date: "1126-1-25"
-  - name: "天承"
-    start_date: "1131-1-31"
-  - name: "長承"
-    start_date: "1132-1-20"
-  - name: "保延"
-    start_date: "1135-2-15"
-  - name: "永治"
-    start_date: "1141-2-9"
-  - name: "康治"
-    start_date: "1142-1-29"
-  - name: "天養"
-    start_date: "1144-2-6"
-  - name: "久安"
-    start_date: "1145-1-25"
-  - name: "仁平"
-    start_date: "1151-1-20"
-  - name: "久寿"
-    start_date: "1154-2-14"
-  - name: "保元"
-    start_date: "1156-1-24"
-  - name: "平治"
-    start_date: "1159-1-21"
-  - name: "永暦"
-    start_date: "1160-2-9"
-  - name: "応保"
-    start_date: "1161-1-28"
-  - name: "長寛"
-    start_date: "1163-2-5"
-  - name: "永万"
-    start_date: "1165-2-13"
-  - name: "仁安"
-    start_date: "1166-2-3"
-  - name: "嘉応"
-    start_date: "1169-1-30"
-  - name: "承安"
-    start_date: "1171-2-7"
-  - name: "安元"
-    start_date: "1175-1-24"
-  - name: "治承"
-    start_date: "1177-2-1"
-  - name: "養和"
-    start_date: "1181-1-17"
-  - name: "寿永"
-    start_date: "1182-2-5"
-  - name: "元暦"
-    start_date: "1184-2-14"
-  - name: "文治"
-    start_date: "1185-2-2"
-  - name: "建久"
-    start_date: "1190-2-7"
-  - name: "正治"
-    start_date: "1199-1-28"
-  - name: "建仁"
-    start_date: "1201-2-5"
-  - name: "元久"
-    start_date: "1204-2-3"
-  - name: "建永"
-    start_date: "1206-2-10"
-  - name: "承元"
-    start_date: "1207-1-30"
-  - name: "建暦"
-    start_date: "1211-1-17"
-  - name: "建保"
-    start_date: "1213-1-24"
-  - name: "承久"
-    start_date: "1219-1-18"
-  - name: "貞応"
-    start_date: "1222-2-13"
-  - name: "元仁"
-    start_date: "1224-1-22"
-  - name: "嘉禄"
-    start_date: "1225-2-9"
-  - name: "安貞"
-    start_date: "1227-1-19"
-  - name: "寛喜"
-    start_date: "1229-1-27"
-  - name: "貞永"
-    start_date: "1232-1-24"
-  - name: "天福"
-    start_date: "1233-2-11"
-  - name: "文暦"
-    start_date: "1234-1-31"
-  - name: "嘉禎"
-    start_date: "1235-1-21"
-  - name: "暦仁"
-    start_date: "1238-1-18"
-  - name: "延応"
-    start_date: "1239-2-6"
-  - name: "仁治"
-    start_date: "1240-1-26"
-  - name: "寛元"
-    start_date: "1243-1-22"
-  - name: "宝治"
-    start_date: "1247-2-7"
-  - name: "建長"
-    start_date: "1249-2-14"
-  - name: "康元"
-    start_date: "1256-1-29"
-  - name: "正嘉"
-    start_date: "1257-1-17"
-  - name: "正元"
-    start_date: "1259-1-25"
-  - name: "文応"
-    start_date: "1260-2-13"
-  - name: "弘長"
-    start_date: "1261-2-1"
-  - name: "文永"
-    start_date: "1264-1-31"
-  - name: "建治"
-    start_date: "1275-1-29"
-  - name: "弘安"
-    start_date: "1278-1-25"
-  - name: "正応"
-    start_date: "1288-2-4"
-  - name: "永仁"
-    start_date: "1293-2-8"
-  - name: "正安"
-    start_date: "1299-2-2"
-  - name: "乾元"
-    start_date: "1302-1-30"
-  - name: "嘉元"
-    start_date: "1303-1-19"
-  - name: "徳治"
-    start_date: "1306-2-14"
-  - name: "延慶"
-    start_date: "1308-1-24"
-  - name: "応長"
-    start_date: "1311-1-21"
-  - name: "正和"
-    start_date: "1312-2-8"
-  - name: "文保"
-    start_date: "1317-2-13"
-  - name: "元応"
-    start_date: "1319-1-22"
-  - name: "元亨"
-    start_date: "1321-1-29"
-  - name: "正中"
-    start_date: "1324-1-27"
-  - name: "嘉暦"
-    start_date: "1326-2-4"
-  - name: "元徳"
-    start_date: "1329-1-31"
-  - name: "元弘"
-    start_date: "1331-2-8"
-  - name: "建武"
-    start_date: "1334-2-5"
-  - name: "延元"
-    start_date: "1336-2-14"
-  - name: "興国"
-    start_date: "1340-1-30"
-  - name: "正平"
-    start_date: "1346-1-24"
-  - name: "建徳"
-    start_date: "1370-1-28"
-  - name: "文中"
-    start_date: "1372-2-6"
-  - name: "天授"
-    start_date: "1375-2-2"
-  - name: "弘和"
-    start_date: "1381-1-26"
-  - name: "元中"
-    start_date: "1384-1-23"