mk_cal_jpl 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 362dd3317abe521d2ec999efc27cb3ea69959467
-  data.tar.gz: eb88747c2741339efb7e6b8197a4fc65db694d6f
+  metadata.gz: d8065593de430f0d8fe8b00401961e5a129a0e5e
+  data.tar.gz: 512cc236da83dc3d21c56dc8d575353929f0bc1a
 SHA512:
-  metadata.gz: dd086b90a2d554b75230e3e9b7e44bfca9108f974d1e7b10f070d88d0a13f5371979499dc7eeac2f597c49ba452a47765644f38f3bbb7d1d79eb2a59a0215f53
-  data.tar.gz: ac53dab8b828a850b5779cbfac6ee77ddc1475672178babc62a701a895f601230486819e807416ca56dc8ac10d5fe18694d99fc6170ef963631c75f0c83e765b
+  metadata.gz: 6308ecd13ee4ff571c63918dd98ba6d3fb4cee3586c120a558b43ab57e3769ff6fe33e81301f539abbd9f583a6561bb5de1afbe1da19f71740aee31de7457a54
+  data.tar.gz: 0f6dea9752b09001b72efc207dc854f45421e62d7e1999020da2828ac422d658dd16cd142daabac321044390eb2530f70048a5eac477f6d6d1a10b2e669a9236

data/lib/mk_cal_jpl/calendar.rb

@@ -13,6 +13,13 @@ module MkCalJpl
       @jd_jst = @jd + Const::JST_D
     end
 
+    #=========================================================================
+    # 年間休日一覧
+    #=========================================================================
+    def holidays
+      return get_holidays(@year)
+    end
+
     #=========================================================================
     # 休日
     #=========================================================================

data/lib/mk_cal_jpl/compute.rb

@@ -13,6 +13,27 @@ module MkCalJpl
     # @return: holiday (漢字１文字)
     #=========================================================================
     def compute_holiday(year, month, day)
+      holidays = get_holidays(year)
+      code = 99
+      holidays.each do |holiday|
+        if holiday[0] == month &&  holiday[1] == day
+          code = holiday[2]
+          break
+        end
+      end
+      holiday = ""
+      res = Const::HOLIDAY.select { |h| h[0] == code }
+      holiday = res[0][4] unless res == []
+      return holiday
+    end
+
+    #=========================================================================
+    # 年間休日一覧の取得
+    #
+    # @param:  year
+    # @return: holidays (年間休日の配列)
+    #=========================================================================
+    def get_holidays(year)
       holiday_0 = Array.new  # 変動の祝日用
       holiday_1 = Array.new  # 国民の休日用
       holiday_2 = Array.new  # 振替休日用
@@ -111,19 +132,7 @@ module MkCalJpl
           holiday_2 << wk_ary
         end
       end
-
-      # 配列整理
-      code = 99
-      (holiday_0 + holiday_1 + holiday_2).sort.each do |holiday|
-        if holiday[0] == month &&  holiday[1] == day
-          code = holiday[2]
-          break
-        end
-      end
-      holiday = ""
-      res = Const::HOLIDAY.select { |h| h[0] == code }
-      holiday = res[0][4] unless res == []
-      return holiday
+      return (holiday_0 + holiday_1 + holiday_2).sort
     end
 
     #=========================================================================

data/lib/mk_cal_jpl/version.rb

@@ -1,3 +1,3 @@
 module MkCalJpl
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mk_cal_jpl
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - komasaru