increments-schedule 0.13.2 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6ed9a60f8d0e1e98939183fb197dbd40e50bf261
-  data.tar.gz: 27cf83e11edd682076f325f6112b9c06b14d3e69
+SHA256:
+  metadata.gz: b172f3f34040984d943581777b5f72b5ee82ef0995d44b896684015d44e734e4
+  data.tar.gz: be80411c1e82320205c17954ff9d903d17208c3e5c0f537bf0cd3d343313fdb8
 SHA512:
-  metadata.gz: 2b41c6f417c1fc3c5dcb9125e28b1328d118979fffe8940810b57586e5378bb9803aac7af5f44afe2766e913953e7adbf90af039f75edd01906473556082092b
-  data.tar.gz: e096e1f259d6ba2c5ebedecdd089326468aa900b1842156e2ae21b6ae35c741c5cda114640d0d3622ecc61b7c3033bead5b897c6fb30edbe0d51b0e27bb65f29
+  metadata.gz: 66fcee8bdf9052e4f427a9788209993c33fb0e042d925ee3f890bc4a7da53cc4fef004b0bb639f332d0fef60c0b5c22c4a134c00368cd3f77ad15338040a7d2d
+  data.tar.gz: 465153b398642caa3739070baf258f481477f2ccf386e9ef2b77c04fb1e10af96278b566d2dc783e5df76637b600abb27d9d77a95080a8c54ec091246cff1a64

data/.rubocop.yml

@@ -1,6 +1,28 @@
+Layout/FirstArrayElementIndentation:
+  Enabled: false
+
+Metrics/BlockLength:
+  Enabled: false
+
+Gemspec/RequiredRubyVersion:
+  Enabled: false
+
+Lint/ConstantDefinitionInBlock:
+  Enabled: false
+
 Metrics/LineLength:
   Max: 100
 
+Naming/FileName:
+  Exclude:
+    - increments-schedule.gemspec
+
+Naming/HeredocDelimiterNaming:
+  Enabled: false
+
+Naming/VariableNumber:
+  Enabled: false
+
 Metrics/ModuleLength:
   Enabled: false
 
@@ -13,9 +35,6 @@ Style/EmptyElse:
 Style/GuardClause:
   Enabled: false
 
-Style/IndentArray:
-  Enabled: false
-
 Style/MutableConstant:
   Enabled: false
 

data/.travis.yml

@@ -1,7 +1,10 @@
 language: ruby
 rvm:
-  - 2.2
-  - 2.3.0
+  - 2.5.7
+  - 2.6.7
+  - 2.7.2
+before_install:
+  - gem update bundler
 script: bundle exec rake ci
 sudo: false
 cache: bundler

data/Gemfile

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec
 
 group :development, :test do
-  gem 'rake', '~> 10.0'
+  gem 'rake', '~> 12.0'
   gem 'rspec', '~> 3.2'
-  gem 'rubocop', '~> 0.30'
+  gem 'rubocop', '~> 0.52'
   gem 'timecop', '~> 0.7'
 end
 

data/README.md

@@ -1,10 +1,9 @@
 [![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
 
-Find out our special remote days and eagerly wait for them!
+**Increments::Schedule** is a convenient library for checking Increments' company schedule.
 
 ## Installation
 
@@ -31,26 +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,10 +1,9 @@
 [![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
 
-Find out our special remote days and eagerly wait for them!
+**Increments::Schedule** is a convenient library for checking Increments' company schedule.
 
 ## Installation
 
@@ -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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
@@ -41,7 +43,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/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'bundler/setup'
 require 'increments/schedule'

data/bin/setup

@@ -2,6 +2,7 @@
 set -euo pipefail
 IFS=$'\n\t'
 
+gem install bundler
 bundle install
 
 # Do any other automated setup that you need to do here

data/increments-schedule.gemspec

@@ -1,5 +1,6 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'increments/schedule/version'
 
@@ -9,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Yuji Nakayama']
   spec.email         = ['nkymyj@gmail.com']
 
-  spec.summary       = "Increments' schedule"
+  spec.summary       = "Convenient library for checking Increments' company schedule"
   spec.description   = spec.summary
   spec.homepage      = 'https://github.com/increments/increments-schedule'
   spec.license       = 'MIT'
@@ -21,5 +22,5 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'holiday_japan', '~> 1.1'
 
-  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'bundler', '~> 2.2'
 end

data/lib/increments/schedule.rb

@@ -1,9 +1,13 @@
+# frozen_string_literal: true
+
+require 'increments/schedule/date'
 require 'increments/schedule/version'
+require 'increments/schedule/winter_vacation_schedule'
 require 'holiday_japan'
 
 module Increments
   module Schedule
-    extend self # rubocop:disable ModuleFunction
+    extend self # rubocop:disable Style/ModuleFunction
 
     def foundation_anniversary?(date = Date.today)
       date.month == 2 && date.day == 29
@@ -14,9 +18,10 @@ module Increments
     end
 
     def pay_day?(date = Date.today)
-      return work_day?(date) if date.day == 25
+      return work_day?(date) if date.day == 15
       return false if rest_day?(date)
-      next_basic_pay_day = Date.new(date.year, date.month, 25)
+
+      next_basic_pay_day = Date.new(date.year, date.month, 15)
       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|
         rest_day?(date_until_basic_pay_day)
@@ -27,10 +32,12 @@ module Increments
       !rest_day?(date)
     end
 
-    alias remote_work_day? work_day?
+    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)
@@ -41,21 +48,14 @@ module Increments
       HolidayJapan.check(date)
     end
 
-    def winter_vacation?(date = Date.today)
-      case date.month
-      when 1
-        return true if date.day <= 3
-        date <= ExtendedDate.new(date.year, 1, 1).find_next(&:sunday?)
-      when 12
-        return true if date.day >= 28
-        date >= ExtendedDate.new(date.year, 12, 31).find_previous(&:saturday?)
-      else
-        false
-      end
+    def winter_vacation_day?(date = Date.today)
+      WinterVacationSchedule.winter_vacation?(date)
     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/, '')
+      enumeration_method = "each_#{predicate_method.to_s.sub(/\?\z/, '')}"
 
       define_method(enumeration_method) do |max_date = nil, &block|
         return to_enum(__method__, max_date) unless block
@@ -67,22 +67,5 @@ module Increments
         end
       end
     end
-
-    class ExtendedDate < Date
-      INFINITY_FUTURE = Date.new(10_000, 1, 1)
-      INFINITY_PAST = Date.new(0, 1, 1)
-
-      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
 end

data/lib/increments/schedule/date.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Increments
+  module Schedule
+    class Date < ::Date
+      INFINITY_FUTURE = Date.new(10_000, 1, 1)
+      INFINITY_PAST = Date.new(0, 1, 1)
+
+      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
+end

data/lib/increments/schedule/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Increments
   module Schedule
-    VERSION = '0.13.2'
+    VERSION = '0.18.0'
   end
 end

data/lib/increments/schedule/winter_vacation_schedule.rb

@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+module Increments
+  module Schedule
+    WinterVacationSchedule = Struct.new(:date) do
+      def self.winter_vacation?(date)
+        new(date).winter_vacation?
+      end
+
+      def winter_vacation?
+        year_end_vacation.days.include?(date) || new_year_vacation.days.include?(date)
+      end
+
+      private
+
+      def year_end_vacation
+        @year_end_vacation ||= YearEndVacation.new(date.year)
+      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
+
+        private
+
+        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 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
+
+        private
+
+        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
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: increments-schedule
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.18.0
 platform: ruby
 authors:
 - Yuji Nakayama
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-23 00:00:00.000000000 Z
+date: 2021-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: holiday_japan
@@ -30,15 +30,15 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
-description: Increments' schedule
+        version: '2.2'
+description: Convenient library for checking Increments' company schedule
 email:
 - nkymyj@gmail.com
 executables: []
@@ -58,7 +58,9 @@ files:
 - bin/setup
 - increments-schedule.gemspec
 - lib/increments/schedule.rb
+- lib/increments/schedule/date.rb
 - lib/increments/schedule/version.rb
+- lib/increments/schedule/winter_vacation_schedule.rb
 homepage: https://github.com/increments/increments-schedule
 licenses:
 - MIT
@@ -78,9 +80,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: Increments' schedule
+summary: Convenient library for checking Increments' company schedule
 test_files: []