HappyFriday 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6dc995fa7776b56cc948825ee7d264abe291a99885adba2381d6db073ab0ba88
-  data.tar.gz: be8801c411b53e396aa61b91fffe3a0a47a28efb9d5cc1c2d70461b38826ffb2
+  metadata.gz: c9357c7d344a25ec5773cfd40a97641602e5d5e33e10435b00b721ce6f2e777e
+  data.tar.gz: c0685d10bbfcfa912e6c5621d471060f7cae9efe7eb903943a3c38261c16d6ae
 SHA512:
-  metadata.gz: 8999d3265a0bca79b081aaa6f57b1036f99995504085c97081013ad607718a5776426581708bb7a37b870d53bb028289b0a6b13676bc9b74cd22eb56e3edf3f9
-  data.tar.gz: a5fbc9cee07f9f53148ea1523cc6740312b441ddcebfd906019eb14618a39e1f82fffbf7098188065eaa687bf48cafc304cfad075b701f138ce435091edf2a79
+  metadata.gz: 37eb44bf9423090e4399176da90c43be7341b4d5c719b789b316c1d0b3193c98fd8f1fdbc999507468453e4906021b048e053a21a04fa6d6e9534a7c48dfd5af
+  data.tar.gz: d4e2d3ef75a298d08e4d5e91ad8a99f542988e64095d7302471dc8c58c1b616238382254ba32ade1f85cd5fdf5dd853823c34c7788b45aaebe9619e37f81fcba

data/README.md

@@ -1,6 +1,6 @@
 # HappyFriday
 
-Gem that can determine HappyFriday.
+This gem is capable of obtaining and determining HappyFriday.
 
 ## Installation
 
@@ -15,15 +15,32 @@ If bundler is not being used to manage dependencies, install the gem by executin
 ## Usage
 
 ### HappyFriday decision
-true or false returns.
 ```rb
-HappyFriday.happyfriday?(Time.now)
+date = Date.new(2022, 5, 3)
+HappyFriday.happy_friday?(date)
+=> false
+
+date = Date.new(2022, 5, 27)
+HappyFriday.happy_friday?(date)
+=> true
 ```
 
-### Getting HappyFriday
+### Get the next HappyFriday
 You can get a HappyFriday for that month.
 ```rb
-HappyFriday.get_happy_friday(Time.now)
+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.3.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)
+  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
@@ -23,16 +23,27 @@ 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
+    loop do
+      if HolidayJp.holiday?(last_friday)
+        last_friday -= 1
+      else
+        break
+      end
+    end
+
+    # 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
 
-    last_friday.strftime("%Y%m%d")
+    happy_friday
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: HappyFriday
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.1
 platform: ruby
 authors:
 - holasoynaoki
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-31 00:00:00.000000000 Z
+date: 2022-06-04 00:00:00.000000000 Z
 dependencies: []
 description: Determine if today is a HappyFriday.
 email:
@@ -48,7 +48,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Determine if today is a HappyFriday.