zakuro 0.1.0 → 0.1.1

data/lib/zakuro/operation/operation.rb

@@ -25,6 +25,8 @@ module Zakuro
       MONTH_HISTORIES
     end
 
+    # :reek:ControlParameter
+
     #
     # 変更履歴を特定する
     #
@@ -41,5 +43,24 @@ module Zakuro
 
       Operation::MonthHistory.new
     end
+
+    # :reek:ControlParameter
+
+    #
+    # 変更履歴を特定する
+    #
+    # @param [Western::Calendar] id 変更履歴ID
+    #
+    # @return [Operation::MonthHistory] 変更履歴
+    #
+    def self.specify_history_by_id(id:)
+      month_histroies = Operation.month_histories
+
+      month_histroies.each do |history|
+        return history if id == history.id
+      end
+
+      Operation::MonthHistory.new
+    end
   end
 end

data/lib/zakuro/operation/yaml/month.yaml

@@ -1,7 +1,7 @@
 ---
 - id: 156-1-a
   relation_id: "-"
-  parent_id: "-"
+  parent_id: 156-1-1
   page: '156'
   number: "-"
   japan_date: 貞観 14年 12 大 丁酉 33-1832

data/lib/zakuro/result/operation.rb

@@ -17,7 +17,7 @@ module Zakuro
         # @return [True] 運用あり
         # @return [False] 運用なし
         attr_reader :operated
-        # @return [Month] 月別履歴情報
+        # @return [Month::Bundle] 月別履歴情報
         attr_reader :month
         # @return [Data::SingleDay] 計算値
         attr_reader :original
@@ -26,7 +26,7 @@ module Zakuro
         # 初期化
         #
         # @param [True, False] operated 運用有無
-        # @param [Month] month 月別履歴情報
+        # @param [Month::Bundle] month 月別履歴情報
         # @param [Data::SingleDay] original 計算値
         #
         def initialize(operated:, month:, original:)
@@ -37,48 +37,76 @@ module Zakuro
       end
 
       #
-      # Month 月別履歴情報
+      # Month 運用情報（月）
       #
-      class Month
-        # @return [Integer] 原文頁数
-        attr_reader :page
-        # @return [Integer] 原文注釈番号
-        attr_reader :number
-        # @return [Array<Zakuro::Result::Operation::Annotation>] 注釈
-        attr_reader :annotations
-
-        #
-        # 初期化
+      module Month
         #
-        # @param [Integer] page 原文頁数
-        # @param [Integer] number 原文注釈番号
-        # @param [Array<Zakuro::Result::Operation::Annotation>] annotations 注釈
+        # Bundle 月履歴集約情報
         #
-        def initialize(page: -1, number: -1, annotations: [])
-          @page = page
-          @number = number
-          @annotations = annotations
-        end
-      end
+        class Bundle
+          # @return [History] 月別履歴情報（当月）
+          attr_reader :current
+          # @return [History] 月別履歴情報（影響を与えた月）
+          attr_reader :parent
 
-      #
-      # Annotation 注釈
-      #
-      class Annotation
-        # @return [String] 注釈内容
-        attr_reader :description
-        # @return [String] 注釈補記
-        attr_reader :note
+          def initialize(current: History.new, parent: History.new)
+            @current = current
+            @parent = parent
+          end
+        end
 
         #
-        # 初期化
+        # History 月別履歴情報
         #
-        # @param [String] description 注釈内容
-        # @param [<Type>] note 注釈補記
+        class History
+          # @return [String] ID
+          attr_reader :id
+          # @return [String] 月初日の西暦日
+          attr_reader :western_date
+          # @return [Integer] 原文頁数
+          attr_reader :page
+          # @return [Integer] 原文注釈番号
+          attr_reader :number
+          # @return [Array<Zakuro::Result::Operation::Annotation>] 注釈
+          attr_reader :annotations
+
+          #
+          # 初期化
+          #
+          # @param [String] id ID
+          # @param [String] western_date 月初日の西暦日
+          # @param [Integer] page 原文頁数
+          # @param [Integer] number 原文注釈番号
+          # @param [Array<Annotation>] annotations 注釈
+          #
+          def initialize(id: '', western_date: '', page: -1, number: -1, annotations: [])
+            @id = id
+            @western_date = western_date
+            @page = page
+            @number = number
+            @annotations = annotations
+          end
+        end
+
+        #
+        # Annotation 注釈
         #
-        def initialize(description:, note:)
-          @description = description
-          @note = note
+        class Annotation
+          # @return [String] 注釈内容
+          attr_reader :description
+          # @return [String] 注釈補記
+          attr_reader :note
+
+          #
+          # 初期化
+          #
+          # @param [String] description 注釈内容
+          # @param [<Type>] note 注釈補記
+          #
+          def initialize(description:, note:)
+            @description = description
+            @note = note
+          end
         end
       end
     end

data/lib/zakuro/tools/stringifier.rb

@@ -31,7 +31,7 @@ module Zakuro
         hash
       end
 
-      # :reek:TooManyStatements { max_statements: 7 } and :reek:NilCheck
+      # :reek:TooManyStatements { max_statements: 7 }
 
       #
       # 対象インスタンスをハッシュ化する（再帰処理）
@@ -42,7 +42,7 @@ module Zakuro
       # @return [Hash<String, Objcet>] ハッシュ
       #
       def self.value_to_hash(obj:, class_prefix:, formatted:)
-        return obj if obj.nil?
+        return obj unless obj
 
         # 日付をフォーマットする
         return obj.format if formatted && Tools::Typeof.time?(obj: obj)

data/lib/zakuro/version.rb

@@ -3,5 +3,5 @@
 # :nodoc:
 module Zakuro
   # @return [String] library version
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

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

@@ -71,6 +71,16 @@ module Zakuro
       def empty?
         (@index == -1 && @remainder.invalid?)
       end
+
+      #
+      # ディープコピー
+      #
+      # @param [SolarTerm] obj 自身
+      #
+      def initialize_copy(obj)
+        @index = obj.index.clone
+        @remainder = obj.remainder.clone
+      end
     end
   end
 end

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

@@ -48,7 +48,9 @@ module Zakuro
         operated_years = []
 
         years.each do |year|
-          operated_year = rewrite_year(year: year)
+          operated_year = OperatedRange.rewrite_year(
+            year: year, operated_solar_terms: @operated_solar_terms
+          )
           operated_years.push(operated_year)
         end
 
@@ -59,16 +61,16 @@ module Zakuro
       # 年を書き換える
       #
       # @param [Year] year 年
+      # @param [OperatedSolarTerms] operated_solar_terms 運用時二十四節気
       #
       # @return [Year] 年
       #
-      def rewrite_year(year:)
+      def self.rewrite_year(year:, operated_solar_terms:)
         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)
+          result.push(month: resolve_month(
+            month: month, operated_solar_terms: operated_solar_terms
+          ))
         end
 
         result.commit
@@ -76,21 +78,40 @@ module Zakuro
         result
       end
 
+      #
+      # 履歴情報の有無に応じた月にする
+      #
+      # @param [Month] month 月
+      # @param [OperatedSolarTerms] operated_solar_terms 運用時二十四節気
+      #
+      # @return [Month] 月
+      #
+      def self.resolve_month(month:, operated_solar_terms:)
+        history = Operation.specify_history(western_date: month.western_date)
+
+        return month if history.invalid?
+
+        OperatedRange.rewrite_month(
+          month: month, history: history, operated_solar_terms: operated_solar_terms
+        )
+      end
+
       #
       # 月を運用結果に書き換える
       #
       # @param [Month] month 月
       # @param [Operation::MonthHistory] history 変更履歴
+      # @param [OperatedSolarTerms] operated_solar_terms 運用時二十四節気
       #
       # @return [Month] 月（運用結果）
       #
-      def rewrite_month(month:, history:)
+      def self.rewrite_month(month:, history:, operated_solar_terms:)
         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_solar_terms: operated_solar_terms
         )
 
         operated_month.rewrite

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

@@ -16,8 +16,6 @@ module Zakuro
     class OperatedSolarTerms
       # @return [Array<Year>] 完全範囲（年データ）
       attr_reader :years
-      # @return [Array<MonthHistory>] 変更履歴
-      attr_reader :month_histroies
       # @return [Hash<String, SolarTerm>] 二十四節気の移動元/移動先（西暦日 -> 対応する二十四節気）
       #
       # * 移動元の二十四節気：無効な大余小余あり（削除対象）
@@ -29,11 +27,9 @@ module Zakuro
       # 初期化
       #
       # @param [Array<Year>] years 完全範囲（年データ）
-      # @param [Array<MonthHistory>] 変更履歴
       #
-      def initialize(years: [], month_histories: Operation.month_histories)
+      def initialize(years: [])
         @years = years
-        @month_histroies = month_histories
         @directions = {}
       end
 
@@ -75,31 +71,35 @@ module Zakuro
         directions = {}
 
         years.each do |year|
-          create_directions_with_months(directions: directions, months: year.months)
+          OperatedSolarTerms.create_directions_with_months(
+            directions: directions, months: year.months
+          )
         end
 
         directions
       end
 
+      # :reek:TooManyStatements { max_statements: 6 }
+
       #
       # 年内の全ての月の移動方向を作成する
       #
       # @param [Hash<String, SolarTerm>] directions 二十四節気の移動元/移動先（西暦日 -> 対応する二十四節気）
       # @param [Array<Month>] months 年内の全ての月
       #
-      def create_directions_with_months(directions: {}, months: [])
+      def self.create_directions_with_months(directions: {}, months: [])
         months.each do |month|
-          @month_histroies.each do |history|
-            next unless month.western_date == history.western_date
+          history = Operation.specify_history(western_date: month.western_date)
+
+          next if history.invalid?
 
-            direction = history.diffs.solar_term
+          direction = history.diffs.solar_term
 
-            next if direction.invalid?
+          next if direction.invalid?
 
-            OperatedSolarTerms.create_directions_each_month(
-              directions: directions, direction: direction, month: month
-            )
-          end
+          OperatedSolarTerms.create_directions_each_month(
+            directions: directions, direction: direction, month: month
+          )
         end
       end
 
@@ -114,7 +114,6 @@ module Zakuro
                                             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)
@@ -138,13 +137,32 @@ module Zakuro
 
         return unless source.index == solar_term.index
 
+        # 移動先に移動元の二十四節気を指定する
+        directions[source.to.format] = OperatedSolarTerms.created_source(
+          direction: direction, solar_term: solar_term
+        )
+      end
+
+      #
+      # 移動先に有効な二十四節気（差し替える二十四節気）を生成する
+      #
+      # @param [Operation::SolarTerm::Direction] source 二十四節気（移動）
+      # @param [SolarTerm] solar_term 二十四節気（計算値）
+      #
+      # @return [SolarTerm] 二十四節気（運用値）
+      #
+      def self.created_source(direction: Operation::SolarTerm::Direction.new,
+                              solar_term: SolarTerm.new)
+        operated_solar_term = solar_term.clone
+
         unless direction.invalid_days?
           # 二十四節気の大余をずらす
-          solar_term.remainder.add!(Remainder.new(day: direction.days, minute: 0, second: 0))
+          operated_solar_term.remainder.add!(
+            Remainder.new(day: direction.days, minute: 0, second: 0)
+          )
         end
 
-        # 移動先に移動元の二十四節気を指定する
-        directions[source.to.format] = solar_term
+        operated_solar_term
       end
 
       #

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

@@ -57,6 +57,7 @@ module Zakuro
 
         raise ArgumentError, "invalid year range. date: #{date.format}"
       end
+      private_class_method :specify_year
 
       #
       # 改元する
@@ -71,6 +72,7 @@ module Zakuro
         Year.new(multi_gengou: multi_gengou, new_year_date: year.new_year_date,
                  months: year.months, total_days: year.total_days)
       end
+      private_class_method :transfer
 
       # :reek:TooManyStatements { max_statements: 7 }
 
@@ -94,6 +96,7 @@ module Zakuro
 
         current_month
       end
+      private_class_method :specify_month
     end
   end
 end

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

@@ -35,37 +35,91 @@ module Zakuro
 
         operated_range = OperatedRange.new(years: years)
 
-        actual_date = SingleDaySpecifier.get(years: operated_range.get, date: date)
+        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 = Single.create_operation_month(operation_history: operation_history)
+        operation_month = create_operation_month(operation_history: operation_history)
 
-        Result::Single.new(data: actual_date, operation: Result::Operation::Bundle.new(
+        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)
-        # TODO: MonthHistory が持つ親IDとの紐付け
-        return Result::Operation::Month.new if operation_history.invalid?
+        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::Annotation.new(
+            Result::Operation::Month::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
-        )
+        annotations
       end
+      private_class_method :create_annnotations
     end
   end
 end