increments-schedule 0.17.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82bb6909cb6c21c1c942ca749dd55b059c196d579a47a9c5ebc364e18c60ce2f
-  data.tar.gz: 3178e7321f0293c611a987fd93377c774ab68af96071b4e2917669be74725665
+  metadata.gz: b172f3f34040984d943581777b5f72b5ee82ef0995d44b896684015d44e734e4
+  data.tar.gz: be80411c1e82320205c17954ff9d903d17208c3e5c0f537bf0cd3d343313fdb8
 SHA512:
-  metadata.gz: 73875c7d926a760744b1ba833fa0dff3a73358dd7708d4eb1ad79d1529cd3986423d805637d396d1918c28b4c449a6fc90dad22deb18e68ddd7469f89916f090
-  data.tar.gz: f95a328aa00b00040a6567dd4826dc026eb426f1078bb3350eed1bb8fe643eccbf0ffbe5e057c1a01744da5141830b3f4a31e4310364c2b01a636c66f7255690
+  metadata.gz: 66fcee8bdf9052e4f427a9788209993c33fb0e042d925ee3f890bc4a7da53cc4fef004b0bb639f332d0fef60c0b5c22c4a134c00368cd3f77ad15338040a7d2d
+  data.tar.gz: 465153b398642caa3739070baf258f481477f2ccf386e9ef2b77c04fb1e10af96278b566d2dc783e5df76637b600abb27d9d77a95080a8c54ec091246cff1a64

data/.rubocop.yml

@@ -1,9 +1,15 @@
-Layout/IndentArray:
+Layout/FirstArrayElementIndentation:
   Enabled: false
 
 Metrics/BlockLength:
   Enabled: false
 
+Gemspec/RequiredRubyVersion:
+  Enabled: false
+
+Lint/ConstantDefinitionInBlock:
+  Enabled: false
+
 Metrics/LineLength:
   Max: 100
 

data/.travis.yml

@@ -1,8 +1,10 @@
 language: ruby
 rvm:
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
+  - 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,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'

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,3 +1,5 @@
+# frozen_string_literal: true
+
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'increments/schedule/version'
@@ -20,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,10 +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)
@@ -45,13 +49,13 @@ module Increments
     end
 
     def winter_vacation_day?(date = Date.today)
-      WinterVacationSchedule.new(date).winter_vacation?
+      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
@@ -63,100 +67,5 @@ module Increments
         end
       end
     end
-
-    WinterVacationSchedule = Struct.new(:date) do
-      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
-
-        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
-
-        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 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/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.17.0'
+    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.17.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Yuji Nakayama
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-24 00:00:00.000000000 Z
+date: 2021-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: holiday_japan
@@ -30,14 +30,14 @@ 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'
+        version: '2.2'
 description: Convenient library for checking Increments' company schedule
 email:
 - nkymyj@gmail.com
@@ -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,8 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Convenient library for checking Increments' company schedule