mk_cal_jpl 0.2.4 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8002fb51681b81cae77f03a8d624ef1d94e1074d2aed760f75729b89c7f97b2
-  data.tar.gz: bf5ceca5c75e856c5c12de6a7e317252edd44a51296685f92d4ba50f08ffa78c
+  metadata.gz: b74745baec925d50fe502c3db8fefd5b3786a63fd945064cd93e961344b716fb
+  data.tar.gz: a0a2b50fd08e952b17ad8b4210cabc3c3bf57f1b91f9a52697e660fb3e3df060
 SHA512:
-  metadata.gz: 0cc04f7e31ebba4f97d591b124f670f00bb422b321bb23642ace9d548f6c12e98b4cdca481f72848897745ce50849f867f8b6b4649c01711a26390a2a35322e9
-  data.tar.gz: e33ca92673b6a13d0c25c093b60bf323d80c656dd30dcafdcbcc40cd7b8914ee0c59832c8a5a711ab0882fe38f5b1dd4fe7ebb7ae9dbbab9a2bd6cf2311059b7
+  metadata.gz: 7cf43e547defbe689daedfb2b9cc213de1e2ba4576fb071c9afef17d100d3abc7ef56409aab0a894010be9e6fc3afe268ee909be859d26b021d68c5b3d15c0a3
+  data.tar.gz: baba7690a994b197a2de06c647ee1060d8d339f4471431caac75c085726dcba6daaf26dd4820489e5e2b599bff5c908d8a5f505e3a364109edee6996e1ea1bc6

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
 
     #=========================================================================
@@ -156,12 +156,16 @@ module MkCalJpl
       lsun_today = compute_lambda(jd)
       # 計算対象日の翌日の太陽の黄経
       lsun_tomorrow = compute_lambda(jd + 1)
+      # ====[ 190919:DEL ]===>
       # 計算対象日の5日前の太陽の黄経(社日計算用)
-      lsun_before_5 = compute_lambda(jd - 5)
+      #lsun_before_5 = compute_lambda(jd - 5)
+      # <===[ 190919:DEL ]====
       # 計算対象日の4日前の太陽の黄経(社日計算用)
       lsun_before_4 = compute_lambda(jd - 4)
+      # ====[ 190919:DEL ]===>
       # 計算対象日の5日後の太陽の黄経(社日計算用)
-      lsun_after_5  = compute_lambda(jd + 5)
+      #lsun_after_5  = compute_lambda(jd + 5)
+      # <===[ 190919:DEL ]====
       # 計算対象日の6日後の太陽の黄経(社日計算用)
       lsun_after_6  = compute_lambda(jd + 6)
       # 太陽の黄経の整数部分( 土用, 入梅, 半夏生 計算用 )
@@ -205,14 +209,19 @@ module MkCalJpl
         if compute_sekki_24(jd + 5)  == "春分"
           # 春分の日の黄経(太陽)と翌日の黄経(太陽)の中間点が
           # 0度(360度)以上なら、春分点が午前と判断
-          zassetsu << 4 if (lsun_after_5 + lsun_after_6 + 360) / 2.0 >= 360
-        end
-        # [ 5日前 ]
-        if compute_sekki_24(jd - 5) == "春分"
-          # 春分の日の黄経(太陽)と翌日の黄経(太陽)の中間点が
-          # 0度(360度)未満なら、春分点が午後と判断
-          zassetsu << 4 if (lsun_before_4 + lsun_before_5 + 360) / 2.0 < 360
+          # ====[ 190919:UPD ]===>
+          #zassetsu << 4 if (lsun_after_5 + lsun_after_6 + 360) / 2.0 >= 360
+          zassetsu << 4
+          # <===[ 190919:UPD ]===~
         end
+        # ====[ 190919:DEL ]===>
+        ## [ 5日前 ]
+        #if compute_sekki_24(jd - 5) == "春分"
+        #  # 春分の日の黄経(太陽)と翌日の黄経(太陽)の中間点が
+        #  # 0度(360度)未満なら、春分点が午後と判断
+        #  zassetsu << 4 if (lsun_before_4 + lsun_before_5 + 360) / 2.0 < 360
+        #end
+        # <===[ 190919:DEL ]===~
       end
       # 5:土用入（春） ( 黄経(太陽) = 27度 )
       unless lsun_today0 == lsun_tomorrow0
@@ -270,14 +279,19 @@ module MkCalJpl
         if compute_sekki_24(jd + 5) == "秋分"
           # 秋分の日の黄経(太陽)と翌日の黄経(太陽)の中間点が
           # 180度以上なら、秋分点が午前と判断
-          zassetsu << 15 if (lsun_after_5 + lsun_after_6) / 2.0 >= 180
-        end
-        # [ 5日前 ]
-        if compute_sekki_24(jd - 5) == "秋分"
-          # 秋分の日の黄経(太陽)と翌日の黄経(太陽)の中間点が
-          # 180度未満なら、秋分点が午後と判断
-          zassetsu << 15 if (lsun_before_4 + lsun_before_5) / 2.0 < 180
+          # ====[ 190919:UPD ]===>
+          #zassetsu << 15 if (lsun_after_5 + lsun_after_6) / 2.0 >= 180
+          zassetsu << 15
+          # <===[ 190919:UPD ]====
         end
+        # ====[ 190919:DEL ]===>
+        ## [ 5日前 ]
+        #if compute_sekki_24(jd - 5) == "秋分"
+        #  # 秋分の日の黄経(太陽)と翌日の黄経(太陽)の中間点が
+        #  # 180度未満なら、秋分点が午後と判断
+        #  zassetsu << 15 if (lsun_before_4 + lsun_before_5) / 2.0 < 180
+        #end
+        # <===[ 190919:DEL ]====
       end
       # 16:土用入（秋） ( 黄経(太陽) = 207度 )
       unless lsun_today0 == lsun_tomorrow0
@@ -661,6 +675,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

@@ -41,36 +41,39 @@ module MkCalJpl
       [ 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 以降
+      [ 4,  2, 23, 0, 2020, 9999, "天皇誕生日"        ],
+      [ 5,  2, 24, 0, 1989, 1989, "昭和天皇の大喪の礼"],
+      [ 6,  3,  0, 4, 1949, 9999, "春分の日"          ],
+      [ 7,  4, 10, 0, 1959, 1959, "明仁親王の結婚の儀"],
+      [ 8,  4, 29, 0, 1949, 1988, "天皇誕生日"        ],
+      [ 9,  4, 29, 0, 1989, 2006, "みどりの日"        ],
+      [10,  4, 29, 0, 2007, 9999, "昭和の日"          ],
+      [11,  5,  1, 0, 2019, 2019, "天皇の即位の日"    ],
+      [12,  5,  3, 0, 1949, 9999, "憲法記念日"        ],
+      [13,  5,  4, 0, 2007, 9999, "みどりの日"        ],
+      [14,  5,  5, 0, 1949, 9999, "こどもの日"        ],
+      [15,  6,  9, 0, 1993, 1993, "徳仁親王の結婚の儀"],
+      [16,  7, 20, 0, 1996, 2002, "海の日"            ],
+      [17,  7, 23, 0, 2020, 2020, "海の日"            ],
+      [18,  7, 24, 0, 2020, 2020, "スポーツの日"      ],
+      [19,  7,  0, 3, 2003, 2019, "海の日"            ],
+      [20,  7,  0, 3, 2021, 9999, "海の日"            ],
+      [21,  8, 10, 0, 2020, 2020, "山の日"            ],
+      [22,  8, 11, 0, 2016, 2019, "山の日"            ],
+      [23,  8, 11, 0, 2021, 9999, "山の日"            ],
+      [24,  9, 15, 0, 1966, 2002, "敬老の日"          ],
+      [25,  9,  0, 3, 2003, 9999, "敬老の日"          ],
+      [26,  9,  0, 4, 1948, 9999, "秋分の日"          ],
+      [27, 10, 10, 0, 1966, 1999, "体育の日"          ],
+      [28, 10, 22, 0, 2019, 2019, "即位礼正殿の儀"    ],
+      [29, 10,  0, 2, 2000, 2019, "体育の日"          ],
+      [30, 10,  0, 2, 2021, 9999, "スポーツの日"      ],
+      [31, 11,  3, 0, 1948, 9999, "文化の日"          ],
+      [32, 11, 12, 0, 1990, 1990, "即位礼正殿の儀"    ],
+      [33, 11, 23, 0, 1948, 9999, "勤労感謝の日"      ],
+      [34, 12, 23, 0, 1989, 2018, "天皇誕生日"        ],
+      [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.3.2"
 end

data/mk_cal_jpl.gemspec

@@ -29,7 +29,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "mk_apos"
   spec.add_dependency "mk_coord"
-  spec.add_development_dependency "bundler", "~> 1.12"
-  spec.add_development_dependency "rake", "~> 10.0"
+  #spec.add_development_dependency "bundler", "~> 1.12"
+  spec.add_development_dependency "bundler", ">= 2.2.10"
+  #spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
 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.3.2
 platform: ruby
 authors:
 - komasaru
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-06-13 00:00:00.000000000 Z
+date: 2021-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mk_apos
@@ -42,30 +42,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 2.2.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 2.2.10
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -113,7 +113,7 @@ homepage: https://github.com/komasaru/mk_cal_jpl
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -128,9 +128,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.2.9
+signing_key:
 specification_version: 4
 summary: Calendar library including Japan's old-calendar, using JPL DE430.
 test_files: []