increments-schedule 0.13.1 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c89435ad919e28bd9aac089199b364729410eeb
-  data.tar.gz: 30f5fc090856aa6156c177f96cff0e7b35efc3ec
+  metadata.gz: 6ed9a60f8d0e1e98939183fb197dbd40e50bf261
+  data.tar.gz: 27cf83e11edd682076f325f6112b9c06b14d3e69
 SHA512:
-  metadata.gz: e2ba480c2f88ebe2dc0e73b6668bc20bc57914f8de908388c326d12135aceb186dc1ee27907c21aefbb34516057f5a62ad1d9f8c161cb1a56c82a0e3ba8fe69b
-  data.tar.gz: f24162fd6498d1f8d6b301b9e626af278d62a07527c96a7308769627dfce6161687baa14ca9a0ab38c5a27cc8f4220f12a28ffbab766e5769cab492fbab76ef4
+  metadata.gz: 2b41c6f417c1fc3c5dcb9125e28b1328d118979fffe8940810b57586e5378bb9803aac7af5f44afe2766e913953e7adbf90af039f75edd01906473556082092b
+  data.tar.gz: e096e1f259d6ba2c5ebedecdd089326468aa900b1842156e2ae21b6ae35c741c5cda114640d0d3622ecc61b7c3033bead5b897c6fb30edbe0d51b0e27bb65f29

data/lib/increments/schedule.rb

@@ -5,9 +5,6 @@ module Increments
   module Schedule
     extend self # rubocop:disable ModuleFunction
 
-    INFINITY_FUTURE = Date.new(10_000, 1, 1)
-    INFINITY_PAST = Date.new(0, 1, 1)
-
     def foundation_anniversary?(date = Date.today)
       date.month == 2 && date.day == 29
     end
@@ -47,11 +44,11 @@ module Increments
     def winter_vacation?(date = Date.today)
       case date.month
       when 1
-        first_sunday = find_date(Date.new(date.year, 1, 1), :upto, &:sunday?)
-        date <= first_sunday
+        return true if date.day <= 3
+        date <= ExtendedDate.new(date.year, 1, 1).find_next(&:sunday?)
       when 12
-        last_saturday = find_date(Date.new(date.year, 12, 31), :downto, &:saturday?)
-        date >= last_saturday
+        return true if date.day >= 28
+        date >= ExtendedDate.new(date.year, 12, 31).find_previous(&:saturday?)
       else
         false
       end
@@ -71,13 +68,20 @@ module Increments
       end
     end
 
-    private
+    class ExtendedDate < Date
+      INFINITY_FUTURE = Date.new(10_000, 1, 1)
+      INFINITY_PAST = Date.new(0, 1, 1)
 
-    def find_date(date, direction)
-      raise ArgumentError unless [:upto, :downto].include?(direction)
-      limit_date = direction == :upto ? INFINITY_FUTURE : INFINITY_PAST
-      date.send(direction, limit_date) do |d|
-        break d if yield d
+      def find_next
+        upto(INFINITY_FUTURE) do |date|
+          break date if yield date
+        end
+      end
+
+      def find_previous
+        downto(INFINITY_PAST) do |date|
+          break date if yield date
+        end
       end
     end
   end

data/lib/increments/schedule/version.rb

@@ -1,5 +1,5 @@
 module Increments
   module Schedule
-    VERSION = '0.13.1'
+    VERSION = '0.13.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: increments-schedule
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.2
 platform: ruby
 authors:
 - Yuji Nakayama