mk_calendar 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b69eb362c33bdbe9da29add1a395475588d11fe
-  data.tar.gz: 56be1defbafc50090313ba881af78df671d914b1
+  metadata.gz: c2c45a2007fdbe17f043f0375b885f6e8b92417e
+  data.tar.gz: b333fed96d844199c13f6e0e68204da8e2187f50
 SHA512:
-  metadata.gz: 646d6b1492c29cc760b704471f5da118619af4200fea00642c32abe114060ea09082676c4cfa0144d44846fcfc4d48dbcc5b511a62888d4624216cef147893b8
-  data.tar.gz: e88e6d608a864f6c78138a9b9d1cbc3414eef25beab89e2efa19ca40ad24aeff3acd02f3927e2d5920e12a3523e638f0489613cb2237e5134b7ebffd63351b4a
+  metadata.gz: fb2fb586573c6e92bd68f2cb7346bdf1689abdfedd84097e3209ba326c16d5313e5d8617d5d96c8730daa6a1b070d186d3113797835d54df971e5eaf14960d8c
+  data.tar.gz: 4547b3125a524af62326c2769975b321eb569814e2b34fd3025deeb5df8fc65fd388a77a0718f9bd9e05c4cb0465576bfe79d47900768a81f4d54f4f638d300a

data/README.md

@@ -62,7 +62,7 @@ p o.sekku
 p o.lambda_sun
 p o.lambda_moon
 p o.moonage
-p o.oc
+p o.oc  # <= [year, leap_flag, month, day]
 ```
 
 ## Development

data/exe/mk_calendar

@@ -27,6 +27,6 @@ str << " #{o.oc[4]}"
 str << " #{o.sekki_24}" unless o.sekki_24 == ""
 str << " #{o.zassetsu}" unless o.zassetsu == ""
 str << " #{o.sekku}" unless o.sekku == ""
-str << " #{o.lambda_sun} #{o.lambda_moon} #{o.moonage} #{o.moonphase}"
+str << " #{o.lambda_sun} #{o.lambda_moon} #{o.moonage}"
 puts str
 

data/lib/mk_calendar/compute.rb

@@ -60,7 +60,6 @@ module MkCalendar
       0.upto(holiday_0.length - 2) do |i|
         if holiday_0[i][3] + 2 == holiday_0[i + 1][3]
           jd = holiday_0[i][3] + 1
-          #yobi = (holiday_0[i][4] + 1) == 7 ? 0 : (holiday_0[i][4] + 1)
           yobi = Const::YOBI[Const::YOBI.index(holiday_0[i][4]) + 1]
           wk_ary = Array.new
           wk_ary << jd2ymd(jd)[1]
@@ -76,9 +75,8 @@ module MkCalendar
       # ( 「国民の祝日」が日曜日に当たるときは、
       #   その日後においてその日に最も近い「国民の祝日」でない日 )
       0.upto(holiday_0.length - 1) do |i|
-        if holiday_0[i][4] == 0
+        if holiday_0[i][4] == "日"
           next_jd = holiday_0[i][3] + 1
-          #next_yobi = (holiday_0[i][4] + 1) == 7 ? 0 : (holiday_0[i][4] + 1)
           next_yobi = Const::YOBI[Const::YOBI.index(holiday_0[i][4]) + 1]
           if i == holiday_0.length - 1
             wk_ary = Array.new
@@ -94,13 +92,13 @@ module MkCalendar
               if i + plus_day < holiday_0.length
                 if next_jd == holiday_0[i + plus_day][3]
                   next_jd += 1
-                  next_yobi = (next_yobi + 1) == 7 ? 0 : (next_yobi + 1)
+                  next_yobi = next_yobi == "土" ? "日" : Const::YOBI[Const::YOBI.index(next_yobi) + 1]
                   plus_day += 1
                 else
                   flg_furikae = 1
                   wk_ary = Array.new
-                  wk_ary << jd2(next_jd)[1]
-                  wk_ary << jd2(next_jd)[2]
+                  wk_ary << jd2ymd(next_jd)[1]
+                  wk_ary << jd2ymd(next_jd)[2]
                   wk_ary << 91
                   wk_ary << next_jd
                   wk_ary << next_yobi

data/lib/mk_calendar/version.rb

@@ -1,3 +1,3 @@
 module MkCalendar
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mk_calendar
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - komasaru