increments-schedule 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6651624066fc41e06e60861b336170c73848ecf
-  data.tar.gz: 9a1e35492daa18f6e9931658d9243aa46235e0d8
+  metadata.gz: 78a000f9c75e15e30f47bc79da35b239a5e71a81
+  data.tar.gz: e031e3f2111035f29cea43467b4ebc21a3f29cb1
 SHA512:
-  metadata.gz: e0db0575b67beba4eb1a27a5529bb6dd40e4dd755b1d8ab292211c9dfa923239b1d21f97436d5c8d352f70d0f69c4bb9870ed032d9093efad636ba3b7c027030
-  data.tar.gz: c2d763c638f846d96e40227a4966ee9d7afe241bf357fd5e96737ea7bdb7b7ed941c2b2c7a1174033f13d0b8f90cc71b7ed75397220cac9e5ad10b75141fee58
+  metadata.gz: df35ae4a3b952720c93e0ebae3f8090015e7b392ebda1683fcc9d2d2830cf2e6bc4abce3ab2c38eee87f899f3e4acbed1429edcd8869bb50ce61428f564b53a4
+  data.tar.gz: 5569f49402c8a2507c8bf0a774ad09fe83072f2c965af6e701cca3cf73f1463d5969288dd4892063531c60018482aad8babe69ecb4bbe8535501747301351550

data/.rubocop.yml

@@ -1,6 +1,16 @@
+Metrics/BlockLength:
+  Exclude:
+    - spec/**/*.rb
+
 Metrics/LineLength:
   Max: 100
 
+Naming/HeredocDelimiterNaming:
+  Enabled: false
+
+Naming/VariableNumber:
+  Enabled: false
+
 Metrics/ModuleLength:
   Enabled: false
 

data/.travis.yml

@@ -1,7 +1,8 @@
 language: ruby
 rvm:
-  - 2.2
-  - 2.3.0
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
 script: bundle exec rake ci
 sudo: false
 cache: bundler

data/Gemfile

@@ -3,9 +3,9 @@ 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

@@ -4,7 +4,7 @@
 
 # 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
 

data/README.md.erb

@@ -4,7 +4,7 @@
 
 # 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
 

data/Rakefile

@@ -41,7 +41,7 @@ def generate_readme
   erb.result(binding)
 end
 
-ci_tasks = %w(spec rubocop)
+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

data/increments-schedule.gemspec

@@ -1,4 +1,3 @@
-# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'increments/schedule/version'
@@ -9,7 +8,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'

data/lib/increments/schedule.rb

@@ -42,11 +42,9 @@ module Increments
     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?)
+        first_three_days_or_adjoining_weekend?(date)
       when 12
-        return true if date.day >= 28
-        date >= ExtendedDate.new(date.year, 12, 31).find_previous(&:saturday?)
+        last_four_days_or_after_last_saturday?(date)
       else
         false
       end
@@ -66,6 +64,21 @@ module Increments
       end
     end
 
+    private
+
+    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
+
     class ExtendedDate < 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.14.0'
+    VERSION = '0.15.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: increments-schedule
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Yuji Nakayama
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-23 00:00:00.000000000 Z
+date: 2017-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: holiday_japan
@@ -38,7 +38,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-description: Increments' schedule
+description: Convenient library for checking Increments' company schedule
 email:
 - nkymyj@gmail.com
 executables: []
@@ -79,8 +79,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
-summary: Increments' schedule
+summary: Convenient library for checking Increments' company schedule
 test_files: []