zakuro 0.6.1 → 0.7.0

data/lib/zakuro/output/logger.rb

@@ -12,9 +12,9 @@ module Zakuro
       LEVELS = {
         none: -1,
         debug: 0,
-        info: 1
-        # warn : 2,
-        # error : 3,
+        info: 1,
+        warn: 2,
+        error: 3
       }.freeze
 
       LEVEL = LEVELS[:none]
@@ -48,6 +48,20 @@ module Zakuro
         output('INFO', *messages)
       end
 
+      #
+      # ERRORレベルの標準出力を行う
+      #
+      # @param [Error] error 例外
+      # @param [String] messages メッセージ
+      #
+      def error(error, *messages)
+        return if LEVEL < LEVELS[:error]
+
+        output('ERROR', *messages)
+        output('ERROR', error.message)
+        output('ERROR', *error.backtrace)
+      end
+
       private
 
       #

data/lib/zakuro/result/data/day.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+# :nodoc:
+module Zakuro
+  #
+  # Result 演算結果
+  #
+  module Result
+    #
+    # データ部
+    #
+    module Data
+      #
+      # Day 日
+      #
+      class Day
+        # @return [Integer] 月初日から数えた日（M月d日のdに相当）
+        attr_reader :number
+        # @return [String] 十干十二支
+        attr_reader :zodiac_name
+        # @return [String] 大余小余
+        attr_reader :remainder
+        # @return [String] 年月日
+        attr_reader :western_date
+
+        #
+        # 初期化
+        #
+        # @param [Integer] number 月初日から数えた日（M月d日のdに相当）
+        # @param [String] zodiac_name 十干十二支
+        # @param [String] remainder 大余小余
+        # @param [String] western_date 年月日
+        #
+        def initialize(number:, zodiac_name:, remainder:, western_date:)
+          @number = number
+          @zodiac_name = zodiac_name
+          @remainder = remainder
+          @western_date = western_date
+        end
+      end
+    end
+  end
+end

data/lib/zakuro/result/data/gengou.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+# :nodoc:
+module Zakuro
+  #
+  # Result 演算結果
+  #
+  module Result
+    #
+    # データ部
+    #
+    module Data
+      #
+      # Gengou 元号
+      #
+      class Gengou
+        # @return [String] 元号名
+        attr_reader :name
+        # @return [Integer] 元号年
+        attr_reader :number
+
+        #
+        # 初期化
+        #
+        # @param [String] name 元号名
+        # @param [Integer] number 元号年
+        #
+        def initialize(name: '', number: -1)
+          @name = name
+          @number = number
+        end
+      end
+    end
+  end
+end

data/lib/zakuro/result/data/month.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require_relative './day'
+
+require_relative './solar_term'
+
+# :nodoc:
+module Zakuro
+  #
+  # Result 演算結果
+  #
+  module Result
+    #
+    # データ部
+    #
+    module Data
+      # :reek:TooManyInstanceVariables { max_instance_variables: 6 }
+
+      #
+      # Month 月
+      #
+      class Month
+        # @return [Integer] 月順（1-12）
+        attr_reader :number
+        # @return [True] 閏月
+        # @return [False] 平月
+        attr_reader :leaped
+        # @return [String] 月の大小
+        attr_reader :days_name
+        # @return [Day] 月初日データ
+        attr_reader :first_day
+        # @return [SolarTerm] 二十四節気（節気）
+        attr_reader :odd_solar_terms
+        # @return [SolarTerm] 二十四節気（中気）
+        attr_reader :even_solar_terms
+
+        # rubocop:disable Metrics/ParameterLists
+        # :reek:LongParameterList { max_params: 6 }
+
+        #
+        # 初期化
+        #
+        # @param [Integer] number 月順（1-12）
+        # @param [True, False] leaped 閏月/平月
+        # @param [String] days_name 月の大小
+        # @param [Day] first_day 月初日データ
+        # @param [SolarTerm] odd_solar_terms 二十四節気（節気）
+        # @param [SolarTerm] even_solar_terms 二十四節気（中気）
+        #
+        def initialize(number:, leaped:, days_name:, first_day:,
+                       odd_solar_terms:, even_solar_terms:)
+          @number = number
+          @leaped = leaped
+          @days_name = days_name
+          @first_day = first_day
+          @odd_solar_terms = odd_solar_terms
+          @even_solar_terms = even_solar_terms
+        end
+        # rubocop:enable Metrics/ParameterLists
+      end
+    end
+  end
+end

data/lib/zakuro/result/data/single_day.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require_relative '../core'
+
+require_relative 'year'
+
+require_relative 'month'
+
+require_relative 'day'
+
+# :nodoc:
+module Zakuro
+  #
+  # Result 演算結果
+  #
+  module Result
+    #
+    # データ部
+    #
+    module Data
+      #
+      # SingleDay 1日
+      #
+      class SingleDay < Core
+        # @return [Year] 年
+        attr_reader :year
+        # @return [Month] 月
+        attr_reader :month
+        # @return [Day] 日
+        attr_reader :day
+
+        #
+        # 初期化
+        #
+        # @param [Year] year 年
+        # @param [Month] month 月
+        # @param [Day] day 日
+        #
+        def initialize(year:, month:, day:)
+          super
+          @year = year
+          @month = month
+          @day = day
+        end
+      end
+    end
+  end
+end

data/lib/zakuro/result/data/solar_term.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+# :nodoc:
+module Zakuro
+  #
+  # Result 演算結果
+  #
+  module Result
+    #
+    # データ部
+    #
+    module Data
+      #
+      # SolarTerm 二十四節気
+      #
+      class SolarTerm
+        # @return [Integer] 連番
+        attr_reader :index
+        # @return [String] 大余小余
+        attr_reader :remainder
+
+        #
+        # 初期化
+        #
+        # @param [Integer] index 連番
+        # @param [String] remainder 大余小余
+        #
+        def initialize(index:, remainder:)
+          @index = index
+          @remainder = remainder
+        end
+      end
+    end
+  end
+end

data/lib/zakuro/result/data/year.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require_relative './gengou'
+
+# :nodoc:
+module Zakuro
+  #
+  # Result 演算結果
+  #
+  module Result
+    #
+    # データ部
+    #
+    module Data
+      #
+      # Year 年
+      #
+      class Year
+        # @return [Gengou] 元号（1行目）
+        attr_reader :first_gengou
+        # @return [Gengou] 元号（2行目）
+        attr_reader :second_gengou
+        # @return [String] 十干十二支
+        attr_reader :zodiac_name
+        # @return [Integer] 日数
+        attr_reader :total_days
+
+        #
+        # 初期化
+        #
+        # @param [Gengou] first_gengou 元号（1行目）
+        # @param [Gengou] second_gengou 元号（2行目）
+        # @param [String] zodiac_name 十干十二支
+        # @param [Integer] total_days 日数
+        #
+        def initialize(first_gengou:, second_gengou:, zodiac_name:, total_days:)
+          @first_gengou = first_gengou
+          @second_gengou = second_gengou
+          @zodiac_name = zodiac_name
+          @total_days = total_days
+        end
+      end
+    end
+  end
+end

data/lib/zakuro/result/operation/month/annotation.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+# :nodoc:
+module Zakuro
+  #
+  # Result 演算結果
+  #
+  module Result
+    #
+    # 運用情報
+    #
+    module Operation
+      #
+      # Month 運用情報（月）
+      #
+      module Month
+        #
+        # Annotation 注釈
+        #
+        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
+  end
+end

data/lib/zakuro/result/operation/month/bundle.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require_relative './history'
+
+# :nodoc:
+module Zakuro
+  #
+  # Result 演算結果
+  #
+  module Result
+    #
+    # 運用情報
+    #
+    module Operation
+      #
+      # Month 運用情報（月）
+      #
+      module Month
+        #
+        # Bundle 月履歴集約情報
+        #
+        class Bundle
+          # @return [History] 月別履歴情報（当月）
+          attr_reader :current
+          # @return [History] 月別履歴情報（影響を与えた月）
+          attr_reader :parent
+
+          def initialize(current: History.new, parent: History.new)
+            @current = current
+            @parent = parent
+          end
+        end
+      end
+    end
+  end
+end

data/lib/zakuro/result/operation/month/history.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require_relative './annotation'
+
+# :nodoc:
+module Zakuro
+  #
+  # Result 演算結果
+  #
+  module Result
+    #
+    # 運用情報
+    #
+    module Operation
+      #
+      # Month 運用情報（月）
+      #
+      module Month
+        #
+        # History 月別履歴情報
+        #
+        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<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
+      end
+    end
+  end
+end

data/lib/zakuro/result/operation/operation.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require_relative '../data/single_day'
+
+require_relative './month/bundle'
+
+# :nodoc:
+module Zakuro
+  #
+  # Result 演算結果
+  #
+  module Result
+    #
+    # 運用情報
+    #
+    module Operation
+      #
+      # Bundle 運用情報
+      #
+      class Bundle
+        # @return [True] 運用あり
+        # @return [False] 運用なし
+        attr_reader :operated
+        # @return [Month::Bundle] 月別履歴情報
+        attr_reader :month
+        # @return [Data::SingleDay] 計算値
+        attr_reader :original
+
+        #
+        # 初期化
+        #
+        # @param [True, False] operated 運用有無
+        # @param [Month::Bundle] month 月別履歴情報
+        # @param [Data::SingleDay] original 計算値
+        #
+        def initialize(operated:, month:, original:)
+          @operated = operated
+          @month = month
+          @original = original
+        end
+      end
+    end
+  end
+end

data/lib/zakuro/result/result.rb

@@ -2,9 +2,11 @@
 
 require 'json'
 
+require_relative './data/single_day'
+
+require_relative './operation/operation'
+
 require_relative './core'
-require_relative './data'
-require_relative './operation'
 
 # :nodoc:
 module Zakuro

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zakuro
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - pldb
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-02 00:00:00.000000000 Z
+date: 2022-04-18 00:00:00.000000000 Z
 dependencies: []
 description: mainly lunar solar calendar
 email:
@@ -48,13 +48,20 @@ files:
 - lib/zakuro/calculation/cycle/abstract_remainder.rb
 - lib/zakuro/calculation/cycle/abstract_solar_term.rb
 - lib/zakuro/calculation/cycle/zodiac.rb
+- lib/zakuro/calculation/era/gengou/abstract_scroll.rb
+- lib/zakuro/calculation/era/gengou/dated_scroll.rb
 - lib/zakuro/calculation/era/gengou/internal/connector.rb
 - lib/zakuro/calculation/era/gengou/internal/counter.rb
 - lib/zakuro/calculation/era/gengou/internal/publisher.rb
 - lib/zakuro/calculation/era/gengou/internal/reserve.rb
-- lib/zakuro/calculation/era/gengou/internal/reserve/list.rb
-- lib/zakuro/calculation/era/gengou/internal/reserve/range.rb
-- lib/zakuro/calculation/era/gengou/scroll.rb
+- lib/zakuro/calculation/era/gengou/internal/reserve/abstract_list.rb
+- lib/zakuro/calculation/era/gengou/internal/reserve/abstract_range.rb
+- lib/zakuro/calculation/era/gengou/internal/reserve/dated_list.rb
+- lib/zakuro/calculation/era/gengou/internal/reserve/dated_range.rb
+- lib/zakuro/calculation/era/gengou/internal/reserve/empty_link.rb
+- lib/zakuro/calculation/era/gengou/internal/reserve/named_list.rb
+- lib/zakuro/calculation/era/gengou/internal/reserve/named_range.rb
+- lib/zakuro/calculation/era/gengou/named_scroll.rb
 - lib/zakuro/calculation/era/version/internal/crawler.rb
 - lib/zakuro/calculation/era/version/internal/range.rb
 - lib/zakuro/calculation/era/version/version.rb
@@ -64,23 +71,30 @@ files:
 - lib/zakuro/calculation/monthly/month.rb
 - lib/zakuro/calculation/monthly/month_label.rb
 - lib/zakuro/calculation/monthly/operated_month.rb
-- lib/zakuro/calculation/range/full_range.rb
+- lib/zakuro/calculation/range/abstract_full_range.rb
+- lib/zakuro/calculation/range/abstract_operation_range.rb
+- lib/zakuro/calculation/range/dated_full_range.rb
+- lib/zakuro/calculation/range/dated_operation_range.rb
 - lib/zakuro/calculation/range/medieval_annual_range.rb
-- lib/zakuro/calculation/range/operated_range.rb
+- lib/zakuro/calculation/range/named_full_range.rb
+- lib/zakuro/calculation/range/named_operation_range.rb
 - lib/zakuro/calculation/range/operated_solar_terms.rb
 - lib/zakuro/calculation/range/transfer/gengou_scroller.rb
 - lib/zakuro/calculation/range/transfer/year_boundary.rb
-- lib/zakuro/calculation/specifier/internal/month.rb
-- lib/zakuro/calculation/specifier/multiple_day.rb
-- lib/zakuro/calculation/specifier/single_day.rb
 - lib/zakuro/calculation/stella/lunar/abstract_location.rb
 - lib/zakuro/calculation/stella/lunar/choukei_value.rb
 - lib/zakuro/calculation/stella/solar/abstract_average.rb
 - lib/zakuro/calculation/stella/solar/abstract_location.rb
 - lib/zakuro/calculation/stella/solar/choukei_value.rb
+- lib/zakuro/calculation/summary/internal/month.rb
 - lib/zakuro/calculation/summary/internal/operation.rb
-- lib/zakuro/calculation/summary/range.rb
-- lib/zakuro/calculation/summary/single.rb
+- lib/zakuro/calculation/summary/japan/range.rb
+- lib/zakuro/calculation/summary/japan/single.rb
+- lib/zakuro/calculation/summary/japan/specifier/single_day.rb
+- lib/zakuro/calculation/summary/western/range.rb
+- lib/zakuro/calculation/summary/western/single.rb
+- lib/zakuro/calculation/summary/western/specifier/multiple_day.rb
+- lib/zakuro/calculation/summary/western/specifier/single_day.rb
 - lib/zakuro/calculation/type/old_float.rb
 - lib/zakuro/condition.rb
 - lib/zakuro/era/japan/calendar.rb
@@ -99,6 +113,16 @@ files:
 - lib/zakuro/era/japan/gengou/resource/yaml/set-003-modern.yaml
 - lib/zakuro/era/japan/version.rb
 - lib/zakuro/era/western/calendar.rb
+- lib/zakuro/exception/case/pattern.rb
+- lib/zakuro/exception/case/preset.rb
+- lib/zakuro/exception/case/template.rb
+- lib/zakuro/exception/cause.rb
+- lib/zakuro/exception/exception.rb
+- lib/zakuro/exception/zakuro_error.rb
+- lib/zakuro/gateway/locale/date.rb
+- lib/zakuro/gateway/locale/range.rb
+- lib/zakuro/gateway/range.rb
+- lib/zakuro/gateway/single.rb
 - lib/zakuro/merchant.rb
 - lib/zakuro/operation/month/parser.rb
 - lib/zakuro/operation/month/type.rb
@@ -109,8 +133,16 @@ files:
 - lib/zakuro/output/logger.rb
 - lib/zakuro/output/response.rb
 - lib/zakuro/result/core.rb
-- lib/zakuro/result/data.rb
-- lib/zakuro/result/operation.rb
+- lib/zakuro/result/data/day.rb
+- lib/zakuro/result/data/gengou.rb
+- lib/zakuro/result/data/month.rb
+- lib/zakuro/result/data/single_day.rb
+- lib/zakuro/result/data/solar_term.rb
+- lib/zakuro/result/data/year.rb
+- lib/zakuro/result/operation/month/annotation.rb
+- lib/zakuro/result/operation/month/bundle.rb
+- lib/zakuro/result/operation/month/history.rb
+- lib/zakuro/result/operation/operation.rb
 - lib/zakuro/result/result.rb
 - lib/zakuro/tools/stringifier.rb
 - lib/zakuro/tools/typeconv.rb