mk_calendar 0.2.0 → 0.2.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/README.md +1 -1
- data/exe/mk_calendar +1 -1
- data/lib/mk_calendar/compute.rb +4 -6
- data/lib/mk_calendar/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: c2c45a2007fdbe17f043f0375b885f6e8b92417e
|
|
4
|
+
data.tar.gz: b333fed96d844199c13f6e0e68204da8e2187f50
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: fb2fb586573c6e92bd68f2cb7346bdf1689abdfedd84097e3209ba326c16d5313e5d8617d5d96c8730daa6a1b070d186d3113797835d54df971e5eaf14960d8c
|
|
7
|
+
data.tar.gz: 4547b3125a524af62326c2769975b321eb569814e2b34fd3025deeb5df8fc65fd388a77a0718f9bd9e05c4cb0465576bfe79d47900768a81f4d54f4f638d300a
|
data/README.md
CHANGED
data/exe/mk_calendar
CHANGED
|
@@ -27,6 +27,6 @@ str << " #{o.oc[4]}"
|
|
|
27
27
|
str << " #{o.sekki_24}" unless o.sekki_24 == ""
|
|
28
28
|
str << " #{o.zassetsu}" unless o.zassetsu == ""
|
|
29
29
|
str << " #{o.sekku}" unless o.sekku == ""
|
|
30
|
-
str << " #{o.lambda_sun} #{o.lambda_moon} #{o.moonage}
|
|
30
|
+
str << " #{o.lambda_sun} #{o.lambda_moon} #{o.moonage}"
|
|
31
31
|
puts str
|
|
32
32
|
|
data/lib/mk_calendar/compute.rb
CHANGED
|
@@ -60,7 +60,6 @@ module MkCalendar
|
|
|
60
60
|
0.upto(holiday_0.length - 2) do |i|
|
|
61
61
|
if holiday_0[i][3] + 2 == holiday_0[i + 1][3]
|
|
62
62
|
jd = holiday_0[i][3] + 1
|
|
63
|
-
#yobi = (holiday_0[i][4] + 1) == 7 ? 0 : (holiday_0[i][4] + 1)
|
|
64
63
|
yobi = Const::YOBI[Const::YOBI.index(holiday_0[i][4]) + 1]
|
|
65
64
|
wk_ary = Array.new
|
|
66
65
|
wk_ary << jd2ymd(jd)[1]
|
|
@@ -76,9 +75,8 @@ module MkCalendar
|
|
|
76
75
|
# ( 「国民の祝日」が日曜日に当たるときは、
|
|
77
76
|
# その日後においてその日に最も近い「国民の祝日」でない日 )
|
|
78
77
|
0.upto(holiday_0.length - 1) do |i|
|
|
79
|
-
if holiday_0[i][4] ==
|
|
78
|
+
if holiday_0[i][4] == "日"
|
|
80
79
|
next_jd = holiday_0[i][3] + 1
|
|
81
|
-
#next_yobi = (holiday_0[i][4] + 1) == 7 ? 0 : (holiday_0[i][4] + 1)
|
|
82
80
|
next_yobi = Const::YOBI[Const::YOBI.index(holiday_0[i][4]) + 1]
|
|
83
81
|
if i == holiday_0.length - 1
|
|
84
82
|
wk_ary = Array.new
|
|
@@ -94,13 +92,13 @@ module MkCalendar
|
|
|
94
92
|
if i + plus_day < holiday_0.length
|
|
95
93
|
if next_jd == holiday_0[i + plus_day][3]
|
|
96
94
|
next_jd += 1
|
|
97
|
-
next_yobi =
|
|
95
|
+
next_yobi = next_yobi == "土" ? "日" : Const::YOBI[Const::YOBI.index(next_yobi) + 1]
|
|
98
96
|
plus_day += 1
|
|
99
97
|
else
|
|
100
98
|
flg_furikae = 1
|
|
101
99
|
wk_ary = Array.new
|
|
102
|
-
wk_ary <<
|
|
103
|
-
wk_ary <<
|
|
100
|
+
wk_ary << jd2ymd(next_jd)[1]
|
|
101
|
+
wk_ary << jd2ymd(next_jd)[2]
|
|
104
102
|
wk_ary << 91
|
|
105
103
|
wk_ary << next_jd
|
|
106
104
|
wk_ary << next_yobi
|
data/lib/mk_calendar/version.rb
CHANGED