ndr_support 5.5.1 → 5.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f5d3aeeaaa13e7221012d0c20948ce96257b4ebb2824e765d0570bc10cec75c
-  data.tar.gz: 57dc19084dc7ebe85fce29dcd5db48372febf8ee58c9cdd8a2ae275c81d1037c
+  metadata.gz: d599151cea4c34a89c568436565e71f11e34d489ed9b6e29aacc009dda5095a4
+  data.tar.gz: 47bc41f2159defce848c6150b4c72032252d6b88088ae38ac354abcf71b9f6e6
 SHA512:
-  metadata.gz: e9b013478c6a967e6dc2293de8c7bae820382fdb6dc0c8b0bb5aae82da064969620fb8143a6ee9013166f0d652c7ce64a7187279ca5b571c718cd74de5d075b5
-  data.tar.gz: c4a0b7c8c41c93aacbf53351d7ef517593e7f0612c6b6cb750ab218223e2d494dc9c746c9005c1bf003d2ed9c9e6ed4887813688f79f7eb22cb25e0bec6cff5b
+  metadata.gz: a7d2e904ba474818b94832adc0d2d5eb0844c1dc4d34cb31f2e8f7c717bd183069c8b014227c809f069960d974245cfd511ea0674b07b55f29645e4a2a592b90
+  data.tar.gz: '08f269ba7631cea9a4257a72bad295d8539c0ff6055ab96fcca6a3734d55b7a132213a39e3048cdd81ee437ce6e470b4f79967e84279da782f7eee8c461ef540'

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 ## [Unreleased]
 *no unreleased changes*
 
+## 5.6.0 / 2019-08-29
+### Added
+* Add `Integer#working_days_since`. (#11)
+
 ## 5.5.1 / 2019-05-15
 ### Fixed
 * Support Ruby 2.6, Rails 6.0. Minimum Ruby/Rails versions are now 2.5/5.2

data/code_safety.yml

@@ -17,7 +17,7 @@ file safety:
   CHANGELOG.md:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 1a3b9f3403a81404b0165c0d4ff7dd9a728eb0b5
+    safe_revision: 1f67d8d27b697d51069ea9d3df27ae44db86c694
   CODE_OF_CONDUCT.md:
     comments: 
     reviewed_by: timgentry
@@ -60,12 +60,12 @@ file safety:
     safe_revision: 4a4ed24d2cfe7e1736baadf4cf6e0fece6823be1
   lib/ndr_support/concerns/working_days.rb:
     comments: 
-    reviewed_by: brian.shand
-    safe_revision: a64c2c4616317240faec2db7a84761947ae844a3
+    reviewed_by: josh.pencheon
+    safe_revision: a5afad784e1e28a76e3907f5d742dc221ce8a235
   lib/ndr_support/date_and_time_extensions.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 3553509e52b3697d361cfa4c6f8a67754ed942d3
+    safe_revision: c1158eccb843b637b4dd82815dc7c081f12b93e4
   lib/ndr_support/daterange.rb:
     comments: 
     reviewed_by: brian.shand
@@ -86,6 +86,10 @@ file safety:
     comments: 
     reviewed_by: josh.pencheon
     safe_revision: 2685f35c907af6968a69eabb5ab9424b490d0f40
+  lib/ndr_support/integer/working_days.rb:
+    comments: 
+    reviewed_by: josh.pencheon
+    safe_revision: c1158eccb843b637b4dd82815dc7c081f12b93e4
   lib/ndr_support/nil.rb:
     comments: 
     reviewed_by: pauleves
@@ -157,7 +161,11 @@ file safety:
   lib/ndr_support/version.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 1a3b9f3403a81404b0165c0d4ff7dd9a728eb0b5
+    safe_revision: 1f67d8d27b697d51069ea9d3df27ae44db86c694
+  lib/ndr_support/working_days.rb:
+    comments: 
+    reviewed_by: josh.pencheon
+    safe_revision: c1158eccb843b637b4dd82815dc7c081f12b93e4
   lib/ndr_support/yaml/serialization_migration.rb:
     comments: 
     reviewed_by: timgentry
@@ -165,7 +173,7 @@ file safety:
   ndr_support.gemspec:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 0cfcfac5ddcd721a67dcd23f04cbf6bc2278b922
+    safe_revision: c685e94ddb1cf2814eb145e87a4c8bc6bced59fb
   test/array_test.rb:
     comments: 
     reviewed_by: timgentry
@@ -190,6 +198,10 @@ file safety:
     comments: 
     reviewed_by: josh.pencheon
     safe_revision: 2685f35c907af6968a69eabb5ab9424b490d0f40
+  test/integer/working_days_test.rb:
+    comments: 
+    reviewed_by: josh.pencheon
+    safe_revision: c1158eccb843b637b4dd82815dc7c081f12b93e4
   test/nil_test.rb:
     comments: 
     reviewed_by: timgentry

data/lib/ndr_support/concerns/working_days.rb

@@ -3,6 +3,8 @@ require 'active_support/time'
 # This module contains logic for #working_days_until, #weekday?, and #public_holiday?.
 module WorkingDays
   WEEK_DAYS = 1..5
+  
+  # TODO: could we use https://github.com/alphagov/gds-api-adapters ?
   HOLIDAYS  = [ # Sourced from https://www.gov.uk/bank-holidays
     # 2012
     '2012-01-02', # Monday    - New Year's Day (substitute day)
@@ -100,7 +102,7 @@ module WorkingDays
   def working_days_until(other)
     return -other.working_days_until(self) if other < self
 
-    whole_days_to(other).count do |day|
+    count_whole_days_to(other) do |day|
       day.weekday? && !day.public_holiday?
     end
   end
@@ -109,7 +111,7 @@ module WorkingDays
   # `other`. Returns negative number if `other` is earlier.
   def weekdays_until(other)
     return -other.weekdays_until(self) if other < self
-    whole_days_to(other).count(&:weekday?)
+    count_whole_days_to(other, &:weekday?)
   end
 
   # Is this a weekday?
@@ -124,14 +126,15 @@ module WorkingDays
 
   private
 
-  def whole_days_to(other)
-    [self].tap do |days|
-      loop do
-        next_day  = days.last + 1.day
-        next_day <= other ? days.push(next_day) : break
-      end
+  def count_whole_days_to(other, &block)
+    day = self + 1.day
+    count = 0
 
-      days.shift # Drop `self` off the front
+    while day <= other
+      count += 1 if block.call(day)
+      day += 1.day
     end
+
+    count
   end
 end

data/lib/ndr_support/date_and_time_extensions.rb

@@ -1,8 +1,6 @@
 require 'yaml'
 require 'date'
-
-require 'ndr_support/concerns/working_days'
-[Time, Date, DateTime].each { |klass| klass.send(:include, WorkingDays) }
+require 'ndr_support/working_days'
 
 class Date
   # to_iso output must be SQL safe for security reasons

data/lib/ndr_support/integer/working_days.rb

@@ -0,0 +1,11 @@
+# Mixin for working_days
+class Integer
+  # Returns a date of the number of working days since a given date
+  def working_days_since(date)
+    times do
+      date = date.next
+      date = date.next while date.public_holiday? || !date.weekday?
+    end
+    date
+  end
+end

data/lib/ndr_support/version.rb

@@ -3,5 +3,5 @@
 # This defines the NdrSupport version. If you change it, rebuild and commit the gem.
 # Use "rake build" to build the gem, see rake -T for all bundler rake tasks.
 module NdrSupport
-  VERSION = '5.5.1'
+  VERSION = '5.6.0'
 end

data/lib/ndr_support/working_days.rb

@@ -0,0 +1,5 @@
+require 'date'
+require 'ndr_support/concerns/working_days'
+require 'ndr_support/integer/working_days'
+
+[Time, Date, DateTime].each { |klass| klass.send(:include, WorkingDays) }

data/ndr_support.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest', '>= 5.0.0'
   spec.add_development_dependency 'mocha', '~> 1.1'
 
-  spec.add_development_dependency 'ndr_dev_support', '~> 3.1', '>= 3.1.3'
+  spec.add_development_dependency 'ndr_dev_support', '~> 5.4', '>= 5.4.5'
   spec.add_development_dependency 'guard'
   spec.add_development_dependency 'listen', '< 3.1' # Bundle 1.12 should be (but isn't) resolving Ruby 2.1 issue
   spec.add_development_dependency 'guard-rubocop'

data/test/integer/working_days_test.rb

@@ -0,0 +1,14 @@
+require 'test_helper'
+
+# This tests our Integer working days extension
+class Integer::WorkingDaysTest < Minitest::Test
+  test 'Integer should be extended with #working_days_since' do
+    assert 1.respond_to?(:working_days_since)
+  end
+
+  test 'Integer#working_days_since should behave correctly' do
+    assert_equal Date.new(2019, 12, 23), 1.working_days_since(Date.new(2019, 12, 20))
+    assert_equal Date.new(2019, 12, 27), 3.working_days_since(Date.new(2019, 12, 20))
+    assert_equal Date.new(2019, 12, 30), 4.working_days_since(Date.new(2019, 12, 20))
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_support
 version: !ruby/object:Gem::Version
-  version: 5.5.1
+  version: 5.6.0
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-15 00:00:00.000000000 Z
+date: 2019-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -112,20 +112,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '5.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: 5.4.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '5.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: 5.4.5
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -251,6 +251,7 @@ files:
 - lib/ndr_support/integer/calculations.rb
 - lib/ndr_support/integer/julian_date_conversions.rb
 - lib/ndr_support/integer/rounding.rb
+- lib/ndr_support/integer/working_days.rb
 - lib/ndr_support/nil.rb
 - lib/ndr_support/obfuscator.rb
 - lib/ndr_support/ourdate.rb
@@ -269,6 +270,7 @@ files:
 - lib/ndr_support/utf8_encoding/force_binary.rb
 - lib/ndr_support/utf8_encoding/object_support.rb
 - lib/ndr_support/version.rb
+- lib/ndr_support/working_days.rb
 - lib/ndr_support/yaml/serialization_migration.rb
 - ndr_support.gemspec
 - test/array_test.rb
@@ -277,6 +279,7 @@ files:
 - test/hash_test.rb
 - test/integer/calculations_test.rb
 - test/integer/rounding_test.rb
+- test/integer/working_days_test.rb
 - test/nil_test.rb
 - test/obfuscator_test.rb
 - test/ourdate_test.rb
@@ -324,6 +327,7 @@ test_files:
 - test/hash_test.rb
 - test/integer/calculations_test.rb
 - test/integer/rounding_test.rb
+- test/integer/working_days_test.rb
 - test/nil_test.rb
 - test/obfuscator_test.rb
 - test/ourdate_test.rb