HappyFriday 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bae7fcd3f539194b5a234f341885ac99c674e742f74ffc1181127cc047f89b49
-  data.tar.gz: '08da745d2b4cdc3b21f0e7fd7a94957c6e805bb7a8b6690825fd7ea9ff0bf5e7'
+  metadata.gz: c9357c7d344a25ec5773cfd40a97641602e5d5e33e10435b00b721ce6f2e777e
+  data.tar.gz: c0685d10bbfcfa912e6c5621d471060f7cae9efe7eb903943a3c38261c16d6ae
 SHA512:
-  metadata.gz: 77ade964d2f191705d50f1f7028edabb951ff2486051beedcc71aa1f895927551722ce776f178d46d2c888ad4db895bb18f9bb83e1268ee87885115abfbf46f1
-  data.tar.gz: 5b2c6b5dad43522d96a94936d4a0768389465385eef2de103ecc03f8a3b2c47cf96a1d42d6c42b6009b18762e56a29f161544b2d2c66128b44c915f590a18ac8
+  metadata.gz: 37eb44bf9423090e4399176da90c43be7341b4d5c719b789b316c1d0b3193c98fd8f1fdbc999507468453e4906021b048e053a21a04fa6d6e9534a7c48dfd5af
+  data.tar.gz: d4e2d3ef75a298d08e4d5e91ad8a99f542988e64095d7302471dc8c58c1b616238382254ba32ade1f85cd5fdf5dd853823c34c7788b45aaebe9619e37f81fcba

data/README.md

@@ -17,24 +17,30 @@ If bundler is not being used to manage dependencies, install the gem by executin
 ### HappyFriday decision
 ```rb
 date = Date.new(2022, 5, 3)
-HappyFriday.happyfriday?(date)
+HappyFriday.happy_friday?(date)
 => false
 
 date = Date.new(2022, 5, 27)
-HappyFriday.happyfriday?(date)
+HappyFriday.happy_friday?(date)
 => 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 = Date.new(2022, 6, 1)
-HappyFriday.get_happy_friday(date)
-=> 2022-06-24 00:00:00 +0900
+date = Date.new(2022, 5)
+HappyFriday.get_next_happy_friday(date)
+=> Fri, 27 May 2022
+
+# If the last Friday of the month is a holiday, the day before becomes HappyFriday.
+date = Date.new(2022, 4)
+HappyFriday.get_next_happy_friday(date)
+=> Thu, 28 Apr 2022
+
+# If HappyFriday of that month has passed, get next month.
+date = Date.new(2022, 4, 30)
+HappyFriday.get_next_happy_friday(date)
+=> Fri, 27 May 2022
 ```
 
 ## Development

data/lib/HappyFriday/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HappyFriday
-  VERSION = "0.4.0"
+  VERSION = "0.4.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 self.happy_friday?(target_date)
+    target_date.strftime("%Y%m%d") == HappyFriday.get_next_happy_friday(target_date).strftime("%Y%m%d")
   end
 
-  def self.get_happy_friday(date)
-    last_of_month = Date.new(date.year, date.month, -1)
+  def self.get_next_happy_friday(target_date)
+    last_of_month = Date.new(target_date.year, target_date.month, -1)
 
     case last_of_month.wday
     when 0..4
@@ -35,6 +35,15 @@ module HappyFriday
       end
     end
 
-    last_friday
+    # If HappyFriday of that month has passed, get next month.
+    # TODO: refactoring
+    if target_date > last_friday
+      next_month = last_friday + 1.month
+      happy_friday = HappyFriday.get_next_happy_friday(Date.new(next_month.year, next_month.month))
+    else
+      happy_friday = last_friday
+    end
+
+    happy_friday
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: HappyFriday
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - holasoynaoki
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-03 00:00:00.000000000 Z
+date: 2022-06-04 00:00:00.000000000 Z
 dependencies: []
 description: Determine if today is a HappyFriday.
 email: