zakuro 0.6.1 → 0.8.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Makefile +3 -0
- data/README.md +46 -17
- data/VERSION +1 -1
- data/doc/dropped_date.md +93 -0
- data/doc/error.md +45 -0
- data/doc/operation/transfer.rb +8 -8
- data/lib/zakuro/calculation/base/day.rb +52 -0
- data/lib/zakuro/calculation/base/gengou.rb +49 -3
- data/lib/zakuro/calculation/base/linear_gengou.rb +5 -5
- data/lib/zakuro/calculation/base/operated_year.rb +26 -24
- data/lib/zakuro/calculation/base/year.rb +7 -7
- data/lib/zakuro/calculation/cycle/abstract_remainder.rb +55 -47
- data/lib/zakuro/calculation/cycle/abstract_solar_term.rb +28 -24
- data/lib/zakuro/calculation/cycle/zodiac.rb +22 -20
- data/lib/zakuro/calculation/era/gengou/{scroll.rb → abstract_scroll.rb} +44 -37
- data/lib/zakuro/calculation/era/gengou/dated_scroll.rb +30 -0
- data/lib/zakuro/calculation/era/gengou/internal/connector.rb +4 -4
- data/lib/zakuro/calculation/era/gengou/internal/counter.rb +16 -16
- data/lib/zakuro/calculation/era/gengou/internal/publisher.rb +74 -72
- data/lib/zakuro/calculation/era/gengou/internal/reserve/{list.rb → abstract_list.rb} +50 -64
- data/lib/zakuro/calculation/era/gengou/internal/reserve/{range.rb → abstract_range.rb} +73 -50
- data/lib/zakuro/calculation/era/gengou/internal/reserve/dated_list.rb +48 -0
- data/lib/zakuro/calculation/era/gengou/internal/reserve/dated_range.rb +30 -0
- data/lib/zakuro/calculation/era/gengou/internal/reserve/empty_link.rb +156 -0
- data/lib/zakuro/calculation/era/gengou/internal/reserve/named_list.rb +125 -0
- data/lib/zakuro/calculation/era/gengou/internal/reserve/named_range.rb +73 -0
- data/lib/zakuro/calculation/era/gengou/internal/reserve.rb +23 -22
- data/lib/zakuro/calculation/era/gengou/named_scroll.rb +30 -0
- data/lib/zakuro/calculation/era/version/internal/crawler.rb +39 -22
- data/lib/zakuro/calculation/era/version/version.rb +12 -10
- data/lib/zakuro/calculation/monthly/abstract_lunar_phase.rb +13 -9
- data/lib/zakuro/calculation/monthly/const.rb +18 -0
- data/lib/zakuro/calculation/monthly/initialized_month.rb +40 -38
- data/lib/zakuro/calculation/monthly/month.rb +55 -16
- data/lib/zakuro/calculation/monthly/month_label.rb +4 -4
- data/lib/zakuro/calculation/monthly/operated_month.rb +37 -86
- data/lib/zakuro/calculation/monthly/operated_solar_term.rb +80 -0
- data/lib/zakuro/calculation/option/dropped_date/abstract_parameter.rb +44 -0
- data/lib/zakuro/calculation/option/dropped_date/location.rb +135 -0
- data/lib/zakuro/calculation/range/{full_range.rb → abstract_full_range.rb} +45 -29
- data/lib/zakuro/calculation/range/abstract_operation_range.rb +193 -0
- data/lib/zakuro/calculation/range/dated_full_range.rb +32 -0
- data/lib/zakuro/calculation/range/dated_operation_range.rb +33 -0
- data/lib/zakuro/calculation/range/medieval_annual_range.rb +64 -63
- data/lib/zakuro/calculation/range/named_full_range.rb +38 -0
- data/lib/zakuro/calculation/range/named_operation_range.rb +36 -0
- data/lib/zakuro/calculation/range/operated_solar_term.rb +220 -0
- data/lib/zakuro/calculation/range/transfer/gengou_scroller.rb +32 -29
- data/lib/zakuro/calculation/range/transfer/year_boundary.rb +115 -117
- data/lib/zakuro/calculation/stella/lunar/abstract_location.rb +1 -1
- data/lib/zakuro/calculation/stella/lunar/choukei_value.rb +48 -46
- data/lib/zakuro/calculation/stella/solar/abstract_average.rb +31 -26
- data/lib/zakuro/calculation/stella/solar/abstract_location.rb +7 -5
- data/lib/zakuro/calculation/stella/solar/choukei_value.rb +114 -114
- data/lib/zakuro/calculation/summary/internal/day.rb +42 -0
- data/lib/zakuro/calculation/{specifier → summary}/internal/month.rb +33 -12
- data/lib/zakuro/calculation/summary/internal/operation.rb +68 -67
- data/lib/zakuro/calculation/summary/internal/option.rb +101 -0
- data/lib/zakuro/calculation/summary/japan/range.rb +179 -0
- data/lib/zakuro/calculation/summary/japan/single.rb +118 -0
- data/lib/zakuro/calculation/summary/japan/specifier/single_day.rb +98 -0
- data/lib/zakuro/calculation/summary/japan/specifier/specified_range.rb +34 -0
- data/lib/zakuro/calculation/summary/western/range.rb +127 -0
- data/lib/zakuro/calculation/summary/western/single.rb +115 -0
- data/lib/zakuro/calculation/summary/western/specifier/multiple_day.rb +173 -0
- data/lib/zakuro/calculation/summary/western/specifier/single_day.rb +100 -0
- data/lib/zakuro/calculation/type/old_float.rb +2 -2
- data/lib/zakuro/calculation/type/optional.rb +46 -0
- data/lib/zakuro/condition.rb +143 -94
- data/lib/zakuro/context/context.rb +44 -0
- data/lib/zakuro/context/option.rb +119 -0
- data/lib/zakuro/context/version_class_resolver.rb +112 -0
- data/lib/zakuro/era/japan/calendar.rb +35 -33
- data/lib/zakuro/era/japan/gengou/alignment/aligner.rb +93 -74
- data/lib/zakuro/era/japan/gengou/alignment/division.rb +135 -133
- data/lib/zakuro/era/japan/gengou/alignment/line.rb +143 -122
- data/lib/zakuro/era/japan/gengou/alignment/linear_gengou.rb +177 -168
- data/lib/zakuro/era/japan/gengou/alignment.rb +40 -25
- data/lib/zakuro/era/japan/gengou/resource/parser.rb +199 -181
- data/lib/zakuro/era/japan/gengou/resource/type.rb +243 -234
- data/lib/zakuro/era/japan/gengou/resource/validator.rb +257 -254
- data/lib/zakuro/era/japan/gengou/resource.rb +23 -22
- data/lib/zakuro/era/japan/gengou.rb +28 -41
- data/lib/zakuro/era/japan/version.rb +18 -16
- data/lib/zakuro/era/western/calendar.rb +104 -88
- data/lib/zakuro/exception/case/pattern.rb +71 -0
- data/lib/zakuro/exception/case/preset.rb +51 -0
- data/lib/zakuro/exception/case/template.rb +48 -0
- data/lib/zakuro/exception/cause.rb +28 -0
- data/lib/zakuro/exception/exception.rb +39 -0
- data/lib/zakuro/exception/zakuro_error.rb +46 -0
- data/lib/zakuro/gateway/locale/date.rb +127 -0
- data/lib/zakuro/gateway/locale/range.rb +67 -0
- data/lib/zakuro/gateway/range.rb +99 -0
- data/lib/zakuro/gateway/single.rb +81 -0
- data/lib/zakuro/merchant.rb +67 -33
- data/lib/zakuro/operation/month/parser.rb +252 -249
- data/lib/zakuro/operation/month/type.rb +44 -35
- data/lib/zakuro/operation/month/validator.rb +182 -178
- data/lib/zakuro/operation/operation.rb +38 -36
- data/lib/zakuro/operation/yaml/month.yaml +3736 -3736
- data/lib/zakuro/output/logger.rb +17 -3
- data/lib/zakuro/output/response.rb +107 -141
- data/lib/zakuro/result/data/day.rb +43 -0
- data/lib/zakuro/result/data/gengou.rb +35 -0
- data/lib/zakuro/result/data/month.rb +63 -0
- data/lib/zakuro/result/data/option/abstract_option.rb +37 -0
- data/lib/zakuro/result/data/option/dropped_date/calculation.rb +47 -0
- data/lib/zakuro/result/data/option/dropped_date/option.rb +47 -0
- data/lib/zakuro/result/data/option/dropped_date/solar_term.rb +48 -0
- data/lib/zakuro/result/data/single_day.rb +56 -0
- data/lib/zakuro/result/data/solar_term.rb +35 -0
- data/lib/zakuro/result/data/year.rb +45 -0
- data/lib/zakuro/result/operation/month/annotation.rb +40 -0
- data/lib/zakuro/result/operation/month/history.rb +54 -0
- data/lib/zakuro/result/operation/month.rb +31 -0
- data/lib/zakuro/result/operation.rb +22 -97
- data/lib/zakuro/result/result.rb +6 -4
- data/lib/zakuro/tools/stringifier.rb +67 -42
- data/lib/zakuro/tools/typeconv.rb +17 -15
- data/lib/zakuro/tools/typeof.rb +15 -13
- data/lib/zakuro/version/daien/cycle/remainder.rb +2 -2
- data/lib/zakuro/version/daien/monthly/lunar_phase.rb +10 -12
- data/lib/zakuro/version/daien/option/dropped_date/parameter.rb +31 -0
- data/lib/zakuro/version/daien/range/annual_range.rb +19 -17
- data/lib/zakuro/version/daien/stella/lunar/adjustment.rb +42 -37
- data/lib/zakuro/version/daien/stella/lunar/localization.rb +16 -14
- data/lib/zakuro/version/daien/stella/lunar/value.rb +52 -47
- data/lib/zakuro/version/daien/stella/origin/average_november.rb +15 -13
- data/lib/zakuro/version/daien/stella/origin/lunar_age.rb +23 -21
- data/lib/zakuro/version/daien/stella/origin/winter_solstice.rb +22 -20
- data/lib/zakuro/version/daien/stella/solar/adjustment.rb +12 -10
- data/lib/zakuro/version/daien/stella/solar/average.rb +53 -51
- data/lib/zakuro/version/daien/stella/solar/interval.rb +19 -17
- data/lib/zakuro/version/daien/stella/solar/value.rb +13 -11
- data/lib/zakuro/version/genka/cycle/remainder.rb +4 -4
- data/lib/zakuro/version/genka/monthly/lunar_phase.rb +7 -5
- data/lib/zakuro/version/genka/option/dropped_date/parameter.rb +31 -0
- data/lib/zakuro/version/genka/range/annual_range.rb +48 -44
- data/lib/zakuro/version/genka/stella/origin/first_term.rb +30 -28
- data/lib/zakuro/version/genka/stella/origin/january.rb +22 -20
- data/lib/zakuro/version/gihou/cycle/remainder.rb +2 -2
- data/lib/zakuro/version/gihou/monthly/lunar_phase.rb +9 -9
- data/lib/zakuro/version/gihou/option/dropped_date/parameter.rb +31 -0
- data/lib/zakuro/version/gihou/range/annual_range.rb +19 -17
- data/lib/zakuro/version/gihou/stella/lunar/adjustment.rb +42 -37
- data/lib/zakuro/version/gihou/stella/lunar/localization.rb +16 -14
- data/lib/zakuro/version/gihou/stella/lunar/value.rb +52 -47
- data/lib/zakuro/version/gihou/stella/origin/average_november.rb +15 -13
- data/lib/zakuro/version/gihou/stella/origin/lunar_age.rb +23 -21
- data/lib/zakuro/version/gihou/stella/origin/winter_solstice.rb +24 -22
- data/lib/zakuro/version/gihou/stella/solar/adjustment.rb +12 -10
- data/lib/zakuro/version/gihou/stella/solar/average.rb +52 -50
- data/lib/zakuro/version/gihou/stella/solar/interval.rb +19 -17
- data/lib/zakuro/version/gihou/stella/solar/value.rb +13 -11
- data/lib/zakuro/version/senmyou/const/remainder.rb +5 -0
- data/lib/zakuro/version/senmyou/cycle/remainder.rb +37 -2
- data/lib/zakuro/version/senmyou/monthly/lunar_phase.rb +10 -10
- data/lib/zakuro/version/senmyou/option/dropped_date/parameter.rb +33 -0
- data/lib/zakuro/version/senmyou/range/annual_range.rb +19 -17
- data/lib/zakuro/version/senmyou/stella/lunar/adjustment.rb +42 -36
- data/lib/zakuro/version/senmyou/stella/lunar/localization.rb +16 -14
- data/lib/zakuro/version/senmyou/stella/lunar/value.rb +39 -34
- data/lib/zakuro/version/senmyou/stella/origin/average_november.rb +15 -13
- data/lib/zakuro/version/senmyou/stella/origin/lunar_age.rb +23 -21
- data/lib/zakuro/version/senmyou/stella/origin/winter_solstice.rb +22 -20
- data/lib/zakuro/version/senmyou/stella/solar/adjustment.rb +12 -10
- data/lib/zakuro/version/senmyou/stella/solar/average.rb +52 -50
- data/lib/zakuro/version/senmyou/stella/solar/interval.rb +19 -17
- data/lib/zakuro/version/senmyou/stella/solar/value.rb +13 -11
- metadata +68 -16
- data/lib/zakuro/calculation/range/operated_range.rb +0 -193
- data/lib/zakuro/calculation/range/operated_solar_terms.rb +0 -220
- data/lib/zakuro/calculation/specifier/multiple_day.rb +0 -162
- data/lib/zakuro/calculation/specifier/single_day.rb +0 -87
- data/lib/zakuro/calculation/summary/range.rb +0 -120
- data/lib/zakuro/calculation/summary/single.rb +0 -110
- data/lib/zakuro/result/data.rb +0 -187
- data/lib/zakuro/version/context.rb +0 -44
- data/lib/zakuro/version/version_class_resolver.rb +0 -74
@@ -19,48 +19,35 @@ module Zakuro
|
|
19
19
|
# @return [Integer] 2行目
|
20
20
|
SECOND_LINE = Alignment::Aligner::SECOND_LINE
|
21
21
|
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
#
|
39
|
-
# 1行目元号を取得する
|
40
|
-
#
|
41
|
-
# @param [Western::Calendar] start_date 開始日
|
42
|
-
# @param [Western::Calendar] last_date 終了日
|
43
|
-
#
|
44
|
-
# @return [Array<LinearGengou>] 1行目元号
|
45
|
-
#
|
46
|
-
def self.first_line(start_date: Western::Calendar.new, last_date: Western::Calendar.new)
|
47
|
-
Alignment.get(
|
48
|
-
line: FIRST_LINE, start_date: start_date, last_date: last_date
|
49
|
-
)
|
50
|
-
end
|
22
|
+
class << self
|
23
|
+
#
|
24
|
+
# 該当行の元号を取得する
|
25
|
+
#
|
26
|
+
# @param [Integer] line 行番号
|
27
|
+
# @param [Western::Calendar] start_date 開始日
|
28
|
+
# @param [Western::Calendar] last_date 終了日
|
29
|
+
#
|
30
|
+
# @return [Array<LinearGengou>] 該当行の元号
|
31
|
+
#
|
32
|
+
def line(line: FIRST_LINE,
|
33
|
+
start_date: Western::Calendar.new, last_date: Western::Calendar.new)
|
34
|
+
Alignment.get(
|
35
|
+
line: line, start_date: start_date, last_date: last_date
|
36
|
+
)
|
37
|
+
end
|
51
38
|
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
line:
|
63
|
-
|
39
|
+
#
|
40
|
+
# 該当行の元号を取得する(元号名)
|
41
|
+
#
|
42
|
+
# @param [Integer] line 行番号
|
43
|
+
# @param [Western::Calendar] start_date 開始日
|
44
|
+
# @param [Western::Calendar] last_date 終了日
|
45
|
+
#
|
46
|
+
# @return [Array<LinearGengou>] 該当行の元号
|
47
|
+
#
|
48
|
+
def line_by_name(line: FIRST_LINE, name:)
|
49
|
+
Alignment.get_by_name(line: line, name: name)
|
50
|
+
end
|
64
51
|
end
|
65
52
|
end
|
66
53
|
end
|
@@ -125,26 +125,28 @@ module Zakuro
|
|
125
125
|
)
|
126
126
|
].freeze
|
127
127
|
|
128
|
-
|
129
|
-
|
130
|
-
|
131
|
-
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
|
136
|
-
|
137
|
-
|
128
|
+
class << self
|
129
|
+
#
|
130
|
+
# 年を基準に暦を引き当てる
|
131
|
+
#
|
132
|
+
# @param [Integer] start_year 開始西暦年
|
133
|
+
# @param [Integer] last_year 終了西暦年
|
134
|
+
#
|
135
|
+
# @return [Array<Range>] 和暦
|
136
|
+
#
|
137
|
+
def ranges_with_year(start_year:, last_year:)
|
138
|
+
result = []
|
138
139
|
|
139
|
-
|
140
|
-
|
140
|
+
LIST.each do |range|
|
141
|
+
next if start_year > range.last_year
|
141
142
|
|
142
|
-
|
143
|
+
next if last_year < range.start_year
|
143
144
|
|
144
|
-
|
145
|
-
|
145
|
+
result.push(range)
|
146
|
+
end
|
146
147
|
|
147
|
-
|
148
|
+
result
|
149
|
+
end
|
148
150
|
end
|
149
151
|
end
|
150
152
|
end
|
@@ -58,26 +58,28 @@ module Zakuro
|
|
58
58
|
Type::DEFAULT => Date::ITALY
|
59
59
|
}.freeze
|
60
60
|
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
61
|
+
class << self
|
62
|
+
#
|
63
|
+
# 日付種別からRuby標準のグレゴリオ暦開始日を引き当てる
|
64
|
+
#
|
65
|
+
# @param [Symbol] type 日付種別
|
66
|
+
#
|
67
|
+
# @return [Integer] Ruby標準のグレゴリオ暦開始日
|
68
|
+
#
|
69
|
+
def to_native_start(type:)
|
70
|
+
DATE_START.fetch(type, DATE_START[Type::DEFAULT])
|
71
|
+
end
|
71
72
|
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
|
73
|
+
#
|
74
|
+
# Ruby標準のグレゴリオ暦開始日から日付種別を引き当てる
|
75
|
+
#
|
76
|
+
# @param [Integer] start Ruby標準のグレゴリオ暦開始日
|
77
|
+
#
|
78
|
+
# @return [Symbol] 日付種別
|
79
|
+
#
|
80
|
+
def to_type(start:)
|
81
|
+
DATE_START.invert.fetch(start, Type::DEFAULT)
|
82
|
+
end
|
81
83
|
end
|
82
84
|
|
83
85
|
#
|
@@ -131,8 +133,16 @@ module Zakuro
|
|
131
133
|
# 定数 DATE_START のバリエーションで日付オブジェクトを初期化するだけで良い
|
132
134
|
#
|
133
135
|
class Calendar # rubocop:disable Metrics/ClassLength
|
134
|
-
|
136
|
+
# @return [Parameter] 初期化引数
|
137
|
+
attr_reader :param
|
138
|
+
# @return [Date] 日付(Ruby日付型)
|
139
|
+
attr_reader :date
|
135
140
|
|
141
|
+
#
|
142
|
+
# 検証する
|
143
|
+
#
|
144
|
+
# @return [Array<String>] エラー文字列
|
145
|
+
#
|
136
146
|
def validate
|
137
147
|
failed = valid_type
|
138
148
|
|
@@ -150,9 +160,9 @@ module Zakuro
|
|
150
160
|
#
|
151
161
|
def valid_type
|
152
162
|
failed = []
|
153
|
-
year =
|
154
|
-
month =
|
155
|
-
day =
|
163
|
+
year = param.year
|
164
|
+
month = param.month
|
165
|
+
day = param.day
|
156
166
|
failed.push("wrong type. year: #{year}") unless year.is_a?(Integer)
|
157
167
|
failed.push("wrong type. month: #{month}") unless month.is_a?(Integer)
|
158
168
|
failed.push("wrong type. day: #{day}") unless day.is_a?(Integer)
|
@@ -169,10 +179,10 @@ module Zakuro
|
|
169
179
|
def valid_date
|
170
180
|
failed = []
|
171
181
|
|
172
|
-
year =
|
173
|
-
month =
|
174
|
-
day =
|
175
|
-
start =
|
182
|
+
year = param.year
|
183
|
+
month = param.month
|
184
|
+
day = param.day
|
185
|
+
start = param.start
|
176
186
|
unless Date.valid_date?(year, month, day, start)
|
177
187
|
failed.push("year: #{year}, month: #{month}, " \
|
178
188
|
"day: #{day}, start: #{start}")
|
@@ -188,6 +198,8 @@ module Zakuro
|
|
188
198
|
# @param [Integer] day 日
|
189
199
|
# @param [Symbol] type 日付種別
|
190
200
|
#
|
201
|
+
# @raise [ArgumentError] 引数エラー
|
202
|
+
#
|
191
203
|
def initialize(year: -4712, month: 1, day: 1, type: Type::DEFAULT)
|
192
204
|
start = Western.to_native_start(type: type)
|
193
205
|
@param = Parameter.new(year: year, month: month, day: day, start: start)
|
@@ -213,7 +225,7 @@ module Zakuro
|
|
213
225
|
#
|
214
226
|
def redate(type: Type::DEFAULT)
|
215
227
|
start = DATE_START.fetch(type, DATE_START[Type::DEFAULT])
|
216
|
-
@date =
|
228
|
+
@date = date.new_start(start)
|
217
229
|
self
|
218
230
|
end
|
219
231
|
|
@@ -225,7 +237,7 @@ module Zakuro
|
|
225
237
|
# @return [Calendar] 年月日情報(西暦)
|
226
238
|
#
|
227
239
|
def +(other)
|
228
|
-
return
|
240
|
+
return date.jd + other.date.jd if other.is_a?(Western::Calendar)
|
229
241
|
|
230
242
|
@date += other
|
231
243
|
self
|
@@ -239,7 +251,7 @@ module Zakuro
|
|
239
251
|
# @return [Calendar] 年月日情報(西暦)
|
240
252
|
#
|
241
253
|
def -(other)
|
242
|
-
return
|
254
|
+
return date.jd - other.date.jd if other.is_a?(Western::Calendar)
|
243
255
|
|
244
256
|
@date -= other
|
245
257
|
self
|
@@ -254,7 +266,7 @@ module Zakuro
|
|
254
266
|
# @return [False] 以下(現在日/過去日である)
|
255
267
|
#
|
256
268
|
def >(other)
|
257
|
-
|
269
|
+
date > other.date
|
258
270
|
end
|
259
271
|
|
260
272
|
#
|
@@ -266,7 +278,7 @@ module Zakuro
|
|
266
278
|
# @return [False] より小さい(過去日である)
|
267
279
|
#
|
268
280
|
def >=(other)
|
269
|
-
|
281
|
+
date >= other.date
|
270
282
|
end
|
271
283
|
|
272
284
|
#
|
@@ -278,7 +290,7 @@ module Zakuro
|
|
278
290
|
# @return [False] 以上(現在日/未来日である)
|
279
291
|
#
|
280
292
|
def <(other)
|
281
|
-
|
293
|
+
date < other.date
|
282
294
|
end
|
283
295
|
|
284
296
|
#
|
@@ -290,7 +302,7 @@ module Zakuro
|
|
290
302
|
# @return [False] より大きい(未来日である)
|
291
303
|
#
|
292
304
|
def <=(other)
|
293
|
-
|
305
|
+
date <= other.date
|
294
306
|
end
|
295
307
|
|
296
308
|
#
|
@@ -302,7 +314,7 @@ module Zakuro
|
|
302
314
|
# @return [False] 等しくない(過去日/未来日である)
|
303
315
|
#
|
304
316
|
def ==(other)
|
305
|
-
|
317
|
+
date == other.date
|
306
318
|
end
|
307
319
|
|
308
320
|
#
|
@@ -311,7 +323,7 @@ module Zakuro
|
|
311
323
|
# @return [Integer] 年
|
312
324
|
#
|
313
325
|
def year
|
314
|
-
|
326
|
+
date.year
|
315
327
|
end
|
316
328
|
|
317
329
|
#
|
@@ -320,7 +332,7 @@ module Zakuro
|
|
320
332
|
# @return [Integer] 月
|
321
333
|
#
|
322
334
|
def month
|
323
|
-
|
335
|
+
date.month
|
324
336
|
end
|
325
337
|
|
326
338
|
#
|
@@ -329,7 +341,7 @@ module Zakuro
|
|
329
341
|
# @return [Integer] 日
|
330
342
|
#
|
331
343
|
def day
|
332
|
-
|
344
|
+
date.day
|
333
345
|
end
|
334
346
|
|
335
347
|
#
|
@@ -340,7 +352,7 @@ module Zakuro
|
|
340
352
|
# @return [Calendar] 年月日情報(西暦)
|
341
353
|
#
|
342
354
|
def next_year(num: 1)
|
343
|
-
@date =
|
355
|
+
@date = date.next_year(num)
|
344
356
|
self
|
345
357
|
end
|
346
358
|
|
@@ -351,7 +363,7 @@ module Zakuro
|
|
351
363
|
# @return [False] 無効値以外
|
352
364
|
#
|
353
365
|
def invalid?
|
354
|
-
(
|
366
|
+
(date == Date.new)
|
355
367
|
end
|
356
368
|
|
357
369
|
#
|
@@ -362,60 +374,64 @@ module Zakuro
|
|
362
374
|
# @return [String] 年月日情報
|
363
375
|
#
|
364
376
|
def format(form: '%Y-%m-%d')
|
365
|
-
|
366
|
-
end
|
367
|
-
|
368
|
-
#
|
369
|
-
# 年月日情報(西暦)を生成する
|
370
|
-
#
|
371
|
-
# @param [Date] date Ruby標準日付
|
372
|
-
#
|
373
|
-
# @return [Calendar] 年月日情報(西暦)
|
374
|
-
#
|
375
|
-
def self.create(date: Date.new)
|
376
|
-
type = Western.to_type(start: date.start)
|
377
|
-
Calendar.new(year: date.year, month: date.month,
|
378
|
-
day: date.day, type: type)
|
377
|
+
date.strftime(form)
|
379
378
|
end
|
380
379
|
|
381
|
-
|
382
|
-
|
383
|
-
|
384
|
-
|
385
|
-
|
386
|
-
|
387
|
-
|
388
|
-
|
389
|
-
|
390
|
-
|
391
|
-
|
380
|
+
class << self
|
381
|
+
#
|
382
|
+
# 年月日情報(西暦)を生成する
|
383
|
+
#
|
384
|
+
# @param [Date] date Ruby標準日付
|
385
|
+
#
|
386
|
+
# @return [Calendar] 年月日情報(西暦)
|
387
|
+
#
|
388
|
+
def create(date: Date.new)
|
389
|
+
type = Western.to_type(start: date.start)
|
390
|
+
Calendar.new(year: date.year, month: date.month,
|
391
|
+
day: date.day, type: type)
|
392
392
|
end
|
393
393
|
|
394
|
-
|
395
|
-
|
396
|
-
|
397
|
-
|
398
|
-
|
399
|
-
|
400
|
-
|
394
|
+
#
|
395
|
+
# 年月日情報(西暦)を生成する
|
396
|
+
#
|
397
|
+
# @param [String] text 日付文字列
|
398
|
+
# @param [Symbol] type 日付種別
|
399
|
+
#
|
400
|
+
# @return [Calendar] 年月日情報(西暦)
|
401
|
+
#
|
402
|
+
# @raise [ArgumentError] 引数エラー
|
403
|
+
#
|
404
|
+
def parse(text: '', type: Type::DEFAULT)
|
405
|
+
unless valid_date_string(text: text, type: type)
|
406
|
+
raise ArgumentError, "invalid date string: #{text}"
|
407
|
+
end
|
408
|
+
|
409
|
+
start = DATE_START.fetch(type, DATE_START[Type::DEFAULT])
|
410
|
+
date = Date.parse(text, start)
|
411
|
+
|
412
|
+
Calendar.new(
|
413
|
+
year: date.year, month: date.month, day: date.day, type: type
|
414
|
+
)
|
415
|
+
end
|
401
416
|
|
402
|
-
|
403
|
-
|
404
|
-
|
405
|
-
|
406
|
-
|
407
|
-
|
408
|
-
|
409
|
-
|
410
|
-
|
411
|
-
|
412
|
-
|
413
|
-
|
414
|
-
|
415
|
-
|
416
|
-
|
417
|
+
#
|
418
|
+
# 日付文字列を検証する
|
419
|
+
#
|
420
|
+
# @param [String] text 日付文字列
|
421
|
+
# @param [Symbol] type 日付種別
|
422
|
+
#
|
423
|
+
# @return [True] 正しい
|
424
|
+
# @return [True] 正しくない
|
425
|
+
#
|
426
|
+
def valid_date_string(text: '', type: Type::DEFAULT)
|
427
|
+
start = DATE_START.fetch(type, DATE_START[Type::DEFAULT])
|
428
|
+
begin
|
429
|
+
Date.parse(text, start)
|
430
|
+
rescue ArgumentError => _e
|
431
|
+
return false
|
432
|
+
end
|
433
|
+
true
|
417
434
|
end
|
418
|
-
true
|
419
435
|
end
|
420
436
|
end
|
421
437
|
end
|
@@ -0,0 +1,71 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require_relative './template'
|
4
|
+
|
5
|
+
# :nodoc:
|
6
|
+
module Zakuro
|
7
|
+
# :nodoc:
|
8
|
+
module Exception
|
9
|
+
# :nodoc:
|
10
|
+
module Case
|
11
|
+
#
|
12
|
+
# Pattern 原因パターン
|
13
|
+
#
|
14
|
+
module Pattern
|
15
|
+
INTERNAL_ERROR = Template.new(
|
16
|
+
code: 'ERROR_0001',
|
17
|
+
message: '内部エラーです。',
|
18
|
+
length: 0
|
19
|
+
)
|
20
|
+
|
21
|
+
INVALID_DATE_TYPE = Template.new(
|
22
|
+
code: 'ERROR_0101',
|
23
|
+
message: '日付の型は文字列/日付です。指定型:%s',
|
24
|
+
length: 1
|
25
|
+
)
|
26
|
+
|
27
|
+
INVALID_RANGE_TYPE = Template.new(
|
28
|
+
code: 'ERROR_0102',
|
29
|
+
message: '範囲の型はhashです。指定型:%s',
|
30
|
+
length: 1
|
31
|
+
)
|
32
|
+
|
33
|
+
INVALID_OPTION_TYPE = Template.new(
|
34
|
+
code: 'ERROR_0103',
|
35
|
+
message: 'オプションの型はhashです。指定型:%s',
|
36
|
+
length: 1
|
37
|
+
)
|
38
|
+
|
39
|
+
INVALID_COLUMN_TYPE = Template.new(
|
40
|
+
code: 'ERROR_0104',
|
41
|
+
message: '列の型は配列です。指定型:%s',
|
42
|
+
length: 1
|
43
|
+
)
|
44
|
+
|
45
|
+
INVALID_CONDITION_TYPE = Template.new(
|
46
|
+
code: 'ERROR_0105',
|
47
|
+
message: '条件の型は配列です。指定型:%s',
|
48
|
+
length: 1
|
49
|
+
)
|
50
|
+
|
51
|
+
INVALID_DATE = Template.new(
|
52
|
+
code: 'ERROR_0201',
|
53
|
+
message: '一日検索の日付指定が誤っています。',
|
54
|
+
length: 0
|
55
|
+
)
|
56
|
+
|
57
|
+
INVALID_RANGE = Template.new(
|
58
|
+
code: 'ERROR_0202',
|
59
|
+
message: '範囲検索の日付指定が誤っています。',
|
60
|
+
length: 0
|
61
|
+
)
|
62
|
+
|
63
|
+
UNCOMMITTABLE_DATE = Template.new(
|
64
|
+
code: 'ERROR_0203',
|
65
|
+
message: '検索不可能な日付指定です。',
|
66
|
+
length: 0
|
67
|
+
)
|
68
|
+
end
|
69
|
+
end
|
70
|
+
end
|
71
|
+
end
|
@@ -0,0 +1,51 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require_relative './template'
|
4
|
+
|
5
|
+
# :nodoc:
|
6
|
+
module Zakuro
|
7
|
+
# :nodoc:
|
8
|
+
module Exception
|
9
|
+
# :nodoc:
|
10
|
+
module Case
|
11
|
+
#
|
12
|
+
# Preset プリセット
|
13
|
+
#
|
14
|
+
class Preset
|
15
|
+
# @return [Template] テンプレート
|
16
|
+
attr_reader :template
|
17
|
+
# @return [Array<Object>] メッセージ引数
|
18
|
+
attr_reader :args
|
19
|
+
|
20
|
+
#
|
21
|
+
# 初期化
|
22
|
+
#
|
23
|
+
# @param [String] args メッセージ引数
|
24
|
+
# @param [String] template テンプレート
|
25
|
+
#
|
26
|
+
def initialize(*args, template:)
|
27
|
+
@template = template
|
28
|
+
@args = args
|
29
|
+
end
|
30
|
+
|
31
|
+
#
|
32
|
+
# エラーコードを取得する
|
33
|
+
#
|
34
|
+
# @return [String] エラーコード
|
35
|
+
#
|
36
|
+
def code
|
37
|
+
template.code
|
38
|
+
end
|
39
|
+
|
40
|
+
#
|
41
|
+
# メッセージを作成する
|
42
|
+
#
|
43
|
+
# @return [String] メッセージ
|
44
|
+
#
|
45
|
+
def message
|
46
|
+
template.format(*args)
|
47
|
+
end
|
48
|
+
end
|
49
|
+
end
|
50
|
+
end
|
51
|
+
end
|
@@ -0,0 +1,48 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
# :nodoc:
|
4
|
+
module Zakuro
|
5
|
+
# :nodoc:
|
6
|
+
module Exception
|
7
|
+
# :nodoc:
|
8
|
+
module Case
|
9
|
+
#
|
10
|
+
# Template テンプレート
|
11
|
+
#
|
12
|
+
class Template
|
13
|
+
# @return [String] エラーコード
|
14
|
+
attr_reader :code
|
15
|
+
# @return [String] メッセージ
|
16
|
+
attr_reader :message
|
17
|
+
# @return [Integer] テンプレート引数長
|
18
|
+
attr_reader :length
|
19
|
+
|
20
|
+
#
|
21
|
+
# 初期化
|
22
|
+
#
|
23
|
+
# @param [String] code エラーコード
|
24
|
+
# @param [String] message メッセージ
|
25
|
+
# @param [Integer] length テンプレート引数長
|
26
|
+
#
|
27
|
+
def initialize(code:, message:, length: 0)
|
28
|
+
@code = code
|
29
|
+
@message = message
|
30
|
+
@length = length
|
31
|
+
end
|
32
|
+
|
33
|
+
#
|
34
|
+
# メッセージを作成する
|
35
|
+
#
|
36
|
+
# @param [Array<Object>] args テンプレート引数長
|
37
|
+
#
|
38
|
+
# @return [String] メッセージ
|
39
|
+
#
|
40
|
+
def format(*args)
|
41
|
+
return '' unless args.size == length
|
42
|
+
|
43
|
+
super(message, *args)
|
44
|
+
end
|
45
|
+
end
|
46
|
+
end
|
47
|
+
end
|
48
|
+
end
|
@@ -0,0 +1,28 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
# :nodoc:
|
4
|
+
module Zakuro
|
5
|
+
# :nodoc:
|
6
|
+
module Exception
|
7
|
+
#
|
8
|
+
# Cause 原因
|
9
|
+
#
|
10
|
+
class Cause
|
11
|
+
# @return [String] エラーコード
|
12
|
+
attr_reader :code
|
13
|
+
# @return [String] メッセージ
|
14
|
+
attr_reader :message
|
15
|
+
|
16
|
+
#
|
17
|
+
# 初期化
|
18
|
+
#
|
19
|
+
# @param [String] code エラーコード
|
20
|
+
# @param [String] message メッセージ
|
21
|
+
#
|
22
|
+
def initialize(code:, message:)
|
23
|
+
@code = code
|
24
|
+
@message = message
|
25
|
+
end
|
26
|
+
end
|
27
|
+
end
|
28
|
+
end
|
@@ -0,0 +1,39 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require_relative '../output/logger'
|
4
|
+
|
5
|
+
require_relative './case/preset'
|
6
|
+
require_relative './case/pattern'
|
7
|
+
|
8
|
+
require_relative './zakuro_error'
|
9
|
+
require_relative './cause'
|
10
|
+
|
11
|
+
# :nodoc:
|
12
|
+
module Zakuro
|
13
|
+
# :nodoc:
|
14
|
+
module Exception
|
15
|
+
# @return [Output::Logger] ロガー
|
16
|
+
LOGGER = Output::Logger.new(location: 'exception')
|
17
|
+
|
18
|
+
# @return [String] 共通メッセージ
|
19
|
+
MESSAGE = 'an error has occurred'
|
20
|
+
|
21
|
+
class << self
|
22
|
+
#
|
23
|
+
# 例外を取得する
|
24
|
+
#
|
25
|
+
# @param [Array<Case::Preset>] presets 原因プリセット
|
26
|
+
#
|
27
|
+
# @return [ZakuroError] ライブラリエラー
|
28
|
+
#
|
29
|
+
def get(presets: [])
|
30
|
+
causes = []
|
31
|
+
presets.each do |preset|
|
32
|
+
causes.push(Cause.new(code: preset.code, message: preset.message))
|
33
|
+
end
|
34
|
+
|
35
|
+
ZakuroError.new(msg: MESSAGE, causes: causes)
|
36
|
+
end
|
37
|
+
end
|
38
|
+
end
|
39
|
+
end
|