zakuro 0.9.3 → 1.0.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile +2 -2
- data/README.md +41 -8
- data/VERSION +1 -1
- data/doc/gengou.md +1 -1
- data/doc/operation/csv/month.csv +8 -9
- data/doc/operation/operation.xlsx +0 -0
- data/images/logo-text.png +0 -0
- data/lib/zakuro/calculation/base/gengou.rb +2 -4
- data/lib/zakuro/calculation/base/year.rb +1 -1
- data/lib/zakuro/calculation/cycle/abstract_solar_term.rb +6 -0
- data/lib/zakuro/calculation/era/gengou/abstract_scroll.rb +2 -2
- data/lib/zakuro/calculation/era/gengou/dated_scroll.rb +4 -2
- data/lib/zakuro/calculation/era/gengou/internal/publisher.rb +1 -1
- data/lib/zakuro/calculation/era/gengou/internal/reserve/abstract_list.rb +13 -7
- data/lib/zakuro/calculation/era/gengou/internal/reserve/abstract_range.rb +18 -9
- data/lib/zakuro/calculation/era/gengou/internal/reserve/dated_list.rb +6 -2
- data/lib/zakuro/calculation/era/gengou/internal/reserve/dated_range.rb +5 -2
- data/lib/zakuro/calculation/era/gengou/internal/reserve/empty_link.rb +3 -3
- data/lib/zakuro/calculation/era/gengou/internal/reserve/named_list.rb +12 -4
- data/lib/zakuro/calculation/era/gengou/internal/reserve/named_range.rb +10 -4
- data/lib/zakuro/calculation/era/gengou/named_scroll.rb +5 -2
- data/lib/zakuro/calculation/era/version/internal/crawler.rb +3 -3
- data/lib/zakuro/calculation/monthly/abstract_lunar_phase.rb +1 -1
- data/lib/zakuro/calculation/monthly/internal/date_comparer.rb +78 -0
- data/lib/zakuro/calculation/monthly/{meta → internal/meta}/all_solar_term.rb +1 -1
- data/lib/zakuro/calculation/monthly/{meta → internal/meta}/meta_collector.rb +2 -2
- data/lib/zakuro/calculation/monthly/{first_day.rb → internal/part/first_day.rb} +2 -2
- data/lib/zakuro/calculation/monthly/{meta.rb → internal/part/meta.rb} +1 -1
- data/lib/zakuro/calculation/monthly/internal/solar_term_selector.rb +203 -0
- data/lib/zakuro/calculation/monthly/month.rb +38 -74
- data/lib/zakuro/calculation/monthly/operated_month.rb +7 -2
- data/lib/zakuro/calculation/option/dropped_date/location.rb +8 -1
- data/lib/zakuro/calculation/range/dated_full_range.rb +6 -3
- data/lib/zakuro/calculation/range/dated_operation_range.rb +2 -1
- data/lib/zakuro/calculation/range/medieval_annual_range.rb +0 -2
- data/lib/zakuro/calculation/range/named_full_range.rb +1 -1
- data/lib/zakuro/calculation/range/transfer/gengou_scroller.rb +24 -10
- data/lib/zakuro/calculation/stella/solar/abstract_average.rb +3 -3
- data/lib/zakuro/calculation/summary/internal/option/dropped_date.rb +102 -0
- data/lib/zakuro/calculation/summary/internal/option/vanished_date.rb +111 -0
- data/lib/zakuro/calculation/summary/internal/option.rb +4 -137
- data/lib/zakuro/calculation/summary/japan/range.rb +4 -5
- data/lib/zakuro/calculation/summary/western/range.rb +8 -1
- data/lib/zakuro/calculation/summary/western/single.rb +10 -5
- data/lib/zakuro/context/version_class_resolver.rb +5 -5
- data/lib/zakuro/era/japan/calendar.rb +4 -4
- data/lib/zakuro/era/japan/gengou/alignment/division.rb +2 -2
- data/lib/zakuro/era/japan/gengou/alignment/linear_gengou.rb +2 -2
- data/lib/zakuro/era/japan/gengou/alignment.rb +35 -6
- data/lib/zakuro/era/japan/gengou/resource/parser.rb +17 -16
- data/lib/zakuro/era/japan/gengou/resource/validator.rb +3 -394
- data/lib/zakuro/era/japan/gengou/resource/yaml/set-001-until-south.yaml +2 -2
- data/lib/zakuro/era/japan/gengou.rb +8 -6
- data/lib/zakuro/era/japan/type/base/both/date.rb +51 -0
- data/lib/zakuro/era/japan/type/base/both/year.rb +53 -0
- data/lib/zakuro/era/japan/type/base/gengou.rb +177 -0
- data/lib/zakuro/era/japan/type/base/gengou_set.rb +78 -0
- data/lib/zakuro/era/japan/type/base/switch_date.rb +74 -0
- data/lib/zakuro/era/japan/type/base/version_range.rb +189 -0
- data/lib/zakuro/era/japan/type/validation/both/date.rb +99 -0
- data/lib/zakuro/era/japan/type/validation/both/year.rb +75 -0
- data/lib/zakuro/era/japan/type/validation/gengou.rb +93 -0
- data/lib/zakuro/era/japan/type/validation/gengou_set.rb +133 -0
- data/lib/zakuro/era/japan/type/validation/switch_date.rb +73 -0
- data/lib/zakuro/era/japan/type/validation/version_range.rb +109 -0
- data/lib/zakuro/era/japan/type/validation/version_root.rb +102 -0
- data/lib/zakuro/era/japan/version/resource/parser.rb +266 -0
- data/lib/zakuro/era/japan/version/resource/validator.rb +37 -0
- data/lib/zakuro/era/japan/version/resource/yaml/version.yaml +80 -0
- data/lib/zakuro/era/japan/version/resource.rb +22 -0
- data/lib/zakuro/era/japan/version.rb +4 -115
- data/lib/zakuro/era/western/calendar.rb +2 -2
- data/lib/zakuro/exception/zakuro_error.rb +1 -1
- data/lib/zakuro/merchant.rb +5 -5
- data/lib/zakuro/operation/month/parser.rb +2 -2
- data/lib/zakuro/operation/yaml/month.yaml +8 -40
- data/lib/zakuro/output/logger.rb +4 -4
- data/lib/zakuro/parameter/catalog/basis_date.rb +55 -0
- data/lib/zakuro/parameter/catalog/column.rb +57 -0
- data/lib/zakuro/parameter/catalog/option.rb +60 -0
- data/lib/zakuro/parameter/catalog/range.rb +81 -0
- data/lib/zakuro/parameter/condition.rb +108 -0
- data/lib/zakuro/result/core.rb +2 -2
- data/lib/zakuro/{tools → tool}/remainder_comparer.rb +3 -2
- data/lib/zakuro/{tools → tool}/stringifier.rb +3 -3
- data/lib/zakuro/{tools → tool}/typeconv.rb +2 -2
- data/lib/zakuro/{tools → tool}/typeof.rb +2 -2
- data/lib/zakuro/version/daien/const/number.rb +42 -39
- data/lib/zakuro/version/daien/const/remainder.rb +38 -35
- data/lib/zakuro/version/daien/cycle/remainder.rb +77 -74
- data/lib/zakuro/version/daien/cycle/solar_term.rb +18 -15
- data/lib/zakuro/version/daien/daien.rb +8 -5
- data/lib/zakuro/version/daien/monthly/lunar_phase.rb +67 -64
- data/lib/zakuro/version/daien/option/dropped_date/parameter.rb +15 -12
- data/lib/zakuro/version/daien/option/vanished_date/parameter.rb +15 -12
- data/lib/zakuro/version/daien/range/annual_range.rb +27 -24
- data/lib/zakuro/version/daien/stella/lunar/adjustment.rb +209 -206
- data/lib/zakuro/version/daien/stella/lunar/localization.rb +32 -29
- data/lib/zakuro/version/daien/stella/lunar/location.rb +53 -50
- data/lib/zakuro/version/daien/stella/lunar/value.rb +65 -62
- data/lib/zakuro/version/daien/stella/origin/average_november.rb +23 -20
- data/lib/zakuro/version/daien/stella/origin/lunar_age.rb +42 -39
- data/lib/zakuro/version/daien/stella/origin/winter_solstice.rb +44 -41
- data/lib/zakuro/version/daien/stella/solar/adjustment.rb +74 -71
- data/lib/zakuro/version/daien/stella/solar/average.rb +68 -65
- data/lib/zakuro/version/daien/stella/solar/interval.rb +95 -92
- data/lib/zakuro/version/daien/stella/solar/location.rb +41 -38
- data/lib/zakuro/version/daien/stella/solar/value.rb +21 -18
- data/lib/zakuro/version/genka/const/number.rb +31 -28
- data/lib/zakuro/version/genka/const/remainder.rb +20 -17
- data/lib/zakuro/version/genka/cycle/remainder.rb +72 -69
- data/lib/zakuro/version/genka/cycle/solar_term.rb +18 -15
- data/lib/zakuro/version/genka/genka.rb +8 -5
- data/lib/zakuro/version/genka/monthly/lunar_phase.rb +82 -79
- data/lib/zakuro/version/genka/option/dropped_date/parameter.rb +13 -10
- data/lib/zakuro/version/genka/option/vanished_date/parameter.rb +13 -10
- data/lib/zakuro/version/genka/range/annual_range.rb +57 -54
- data/lib/zakuro/version/genka/stella/origin/first_term.rb +44 -41
- data/lib/zakuro/version/genka/stella/origin/january.rb +38 -35
- data/lib/zakuro/version/genka/stella/solar/average.rb +24 -21
- data/lib/zakuro/version/gihou/const/number.rb +40 -37
- data/lib/zakuro/version/gihou/const/remainder.rb +32 -29
- data/lib/zakuro/version/gihou/cycle/remainder.rb +38 -35
- data/lib/zakuro/version/gihou/cycle/solar_term.rb +18 -15
- data/lib/zakuro/version/gihou/gihou.rb +8 -5
- data/lib/zakuro/version/gihou/monthly/lunar_phase.rb +68 -65
- data/lib/zakuro/version/gihou/option/dropped_date/parameter.rb +13 -10
- data/lib/zakuro/version/gihou/option/vanished_date/parameter.rb +13 -10
- data/lib/zakuro/version/gihou/range/annual_range.rb +27 -24
- data/lib/zakuro/version/gihou/stella/lunar/adjustment.rb +212 -209
- data/lib/zakuro/version/gihou/stella/lunar/localization.rb +32 -29
- data/lib/zakuro/version/gihou/stella/lunar/location.rb +53 -50
- data/lib/zakuro/version/gihou/stella/lunar/value.rb +65 -62
- data/lib/zakuro/version/gihou/stella/origin/average_november.rb +23 -20
- data/lib/zakuro/version/gihou/stella/origin/lunar_age.rb +42 -39
- data/lib/zakuro/version/gihou/stella/origin/winter_solstice.rb +44 -41
- data/lib/zakuro/version/gihou/stella/solar/adjustment.rb +74 -71
- data/lib/zakuro/version/gihou/stella/solar/average.rb +67 -64
- data/lib/zakuro/version/gihou/stella/solar/interval.rb +95 -92
- data/lib/zakuro/version/gihou/stella/solar/location.rb +41 -38
- data/lib/zakuro/version/gihou/stella/solar/value.rb +21 -18
- data/lib/zakuro/version/gregorio/gregorio.rb +8 -5
- data/lib/zakuro/version/houryaku/houryaku.rb +8 -5
- data/lib/zakuro/version/joukyou/joukyou.rb +8 -5
- data/lib/zakuro/version/kansei/kansei.rb +8 -5
- data/lib/zakuro/version/senmyou/const/number.rb +40 -37
- data/lib/zakuro/version/senmyou/const/remainder.rb +35 -32
- data/lib/zakuro/version/senmyou/cycle/remainder.rb +74 -71
- data/lib/zakuro/version/senmyou/cycle/solar_term.rb +18 -15
- data/lib/zakuro/version/senmyou/monthly/lunar_phase.rb +69 -66
- data/lib/zakuro/version/senmyou/option/dropped_date/parameter.rb +15 -12
- data/lib/zakuro/version/senmyou/option/vanished_date/parameter.rb +15 -12
- data/lib/zakuro/version/senmyou/range/annual_range.rb +27 -24
- data/lib/zakuro/version/senmyou/senmyou.rb +8 -5
- data/lib/zakuro/version/senmyou/stella/lunar/adjustment.rb +206 -203
- data/lib/zakuro/version/senmyou/stella/lunar/localization.rb +32 -29
- data/lib/zakuro/version/senmyou/stella/lunar/location.rb +60 -57
- data/lib/zakuro/version/senmyou/stella/lunar/value.rb +66 -63
- data/lib/zakuro/version/senmyou/stella/origin/average_november.rb +23 -20
- data/lib/zakuro/version/senmyou/stella/origin/lunar_age.rb +42 -39
- data/lib/zakuro/version/senmyou/stella/origin/winter_solstice.rb +44 -41
- data/lib/zakuro/version/senmyou/stella/solar/adjustment.rb +74 -71
- data/lib/zakuro/version/senmyou/stella/solar/average.rb +67 -64
- data/lib/zakuro/version/senmyou/stella/solar/interval.rb +93 -90
- data/lib/zakuro/version/senmyou/stella/solar/location.rb +41 -38
- data/lib/zakuro/version/senmyou/stella/solar/value.rb +23 -20
- data/lib/zakuro/version/tenpou/tenpou.rb +8 -5
- metadata +40 -15
- data/lib/zakuro/condition.rb +0 -306
- data/lib/zakuro/era/japan/gengou/resource/type.rb +0 -356
- /data/lib/zakuro/calculation/monthly/{operated_solar_term.rb → internal/operated_solar_term.rb} +0 -0
- /data/lib/zakuro/calculation/monthly/{const.rb → internal/part/const.rb} +0 -0
- /data/lib/zakuro/calculation/monthly/{month_label.rb → internal/part/month_label.rb} +0 -0
@@ -6405,7 +6405,7 @@
|
|
6405
6405
|
page: '140'
|
6406
6406
|
number: "-"
|
6407
6407
|
japan_date: 天長 2年 12 大 己亥 35-1289
|
6408
|
-
western_date:
|
6408
|
+
western_date: 826-1-12
|
6409
6409
|
description: "-"
|
6410
6410
|
note: "-"
|
6411
6411
|
modified: 'true'
|
@@ -7655,7 +7655,7 @@
|
|
7655
7655
|
page: '147'
|
7656
7656
|
number: "-"
|
7657
7657
|
japan_date: 承和 12年 9 大 乙巳 41-1264
|
7658
|
-
western_date:
|
7658
|
+
western_date: 845-10-5
|
7659
7659
|
description: "-"
|
7660
7660
|
note: "-"
|
7661
7661
|
modified: 'true'
|
@@ -11294,7 +11294,7 @@
|
|
11294
11294
|
zodiac_name: "-"
|
11295
11295
|
dest:
|
11296
11296
|
index: '0'
|
11297
|
-
from: '1050-
|
11297
|
+
from: '1050-11-17'
|
11298
11298
|
zodiac_name: "-"
|
11299
11299
|
days: "-"
|
11300
11300
|
days: "-1"
|
@@ -11607,7 +11607,7 @@
|
|
11607
11607
|
src: "-"
|
11608
11608
|
dest: "-"
|
11609
11609
|
days:
|
11610
|
-
src:
|
11610
|
+
src: 小
|
11611
11611
|
dest: 大
|
11612
11612
|
solar_term:
|
11613
11613
|
src:
|
@@ -11736,7 +11736,7 @@
|
|
11736
11736
|
src: 'true'
|
11737
11737
|
dest: 'false'
|
11738
11738
|
days:
|
11739
|
-
src:
|
11739
|
+
src: 小
|
11740
11740
|
dest: 大
|
11741
11741
|
solar_term:
|
11742
11742
|
src:
|
@@ -12493,7 +12493,7 @@
|
|
12493
12493
|
page: '275'
|
12494
12494
|
number: "-"
|
12495
12495
|
japan_date: 安貞 1年 12 小 丙午 42-2281
|
12496
|
-
western_date: '1228-1-
|
12496
|
+
western_date: '1228-1-9'
|
12497
12497
|
description: "-"
|
12498
12498
|
note: "-"
|
12499
12499
|
modified: 'true'
|
@@ -13837,38 +13837,6 @@
|
|
13837
13837
|
zodiac_name: "-"
|
13838
13838
|
days: "-"
|
13839
13839
|
days: "-1"
|
13840
|
-
- id: 318-1-a
|
13841
|
-
relation_id: "-"
|
13842
|
-
parent_id: 318-1-1
|
13843
|
-
page: '318'
|
13844
|
-
number: "-"
|
13845
|
-
japan_date: 正平 12年 7 小 甲戌 10-1300
|
13846
|
-
western_date: '1357-7-18'
|
13847
|
-
description: "-"
|
13848
|
-
note: "-"
|
13849
|
-
modified: 'true'
|
13850
|
-
diffs:
|
13851
|
-
month:
|
13852
|
-
number:
|
13853
|
-
src: "-"
|
13854
|
-
dest: "-"
|
13855
|
-
leaped:
|
13856
|
-
src: "-"
|
13857
|
-
dest: "-"
|
13858
|
-
days:
|
13859
|
-
src: 大
|
13860
|
-
dest: 小
|
13861
|
-
solar_term:
|
13862
|
-
src:
|
13863
|
-
index: "-"
|
13864
|
-
to: "-"
|
13865
|
-
zodiac_name: "-"
|
13866
|
-
dest:
|
13867
|
-
index: "-"
|
13868
|
-
from: "-"
|
13869
|
-
zodiac_name: "-"
|
13870
|
-
days: "-"
|
13871
|
-
days: "-"
|
13872
13840
|
- id: 318-1-0
|
13873
13841
|
relation_id: 318-1-1
|
13874
13842
|
parent_id: "-"
|
@@ -13888,7 +13856,7 @@
|
|
13888
13856
|
src: 'false'
|
13889
13857
|
dest: 'true'
|
13890
13858
|
days:
|
13891
|
-
src:
|
13859
|
+
src: 大
|
13892
13860
|
dest: 小
|
13893
13861
|
solar_term:
|
13894
13862
|
src:
|
@@ -13920,7 +13888,7 @@
|
|
13920
13888
|
src: 'true'
|
13921
13889
|
dest: 'false'
|
13922
13890
|
days:
|
13923
|
-
src:
|
13891
|
+
src: 小
|
13924
13892
|
dest: 大
|
13925
13893
|
solar_term:
|
13926
13894
|
src:
|
data/lib/zakuro/output/logger.rb
CHANGED
@@ -36,7 +36,7 @@ module Zakuro
|
|
36
36
|
def debug(*messages)
|
37
37
|
return if none?
|
38
38
|
|
39
|
-
return if
|
39
|
+
return if LEVELS[:debug] < LEVEL
|
40
40
|
|
41
41
|
output('DEBUG', *messages)
|
42
42
|
end
|
@@ -49,7 +49,7 @@ module Zakuro
|
|
49
49
|
def info(*messages)
|
50
50
|
return if none?
|
51
51
|
|
52
|
-
return if
|
52
|
+
return if LEVELS[:info] < LEVEL
|
53
53
|
|
54
54
|
output('INFO', *messages)
|
55
55
|
end
|
@@ -63,7 +63,7 @@ module Zakuro
|
|
63
63
|
def error(error, *messages)
|
64
64
|
return if none?
|
65
65
|
|
66
|
-
return if
|
66
|
+
return if LEVELS[:error] < LEVEL
|
67
67
|
|
68
68
|
output('ERROR', *messages)
|
69
69
|
output('ERROR', error.message)
|
@@ -79,7 +79,7 @@ module Zakuro
|
|
79
79
|
# @return [False] 出力あり
|
80
80
|
#
|
81
81
|
def none?
|
82
|
-
|
82
|
+
LEVELS[:debug] >= LEVEL
|
83
83
|
end
|
84
84
|
|
85
85
|
#
|
@@ -0,0 +1,55 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require_relative '../../exception/exception'
|
4
|
+
|
5
|
+
require 'date'
|
6
|
+
|
7
|
+
# :nodoc:
|
8
|
+
module Zakuro
|
9
|
+
# :nodoc:
|
10
|
+
module Parameter
|
11
|
+
# :nodoc:
|
12
|
+
module Catalog
|
13
|
+
#
|
14
|
+
# BasisDate 基準日
|
15
|
+
#
|
16
|
+
class BasisDate
|
17
|
+
# @return [Date] 西暦日
|
18
|
+
attr_reader :date
|
19
|
+
|
20
|
+
#
|
21
|
+
# 初期化
|
22
|
+
#
|
23
|
+
# @param [Date, String] date 西暦日/和暦日
|
24
|
+
#
|
25
|
+
def initialize(date:)
|
26
|
+
@date = date
|
27
|
+
end
|
28
|
+
|
29
|
+
class << self
|
30
|
+
#
|
31
|
+
# 検証する
|
32
|
+
#
|
33
|
+
# @param [Date] date 日付
|
34
|
+
#
|
35
|
+
# @return [Array<Exception::Case::Preset>] エラープリセット配列
|
36
|
+
#
|
37
|
+
def validate(date:)
|
38
|
+
failed = []
|
39
|
+
return failed unless date
|
40
|
+
|
41
|
+
return failed if date.is_a?(Date) || date.is_a?(String)
|
42
|
+
|
43
|
+
failed.push(
|
44
|
+
Exception::Case::Preset.new(
|
45
|
+
date.class,
|
46
|
+
template: Exception::Case::Pattern::INVALID_DATE_TYPE
|
47
|
+
)
|
48
|
+
)
|
49
|
+
failed
|
50
|
+
end
|
51
|
+
end
|
52
|
+
end
|
53
|
+
end
|
54
|
+
end
|
55
|
+
end
|
@@ -0,0 +1,57 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require_relative '../../exception/exception'
|
4
|
+
|
5
|
+
# :nodoc:
|
6
|
+
module Zakuro
|
7
|
+
# :nodoc:
|
8
|
+
module Parameter
|
9
|
+
# :nodoc:
|
10
|
+
module Catalog
|
11
|
+
#
|
12
|
+
# Column 特定の列(フィールド)
|
13
|
+
# @note 指定された列のみ出力する
|
14
|
+
#
|
15
|
+
class Column
|
16
|
+
# @return [Array<String>] 列
|
17
|
+
attr_reader :columns
|
18
|
+
|
19
|
+
#
|
20
|
+
# 初期化
|
21
|
+
#
|
22
|
+
# @param [Array<String>] columns 列
|
23
|
+
#
|
24
|
+
def initialize(columns: [])
|
25
|
+
@columns = columns
|
26
|
+
end
|
27
|
+
|
28
|
+
class << self
|
29
|
+
#
|
30
|
+
# 検証する
|
31
|
+
#
|
32
|
+
# @param [Array<String>] columns 列
|
33
|
+
#
|
34
|
+
# @return [Array<Exception::Case::Preset>] エラープリセット配列
|
35
|
+
#
|
36
|
+
def validate(columns:)
|
37
|
+
# TODO: 列内容のバリデーション
|
38
|
+
failed = []
|
39
|
+
|
40
|
+
return failed unless columns
|
41
|
+
|
42
|
+
return failed if columns.is_a?(Array)
|
43
|
+
|
44
|
+
failed.push(
|
45
|
+
Exception::Case::Preset.new(
|
46
|
+
hash.class,
|
47
|
+
template: Exception::Case::Pattern::INVALID_COLUMN_TYPE
|
48
|
+
)
|
49
|
+
)
|
50
|
+
|
51
|
+
failed
|
52
|
+
end
|
53
|
+
end
|
54
|
+
end
|
55
|
+
end
|
56
|
+
end
|
57
|
+
end
|
@@ -0,0 +1,60 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require_relative '../../exception/exception'
|
4
|
+
|
5
|
+
# :nodoc:
|
6
|
+
module Zakuro
|
7
|
+
# :nodoc:
|
8
|
+
module Parameter
|
9
|
+
# :nodoc:
|
10
|
+
module Catalog
|
11
|
+
#
|
12
|
+
# Option オプション
|
13
|
+
# 取得内容を変更する
|
14
|
+
#
|
15
|
+
# * version: 暦
|
16
|
+
# * dropped_days: 没日あり
|
17
|
+
# * seasons: 四季あり
|
18
|
+
#
|
19
|
+
class Option
|
20
|
+
# @return [Array<String>] オプション
|
21
|
+
attr_reader :options
|
22
|
+
|
23
|
+
#
|
24
|
+
# 初期化
|
25
|
+
#
|
26
|
+
# @param [Hash<Symbol, Object>] options オプション
|
27
|
+
#
|
28
|
+
def initialize(options: [])
|
29
|
+
@options = options
|
30
|
+
end
|
31
|
+
|
32
|
+
# TODO: オプションキーのバリデーション
|
33
|
+
|
34
|
+
class << self
|
35
|
+
#
|
36
|
+
# 検証する
|
37
|
+
#
|
38
|
+
# @param [Hash<Symbol, Object>] options オプション
|
39
|
+
#
|
40
|
+
# @return [Array<Exception::Case::Preset>] エラープリセット配列
|
41
|
+
#
|
42
|
+
def validate(options:)
|
43
|
+
failed = []
|
44
|
+
return failed unless options
|
45
|
+
|
46
|
+
return failed if options.is_a?(Hash)
|
47
|
+
|
48
|
+
failed.push(
|
49
|
+
Exception::Case::Preset.new(
|
50
|
+
hash.class,
|
51
|
+
template: Exception::Case::Pattern::INVALID_OPTION_TYPE
|
52
|
+
)
|
53
|
+
)
|
54
|
+
failed
|
55
|
+
end
|
56
|
+
end
|
57
|
+
end
|
58
|
+
end
|
59
|
+
end
|
60
|
+
end
|
@@ -0,0 +1,81 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require_relative '../../exception/exception'
|
4
|
+
|
5
|
+
require_relative './basis_date'
|
6
|
+
|
7
|
+
# :nodoc:
|
8
|
+
module Zakuro
|
9
|
+
# :nodoc:
|
10
|
+
module Parameter
|
11
|
+
# :nodoc:
|
12
|
+
module Catalog
|
13
|
+
#
|
14
|
+
# Range 範囲(開始日-終了日)
|
15
|
+
#
|
16
|
+
class Range
|
17
|
+
# @return [Date] 開始日
|
18
|
+
attr_reader :start
|
19
|
+
# @return [Date] 終了日
|
20
|
+
attr_reader :last
|
21
|
+
|
22
|
+
#
|
23
|
+
# 初期化
|
24
|
+
#
|
25
|
+
# @param [Hash<Symbol, Object>] hash パラメータ
|
26
|
+
# @option hash [Symbol] :start 開始日
|
27
|
+
# @option hash [Symbol] :start 終了日
|
28
|
+
#
|
29
|
+
def initialize(hash: {})
|
30
|
+
@start = hash[:start]
|
31
|
+
@last = hash[:last]
|
32
|
+
end
|
33
|
+
|
34
|
+
# :reek:TooManyStatements { max_statements: 7 }
|
35
|
+
|
36
|
+
class << self
|
37
|
+
#
|
38
|
+
# 検証する
|
39
|
+
#
|
40
|
+
# @param [Hash<Symbol, Object>] hash パラメータ
|
41
|
+
#
|
42
|
+
# @return [Array<Exception::Case::Preset>] エラープリセット
|
43
|
+
#
|
44
|
+
def validate(hash:)
|
45
|
+
failed = []
|
46
|
+
return failed unless hash
|
47
|
+
|
48
|
+
unless hash.is_a?(Hash)
|
49
|
+
failed.push(
|
50
|
+
Exception::Case::Preset.new(
|
51
|
+
hash.class,
|
52
|
+
template: Exception::Case::Pattern::INVALID_RANGE_TYPE
|
53
|
+
)
|
54
|
+
)
|
55
|
+
return failed
|
56
|
+
end
|
57
|
+
|
58
|
+
failed.concat(BasisDate.validate(date: hash[:start]))
|
59
|
+
failed.concat(BasisDate.validate(date: hash[:last]))
|
60
|
+
|
61
|
+
failed
|
62
|
+
end
|
63
|
+
end
|
64
|
+
|
65
|
+
#
|
66
|
+
# 不正か
|
67
|
+
#
|
68
|
+
# @return [True] 不正
|
69
|
+
# @return [False] 不正なし
|
70
|
+
#
|
71
|
+
def invalid?
|
72
|
+
return true unless @start
|
73
|
+
|
74
|
+
return true unless @end
|
75
|
+
|
76
|
+
false
|
77
|
+
end
|
78
|
+
end
|
79
|
+
end
|
80
|
+
end
|
81
|
+
end
|
@@ -0,0 +1,108 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require_relative '../exception/exception'
|
4
|
+
|
5
|
+
require_relative './catalog/basis_date'
|
6
|
+
require_relative './catalog/column'
|
7
|
+
require_relative './catalog/option'
|
8
|
+
require_relative './catalog/range'
|
9
|
+
|
10
|
+
# :nodoc:
|
11
|
+
module Zakuro
|
12
|
+
# :nodoc:
|
13
|
+
module Parameter
|
14
|
+
#
|
15
|
+
# Condition 条件
|
16
|
+
#
|
17
|
+
class Condition
|
18
|
+
# @return [Date] 基準日
|
19
|
+
attr_reader :date
|
20
|
+
# @return [Hash<Symbol, Date>] 範囲
|
21
|
+
attr_reader :range
|
22
|
+
# @return [Array<String>] 列
|
23
|
+
attr_reader :columns
|
24
|
+
# @return [Hash<String, Object>] オプション
|
25
|
+
attr_reader :options
|
26
|
+
|
27
|
+
#
|
28
|
+
# 初期化
|
29
|
+
#
|
30
|
+
# @param [Hash<Symbol, Object>] hash パラメータ
|
31
|
+
# @option hash [Date] :date 基準日
|
32
|
+
# @option hash [Hash<Symbol, Date>] :range 範囲
|
33
|
+
# @option hash [Array<String>] :columns 列
|
34
|
+
# @option hash [Hash<String, Object>] :options オプション
|
35
|
+
#
|
36
|
+
def initialize(hash: {})
|
37
|
+
@date = hash[:date]
|
38
|
+
@range = hash[:range]
|
39
|
+
@columns = hash[:columns]
|
40
|
+
@options = hash[:options] || {}
|
41
|
+
end
|
42
|
+
|
43
|
+
#
|
44
|
+
# 上書きする
|
45
|
+
#
|
46
|
+
# @param [Hash<Symbol, Object>] hash パラメータ
|
47
|
+
#
|
48
|
+
def rewrite(hash: {})
|
49
|
+
instance_variables.each do |var|
|
50
|
+
key = var.to_s.delete('@')
|
51
|
+
val = hash[key.intern]
|
52
|
+
|
53
|
+
next unless val
|
54
|
+
|
55
|
+
instance_variable_set(var, val)
|
56
|
+
end
|
57
|
+
end
|
58
|
+
|
59
|
+
# :reek:TooManyStatements { max_statements: 8 }
|
60
|
+
|
61
|
+
class << self
|
62
|
+
#
|
63
|
+
# 検証する
|
64
|
+
#
|
65
|
+
# @param [Hash<Symbol, Object>] hash パラメータ
|
66
|
+
#
|
67
|
+
# @return [Array<Exception::Case::Preset>] エラープリセット配列
|
68
|
+
#
|
69
|
+
def validate(hash:)
|
70
|
+
failed = []
|
71
|
+
|
72
|
+
unless hash.is_a?(Hash)
|
73
|
+
failed.push(
|
74
|
+
Exception::Case::Preset.new(
|
75
|
+
hash.class,
|
76
|
+
template: Exception::Case::Pattern::INVALID_CONDITION_TYPE
|
77
|
+
)
|
78
|
+
)
|
79
|
+
return failed
|
80
|
+
end
|
81
|
+
|
82
|
+
failed.concat(validate_hash(hash: hash))
|
83
|
+
|
84
|
+
failed
|
85
|
+
end
|
86
|
+
|
87
|
+
private
|
88
|
+
|
89
|
+
#
|
90
|
+
# ハッシュ内を検証する
|
91
|
+
#
|
92
|
+
# @param [Hash<Symbol, Object>] hash パラメータ
|
93
|
+
#
|
94
|
+
# @return [Array<Exception::Case::Preset>] エラープリセット配列
|
95
|
+
#
|
96
|
+
def validate_hash(hash:)
|
97
|
+
failed = []
|
98
|
+
failed.concat(Catalog::BasisDate.validate(date: hash[:date]))
|
99
|
+
failed.concat(Catalog::Range.validate(hash: hash[:range]))
|
100
|
+
failed.concat(Catalog::Column.validate(columns: hash[:columns]))
|
101
|
+
failed.concat(Catalog::Option.validate(options: hash[:options]))
|
102
|
+
|
103
|
+
failed
|
104
|
+
end
|
105
|
+
end
|
106
|
+
end
|
107
|
+
end
|
108
|
+
end
|
data/lib/zakuro/result/core.rb
CHANGED
@@ -2,7 +2,7 @@
|
|
2
2
|
|
3
3
|
require 'json'
|
4
4
|
|
5
|
-
require_relative '../
|
5
|
+
require_relative '../tool/stringifier'
|
6
6
|
|
7
7
|
# :nodoc:
|
8
8
|
module Zakuro
|
@@ -25,7 +25,7 @@ module Zakuro
|
|
25
25
|
# @return [Hash<String, Object>] ハッシュ
|
26
26
|
#
|
27
27
|
def to_h
|
28
|
-
|
28
|
+
Tool::Stringifier.to_h(obj: self, class_prefix: 'Zakuro::Result')
|
29
29
|
end
|
30
30
|
|
31
31
|
#
|
@@ -7,13 +7,14 @@ require_relative '../calculation/cycle/abstract_remainder'
|
|
7
7
|
# :nodoc:
|
8
8
|
module Zakuro
|
9
9
|
#
|
10
|
-
#
|
10
|
+
# Tool 汎用メソッド群
|
11
11
|
#
|
12
|
-
module
|
12
|
+
module Tool
|
13
13
|
#
|
14
14
|
# RemainderComparer 大余小余比較
|
15
15
|
#
|
16
16
|
module RemainderComparer
|
17
|
+
# @return [Output::Logger] ロガー
|
17
18
|
LOGGER = Output::Logger.new(location: 'RemainderComparer')
|
18
19
|
|
19
20
|
class << self
|
@@ -5,9 +5,9 @@ require_relative './typeof'
|
|
5
5
|
# :nodoc:
|
6
6
|
module Zakuro
|
7
7
|
#
|
8
|
-
#
|
8
|
+
# Tool 汎用メソッド群
|
9
9
|
#
|
10
|
-
module
|
10
|
+
module Tool
|
11
11
|
#
|
12
12
|
# Stringifier 文字列処理
|
13
13
|
#
|
@@ -48,7 +48,7 @@ module Zakuro
|
|
48
48
|
return obj unless obj
|
49
49
|
|
50
50
|
# 日付をフォーマットする
|
51
|
-
return obj.format if formatted &&
|
51
|
+
return obj.format if formatted && Tool::Typeof.time?(obj: obj)
|
52
52
|
|
53
53
|
# 同じモジュール内のオブジェクトは再帰する
|
54
54
|
if obj.class.name.start_with?(class_prefix)
|
@@ -3,53 +3,56 @@
|
|
3
3
|
# :nodoc:
|
4
4
|
module Zakuro
|
5
5
|
# :nodoc:
|
6
|
-
module
|
7
|
-
#
|
8
|
-
|
9
|
-
#
|
10
|
-
module Const
|
6
|
+
module Version
|
7
|
+
# :nodoc:
|
8
|
+
module Daien
|
11
9
|
#
|
12
|
-
#
|
10
|
+
# Const 定数
|
13
11
|
#
|
14
|
-
module
|
12
|
+
module Const
|
15
13
|
#
|
16
|
-
#
|
14
|
+
# Number 数値
|
17
15
|
#
|
18
|
-
module
|
19
|
-
# @return [Integer] 通法(1日=3040分)
|
20
|
-
DAY = 3040
|
16
|
+
module Number
|
21
17
|
#
|
22
|
-
#
|
23
|
-
# @note 小数点以下の値によって大幅に結果が変わる。除算結果を設定した
|
18
|
+
# Cycle 周期
|
24
19
|
#
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
20
|
+
module Cycle
|
21
|
+
# @return [Integer] 通法(1日=3040分)
|
22
|
+
DAY = 3040
|
23
|
+
#
|
24
|
+
# @return [Float] 転日(1近点月 = 27日1685分79秒(1分=80秒))
|
25
|
+
# @note 小数点以下の値によって大幅に結果が変わる。除算結果を設定した
|
26
|
+
#
|
27
|
+
ANOMALISTIC_MONTH = 83_765 + (79.0 / 80)
|
28
|
+
# @return [Integer] 朔望月
|
29
|
+
SYNODIC_MONTH = 89_773
|
30
|
+
# @return [Integer] 一年
|
31
|
+
YEAR = 1_110_343
|
32
|
+
end
|
31
33
|
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
34
|
+
#
|
35
|
+
# Derivation 導出
|
36
|
+
#
|
37
|
+
module Derivation
|
38
|
+
# @return [Integer] 通余: (YEAR - DAY * 12 * 30)
|
39
|
+
# 1110343 - 1094400
|
40
|
+
REMAINDER_ALL_YEAR = 15_943
|
41
|
+
# @return [Integer] 旬周(60日) DAY * 60
|
42
|
+
SIXTY_DAYS = 182_400
|
43
|
+
# @return [Integer] 朔虚分: (30 * 3040) % (29 * 3040 + 1613)
|
44
|
+
REMAINDER_IDEAL_MONTH = 1427
|
45
|
+
end
|
44
46
|
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
47
|
+
#
|
48
|
+
# 累積
|
49
|
+
#
|
50
|
+
module Stack
|
51
|
+
# @return [Integer] 積年(甲子夜半朔旦冬至〜暦の開始前)
|
52
|
+
TOTAL_YEAR = 96_961_740
|
53
|
+
# @return [Integer] 暦の開始年(開元12年)
|
54
|
+
BEGIN_YEAR = 724
|
55
|
+
end
|
53
56
|
end
|
54
57
|
end
|
55
58
|
end
|