date-holiday 0.0.1 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ce42e68e404159b0d65ea1f92c61a7f86d51f430
-  data.tar.gz: 4a15256f08173ce195a07a41a1fea3b441985dce
+SHA256:
+  metadata.gz: df03a487c7e80486c40d32484d0f7640645422361f82a8150de4b95f19b80ab2
+  data.tar.gz: 9ca73e5bf58e8590d49b54ffd1352d4c885a7b8d3772ddfb54a3d513f70adc7d
 SHA512:
-  metadata.gz: 1a49ac097801f05c73b14957e9a521b64e560527e8eabe2ac5fda271cd14742e37d0826e4c164417ddaa84800d163b1c7300918aa19ed70e60cad043681291a3
-  data.tar.gz: f8e9f9dce74c27ae837ec875892f4165fa491fb50250edc8b7b3bd74a8a3956021c28518eb28b3793f94178407b8a2b249d4ee7fc1c7878d82bf657ea53ba940
+  metadata.gz: 11cfa780eaaedfbf770553bbac88f0a72bbc91ef64ba847bd0af12fc635cfaff1c72d956594bb3a57a2f49f36870997c95e0b53303de981056bdfa7a2654f902
+  data.tar.gz: a1904a7720e2629aeb2084a6811973c621e13ad1a95700633a59b5cadab883a7ceac5faef179f36c675c91d7d4849ff7a75931ac226a0d09da879ee9eeff266d

data/README

@@ -33,6 +33,8 @@ Calculations'', Software---Practice & Experience, vol. 20, no. 9
 
 ��̱�ν����˴ؤ���ˡΧ (����23ǯ7��20��ˡΧ��178�� - ʿ��13ǯ6��22������)
 
+��̱�ν����˴ؤ���ˡΧ�ΰ������������ˡΧ (ʿ��26ǯ5��30���泰ˡΧ��43��)
+
 ����ǰ�����Ȥʤ������������� (����41ǯ12��9���泰������376��)
 
 ����ŷ�Ĥ����Ӥ���ιԤ�����������Ȥ���ˡΧ (ʿ����ǯ2��17��ˡΧ��4��)

data/README.en

@@ -36,6 +36,9 @@ Koyomi-Keisan Kenkyū-kai, Shin Koyomi Benrichō, Kōseisha Kōseikaku,
 Kokumin no Shukujitsu ni Kansuru Hōritsu (Shōwa 23 nen 7 gatsu 20 ka
 Hōritsu Dai 178 Gō - Heisei 13 nen 6 gatsu 22 nichi Kaisei)
 
+Kokumin no Shukujitsu ni Kansuru Hōritsu no Ichibu o Kaisei Suru
+Hōritsu (Heisei 26 nen 5 gatsu 30 nichi Gōgai Hōritsu Dai 43 Gō)
+
 Kenkoku-Kinen-no-Hi Tonaru Hi o Sadameru Seirei (Shōwa 41 nen 12 gatsu
 9 ka Gōgai Seirei Dai 376 Gō)
 

data/lib/date/holiday.rb

@@ -1,5 +1,5 @@
-# date/holiday.rb: Written by Tadayoshi Funaba 1998-2006,2014
-# $Id: holiday.rb,v 2.17 2014-04-07 20:18:37+09 tadf Exp $
+# date/holiday.rb: Written by Tadayoshi Funaba 1998-2006,2014,2018,2021
+# $Id: holiday.rb,v 2.22 2021-02-24 08:57:15+09 tadf Exp $
 
 require 'date'
 
@@ -8,11 +8,18 @@ class Date
   def fixed?
     return false unless jd >= 2432753	# 1948-07-20/PooD
     *x = mon, mday
+    xi = case year
+	 when 2020; 10
+	 when 2021; 8
+	 else; 11
+	 end
     (x == [ 1,  1]) ||			# --01-01
     (x == [ 1, 15]  &&			# --01-15 (1948-07-20/1999-12-31)
      jd <= 2451544) ||
     (x == [ 2, 11]  &&			# --02-11 (1966-12-09/PooD)
      jd >= 2439469) ||
+    (x == [ 2, 23]  &&			# --02-23 (2019-05-01/PooD)
+     jd >= 2458605) ||
     (x == [ 4, 29]) ||			# --04-29
     (x == [ 5,  3]) ||			# --05-03
     (x == [ 5,  4]  &&			# --05-04 (2007-01-01/PooD)
@@ -21,6 +28,8 @@ class Date
     (x == [ 7, 20]  &&			# --07-20 (1996-01-01/2002-12-31)
      jd >= 2450084  &&
      jd <= 2452640) ||
+    (x == [ 8, xi]  &&			# --08-11 (2016-01-01/PooD) ex 2020-08-10
+     jd >= 2457389) ||
     (x == [ 9, 15]  &&			# --09-15 (1966-06-25/2002-12-31)
      jd >= 2439302  &&
      jd <= 2452640) ||
@@ -29,8 +38,9 @@ class Date
      jd <= 2451544) ||
     (x == [11,  3]) ||			# --11-03
     (x == [11, 23]) ||			# --11-23
-    (x == [12, 23]  &&			# --12-23 (1989-02-17/PooD)
-     jd >= 2447575)
+    (x == [12, 23]  &&			# --12-23 (1989-02-17/2019-04-30)
+     jd >= 2447575  &&
+     jd <= 2458604)
   end
 
   t = Module.new do
@@ -74,6 +84,18 @@ class Date
   private :nth_kday?
 
   def float?
+    if year == 2020
+      return jd == 2458862 || # --01-13
+             jd == 2459054 || # --07-23
+             jd == 2459055 || # --07-24
+             jd == 2459114    # --09-21
+    end
+    if year == 2021
+      return jd == 2459226 || # --01-11
+             jd == 2459418 || # --07-22
+             jd == 2459419 || # --07-23
+             jd == 2459478    # --09-20
+    end
     (mon ==  1 && nth_kday?(2, 1) &&	# 2nd Mon, Jan (2000-01-01/PooD)
      jd >= 2451545) ||
     (mon ==  7 && nth_kday?(3, 1) &&	# 3nd Mon, Jul (2003-01-01/PooD)
@@ -124,9 +146,18 @@ class Date
     jd == _aeq(year)
   end
 
-  private :veq?, :aeq?
+  def extra?
+    jd == 2436669 ||	# 1959-04-10 # 16
+    jd == 2447582 ||	# 1989-02-24
+    jd == 2448208 ||	# 1990-11-12
+    jd == 2449148 ||	# 1993-06-09
+    jd == 2458605 ||	# 2019-05-01
+    jd == 2458779	# 2019-10-22
+  end
+
+  private :veq?, :aeq?, :extra?
 
-  def nhol2? () fixed? || float? || veq? || aeq? end
+  def nhol2? () fixed? || float? || veq? || aeq? || extra? end
 
   unless Date.new.respond_to?(:sunday?)
     def sunday? () wday == 0 end
@@ -163,18 +194,11 @@ class Date
     end
   end
 
-  def nholx?
-    jd == 2436669 ||	# 1959-04-10 # 16
-    jd == 2447582 ||	# 1989-02-24
-    jd == 2448208 ||	# 1990-11-12
-    jd == 2449148	# 1993-06-09
-  end
-
-  private :nhol32?, :nhol33?, :nholx?
+  private :nhol32?, :nhol33?
 
   def national_holiday?
     d = if julian? then self.gregorian else self end
-    d.instance_eval do nhol2? || nhol32? || nhol33? || nholx? end
+    d.instance_eval do nhol2? || nhol32? || nhol33? end
   end
 
   def qfixed?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: date-holiday
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.6
 platform: ruby
 authors:
 - Tadayoshi Funaba
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-07 00:00:00.000000000 Z
+date: 2021-02-24 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: tadf@funaba.org
@@ -30,7 +30,7 @@ files:
 - lib/date/holiday.rb
 homepage: http://www.funaba.org/code
 licenses:
-- BSD 2-Clause
+- BSD-2-Clause
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -47,8 +47,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: tadf
-rubygems_version: 2.2.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: determination of holiday