mk_cal_jpl 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8002fb51681b81cae77f03a8d624ef1d94e1074d2aed760f75729b89c7f97b2
-  data.tar.gz: bf5ceca5c75e856c5c12de6a7e317252edd44a51296685f92d4ba50f08ffa78c
+  metadata.gz: 1e30bc3dde183fcd292276e2c5bc490e10e5e3fb1924d13b62b9ef151e6ffdbd
+  data.tar.gz: 2f86b74f9f21ded36a21d22181bf1b96370bfe712d0abea466ec30fdffc242c4
 SHA512:
-  metadata.gz: 0cc04f7e31ebba4f97d591b124f670f00bb422b321bb23642ace9d548f6c12e98b4cdca481f72848897745ce50849f867f8b6b4649c01711a26390a2a35322e9
-  data.tar.gz: e33ca92673b6a13d0c25c093b60bf323d80c656dd30dcafdcbcc40cd7b8914ee0c59832c8a5a711ab0882fe38f5b1dd4fe7ebb7ae9dbbab9a2bd6cf2311059b7
+  metadata.gz: c6e5f29ad7be9e145c382e5d8f4108f7bc93e72fee5a58a1fdade8ae328838b876254956e1994e12f664157e5bfe40b6b97758816d7806d5058a1e98a2cc11f6
+  data.tar.gz: 706f98e2cdb465eba1ce947af70ea3cd9557f02a40e9cbe1a8d1ec9c6b6c891d8086ecf63e62f92c8e36259e6311a065464ba62a3f1d25e838f6e7ab3ff58f79

data/lib/mk_cal_jpl/compute.rb

@@ -10,7 +10,7 @@ module MkCalJpl
     # @param:  year
     # @param:  month
     # @param:  day
-    # @return: holiday (漢字１文字)
+    # @return: holiday (漢字)
     #=========================================================================
     def compute_holiday(year, month, day)
       holidays = get_holidays(year)
@@ -35,8 +35,8 @@ module MkCalJpl
     #=========================================================================
     def get_holidays(year)
       holiday_0 = Array.new  # 変動の祝日用
-      holiday_1 = Array.new  # 国民の休日用
-      holiday_2 = Array.new  # 振替休日用
+      holiday_1 = Array.new  # 振替休日用
+      holiday_2 = Array.new  # 国民の休日用
 
       # 変動の祝日の日付･曜日を計算 ( 振替休日,国民の休日を除く )
       Const::HOLIDAY.each do |id, month, day, kbn, year_s, year_e, name|
@@ -77,34 +77,17 @@ module MkCalJpl
         end
       end
 
-      # 国民の休日計算
-      # ( 「国民の祝日」で前後を挟まれた「国民の祝日」でない日 )
-      # ( 年またぎは考慮していない(今のところ不要) )
-      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]
-        jd_0 = gc2jd(year, m_0, d_0)
-        jd_1 = gc2jd(year, m_1, d_1)
-        if jd_0 + 2 == jd_1
-          jd = jd_0 + 1
-          m, d = jd2ymd(jd)[1, 2]
-          yobi = Const::YOBI[Const::YOBI.index(holiday_0[i][4]) + 1]
-          holiday_1 << [m, d, 90, jd, yobi]
-        end
-      end if year < year_s_k
-
       # 振替休日計算
       # ( 「国民の祝日」が日曜日に当たるときは、
       #   その日後においてその日に最も近い「国民の祝日」でない日 )
-      year_s_f = Const::HOLIDAY.select { |a| a[0] == 91 }[0][4]
+      year_s_f = Const::HOLIDAY.select { |a| a[0] == 90 }[0][4]
       0.upto(holiday_0.length - 1) do |i|
         if holiday_0[i][4] == "日"
           next_jd = holiday_0[i][3] + 1
           next_yobi = Const::YOBI[Const::YOBI.index(holiday_0[i][4]) + 1]
           if i == holiday_0.length - 1
             wk_ymd = jd2ymd(next_jd)
-            wk_ary = [wk_ymd[1], wk_ymd[2], 91, next_jd, next_yobi]
+            wk_ary = [wk_ymd[1], wk_ymd[2], 90, next_jd, next_yobi]
           else
             flg_furikae = 0
             plus_day = 1
@@ -118,15 +101,32 @@ module MkCalJpl
                 else
                   flg_furikae = 1
                   wk_ymd = jd2ymd(next_jd)
-                  wk_ary =[wk_ymd[1], wk_ymd[2], 91, next_jd, next_yobi]
+                  wk_ary =[wk_ymd[1], wk_ymd[2], 90, next_jd, next_yobi]
                 end
               end
             end
           end
-          holiday_2 << wk_ary
+          holiday_1 << wk_ary
+        end
+      end if year >= year_s_f
+
+      # 国民の休日計算
+      # ( 「国民の祝日」で前後を挟まれた「国民の祝日」でない日 )
+      # ( 年またぎは考慮していない(今のところ不要) )
+      year_s_k = Const::HOLIDAY.select { |a| a[0] == 91 }[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]
+        jd_0 = gc2jd(year, m_0, d_0)
+        jd_1 = gc2jd(year, m_1, d_1)
+        if jd_0 + 2 == jd_1
+          jd = jd_0 + 1
+          m, d = jd2ymd(jd)[1, 2]
+          yobi = Const::YOBI[Const::YOBI.index(holiday_0[i][4]) + 1]
+          holiday_2 << [m, d, 91, jd, yobi]
         end
-      end if year < year_s_f
-      return (holiday_0 + holiday_1 + holiday_2).sort
+      end if year >= year_s_k
+      return merge_sort(holiday_0, holiday_1, holiday_2)
     end
 
     #=========================================================================
@@ -661,6 +661,27 @@ module MkCalJpl
       lmd = a.moon[1][0] * 180.0 / Math::PI
       return lmd
     end
+
+    private
+
+    # マージ＆ソート
+    # * さらに、「振替休日」と「国民の休日」がダブる場合は、
+    #   「振替休日」を優先
+    def merge_sort(hol_0, hol_1, hol_2)
+      data = Array.new
+      data_src = (hol_0 + hol_1 + hol_2).sort
+      data_src.each_with_index do |d, i|
+        if i == 0
+          data << d
+          next
+        end
+        if data_src[i - 1][0..2] == d[0..2]
+          next if data_src[i - 1][3] == 90 && d[3] == 91
+        end
+        data << d
+      end
+      return data
+    end
   end
 end
 

data/lib/mk_cal_jpl/const.rb

@@ -69,8 +69,8 @@ module MkCalJpl
       [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 以降
+      [90,  0,  0, 8, 1973, 9999, "振替休日"          ],  # 1973-04-12 以降
+      [91,  0,  0, 9, 1986, 9999, "国民の休日"        ]
     ]
   end
 end

data/lib/mk_cal_jpl/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mk_cal_jpl
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - komasaru
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-13 00:00:00.000000000 Z
+date: 2018-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mk_apos