mk_cal_jpl 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff4246f870c5e44229743f3bfe184c61b3aca4481f3c007e41d24f32293b944c
-  data.tar.gz: 5adaf2b851b905b6959807ec63a5eeb61806031b55f899388ff3b05c2920e2b4
+  metadata.gz: d8002fb51681b81cae77f03a8d624ef1d94e1074d2aed760f75729b89c7f97b2
+  data.tar.gz: bf5ceca5c75e856c5c12de6a7e317252edd44a51296685f92d4ba50f08ffa78c
 SHA512:
-  metadata.gz: 57d34e854bf6de74d8c4a264718cf73ce7fad2748e51caa24294e50017c8162efec77f63fb67640e2e815613605e301048c5fac0071667ccb91adec5da80a75a
-  data.tar.gz: 76681ca2752103fb2ec426098b5d74c211e9fe7a1f266b037be0c612d8792a42f96906eed4696ae9cf89e278cf007f8598b67ae284a023ffabc48e31b233356d
+  metadata.gz: 0cc04f7e31ebba4f97d591b124f670f00bb422b321bb23642ace9d548f6c12e98b4cdca481f72848897745ce50849f867f8b6b4649c01711a26390a2a35322e9
+  data.tar.gz: e33ca92673b6a13d0c25c093b60bf323d80c656dd30dcafdcbcc40cd7b8914ee0c59832c8a5a711ab0882fe38f5b1dd4fe7ebb7ae9dbbab9a2bd6cf2311059b7

data/lib/mk_cal_jpl/compute.rb

@@ -23,7 +23,7 @@ module MkCalJpl
       end
       holiday = ""
       res = Const::HOLIDAY.select { |h| h[0] == code }
-      holiday = res[0][4] unless res == []
+      holiday = res[0][6] unless res == []
       return holiday
     end
 
@@ -39,8 +39,9 @@ module MkCalJpl
       holiday_2 = Array.new  # 振替休日用
 
       # 変動の祝日の日付･曜日を計算 ( 振替休日,国民の休日を除く )
-      Const::HOLIDAY.each do |id, month, day, kbn, name|
+      Const::HOLIDAY.each do |id, month, day, kbn, year_s, year_e, name|
         next if kbn > 7
+        next if year < year_s || year_e < year
         if kbn == 0   # 月日が既定のもの
           jd_jst = gc2jd(year, month, day)
           yobi = compute_yobi(jd_jst)
@@ -79,6 +80,7 @@ module MkCalJpl
       # 国民の休日計算
       # ( 「国民の祝日」で前後を挟まれた「国民の祝日」でない日 )
       # ( 年またぎは考慮していない(今のところ不要) )
+      year_s_k = Const::HOLIDAY.select { |a| a[0] == 90 }[0][4]
       0.upto(holiday_0.length - 2) do |i|
         m_0, d_0 = holiday_0[i    ][0, 2]
         m_1, d_1 = holiday_0[i + 1][0, 2]
@@ -90,11 +92,12 @@ module MkCalJpl
           yobi = Const::YOBI[Const::YOBI.index(holiday_0[i][4]) + 1]
           holiday_1 << [m, d, 90, jd, yobi]
         end
-      end
+      end if year < year_s_k
 
       # 振替休日計算
       # ( 「国民の祝日」が日曜日に当たるときは、
       #   その日後においてその日に最も近い「国民の祝日」でない日 )
+      year_s_f = Const::HOLIDAY.select { |a| a[0] == 91 }[0][4]
       0.upto(holiday_0.length - 1) do |i|
         if holiday_0[i][4] == "日"
           next_jd = holiday_0[i][3] + 1
@@ -122,7 +125,7 @@ module MkCalJpl
           end
           holiday_2 << wk_ary
         end
-      end
+      end if year < year_s_f
       return (holiday_0 + holiday_1 + holiday_2).sort
     end
 

data/lib/mk_cal_jpl/const.rb

@@ -37,24 +37,40 @@ module MkCalJpl
       "土用入(秋)", "土用入(冬)"
     ]
     HOLIDAY = [
-      [ 0,  1,  1, 0, "元日"        ],
-      [ 1,  1,  0, 2, "成人の日"    ],
-      [ 2,  2, 11, 0, "建国記念の日"],
-      [ 3,  3,  0, 4, "春分の日"    ],
-      [ 4,  4, 29, 0, "昭和の日"    ],
-      [ 5,  5,  3, 0, "憲法記念日"  ],
-      [ 6,  5,  4, 0, "みどりの日"  ],
-      [ 7,  5,  5, 0, "こどもの日"  ],
-      [ 8,  7,  0, 3, "海の日"      ],
-      [ 9,  8, 11, 0, "山の日"      ],
-      [10,  9,  0, 3, "敬老の日"    ],
-      [11,  9,  0, 4, "秋分の日"    ],
-      [12, 10,  0, 2, "体育の日"    ],
-      [13, 11,  3, 0, "文化の日"    ],
-      [14, 11, 23, 0, "勤労感謝の日"],
-      [15, 12, 23, 0, "天皇誕生日"  ],
-      [90,  0,  0, 8, "国民の休日"  ],
-      [91,  0,  0, 9, "振替休日"    ]
+      [ 0,  1,  1, 0, 1949, 9999, "元日"              ],
+      [ 1,  1, 15, 0, 1949, 1999, "成人の日"          ],
+      [ 2,  1,  0, 2, 2000, 9999, "成人の日"          ],
+      [ 3,  2, 11, 0, 1967, 9999, "建国記念の日"      ],
+      [ 4,  3,  0, 4, 1949, 9999, "春分の日"          ],
+      [ 5,  4, 29, 0, 1949, 1988, "天皇誕生日"        ],
+      [ 6,  4, 29, 0, 1989, 2006, "みどりの日"        ],
+      [ 7,  4, 29, 0, 2007, 9999, "昭和の日"          ],
+      [ 8,  5,  3, 0, 1949, 9999, "憲法記念日"        ],
+      [ 9,  5,  4, 0, 2007, 9999, "みどりの日"        ],
+      [10,  5,  5, 0, 1949, 9999, "こどもの日"        ],
+      [11,  7, 20, 0, 1996, 2002, "海の日"            ],
+      [12,  7,  0, 3, 2003, 2019, "海の日"            ],
+      [13,  7, 23, 0, 2020, 2020, "海の日"            ],
+      [14,  7,  0, 3, 2021, 9999, "海の日"            ],
+      [15,  8, 11, 0, 2016, 2019, "山の日"            ],
+      [16,  8, 10, 0, 2020, 2020, "山の日"            ],
+      [17,  8, 11, 0, 2021, 9999, "山の日"            ],
+      [18,  9, 15, 0, 1966, 2002, "敬老の日"          ],
+      [19,  9,  0, 3, 2003, 9999, "敬老の日"          ],
+      [20,  9,  0, 4, 1948, 9999, "秋分の日"          ],
+      [21, 10, 10, 0, 1966, 1999, "体育の日"          ],
+      [22, 10,  0, 2, 2000, 2019, "体育の日"          ],
+      [23,  7, 24, 0, 2020, 2020, "スポーツの日"      ],
+      [24, 10,  0, 2, 2021, 9999, "スポーツの日"      ],
+      [25, 11,  3, 0, 1948, 9999, "文化の日"          ],
+      [26, 11, 23, 0, 1948, 9999, "勤労感謝の日"      ],
+      [27, 12, 23, 0, 1989, 9999, "天皇誕生日"        ],
+      [28,  4, 10, 0, 1959, 1959, "明仁親王の結婚の儀"],
+      [29,  2, 24, 0, 1989, 1989, "昭和天皇の大喪の礼"],
+      [30, 11, 12, 0, 1990, 1990, "即位礼正殿の儀"    ],
+      [31,  6,  9, 0, 1993, 1993, "徳仁親王の結婚の儀"],
+      [90,  0,  0, 8, 1986, 9999, "国民の休日"        ],
+      [91,  0,  0, 9, 1973, 9999, "振替休日"          ]  # 1973-04-12 以降
     ]
   end
 end

data/lib/mk_cal_jpl/version.rb

@@ -1,3 +1,3 @@
 module MkCalJpl
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mk_cal_jpl
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - komasaru
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-11 00:00:00.000000000 Z
+date: 2018-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mk_apos
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Calendar library including Japan's old-calendar, using JPL DE430.