zakuro 0.1.2 → 0.3.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/zakuro/calculation/base/multi_gengou.rb +101 -0
- data/lib/zakuro/calculation/base/multi_gengou_roller.rb +218 -0
- data/lib/zakuro/calculation/base/year.rb +107 -0
- data/lib/zakuro/calculation/cycle/abstract_remainder.rb +484 -0
- data/lib/zakuro/calculation/cycle/abstract_solar_term.rb +173 -0
- data/lib/zakuro/calculation/cycle/zodiac.rb +106 -0
- data/lib/zakuro/calculation/monthly/abstract_lunar_phase.rb +169 -0
- data/lib/zakuro/calculation/monthly/first_day.rb +45 -0
- data/lib/zakuro/calculation/monthly/initialized_month.rb +125 -0
- data/lib/zakuro/calculation/monthly/month.rb +187 -0
- data/lib/zakuro/calculation/monthly/month_label.rb +88 -0
- data/lib/zakuro/calculation/monthly/operated_month.rb +209 -0
- data/lib/zakuro/calculation/range/full_range.rb +210 -0
- data/lib/zakuro/calculation/range/medieval_annual_range.rb +105 -0
- data/lib/zakuro/calculation/range/operated_range.rb +144 -0
- data/lib/zakuro/calculation/range/operated_solar_terms.rb +201 -0
- data/lib/zakuro/calculation/range/transfer/western_date_allocation.rb +82 -0
- data/lib/zakuro/calculation/range/transfer/year_boundary.rb +146 -0
- data/lib/zakuro/calculation/specifier/single_day.rb +109 -0
- data/lib/zakuro/calculation/stella/lunar/abstract_location.rb +78 -0
- data/lib/zakuro/calculation/stella/lunar/choukei_value.rb +71 -0
- data/lib/zakuro/calculation/stella/solar/abstract_average.rb +117 -0
- data/lib/zakuro/calculation/stella/solar/abstract_location.rb +187 -0
- data/lib/zakuro/calculation/stella/solar/choukei_value.rb +136 -0
- data/lib/zakuro/calculation/summary/single.rb +129 -0
- data/lib/zakuro/calculation/type/old_float.rb +69 -0
- data/lib/zakuro/era/japan/reki.rb +1 -1
- data/lib/zakuro/merchant.rb +2 -2
- data/lib/zakuro/output/error.rb +7 -6
- data/lib/zakuro/output/logger.rb +50 -49
- data/lib/zakuro/output/response.rb +145 -144
- data/lib/zakuro/tools/typeof.rb +2 -2
- data/lib/zakuro/version.rb +1 -1
- data/lib/zakuro/version/abstract_version.rb +1 -1
- data/lib/zakuro/version/context.rb +23 -0
- data/lib/zakuro/version/daien/const/number.rb +55 -0
- data/lib/zakuro/version/daien/const/remainder.rb +53 -0
- data/lib/zakuro/version/daien/cycle/remainder.rb +59 -0
- data/lib/zakuro/version/daien/cycle/solar_term.rb +34 -0
- data/lib/zakuro/version/daien/daien.rb +36 -0
- data/lib/zakuro/version/daien/monthly/lunar_phase.rb +106 -0
- data/lib/zakuro/version/daien/range/annual_range.rb +39 -0
- data/lib/zakuro/version/daien/stella/lunar/adjustment.rb +240 -0
- data/lib/zakuro/version/daien/stella/lunar/localization.rb +44 -0
- data/lib/zakuro/version/daien/stella/lunar/location.rb +80 -0
- data/lib/zakuro/version/daien/stella/lunar/value.rb +75 -0
- data/lib/zakuro/version/daien/stella/origin/average_november.rb +34 -0
- data/lib/zakuro/version/daien/stella/origin/lunar_age.rb +62 -0
- data/lib/zakuro/version/daien/stella/origin/winter_solstice.rb +55 -0
- data/lib/zakuro/version/daien/stella/solar/adjustment.rb +93 -0
- data/lib/zakuro/version/daien/stella/solar/average.rb +98 -0
- data/lib/zakuro/version/daien/stella/solar/interval.rb +108 -0
- data/lib/zakuro/version/daien/stella/solar/location.rb +61 -0
- data/lib/zakuro/version/daien/stella/solar/value.rb +36 -0
- data/lib/zakuro/version/gihou/const/number.rb +55 -0
- data/lib/zakuro/version/gihou/const/remainder.rb +54 -0
- data/lib/zakuro/version/gihou/cycle/remainder.rb +56 -0
- data/lib/zakuro/version/gihou/cycle/solar_term.rb +34 -0
- data/lib/zakuro/version/gihou/gihou.rb +23 -2
- data/lib/zakuro/version/gihou/monthly/lunar_phase.rb +106 -0
- data/lib/zakuro/version/gihou/range/annual_range.rb +39 -0
- data/lib/zakuro/version/gihou/stella/lunar/adjustment.rb +250 -0
- data/lib/zakuro/version/gihou/stella/lunar/localization.rb +44 -0
- data/lib/zakuro/version/gihou/stella/lunar/location.rb +80 -0
- data/lib/zakuro/version/gihou/stella/lunar/value.rb +75 -0
- data/lib/zakuro/version/gihou/stella/origin/average_november.rb +34 -0
- data/lib/zakuro/version/gihou/stella/origin/lunar_age.rb +62 -0
- data/lib/zakuro/version/gihou/stella/origin/winter_solstice.rb +55 -0
- data/lib/zakuro/version/gihou/stella/solar/adjustment.rb +93 -0
- data/lib/zakuro/version/gihou/stella/solar/average.rb +97 -0
- data/lib/zakuro/version/gihou/stella/solar/interval.rb +108 -0
- data/lib/zakuro/version/gihou/stella/solar/location.rb +61 -0
- data/lib/zakuro/version/gihou/stella/solar/value.rb +36 -0
- data/lib/zakuro/version/senmyou/const/number.rb +51 -0
- data/lib/zakuro/version/senmyou/const/remainder.rb +47 -0
- data/lib/zakuro/version/senmyou/cycle/remainder.rb +56 -0
- data/lib/zakuro/version/senmyou/cycle/solar_term.rb +34 -0
- data/lib/zakuro/version/senmyou/monthly/lunar_phase.rb +80 -195
- data/lib/zakuro/version/senmyou/range/annual_range.rb +25 -145
- data/lib/zakuro/version/senmyou/senmyou.rb +10 -4
- data/lib/zakuro/version/senmyou/stella/lunar/adjustment.rb +237 -0
- data/lib/zakuro/version/senmyou/stella/lunar/localization.rb +44 -0
- data/lib/zakuro/version/senmyou/stella/lunar/location.rb +87 -0
- data/lib/zakuro/version/senmyou/stella/lunar/value.rb +67 -0
- data/lib/zakuro/version/senmyou/stella/origin/average_november.rb +34 -0
- data/lib/zakuro/version/senmyou/stella/origin/lunar_age.rb +62 -0
- data/lib/zakuro/version/senmyou/stella/origin/winter_solstice.rb +55 -0
- data/lib/zakuro/version/senmyou/stella/solar/adjustment.rb +93 -0
- data/lib/zakuro/version/senmyou/stella/solar/average.rb +97 -0
- data/lib/zakuro/version/senmyou/stella/solar/interval.rb +103 -0
- data/lib/zakuro/version/senmyou/stella/solar/location.rb +61 -0
- data/lib/zakuro/version/senmyou/stella/solar/value.rb +39 -0
- data/lib/zakuro/version/version_class_resolver.rb +70 -0
- data/lib/zakuro/version_factory.rb +3 -3
- metadata +83 -28
- data/lib/zakuro/cycle/abstract_remainder.rb +0 -456
- data/lib/zakuro/cycle/zodiac.rb +0 -103
- data/lib/zakuro/version/senmyou/base/era.rb +0 -83
- data/lib/zakuro/version/senmyou/base/multi_gengou.rb +0 -98
- data/lib/zakuro/version/senmyou/base/multi_gengou_roller.rb +0 -217
- data/lib/zakuro/version/senmyou/base/remainder.rb +0 -60
- data/lib/zakuro/version/senmyou/base/solar_term.rb +0 -148
- data/lib/zakuro/version/senmyou/base/year.rb +0 -104
- data/lib/zakuro/version/senmyou/monthly/first_day.rb +0 -44
- data/lib/zakuro/version/senmyou/monthly/initialized_month.rb +0 -119
- data/lib/zakuro/version/senmyou/monthly/month.rb +0 -181
- data/lib/zakuro/version/senmyou/monthly/month_label.rb +0 -87
- data/lib/zakuro/version/senmyou/monthly/operated_month.rb +0 -196
- data/lib/zakuro/version/senmyou/range/full_range.rb +0 -194
- data/lib/zakuro/version/senmyou/range/operated_range.rb +0 -126
- data/lib/zakuro/version/senmyou/range/operated_solar_terms.rb +0 -181
- data/lib/zakuro/version/senmyou/range/western_date_allocation.rb +0 -68
- data/lib/zakuro/version/senmyou/range/year_boundary.rb +0 -138
- data/lib/zakuro/version/senmyou/specifier/single_day_specifier.rb +0 -102
- data/lib/zakuro/version/senmyou/stella/lunar_orbit.rb +0 -332
- data/lib/zakuro/version/senmyou/stella/solar_average.rb +0 -169
- data/lib/zakuro/version/senmyou/stella/solar_location.rb +0 -213
- data/lib/zakuro/version/senmyou/stella/solar_orbit.rb +0 -213
- data/lib/zakuro/version/senmyou/stella/winter_solstice.rb +0 -106
- data/lib/zakuro/version/senmyou/summary/single.rb +0 -125
- data/lib/zakuro/version/taien/taien.rb +0 -19
@@ -0,0 +1,136 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require_relative '../../type/old_float'
|
4
|
+
|
5
|
+
# :nodoc:
|
6
|
+
module Zakuro
|
7
|
+
# :nodoc:
|
8
|
+
module Calculation
|
9
|
+
# :nodoc:
|
10
|
+
module Solar
|
11
|
+
#
|
12
|
+
# ChoukeiValue 再考長慶宣明暦算法
|
13
|
+
#
|
14
|
+
module ChoukeiValue
|
15
|
+
# @return [Output::Logger] ロガー
|
16
|
+
LOGGER = Output::Logger.new(location: 'solar_choukei')
|
17
|
+
|
18
|
+
#
|
19
|
+
# 補正値を返す
|
20
|
+
#
|
21
|
+
# @param [Cycle::AbstractRemainder] remainder 大余小余
|
22
|
+
# @param [Adjustment::Row] row 24気損益眺朒(ちょうじく)数
|
23
|
+
#
|
24
|
+
# @return [Integer] 補正値
|
25
|
+
#
|
26
|
+
def self.get(remainder:, row:)
|
27
|
+
# 損益率/眺朒(ちょうじく)数
|
28
|
+
# パラメータ:
|
29
|
+
# a: 眺朒(ちょうじく)数の初日の値
|
30
|
+
# b: 損益率初日の値
|
31
|
+
# c: 損益率の毎日の差
|
32
|
+
# n: 定気の日から数えた日数
|
33
|
+
|
34
|
+
# LOGGER.debug("row.per_day: #{row.per_day}")
|
35
|
+
# LOGGER.debug("row.stack: #{row.stack}")
|
36
|
+
|
37
|
+
day_stack = calc_day_stack(remainder: remainder, row: row)
|
38
|
+
|
39
|
+
# LOGGER.debug("day_stack: #{day_stack}")
|
40
|
+
|
41
|
+
month_stack = calc_month_stack(row: row, day: remainder.day)
|
42
|
+
|
43
|
+
# LOGGER.debug("month_stack: #{month_stack}")
|
44
|
+
|
45
|
+
# 冬至であれば眺朒数がプラスになり続けて損益率が「益」で、小雪であればマイナスの眺朒数がプラスされ続けて「損」
|
46
|
+
month_stack + day_stack
|
47
|
+
end
|
48
|
+
|
49
|
+
#
|
50
|
+
# 損益率を求める
|
51
|
+
#
|
52
|
+
# @param [Remainder] remainder 入定気
|
53
|
+
# @param [Adjustment::Row] row 24気損益眺朒(ちょうじく)数
|
54
|
+
#
|
55
|
+
# @return [Integer] 損益率
|
56
|
+
#
|
57
|
+
def self.calc_day_stack(remainder:, row:)
|
58
|
+
ratio = calc_ratio(day: remainder.day, per_term: row.per_term, per_day: row.per_day)
|
59
|
+
|
60
|
+
# LOGGER.debug("ratio.sign: #{ratio.sign}")
|
61
|
+
# LOGGER.debug("ratio.abs: #{ratio.abs}")
|
62
|
+
|
63
|
+
calc_day_stack_from_ratio(
|
64
|
+
ratio: ratio, minute: remainder.minute, limit: remainder.base_day
|
65
|
+
)
|
66
|
+
end
|
67
|
+
private_class_method :calc_day_stack
|
68
|
+
|
69
|
+
#
|
70
|
+
# 大余に対応する損益率を求める
|
71
|
+
# 損益率 = b + n * c
|
72
|
+
#
|
73
|
+
# @param [Integer] day 大余
|
74
|
+
# @param [Integer] per_term 眺朒(ちょうじく)数
|
75
|
+
# @param [Integer] per_day 毎日差
|
76
|
+
#
|
77
|
+
# @return [Type::OldFloat] 大余に対応する損益率
|
78
|
+
#
|
79
|
+
def self.calc_ratio(day:, per_term:, per_day:)
|
80
|
+
ratio = Type::OldFloat.new(per_term + day * per_day)
|
81
|
+
# 小数点以下は無視する
|
82
|
+
ratio.floor!
|
83
|
+
|
84
|
+
ratio
|
85
|
+
end
|
86
|
+
private_class_method :calc_ratio
|
87
|
+
|
88
|
+
#
|
89
|
+
# 小余を含めた損益率を求める
|
90
|
+
#
|
91
|
+
# @param [Integer] sign 正負(大余に対応する損益率)
|
92
|
+
# @param [Integer] ratio 大余に対応する損益率
|
93
|
+
# @param [Integer] minute 小余
|
94
|
+
#
|
95
|
+
# @return [Integer] 小余を含めた損益率
|
96
|
+
#
|
97
|
+
def self.calc_day_stack_from_ratio(ratio:, minute:, limit:)
|
98
|
+
minute_stack = ratio.abs * minute
|
99
|
+
day_stack = (minute_stack / limit).floor
|
100
|
+
# 四捨五入
|
101
|
+
# NOTE 資料では「この余りが4200をこえていれば切り上げる」とあり「>=」とした
|
102
|
+
# 1612年の7月(慶長17年7月)が境界値4200だが、繰り上げを行なっていたため
|
103
|
+
day_stack += 1 if minute_stack % limit >= (limit / 2)
|
104
|
+
day_stack *= ratio.sign
|
105
|
+
|
106
|
+
day_stack
|
107
|
+
end
|
108
|
+
private_class_method :calc_day_stack_from_ratio
|
109
|
+
|
110
|
+
#
|
111
|
+
# 眺朒(ちょうじく)数を求める
|
112
|
+
# 眺朒(ちょうじく)数 = a + (n * b) + (1/2)n(n-1)c
|
113
|
+
#
|
114
|
+
# @param [Adjustment::Row] row 24気損益眺朒(ちょうじく)数
|
115
|
+
# @param [Integer] day 大余
|
116
|
+
#
|
117
|
+
# @return [Integer] 眺朒(ちょうじく)数
|
118
|
+
#
|
119
|
+
def self.calc_month_stack(row:, day:)
|
120
|
+
# row.stack: 眺朒(ちょうじく)積
|
121
|
+
# row.per_term: 眺朒(ちょうじく)数
|
122
|
+
# row.per_day: 毎日差
|
123
|
+
month_stack = Type::OldFloat.new(
|
124
|
+
row.stack + day * row.per_term + \
|
125
|
+
(1 / 2.0) * (day * (day - 1) * row.per_day)
|
126
|
+
)
|
127
|
+
# 切り捨て(プラスマイナスに関わらず小数点以下切り捨て)
|
128
|
+
month_stack.floor!
|
129
|
+
|
130
|
+
month_stack.get
|
131
|
+
end
|
132
|
+
private_class_method :calc_month_stack
|
133
|
+
end
|
134
|
+
end
|
135
|
+
end
|
136
|
+
end
|
@@ -0,0 +1,129 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require_relative '../specifier/single_day'
|
4
|
+
|
5
|
+
require_relative '../range/operated_range'
|
6
|
+
|
7
|
+
require_relative '../range/full_range'
|
8
|
+
|
9
|
+
# :nodoc:
|
10
|
+
module Zakuro
|
11
|
+
# :nodoc:
|
12
|
+
module Calculation
|
13
|
+
# :nodoc:
|
14
|
+
module Summary
|
15
|
+
#
|
16
|
+
# Single 一日
|
17
|
+
#
|
18
|
+
module Single
|
19
|
+
#
|
20
|
+
# 生成する
|
21
|
+
#
|
22
|
+
# @param [Context] context 暦コンテキスト
|
23
|
+
# @param [Western::Calendar] date 西暦日
|
24
|
+
#
|
25
|
+
# @return [Result::Single] 一日検索結果(和暦日)
|
26
|
+
#
|
27
|
+
def self.get(context:, date: Western::Calendar.new)
|
28
|
+
full_range = Calculation::Range::FullRange.new(context: context, start_date: date)
|
29
|
+
years = full_range.get
|
30
|
+
|
31
|
+
calc_date = Calculation::Specifier::SingleDay.get(
|
32
|
+
years: years, date: date
|
33
|
+
)
|
34
|
+
|
35
|
+
operated_range = Calculation::Range::OperatedRange.new(context: context, years: years)
|
36
|
+
|
37
|
+
Result::Single.new(
|
38
|
+
data: Calculation::Specifier::SingleDay.get(
|
39
|
+
years: operated_range.get, date: date
|
40
|
+
),
|
41
|
+
operation: create_operation(calc_date: calc_date)
|
42
|
+
)
|
43
|
+
end
|
44
|
+
|
45
|
+
#
|
46
|
+
# 運用情報を生成する
|
47
|
+
#
|
48
|
+
# @param [Result::Data::SingleDay] calc_date 和暦日(計算値)
|
49
|
+
#
|
50
|
+
# @return [Result::Operation::Bundle] 運用情報
|
51
|
+
#
|
52
|
+
def self.create_operation(calc_date: Result::Data::SingleDay.new)
|
53
|
+
first_day = calc_date.month.first_day.western_date
|
54
|
+
operation_history = Operation.specify_history(western_date: first_day)
|
55
|
+
|
56
|
+
operation_month = create_operation_month(operation_history: operation_history)
|
57
|
+
|
58
|
+
Result::Operation::Bundle.new(
|
59
|
+
operated: !operation_history.invalid?, month: operation_month, original: calc_date
|
60
|
+
)
|
61
|
+
end
|
62
|
+
private_class_method :create_operation
|
63
|
+
|
64
|
+
#
|
65
|
+
# 月履歴集約情報を生成する
|
66
|
+
#
|
67
|
+
# @param [Operation::MonthHistory] operation_history 変更履歴(月)
|
68
|
+
#
|
69
|
+
# @return [Result::Operation::Month::Bundle] 月履歴集約情報
|
70
|
+
#
|
71
|
+
def self.create_operation_month(operation_history: Operation::MonthHistory.new)
|
72
|
+
return Result::Operation::Month::Bundle.new if operation_history.invalid?
|
73
|
+
|
74
|
+
parent_operation_history = Operation.specify_history_by_id(
|
75
|
+
id: operation_history.parent_id
|
76
|
+
)
|
77
|
+
|
78
|
+
Result::Operation::Month::Bundle.new(
|
79
|
+
current: create_operation_month_history(operation_history: operation_history),
|
80
|
+
parent: create_operation_month_history(operation_history: parent_operation_history)
|
81
|
+
)
|
82
|
+
end
|
83
|
+
private_class_method :create_operation_month
|
84
|
+
|
85
|
+
#
|
86
|
+
# 月別履歴情報を生成する
|
87
|
+
#
|
88
|
+
# @param [Operation::MonthHistory] operation_history 変更履歴(月)
|
89
|
+
#
|
90
|
+
# @return [Result::Operation::Month::History] 月別履歴情報
|
91
|
+
#
|
92
|
+
def self.create_operation_month_history(operation_history: Operation::MonthHistory.new)
|
93
|
+
return Result::Operation::Month::History.new if operation_history.invalid?
|
94
|
+
|
95
|
+
annotations = create_annnotations(operation_history: operation_history)
|
96
|
+
|
97
|
+
reference = operation_history.reference
|
98
|
+
Result::Operation::Month::History.new(
|
99
|
+
id: operation_history.id, western_date: operation_history.western_date.format,
|
100
|
+
page: reference.page, number: reference.number, annotations: annotations
|
101
|
+
)
|
102
|
+
end
|
103
|
+
private_class_method :create_operation_month_history
|
104
|
+
|
105
|
+
#
|
106
|
+
# 注釈情報を生成する
|
107
|
+
#
|
108
|
+
# @param [Operation::MonthHistory] operation_history 変更履歴(月)
|
109
|
+
#
|
110
|
+
# @return [Array<Result::Operation::Month::Annotation>] 注釈
|
111
|
+
#
|
112
|
+
def self.create_annnotations(operation_history: Operation::MonthHistory.new)
|
113
|
+
annotations = []
|
114
|
+
operation_history.annotations.each do |annotation|
|
115
|
+
annotations.push(
|
116
|
+
Result::Operation::Month::Annotation.new(
|
117
|
+
description: annotation.description,
|
118
|
+
note: annotation.note
|
119
|
+
)
|
120
|
+
)
|
121
|
+
end
|
122
|
+
|
123
|
+
annotations
|
124
|
+
end
|
125
|
+
private_class_method :create_annnotations
|
126
|
+
end
|
127
|
+
end
|
128
|
+
end
|
129
|
+
end
|
@@ -0,0 +1,69 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
# :nodoc:
|
4
|
+
module Zakuro
|
5
|
+
# :nodoc:
|
6
|
+
module Calculation
|
7
|
+
# :nodoc:
|
8
|
+
module Type
|
9
|
+
#
|
10
|
+
# OldFloat 浮動小数点数(古代)
|
11
|
+
#
|
12
|
+
# @note 四捨五入は常に絶対値に対して行う
|
13
|
+
# * value.negative? ? value.ceil : value.floor
|
14
|
+
# * 絶対値だけを取り出すことで、四捨五入を平易にする
|
15
|
+
#
|
16
|
+
class OldFloat
|
17
|
+
# @return [Integer] 符号
|
18
|
+
attr_reader :sign
|
19
|
+
# @return [Float] 絶対値
|
20
|
+
attr_reader :abs
|
21
|
+
|
22
|
+
#
|
23
|
+
# 初期化
|
24
|
+
#
|
25
|
+
# @param [Float] value 符号つき浮動小数点数
|
26
|
+
#
|
27
|
+
def initialize(value)
|
28
|
+
@sign = value.negative? ? -1 : 1
|
29
|
+
@abs = @sign * value
|
30
|
+
end
|
31
|
+
|
32
|
+
#
|
33
|
+
# 四捨五入する
|
34
|
+
#
|
35
|
+
def floor!
|
36
|
+
@abs = floor
|
37
|
+
end
|
38
|
+
|
39
|
+
#
|
40
|
+
# 四捨五入する(非破壊的)
|
41
|
+
#
|
42
|
+
# @return [Float] 絶対値
|
43
|
+
#
|
44
|
+
def floor
|
45
|
+
@abs.floor
|
46
|
+
end
|
47
|
+
|
48
|
+
#
|
49
|
+
# 符号つき浮動小数点数を取得する
|
50
|
+
#
|
51
|
+
# @return [Float] 符号つき浮動小数点数
|
52
|
+
#
|
53
|
+
def get
|
54
|
+
@sign * @abs
|
55
|
+
end
|
56
|
+
|
57
|
+
#
|
58
|
+
# 負数かどうか
|
59
|
+
#
|
60
|
+
# @return [True] 負数
|
61
|
+
# @return [False] 正数
|
62
|
+
#
|
63
|
+
def negative?
|
64
|
+
@sign == -1
|
65
|
+
end
|
66
|
+
end
|
67
|
+
end
|
68
|
+
end
|
69
|
+
end
|
@@ -44,7 +44,7 @@ module Zakuro
|
|
44
44
|
start_date: Western::Calendar.new(year: 698, month: 2, day: 16)
|
45
45
|
),
|
46
46
|
Range.new(
|
47
|
-
class_name: 'Zakuro::
|
47
|
+
class_name: 'Zakuro::Daien::Gateway',
|
48
48
|
start_date: Western::Calendar.new(year: 764, month: 2, day: 7)
|
49
49
|
),
|
50
50
|
Range.new(
|
data/lib/zakuro/merchant.rb
CHANGED
@@ -22,7 +22,7 @@ module Zakuro
|
|
22
22
|
#
|
23
23
|
def initialize(condition: {})
|
24
24
|
failed = Condition.validate(hash: condition)
|
25
|
-
raise ZakuroError, failed.join('\n') unless failed.empty?
|
25
|
+
raise Output::ZakuroError, failed.join('\n') unless failed.empty?
|
26
26
|
|
27
27
|
@condition = Condition.new(hash: condition)
|
28
28
|
end
|
@@ -36,7 +36,7 @@ module Zakuro
|
|
36
36
|
#
|
37
37
|
def offer(condition: {})
|
38
38
|
failed = Condition.validate(hash: condition)
|
39
|
-
raise ZakuroError, failed.join('\n') unless failed.empty?
|
39
|
+
raise Output::ZakuroError, failed.join('\n') unless failed.empty?
|
40
40
|
|
41
41
|
@condition.rewrite(hash: condition)
|
42
42
|
|
data/lib/zakuro/output/error.rb
CHANGED
@@ -1,12 +1,13 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
# TODO: outputモジュール内にする
|
4
|
-
|
5
3
|
# :nodoc:
|
6
4
|
module Zakuro
|
7
|
-
#
|
8
|
-
|
9
|
-
|
10
|
-
|
5
|
+
# :nodoc:
|
6
|
+
module Output
|
7
|
+
#
|
8
|
+
# ZakuroError ライブラリ内エラー
|
9
|
+
#
|
10
|
+
class ZakuroError < StandardError
|
11
|
+
end
|
11
12
|
end
|
12
13
|
end
|
data/lib/zakuro/output/logger.rb
CHANGED
@@ -1,65 +1,66 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
# TODO: outputモジュール内にする
|
4
|
-
|
5
3
|
# :nodoc:
|
6
4
|
module Zakuro
|
7
|
-
#
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
5
|
+
# :nodoc:
|
6
|
+
module Output
|
7
|
+
#
|
8
|
+
# 軽量なロガー
|
9
|
+
# @note 本番では使用しない
|
10
|
+
#
|
11
|
+
class Logger
|
12
|
+
LEVELS = {
|
13
|
+
none: -1,
|
14
|
+
debug: 0,
|
15
|
+
info: 1
|
16
|
+
# warn : 2,
|
17
|
+
# error : 3,
|
18
|
+
}.freeze
|
19
19
|
|
20
|
-
|
20
|
+
LEVEL = LEVELS[:none]
|
21
21
|
|
22
|
-
|
23
|
-
|
22
|
+
# @return [String] 呼び出し位置
|
23
|
+
attr_reader :location
|
24
24
|
|
25
|
-
|
26
|
-
|
27
|
-
|
25
|
+
def initialize(location:)
|
26
|
+
@location = location
|
27
|
+
end
|
28
28
|
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
29
|
+
#
|
30
|
+
# DEBUGレベルの標準出力を行う
|
31
|
+
#
|
32
|
+
# @param [String] messages メッセージ
|
33
|
+
#
|
34
|
+
def debug(*messages)
|
35
|
+
return if LEVEL < LEVELS[:debug]
|
36
36
|
|
37
|
-
|
38
|
-
|
37
|
+
output('DEBUG', *messages)
|
38
|
+
end
|
39
39
|
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
40
|
+
#
|
41
|
+
# INFOレベルの標準出力を行う
|
42
|
+
#
|
43
|
+
# @param [String] messages メッセージ
|
44
|
+
#
|
45
|
+
def info(*messages)
|
46
|
+
return if LEVEL < LEVELS[:info]
|
47
47
|
|
48
|
-
|
49
|
-
|
48
|
+
output('INFO', *messages)
|
49
|
+
end
|
50
50
|
|
51
|
-
|
51
|
+
private
|
52
52
|
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
53
|
+
#
|
54
|
+
# 標準出力を行う
|
55
|
+
#
|
56
|
+
# @param [String] level ログレベル
|
57
|
+
# @param [String] messages メッセージ
|
58
|
+
#
|
59
|
+
def output(level, *messages)
|
60
|
+
messages.each do |message|
|
61
|
+
# :#{Thread.current.backtrace[5]}
|
62
|
+
p "[#{level}] #{@location}: #{message}"
|
63
|
+
end
|
63
64
|
end
|
64
65
|
end
|
65
66
|
end
|