zakuro 0.0.3 → 0.1.0

data/lib/zakuro/version/senmyou/range/operated_range.rb

@@ -0,0 +1,105 @@
+# frozen_string_literal: true
+
+require_relative './full_range'
+require_relative './operated_solar_terms'
+require_relative '../../../operation/operation'
+require_relative '../monthly/operated_month'
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Senmyou
+    #
+    # OperatedRange 運用結果範囲
+    #
+    # 何らかの理由により、計算された暦とは異なる運用結果である場合、その結果に合わせて計算結果を上書きする
+    class OperatedRange
+      # @return [Array<Year>] 年データ（完全範囲）
+      attr_reader :years
+      # @return [OperatedSolarTerms] 運用時二十四節気
+      attr_reader :operated_solar_terms
+
+      #
+      # 初期化
+      #
+      # @param [Array<Year>] years 年データ（完全範囲）
+      #
+      def initialize(years: [])
+        @years = years
+        @operated_solar_terms = OperatedSolarTerms.new(years: @years)
+        @operated_solar_terms.create
+      end
+
+      #
+      # 運用結果範囲を取得する
+      #
+      # @return [Array<Year>] 運用結果範囲
+      #
+      def get
+        rewrite
+      end
+
+      #
+      # 運用結果に書き換える
+      #
+      # @return [Array<Year>] 運用結果範囲
+      #
+      def rewrite
+        operated_years = []
+
+        years.each do |year|
+          operated_year = rewrite_year(year: year)
+          operated_years.push(operated_year)
+        end
+
+        operated_years
+      end
+
+      #
+      # 年を書き換える
+      #
+      # @param [Year] year 年
+      #
+      # @return [Year] 年
+      #
+      def rewrite_year(year:)
+        result = Year.new(multi_gengou: year.multi_gengou, new_year_date: year.new_year_date)
+        year.months.each do |month|
+          operated_month = month
+          history = Operation.specify_history(western_date: month.western_date)
+          operated_month = rewrite_month(month: month, history: history) unless history.invalid?
+          result.push(month: operated_month)
+        end
+
+        result.commit
+
+        result
+      end
+
+      #
+      # 月を運用結果に書き換える
+      #
+      # @param [Month] month 月
+      # @param [Operation::MonthHistory] history 変更履歴
+      #
+      # @return [Month] 月（運用結果）
+      #
+      def rewrite_month(month:, history:)
+        return month unless month.western_date == history.western_date
+
+        operated_month = OperatedMonth.new(
+          month_label: month.month_label, first_day: month.first_day,
+          solar_terms: month.solar_terms, history: history,
+          operated_solar_terms: @operated_solar_terms
+        )
+
+        operated_month.rewrite
+
+        Month.new(
+          month_label: operated_month.month_label, first_day: operated_month.first_day,
+          solar_terms: operated_month.solar_terms
+        )
+      end
+    end
+  end
+end

data/lib/zakuro/version/senmyou/range/operated_solar_terms.rb

@@ -0,0 +1,163 @@
+# frozen_string_literal: true
+
+require_relative './full_range'
+require_relative '../../../operation/operation'
+require_relative '../monthly/month'
+
+# TODO: solar_termの中はsrc/destだが、yamlはcalc/actual。統一したい。
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Senmyou
+    #
+    # OperatedSolarTerm 運用時二十四節気
+    #
+    class OperatedSolarTerms
+      # @return [Array<Year>] 完全範囲（年データ）
+      attr_reader :years
+      # @return [Array<MonthHistory>] 変更履歴
+      attr_reader :month_histroies
+      # @return [Hash<String, SolarTerm>] 二十四節気の移動元/移動先（西暦日 -> 対応する二十四節気）
+      #
+      # * 移動元の二十四節気：無効な大余小余あり（削除対象）
+      # * 移動先の二十四節気：移動元からの二十四節気（追加対象）
+      #
+      attr_reader :directions
+
+      #
+      # 初期化
+      #
+      # @param [Array<Year>] years 完全範囲（年データ）
+      # @param [Array<MonthHistory>] 変更履歴
+      #
+      def initialize(years: [], month_histories: Operation.month_histories)
+        @years = years
+        @month_histroies = month_histories
+        @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)
+        solar_term = @directions.fetch(western_date.format, SolarTerm.new)
+
+        # 合致しない場合
+        return false, SolarTerm.new if solar_term.empty?
+
+        # 合致した上で、二十四節気が移動元（削除対象）の場合
+        # 合致した上で、二十四節気が移動先（追加対象）の場合
+        [true, solar_term]
+      end
+
+      #
+      # 二十四節気の移動元/移動先を生成する
+      #
+      # @return [Hash<String, SolarTerm>] 二十四節気の移動元/移動先（西暦日 -> 対応する二十四節気）
+      #
+      def create_directions
+        directions = {}
+
+        years.each do |year|
+          create_directions_with_months(directions: directions, months: year.months)
+        end
+
+        directions
+      end
+
+      #
+      # 年内の全ての月の移動方向を作成する
+      #
+      # @param [Hash<String, SolarTerm>] directions 二十四節気の移動元/移動先（西暦日 -> 対応する二十四節気）
+      # @param [Array<Month>] months 年内の全ての月
+      #
+      def create_directions_with_months(directions: {}, months: [])
+        months.each do |month|
+          @month_histroies.each do |history|
+            next unless month.western_date == history.western_date
+
+            direction = history.diffs.solar_term
+
+            next if direction.invalid?
+
+            OperatedSolarTerms.create_directions_each_month(
+              directions: directions, direction: direction, month: month
+            )
+          end
+        end
+      end
+
+      #
+      # 月毎の移動方向を作成する
+      #
+      # @param [Hash<String, SolarTerm>] directions 二十四節気の移動元/移動先（西暦日 -> 対応する二十四節気）
+      # @param [Operation::SolarTerm::Diretion] 二十四節気（移動）
+      # @param [Month] 月
+      #
+      def self.create_directions_each_month(directions: {},
+                                            direction: Operation::SolarTerm::Diretion.new,
+                                            month: Month.new)
+
+        # TDOO: 移動だけではなく大余差分を反映する場合
+        month.solar_terms.each do |solar_term|
+          OperatedSolarTerms.push_source(directions: directions, direction: direction,
+                                         solar_term: solar_term)
+        end
+        OperatedSolarTerms.push_destination(directions: directions,
+                                            destination: direction.destination)
+      end
+
+      #
+      # 移動先に有効な二十四節気（差し替える二十四節気）を指定する
+      #
+      # @param [Hash<String, SolarTerm>] directions 二十四節気の移動元/移動先（西暦日 -> 対応する二十四節気）
+      # @param [Operation::SolarTerm::Direction] source 二十四節気（移動）
+      # @param [SolarTerm] solar_term 二十四節気（計算値）
+      #
+      def self.push_source(directions: {}, direction: Operation::SolarTerm::Direction.new,
+                           solar_term: SolarTerm.new)
+        source = direction.source
+
+        return if source.invalid?
+
+        return unless source.index == solar_term.index
+
+        unless direction.invalid_days?
+          # 二十四節気の大余をずらす
+          solar_term.remainder.add!(Remainder.new(day: direction.days, minute: 0, second: 0))
+        end
+
+        # 移動先に移動元の二十四節気を指定する
+        directions[source.to.format] = solar_term
+      end
+
+      #
+      # 移動元に無効な二十四節気（連番のみ指定）を指定する
+      #
+      # @param [Hash<String, SolarTerm>] directions 二十四節気の移動元/移動先（西暦日 -> 対応する二十四節気）
+      # @param [Operation::SolarTerm::Destination] destination 二十四節気（移動先）
+      #
+      def self.push_destination(directions: {}, destination: Operation::SolarTerm::Destination.new)
+        return if destination.invalid?
+
+        directions[destination.from.format] = SolarTerm.new(index: destination.index)
+      end
+    end
+  end
+end

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

@@ -3,7 +3,7 @@
 require 'date'
 require_relative '../abstract_version'
 require_relative '../../era/western'
-require_relative 'summary/specifier'
+require_relative 'summary/single'
 
 # :nodoc:
 module Zakuro
@@ -27,7 +27,7 @@ module Zakuro
       #
       def self.to_japan_date(western_date:)
         date = Western::Calendar.create(date: western_date)
-        SingleDaySpecifier.get(date: date)
+        Single.get(date: date)
       end
     end
   end

data/lib/zakuro/version/senmyou/{summary/specifier.rb → specifier/single_day_specifier.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative '../../../era/western'
-require_relative './full_range'
+require_relative '../range/full_range'
 require_relative '../base/multi_gengou_roller'
 require_relative '../base/year'
 require_relative '../../../output/response'
@@ -21,18 +21,18 @@ module Zakuro
       #
       # 取得する
       #
+      # @param [Array<Year>] yeas 範囲
       # @param [Western::Calendar] date 西暦日
       #
-      # @return [Response::SingleDay] 和暦日
+      # @return [Result::Data::SingleDay] 和暦日
       #
-      def self.get(date:)
-        years = FullRange.new(start_date: date).get
-
+      def self.get(years: [], date: Western::Calendar.new)
         year = specify_year(years: years, date: date)
 
         year = transfer(year: year, date: date)
 
-        month, first_date = specify_month(year: year, date: date)
+        month = specify_month(year: year, date: date)
+        first_date = month.western_date
 
         Response::SingleDay.save_single_day(
           param: Response::SingleDay::Param.new(
@@ -81,19 +81,18 @@ module Zakuro
       # @param [Western::Calendar] date 西暦日
       #
       # @return [Month] 対象月
-      # @return [Western::Calendar] 月初日
       #
       def self.specify_month(year:, date:)
-        current_month_date = year.new_year_date.clone
-        next_month_date = current_month_date.clone
-        year.months.each do |month|
-          next_month_date += month.days
-          return month, current_month_date if next_month_date > date
+        months = year.months
+
+        current_month = months[0]
+        months.each do |month|
+          return current_month if month.western_date > date
 
-          current_month_date = next_month_date.clone
+          current_month = month
         end
 
-        raise ArgumentError, "invalid month range. date: #{date.format}"
+        current_month
       end
     end
   end

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

@@ -202,13 +202,9 @@ module Zakuro
       #
       def self.set_solar_term(month:, solar_term:, solar_term_index:)
         term = SolarTerm.new(remainder: solar_term, index: solar_term_index)
-        if solar_term_index.even?
-          # 中気
-          month.even_term = term
-        else
-          # 節気
-          month.odd_term = term
-        end
+
+        # 設定する
+        month.add_term(term: term)
 
         nil
       end

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

@@ -0,0 +1,71 @@
+# 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)
+
+        actual_date = SingleDaySpecifier.get(years: operated_range.get, date: date)
+
+        first_day = calc_date.month.first_day.western_date
+        operation_history = Operation.specify_history(western_date: first_day)
+
+        operation_month = Single.create_operation_month(operation_history: operation_history)
+
+        Result::Single.new(data: actual_date, operation: Result::Operation::Bundle.new(
+          operated: !operation_history.invalid?, month: operation_month, original: calc_date
+        ))
+      end
+
+      def self.create_operation_month(operation_history: Operation::MonthHistory.new)
+        # TODO: MonthHistory が持つ親IDとの紐付け
+        return Result::Operation::Month.new if operation_history.invalid?
+
+        annotations = []
+        operation_history.annotations.each do |annotation|
+          annotations.push(
+            Result::Operation::Annotation.new(
+              description: annotation.description,
+              note: annotation.note
+            )
+          )
+        end
+
+        reference = operation_history.reference
+        Result::Operation::Month.new(
+          page: reference.page, number: reference.number, annotations: annotations
+        )
+      end
+    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.3
+  version: 0.1.0
 platform: ruby
 authors:
 - pldb
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-30 00:00:00.000000000 Z
+date: 2021-04-10 00:00:00.000000000 Z
 dependencies: []
 description: mainly lunar solar calendar
 email:
@@ -29,6 +29,10 @@ files:
 - 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
@@ -39,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
@@ -65,16 +82,23 @@ files:
 - 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_range.rb
-- lib/zakuro/version/senmyou/summary/full_range.rb
-- lib/zakuro/version/senmyou/summary/specifier.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