increments-schedule 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4f4d11215e5e04c912ce6d9dfd5d147dc58edee
-  data.tar.gz: 7a2d18a7f97da8386e03d24b866dfdc261a508a6
+  metadata.gz: cc11817841783d4d1d0b8b81c527bf51c053012e
+  data.tar.gz: cb0a7a4e0db7e96e9a960c1f4c13cf8f6074e74e
 SHA512:
-  metadata.gz: 224a58fad8a3760e692fa0db80871ad76fd637c29864de304221dae770abb5865af9ac1bb0d7ea23c8d595a38a9feae628d6a41d64378f31199c9b222fe23c69
-  data.tar.gz: 4ad981dd2b182779d385c979409f02efe89bc79805cfdae45d97dc94667dc81c2b9087522590e4bf27bb0f337c8118e44ca17b37ca32678cafe1d52d6b964e90
+  metadata.gz: 42d456886744ef07db78fb0029233b1b3eb665653a058fc81256159170107c6f3f2b0b3ae24bf4e8e1a15caeb296b373757b9dedba3d58434f297aa72ab3992c
+  data.tar.gz: 4e249baa1368e8d00a3d829ebbe0c9e1b73a26d24e1df2cd0ce8155a48eebf35f1865efc72d8b524e9b3dfbcbad1e3f44e3e98f03512dde7a94efde87e160d32

data/README.md

@@ -34,13 +34,11 @@ $ gem install increments-schedule
 * `Increments::Schedule.super_hanakin?(date = Date.today)`
 * `Increments::Schedule.pay_day?(date = Date.today)`
 * `Increments::Schedule.work_day?(date = Date.today)`
-* `Increments::Schedule.office_work_day?(date = Date.today)`
 * `Increments::Schedule.remote_work_day?(date = Date.today)`
-* `Increments::Schedule.normal_remote_work_day?(date = Date.today)`
-* `Increments::Schedule.special_remote_work_day?(date = Date.today)`
 * `Increments::Schedule.rest_day?(date = Date.today)`
 * `Increments::Schedule.weekend?(date = Date.today)`
 * `Increments::Schedule.holiday?(date = Date.today)`
+* `Increments::Schedule.summer_vacation?(date = Date.today)`
 * `Increments::Schedule.winter_vacation?(date = Date.today)`
 
 ### Enumeration Methods
@@ -49,13 +47,11 @@ $ gem install increments-schedule
 * `Increments::Schedule.each_super_hanakin(max_date = Date.today + 365)`
 * `Increments::Schedule.each_pay_day(max_date = Date.today + 365)`
 * `Increments::Schedule.each_work_day(max_date = Date.today + 365)`
-* `Increments::Schedule.each_office_work_day(max_date = Date.today + 365)`
 * `Increments::Schedule.each_remote_work_day(max_date = Date.today + 365)`
-* `Increments::Schedule.each_normal_remote_work_day(max_date = Date.today + 365)`
-* `Increments::Schedule.each_special_remote_work_day(max_date = Date.today + 365)`
 * `Increments::Schedule.each_rest_day(max_date = Date.today + 365)`
 * `Increments::Schedule.each_weekend(max_date = Date.today + 365)`
 * `Increments::Schedule.each_holiday(max_date = Date.today + 365)`
+* `Increments::Schedule.each_summer_vacation(max_date = Date.today + 365)`
 * `Increments::Schedule.each_winter_vacation(max_date = Date.today + 365)`
 
 ## Development

data/lib/increments/schedule/version.rb

@@ -1,5 +1,5 @@
 module Increments
   module Schedule
-    VERSION = '0.11.0'
+    VERSION = '0.12.0'
   end
 end

data/lib/increments/schedule.rb

@@ -29,10 +29,10 @@ module Increments
       !rest_day?(date)
     end
 
-    alias_method :remote_work_day?, :work_day?
+    alias remote_work_day? work_day?
 
     def rest_day?(date = Date.today)
-      weekend?(date) || holiday?(date) || winter_vacation?(date)
+      weekend?(date) || holiday?(date) || summer_vacation?(date) || winter_vacation?(date)
     end
 
     def weekend?(date = Date.today)
@@ -43,6 +43,13 @@ module Increments
       HolidayJapan.check(date)
     end
 
+    def summer_vacation?(date = Date.today)
+      return false unless date.month == 8
+      return true if date.day.between?(13, 16)
+      return false if !weekend?(date) && !holiday?(date)
+      any_adjacent_date?(date) { |adjacent_date| summer_vacation?(adjacent_date) }
+    end
+
     def winter_vacation?(date = Date.today)
       case date.month
       when 1
@@ -72,6 +79,12 @@ module Increments
 
     private
 
+    def any_adjacent_date?(date, &_block)
+      [(date - 1), (date + 1)].any? do |adjacent_date|
+        yield adjacent_date
+      end
+    end
+
     def find_date(date, direction)
       raise ArgumentError unless [:upto, :downto].include?(direction)
       limit_date = direction == :upto ? INFINITY_FUTURE : INFINITY_PAST

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: increments-schedule
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Yuji Nakayama
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2016-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: holiday_japan