increments-schedule 0.15.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 78a000f9c75e15e30f47bc79da35b239a5e71a81
-  data.tar.gz: e031e3f2111035f29cea43467b4ebc21a3f29cb1
+SHA256:
+  metadata.gz: 273516dd5f8d88668dcdc503f160cbeb05771183ad1554d413bee129e6bfe88c
+  data.tar.gz: '05476799e3a61e0e5305e9b2ec0d639cd254ff8cfe106713ce1a643795576c91'
 SHA512:
-  metadata.gz: df35ae4a3b952720c93e0ebae3f8090015e7b392ebda1683fcc9d2d2830cf2e6bc4abce3ab2c38eee87f899f3e4acbed1429edcd8869bb50ce61428f564b53a4
-  data.tar.gz: 5569f49402c8a2507c8bf0a774ad09fe83072f2c965af6e701cca3cf73f1463d5969288dd4892063531c60018482aad8babe69ecb4bbe8535501747301351550
+  metadata.gz: f8a1ef7a936083a5151e92842bb04dfef915bc49beb0e5937a9db9f02c274a53911f338201649941c34a1c3a07345411118ccffe2a9eb40172139080bea55dfc
+  data.tar.gz: a9a3df9e8feb60d151e7e0de0f24fc02642852712fa081ca757740c5e7236833f2295defbc69d0ef33a270a14d4b85826aa620595d31f10f66b03c9c7552671c

data/.rubocop.yml

@@ -1,3 +1,6 @@
+Layout/IndentArray:
+  Enabled: false
+
 Metrics/BlockLength:
   Exclude:
     - spec/**/*.rb
@@ -5,6 +8,10 @@ Metrics/BlockLength:
 Metrics/LineLength:
   Max: 100
 
+Naming/FileName:
+  Exclude:
+    - increments-schedule.gemspec
+
 Naming/HeredocDelimiterNaming:
   Enabled: false
 
@@ -23,9 +30,6 @@ Style/EmptyElse:
 Style/GuardClause:
   Enabled: false
 
-Style/IndentArray:
-  Enabled: false
-
 Style/MutableConstant:
   Enabled: false
 

data/README.md

@@ -1,5 +1,4 @@
 [![Gem Version](http://img.shields.io/gem/v/increments-schedule.svg?style=flat)](http://badge.fury.io/rb/increments-schedule)
-[![Dependency Status](http://img.shields.io/gemnasium/increments/increments-schedule.svg?style=flat)](https://gemnasium.com/increments/increments-schedule)
 [![Build Status](https://travis-ci.org/increments/increments-schedule.svg?branch=master&style=flat)](https://travis-ci.org/increments/increments-schedule)
 
 # Increments::Schedule
@@ -31,24 +30,26 @@ $ gem install increments-schedule
 ### Predicate Methods
 
 * `Increments::Schedule.foundation_anniversary?(date = Date.today)`
-* `Increments::Schedule.super_hanakin?(date = Date.today)`
+* `Increments::Schedule.holiday?(date = Date.today)`
 * `Increments::Schedule.pay_day?(date = Date.today)`
-* `Increments::Schedule.work_day?(date = Date.today)`
+* `Increments::Schedule.remote_work_day?(date = Date.today)`
 * `Increments::Schedule.rest_day?(date = Date.today)`
+* `Increments::Schedule.super_hanakin?(date = Date.today)`
 * `Increments::Schedule.weekend?(date = Date.today)`
-* `Increments::Schedule.holiday?(date = Date.today)`
-* `Increments::Schedule.winter_vacation?(date = Date.today)`
+* `Increments::Schedule.winter_vacation_day?(date = Date.today)`
+* `Increments::Schedule.work_day?(date = Date.today)`
 
 ### Enumeration Methods
 
 * `Increments::Schedule.each_foundation_anniversary(max_date = Date.today + 365)`
-* `Increments::Schedule.each_super_hanakin(max_date = Date.today + 365)`
+* `Increments::Schedule.each_holiday(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_remote_work_day(max_date = Date.today + 365)`
 * `Increments::Schedule.each_rest_day(max_date = Date.today + 365)`
+* `Increments::Schedule.each_super_hanakin(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_winter_vacation(max_date = Date.today + 365)`
+* `Increments::Schedule.each_winter_vacation_day(max_date = Date.today + 365)`
+* `Increments::Schedule.each_work_day(max_date = Date.today + 365)`
 
 ## Development
 

data/README.md.erb

@@ -1,5 +1,4 @@
 [![Gem Version](http://img.shields.io/gem/v/increments-schedule.svg?style=flat)](http://badge.fury.io/rb/increments-schedule)
-[![Dependency Status](http://img.shields.io/gemnasium/increments/increments-schedule.svg?style=flat)](https://gemnasium.com/increments/increments-schedule)
 [![Build Status](https://travis-ci.org/increments/increments-schedule.svg?branch=master&style=flat)](https://travis-ci.org/increments/increments-schedule)
 
 # Increments::Schedule
@@ -32,8 +31,8 @@ $ gem install increments-schedule
 
 <%=
 methods = Increments::Schedule.public_instance_methods.select do |method|
-  method.to_s.end_with?('?')
-end
+  method.to_s.end_with?('?') && method != :winter_vacation?
+end.sort
 
 methods.map do |method|
   "* `Increments::Schedule.#{method}(date = Date.today)`"
@@ -44,8 +43,8 @@ end.join("\n")
 
 <%=
 methods = Increments::Schedule.public_instance_methods.select do |method|
-  method.to_s.start_with?('each_')
-end
+  method.to_s.start_with?('each_') && method != :each_winter_vacation
+end.sort
 
 methods.map do |method|
   "* `Increments::Schedule.#{method}(max_date = Date.today + 365)`"

data/Rakefile

@@ -41,7 +41,4 @@ def generate_readme
   erb.result(binding)
 end
 
-ci_tasks = %w[spec rubocop]
-# For some reason MRI 2.3 returns the method list with different order.
-ci_tasks << 'readme:validate' if RUBY_VERSION.start_with?('2.2.')
-task ci: ci_tasks
+task ci: %w[spec rubocop readme:validate]

data/increments-schedule.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'increments/schedule/version'
 

data/lib/increments/schedule.rb

@@ -16,6 +16,7 @@ module Increments
     def pay_day?(date = Date.today)
       return work_day?(date) if date.day == 25
       return false if rest_day?(date)
+
       next_basic_pay_day = Date.new(date.year, date.month, 25)
       next_basic_pay_day = next_basic_pay_day.next_month if date > next_basic_pay_day
       date.next_day.upto(next_basic_pay_day).all? do |date_until_basic_pay_day|
@@ -27,8 +28,12 @@ module Increments
       !rest_day?(date)
     end
 
+    def remote_work_day?(date = Date.today)
+      date.wednesday? && work_day?(date)
+    end
+
     def rest_day?(date = Date.today)
-      weekend?(date) || holiday?(date) || winter_vacation?(date)
+      weekend?(date) || holiday?(date) || winter_vacation_day?(date)
     end
 
     def weekend?(date = Date.today)
@@ -39,7 +44,7 @@ module Increments
       HolidayJapan.check(date)
     end
 
-    def winter_vacation?(date = Date.today)
+    def winter_vacation_day?(date = Date.today)
       case date.month
       when 1
         first_three_days_or_adjoining_weekend?(date)
@@ -50,6 +55,8 @@ module Increments
       end
     end
 
+    alias winter_vacation? winter_vacation_day?
+
     public_instance_methods.select { |name| name.to_s.end_with?('?') }.each do |predicate_method|
       enumeration_method = 'each_' + predicate_method.to_s.sub(/\?\z/, '')
 
@@ -69,13 +76,16 @@ module Increments
     def first_three_days_or_adjoining_weekend?(date)
       jan_3 = ExtendedDate.new(date.year, 1, 3)
       return true if date <= jan_3
+
       first_sunday = ExtendedDate.new(date.year, 1, 1).find_next(&:sunday?)
       return false unless date.between?(jan_3, first_sunday)
+
       jan_3.next_day.upto(first_sunday).all? { |d| weekend?(d) }
     end
 
     def last_four_days_or_after_last_saturday?(date)
       return true if date.day >= 28
+
       date >= ExtendedDate.new(date.year, 12, 31).find_previous(&:saturday?)
     end
 

data/lib/increments/schedule/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: increments-schedule
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.1
 platform: ruby
 authors:
 - Yuji Nakayama
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-28 00:00:00.000000000 Z
+date: 2018-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: holiday_japan
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Convenient library for checking Increments' company schedule