HappyFriday 0.3.1 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc61748501928c69e0c18053c2ec7bba02c344bf19a545f91e56f701877b4202
-  data.tar.gz: ec5251820ad1d7c24dfae6fab231e0e0ab9ba1bcb760b697eb0aab75c8530ed4
+  metadata.gz: e7e2a2da8392cf104f420a5761b804499f3fa5bb531e044f5a3d0cfa3fb9fb28
+  data.tar.gz: 19caecefaba952ec58b0955606668de9d6edafd60080792e0e76244808b39a41
 SHA512:
-  metadata.gz: aca0d24fc307b04be91c461f46a99cc5dfbb05edaac1074adeb05eecdbdf4c837fff6491c30fc28490bf06a0790cccc3d1e54f6af8ad9f03286fe5f3e44de5fe
-  data.tar.gz: a1041d067961bbccda61f0669b824959a2291449e1828f46202a0a254b1483c3466d4dee61f0a3199ea58109686e9f1ff295efa0895e0ff316b5503c2ff1f3ca
+  metadata.gz: 6fd4e5698a27346df8827ec58993d0759396b4fa7e1ec3d33a6b2e0d6ceac141c579b3cc068d6394e38deac90e28f33f5611c1b5e521fc53df326f4f90152139
+  data.tar.gz: 22452139f2a94c58a69ba6c9a7c45165e2879a80c518dcc13d94adbf791ae7ccb6fe329dbff1f224c1381c8841049913722717908869c238f4526ba2f2b87633

data/README.md

@@ -1,6 +1,7 @@
 # HappyFriday
 
-Gem that can determine HappyFriday.
+This gem is capable of obtaining and determining HappyFriday.
+Extend to Date class.
 
 ## Installation
 
@@ -15,20 +16,27 @@ If bundler is not being used to manage dependencies, install the gem by executin
 ## Usage
 
 ### HappyFriday decision
-true or false returns.
 ```rb
-date = Date.new(2022, 5, 3)
-HappyFriday.happyfriday?(date) # false
+Date.new(2022, 5, 3).happy_friday?
+=> false
 
-date = Date.new(2022, 5, 27)
-HappyFriday.happyfriday?(date) # true
+Date.new(2022, 5, 27).happy_friday?
+=> true
 ```
 
-### Getting HappyFriday
+### Get the next HappyFriday
 You can get a HappyFriday for that month.
 ```rb
-date = Date.new(2022, 5, 1)
-HappyFriday.get_happy_friday(date) # 2022-05-27 00:00:00 +0900
+Date.new(2022, 5).get_next_happy_friday
+=> Fri, 27 May 2022
+
+# If the last Friday of the month is a holiday, the day before becomes HappyFriday.
+Date.new(2022, 4).get_next_happy_friday
+=> Thu, 28 Apr 2022
+
+# If HappyFriday of that month has passed, get next month.
+Date.new(2022, 4, 30).get_next_happy_friday
+=> Fri, 27 May 2022
 ```
 
 ## Development

data/lib/HappyFriday/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HappyFriday
-  VERSION = "0.3.1"
+  VERSION = "0.5.1"
 end

data/lib/HappyFriday.rb

@@ -7,12 +7,12 @@ require 'holiday_jp'
 module HappyFriday
   class Error < StandardError; end
 
-  def self.happyfriday?(target_date)
-    target_date.strftime("%Y%m%d") == HappyFriday.get_happy_friday(target_date).strftime("%Y%m%d")
+  def happy_friday?
+    self == self.get_next_happy_friday
   end
 
-  def self.get_happy_friday(date)
-    last_of_month = Date.new(date.year, date.month, -1)
+  def get_next_happy_friday
+    last_of_month = self.end_of_month
 
     case last_of_month.wday
     when 0..4
@@ -23,16 +23,29 @@ module HappyFriday
       raise 'Unpredictable day of the week.'
     end
 
-    last_friday = last_of_month.ago(before_friday_days.days)
+    last_friday = last_of_month - before_friday_days.days
 
     raise 'err' unless last_friday.wday == 5
 
-    # Doesn't work
-    # while HolidayJp.holiday?(last_friday)
-    #   last_friday = last_friday.ago(1.week)
-    # end
-    # return false if last_friday.month != last_of_month.month
+    100.times do
+      if HolidayJp.holiday?(last_friday)
+        last_friday -= 1
+      else
+        break
+      end
+    end
+
+    # If HappyFriday of that month has passed, get next month.
+    if self > last_friday
+      happy_friday = self.next_month.beginning_of_month.get_next_happy_friday
+    else
+      happy_friday = last_friday
+    end
 
-    last_friday
+    happy_friday
   end
 end
+
+class Date
+  include HappyFriday
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: HappyFriday
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.5.1
 platform: ruby
 authors:
 - holasoynaoki
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-31 00:00:00.000000000 Z
+date: 2022-07-10 00:00:00.000000000 Z
 dependencies: []
 description: Determine if today is a HappyFriday.
 email:
@@ -33,7 +33,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/holasoynaoki/HappyFriday
   source_code_uri: https://github.com/holasoynaoki/HappyFriday
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -48,8 +48,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Determine if today is a HappyFriday.
 test_files: []