increments-schedule 0.16.1 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 273516dd5f8d88668dcdc503f160cbeb05771183ad1554d413bee129e6bfe88c
-  data.tar.gz: '05476799e3a61e0e5305e9b2ec0d639cd254ff8cfe106713ce1a643795576c91'
+  metadata.gz: 82bb6909cb6c21c1c942ca749dd55b059c196d579a47a9c5ebc364e18c60ce2f
+  data.tar.gz: 3178e7321f0293c611a987fd93377c774ab68af96071b4e2917669be74725665
 SHA512:
-  metadata.gz: f8a1ef7a936083a5151e92842bb04dfef915bc49beb0e5937a9db9f02c274a53911f338201649941c34a1c3a07345411118ccffe2a9eb40172139080bea55dfc
-  data.tar.gz: a9a3df9e8feb60d151e7e0de0f24fc02642852712fa081ca757740c5e7236833f2295defbc69d0ef33a270a14d4b85826aa620595d31f10f66b03c9c7552671c
+  metadata.gz: 73875c7d926a760744b1ba833fa0dff3a73358dd7708d4eb1ad79d1529cd3986423d805637d396d1918c28b4c449a6fc90dad22deb18e68ddd7469f89916f090
+  data.tar.gz: f95a328aa00b00040a6567dd4826dc026eb426f1078bb3350eed1bb8fe643eccbf0ffbe5e057c1a01744da5141830b3f4a31e4310364c2b01a636c66f7255690

data/.rubocop.yml

@@ -2,8 +2,7 @@ Layout/IndentArray:
   Enabled: false
 
 Metrics/BlockLength:
-  Exclude:
-    - spec/**/*.rb
+  Enabled: false
 
 Metrics/LineLength:
   Max: 100

data/lib/increments/schedule.rb

@@ -45,14 +45,7 @@ module Increments
     end
 
     def winter_vacation_day?(date = Date.today)
-      case date.month
-      when 1
-        first_three_days_or_adjoining_weekend?(date)
-      when 12
-        last_four_days_or_after_last_saturday?(date)
-      else
-        false
-      end
+      WinterVacationSchedule.new(date).winter_vacation?
     end
 
     alias winter_vacation? winter_vacation_day?
@@ -71,25 +64,85 @@ module Increments
       end
     end
 
-    private
+    WinterVacationSchedule = Struct.new(:date) do
+      def winter_vacation?
+        year_end_vacation.days.include?(date) || new_year_vacation.days.include?(date)
+      end
 
-    def first_three_days_or_adjoining_weekend?(date)
-      jan_3 = ExtendedDate.new(date.year, 1, 3)
-      return true if date <= jan_3
+      private
 
-      first_sunday = ExtendedDate.new(date.year, 1, 1).find_next(&:sunday?)
-      return false unless date.between?(jan_3, first_sunday)
+      def year_end_vacation
+        @year_end_vacation ||= YearEndVacation.new(date.year)
+      end
 
-      jan_3.next_day.upto(first_sunday).all? { |d| weekend?(d) }
-    end
+      def new_year_vacation
+        @new_year_vacation ||= NewYearVacation.new(date.year)
+      end
+
+      YearEndVacation = Struct.new(:year) do
+        def days
+          beginning_day..dec_31
+        end
+
+        def beginning_day
+          if coupled_new_year_vacation.days.count >= 5
+            last_saturday
+          else
+            [dec_28, last_saturday].min
+          end
+        end
+
+        def dec_28
+          @dec_28 ||= Date.new(year, 12, 28)
+        end
+
+        def dec_31
+          @dec_31 ||= Date.new(year, 12, 31)
+        end
+
+        def last_saturday
+          @last_saturday ||= dec_31.find_previous(&:saturday?)
+        end
 
-    def last_four_days_or_after_last_saturday?(date)
-      return true if date.day >= 28
+        def coupled_new_year_vacation
+          @coupled_new_year_vacation ||= NewYearVacation.new(year + 1)
+        end
+      end
+
+      NewYearVacation = Struct.new(:year) do
+        def days
+          jan_1..end_day
+        end
 
-      date >= ExtendedDate.new(date.year, 12, 31).find_previous(&:saturday?)
+        def end_day
+          return jan_3 if first_sunday <= jan_3
+
+          if first_weekend_almost_adjoins_jan_3?
+            first_sunday
+          else
+            jan_3
+          end
+        end
+
+        def first_weekend_almost_adjoins_jan_3?
+          jan_3.next_day.upto(first_sunday).all? { |d| d.friday? || d.saturday? || d.sunday? }
+        end
+
+        def first_sunday
+          @first_sunday ||= jan_1.find_next(&:sunday?)
+        end
+
+        def jan_1
+          @jan_1 ||= Date.new(year, 1, 1)
+        end
+
+        def jan_3
+          @jan_3 ||= Date.new(year, 1, 3)
+        end
+      end
     end
 
-    class ExtendedDate < Date
+    class Date < Date
       INFINITY_FUTURE = Date.new(10_000, 1, 1)
       INFINITY_PAST = Date.new(0, 1, 1)
 

data/lib/increments/schedule/version.rb

@@ -1,5 +1,5 @@
 module Increments
   module Schedule
-    VERSION = '0.16.1'
+    VERSION = '0.17.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: increments-schedule
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.17.0
 platform: ruby
 authors:
 - Yuji Nakayama
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-13 00:00:00.000000000 Z
+date: 2018-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: holiday_japan