ndr_support 5.5.1 → 5.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f5d3aeeaaa13e7221012d0c20948ce96257b4ebb2824e765d0570bc10cec75c
-  data.tar.gz: 57dc19084dc7ebe85fce29dcd5db48372febf8ee58c9cdd8a2ae275c81d1037c
+  metadata.gz: 902f81bfb91abe5145aebc693e0f200b621db63183963e6c1bc0d2c7ef783c7e
+  data.tar.gz: 8bb91d0cfa4e64493330d9fa1eeb2765452e45547d751df43daf954da5a06ddd
 SHA512:
-  metadata.gz: e9b013478c6a967e6dc2293de8c7bae820382fdb6dc0c8b0bb5aae82da064969620fb8143a6ee9013166f0d652c7ce64a7187279ca5b571c718cd74de5d075b5
-  data.tar.gz: c4a0b7c8c41c93aacbf53351d7ef517593e7f0612c6b6cb750ab218223e2d494dc9c746c9005c1bf003d2ed9c9e6ed4887813688f79f7eb22cb25e0bec6cff5b
+  metadata.gz: b006ab6c6ea53f6ce5b47dc38fd290d1b9679995eacea4cbd269477e79e06bc2a1a752b273d707dce3a127e8c605b08fae8dfa6c1a606bb272f290521f66d971
+  data.tar.gz: 193a182ca039ba2113d1701c75511eb00bd8c4ce3e52e5797c7a6846c3963fdca392b3374faa79b9fdf78e25ad3514f87d1bbc2bc6545f68092f698b7ab93a33

data/CHANGELOG.md

@@ -1,11 +1,40 @@
 ## [Unreleased]
 *no unreleased changes*
 
+## 5.8.0 / 2021-04-19
+## Added
+
+* Add ability to disable date reversing in Daterange
+
+## Fixed
+* Support Ruby 2.6-3.0.
+* Fix ruby warnings
+
+## 5.7.1 / 2021-01-03
+## Fixed
+* Postcodeize old Newport postcodes
+* Bump rake version
+* Support 2022 public holidays
+
+## 5.7.0 / 2020-06-30
+## Added
+* Handle three char months in Daterange
+
+## 5.6.1 / 2020-01-02
+## Fixed
+* Fix issue with 2020 public holiday
+* Support 2021 public holidays
+* Ensure dateranges up to 2030 are supported
+
+## 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
 * Warn when WorkingDays lookup is getting stale
-* Improved date parsing in String#to_date
+* Improved date parsing in `String#to_date`
 
 ## 5.5.0 / 2018-11-16
 ### Added

data/README.md

@@ -1,4 +1,4 @@
-# NdrSupport [![Build Status](https://travis-ci.org/PublicHealthEngland/ndr_support.svg?branch=master)](https://travis-ci.org/PublicHealthEngland/ndr_support) [![Gem Version](https://badge.fury.io/rb/ndr_support.svg)](https://badge.fury.io/rb/ndr_support)
+# NdrSupport [![Build Status](https://github.com/publichealthengland/ndr_support/workflows/Test/badge.svg)](https://github.com/publichealthengland/ndr_support/actions?query=workflow%3Atest) [![Gem Version](https://badge.fury.io/rb/ndr_support.svg)](https://rubygems.org/gems/ndr_support)
 
 This is the Public Health England (PHE) National Disease Registers (NDR) Support ruby gem, providing:
 

data/code_safety.yml

@@ -1,5 +1,17 @@
 ---
 file safety:
+  ".github/CODEOWNERS":
+    comments: 
+    reviewed_by: ollietulloch
+    safe_revision: 993f7719b57eb6ddd8dffa7230ed9ffc69f48749
+  ".github/workflows/lint.yml":
+    comments: 
+    reviewed_by: ollietulloch
+    safe_revision: 993f7719b57eb6ddd8dffa7230ed9ffc69f48749
+  ".github/workflows/test.yml":
+    comments: 
+    reviewed_by: ollietulloch
+    safe_revision: 993f7719b57eb6ddd8dffa7230ed9ffc69f48749
   ".gitignore":
     comments: 
     reviewed_by: josh.pencheon
@@ -8,16 +20,10 @@ file safety:
     comments: 
     reviewed_by: josh.pencheon
     safe_revision: a02f14cbf1fc36fbaf820365fdedfdc9af326db1
-  ".travis.yml":
-    comments: 'diff failed; reviewed whole file. Revision c88f5ac8c12fd657bb142144e0d3afaa7f9bc361:
-      Slack notification secret is public/private key encrypted, so not a disclosure
-      risk. As a secondary protection, it''s excluded from the .gem file by ndr_support.gemspec'
-    reviewed_by: josh.pencheon
-    safe_revision: 0cfcfac5ddcd721a67dcd23f04cbf6bc2278b922
   CHANGELOG.md:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: 1a3b9f3403a81404b0165c0d4ff7dd9a728eb0b5
+    reviewed_by: ollietulloch
+    safe_revision: b0dc20ab24516ac5c3ecb6c7078b56a20dd2fbd5
   CODE_OF_CONDUCT.md:
     comments: 
     reviewed_by: timgentry
@@ -36,8 +42,8 @@ file safety:
     safe_revision: 90328cca8494539257e192a63b240a91c89f0616
   README.md:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: 2685f35c907af6968a69eabb5ab9424b490d0f40
+    reviewed_by: ollietulloch
+    safe_revision: 993f7719b57eb6ddd8dffa7230ed9ffc69f48749
   Rakefile:
     comments: 
     reviewed_by: timgentry
@@ -60,16 +66,16 @@ file safety:
     safe_revision: 4a4ed24d2cfe7e1736baadf4cf6e0fece6823be1
   lib/ndr_support/concerns/working_days.rb:
     comments: 
-    reviewed_by: brian.shand
-    safe_revision: a64c2c4616317240faec2db7a84761947ae844a3
+    reviewed_by: brianshand
+    safe_revision: b72baa322dc58820ccd615a178371c2e5dab113c
   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
-    safe_revision: c7ed8bc16be8ec803dfaeb3473fbc538b54587ec
+    reviewed_by: ollietulloch
+    safe_revision: 7b9c9525a5d9d319ddec75d5106c85a53f77e3f4
   lib/ndr_support/hash.rb:
     comments: 
     reviewed_by: pauleves
@@ -80,12 +86,16 @@ file safety:
     safe_revision: 2685f35c907af6968a69eabb5ab9424b490d0f40
   lib/ndr_support/integer/julian_date_conversions.rb:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: 2685f35c907af6968a69eabb5ab9424b490d0f40
+    reviewed_by: ollietulloch
+    safe_revision: '09b3f97fb4c1afc88d0d070c39796b1f60c39d25'
   lib/ndr_support/integer/rounding.rb:
     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
@@ -96,12 +106,12 @@ file safety:
     safe_revision: 50a4293953f9ae227823c390b069a3ed4825074c
   lib/ndr_support/ourdate.rb:
     comments: 
-    reviewed_by: pauleves
-    safe_revision: a18fb5c6c360806a177a9c5584458586e90b3530
+    reviewed_by: ollietulloch
+    safe_revision: '09b3f97fb4c1afc88d0d070c39796b1f60c39d25'
   lib/ndr_support/ourtime.rb:
     comments: 
-    reviewed_by: brian.shand
-    safe_revision: 73527378c53b7ac00d1037155572fe3f01324992
+    reviewed_by: ollietulloch
+    safe_revision: '09b3f97fb4c1afc88d0d070c39796b1f60c39d25'
   lib/ndr_support/password.rb:
     comments: with input from brian.shand
     reviewed_by: josh.pencheon
@@ -120,64 +130,68 @@ file safety:
     safe_revision: 2685f35c907af6968a69eabb5ab9424b490d0f40
   lib/ndr_support/safe_path.rb:
     comments: 
-    reviewed_by: timgentry
-    safe_revision: 4492da77f6a8b678c40dd571fdd46fd936052cca
+    reviewed_by: ollietulloch
+    safe_revision: '09b3f97fb4c1afc88d0d070c39796b1f60c39d25'
   lib/ndr_support/string/cleaning.rb:
     comments: 
-    reviewed_by: brian.shand
-    safe_revision: 60cc69774d5aff92252558feae9604544def7583
+    reviewed_by: brianshand
+    safe_revision: b7b033ad9773cc9037c408a7763b113d31cbf191
   lib/ndr_support/string/conversions.rb:
     comments: 
-    reviewed_by: brian.shand
-    safe_revision: 1692170e1d07e3b6ba95e88d6c15510a7b3c2fe6
+    reviewed_by: ollietulloch
+    safe_revision: '09b3f97fb4c1afc88d0d070c39796b1f60c39d25'
   lib/ndr_support/tasks.rb:
     comments: 
     reviewed_by: timgentry
     safe_revision: 62337584a32e5c30c2e9af7cd998a9df684885cc
   lib/ndr_support/threat_scanner.rb:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: ed8ff421cc9353456af13a37049a07ce2545aac1
+    reviewed_by: brianshand
+    safe_revision: befa1d4f27448d5be4e133f442c2b5fbac7d8f25
   lib/ndr_support/utf8_encoding.rb:
     comments: 
     reviewed_by: josh.pencheon
     safe_revision: 8e024a4bacfd36e172aad4b800f1960faae0b4b6
   lib/ndr_support/utf8_encoding/control_characters.rb:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: 8e024a4bacfd36e172aad4b800f1960faae0b4b6
+    reviewed_by: ollietulloch
+    safe_revision: '09b3f97fb4c1afc88d0d070c39796b1f60c39d25'
   lib/ndr_support/utf8_encoding/force_binary.rb:
     comments: 
-    reviewed_by: timgentry
-    safe_revision: 29595e6431587ff9b7db6e3ad3abbb3577bff99c
+    reviewed_by: ollietulloch
+    safe_revision: '09b3f97fb4c1afc88d0d070c39796b1f60c39d25'
   lib/ndr_support/utf8_encoding/object_support.rb:
     comments: 
-    reviewed_by: timgentry
-    safe_revision: f7adf44fc2772e1926df37abfd9041d41c303328
+    reviewed_by: ollietulloch
+    safe_revision: '09b3f97fb4c1afc88d0d070c39796b1f60c39d25'
   lib/ndr_support/version.rb:
+    comments: 
+    reviewed_by: ollietulloch
+    safe_revision: b0dc20ab24516ac5c3ecb6c7078b56a20dd2fbd5
+  lib/ndr_support/working_days.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 1a3b9f3403a81404b0165c0d4ff7dd9a728eb0b5
+    safe_revision: c1158eccb843b637b4dd82815dc7c081f12b93e4
   lib/ndr_support/yaml/serialization_migration.rb:
     comments: 
     reviewed_by: timgentry
     safe_revision: 29595e6431587ff9b7db6e3ad3abbb3577bff99c
   ndr_support.gemspec:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: 0cfcfac5ddcd721a67dcd23f04cbf6bc2278b922
+    reviewed_by: ollietulloch
+    safe_revision: 993f7719b57eb6ddd8dffa7230ed9ffc69f48749
   test/array_test.rb:
     comments: 
     reviewed_by: timgentry
     safe_revision: 2a5d30674dc9dde336e1dbbbf3c8a98905647432
   test/concerns/working_days_test.rb:
     comments: 
-    reviewed_by: timgentry
-    safe_revision: 506a317e59d0ccb5b32d813b74d822f35a55cea9
+    reviewed_by: josh.pencheon
+    safe_revision: fe6c3beff445e3c84ed0c89f08e1ab10bfb00587
   test/daterange_test.rb:
     comments: 
-    reviewed_by: brian.shand
-    safe_revision: c7ed8bc16be8ec803dfaeb3473fbc538b54587ec
+    reviewed_by: ollietulloch
+    safe_revision: 7b9c9525a5d9d319ddec75d5106c85a53f77e3f4
   test/hash_test.rb:
     comments: 
     reviewed_by: timgentry
@@ -190,6 +204,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
@@ -228,12 +246,12 @@ file safety:
     safe_revision: b562d0c15ff1b1d565522a47e6bae47ea09706f0
   test/string/cleaning_test.rb:
     comments: 
-    reviewed_by: brian.shand
-    safe_revision: 60cc69774d5aff92252558feae9604544def7583
+    reviewed_by: brianshand
+    safe_revision: b7b033ad9773cc9037c408a7763b113d31cbf191
   test/string/conversions_test.rb:
     comments: 
-    reviewed_by: brian.shand
-    safe_revision: 1692170e1d07e3b6ba95e88d6c15510a7b3c2fe6
+    reviewed_by: ollietulloch
+    safe_revision: '09b3f97fb4c1afc88d0d070c39796b1f60c39d25'
   test/test_helper.rb:
     comments: 
     reviewed_by: josh.pencheon

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)
@@ -81,11 +83,30 @@ module WorkingDays
     '2020-01-01', # Wednesday - New Year's Day
     '2020-04-10', # Friday    - Good Friday
     '2020-04-13', # Monday    - Easter Monday
-    '2020-05-04', # Monday    - Early May bank holiday
+    '2020-05-08', # Friday    - Early May bank holiday (moved from Monday)
     '2020-05-25', # Monday    - Spring bank holiday
     '2020-08-31', # Monday    - Summer bank holiday
     '2020-12-25', # Friday    - Christmas Day
-    '2020-12-26', # Monday    - Boxing Day
+    '2020-12-28', # Monday    - Boxing Day (substitute day)
+    # 2021
+    '2021-01-01', # Friday - New Year’s Day
+    '2021-04-02', # Friday - Good Friday
+    '2021-04-05', # Monday - Easter Monday
+    '2021-05-03', # Monday - Early May bank holiday
+    '2021-05-31', # Monday - Spring bank holiday
+    '2021-08-30', # Monday - Summer bank holiday
+    '2021-12-27', # Monday - Christmas Day
+    '2021-12-28', # Tuesday - Boxing Day
+    # 2022
+    '2022-01-03', # Monday   - New Year’s Day (substitute day)
+    '2022-04-15', # Friday   - Good Friday
+    '2022-04-18', # Monday   - Easter Monday
+    '2022-05-02', # Monday   - Early May bank holiday
+    '2022-06-02', # Thursday - Spring bank holiday
+    '2022-06-03', # Friday   - Platinum Jubilee bank holiday
+    '2022-08-29', # Monday   - Summer bank holiday
+    '2022-12-26', # Monday   - Boxing Day
+    '2022-12-27', # Tuesday  - Christmas Day (substitute day)
   ].map { |str| Date.parse(str) }
 
   def self.check_lookup
@@ -100,7 +121,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 +130,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 +145,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/daterange.rb

@@ -6,7 +6,10 @@ require 'ndr_support/integer/julian_date_conversions'
 class Daterange
   attr_reader :date1, :date2, :source
 
-  OKYEARS = 1880..2020
+  OKYEARS = 1880..2030
+
+  # Raised when dates are not supplied in the correct order if do_not_flip_dates is passed as true:
+  class WrongDateOrderError < StandardError; end
 
   def self.extract(dates_string)
     dates_string.to_s.split(',').map { |str| new(str) }
@@ -17,15 +20,15 @@ class Daterange
     new(ranges.map(&:date1).compact.min, ranges.map(&:date2).compact.max)
   end
 
-  def initialize(x1 = nil, x2 = nil)
+  def initialize(x1 = nil, x2 = nil, do_not_sort_dates: false)
     x1 = x1.to_datetime if x1.is_a?(Date) || x1.is_a?(Time)
     x2 = x2.to_datetime if x2.is_a?(Date) || x2.is_a?(Time)
 
     if x1.is_a?(DateTime) && x2.is_a?(DateTime)
-      @date1 = [x1, x2].min
-      @date2 = [x1, x2].max
+      @date1 = do_not_sort_dates ? x1 : [x1, x2].min
+      @date2 = do_not_sort_dates ? x2 : [x1, x2].max
       @source = nil
-    elsif x1.is_a?(Daterange) && x2.nil?  # Patient model line 645
+    elsif x1.is_a?(Daterange) && x2.nil? # Patient model line 645
       @date1 = x1.date1
       @date2 = x1.date2
       @source = x1.source
@@ -34,12 +37,14 @@ class Daterange
       @date2 = x1
       @source = nil
     elsif x1.is_a?(String) && x2.nil?
-      self.source = (x1)
+      self.send(:source=, x1, do_not_sort_dates)
     else
       @date1 = nil
       @date2 = nil
       @source = nil
     end
+    raise WrongDateOrderError, 'Invalid date range order' if do_not_sort_dates && @date1 > @date2
+
     self.freeze
   end
 
@@ -135,24 +140,25 @@ class Daterange
 
   # Update our attribute values using a string representation of the date(s).
   # +s+ consists of one or more dates separated with spaces.
-  # Each date can be in various formats, e.g. d/m/yyyy, ddmmyyyy, yyyy-mm-dd.
-  # Each date can omit days or months, e.g. yyyy, dd/yyyy, yyyy-mm
-  def source=(s)
+  # Each date can be in various formats, e.g. d/m/yyyy, ddmmyyyy, yyyy-mm-dd, dd-mon-yyyy
+  # Each date can omit days or months, e.g. yyyy, dd/yyyy, yyyy-mm, mon-yyyy
+  def source=(s, do_not_sort_dates)
     @source = s
     ss = s.upcase.sub(/TO/, ' ') # accept default _to_s format
-    if ss =~ /[^0-9\-\/\. ]/ # only allow digits, hyphen, slash, dot, space
+    if ss =~ %r{[^A-Z0-9\-/\. ]}i # only allow letters, digits, hyphen, slash, dot, space
       @date1 = @date2 = nil
     else
       da = [] # temporary array of arrays of dates
-      ss.split(' ').each do |vaguedate|
+      ss.split.each do |vaguedate|
         da << str_to_date_array(vaguedate)
       end
       da.flatten!
       if da.include?(nil)
-        @date1 = @date2 =  nil
+        @date1 = @date2 = nil
       else
-        da.sort!
-        @date1, @date2 = da.first, da.last
+        da.sort! unless do_not_sort_dates
+        @date1 = da.first
+        @date2 = da.last
       end
     end
   end
@@ -184,7 +190,9 @@ class Daterange
   # e.g year only or year/month only) and return an array of 1..3 integers
   # representing the year, month and day
   def date_string_parts(ds)
-    if ds =~ /([\/\.\-])/ # find a slash or dot or hyphen
+    if ds =~ /\A(\d{1,2}[\/\.\-])?\w{3}[\/\.\-]\d{4}\z/i # dd[-/.]mon[-/.]yyyy or mon[-/.]yyyy
+      result = handle_three_char_months(ds)
+    elsif ds =~ /([\/\.\-])/ # find a slash or dot or hyphen
       delimiter = $1
       result = ds.split(delimiter)
     elsif ds.length == 8 # ddmmyyyy
@@ -200,4 +208,21 @@ class Daterange
     result.reverse! unless delimiter == '-' # change to YMD if not ISO format
     result.collect(&:to_i)
   end
+
+  def handle_three_char_months(datestring)
+    delimiter  = datestring.match(%r{[\/\.\-]})[0]
+    components = datestring.split(delimiter)
+
+    if datestring =~ /\A\d{1,2}#{delimiter}\w{3}#{delimiter}\d{4}\z/i
+      month = abbreviated_month_index_for(components[1])
+      month.nil? ? [] : [components.first, month, components.last]
+    elsif datestring =~ /\A\w{3}#{delimiter}\d{4}\z/i
+      month = abbreviated_month_index_for(components.first)
+      month.nil? ? [] : [month, components.last]
+    end
+  end
+
+  def abbreviated_month_index_for(string)
+    Date::ABBR_MONTHNAMES.index(string.capitalize)
+  end
 end

data/lib/ndr_support/integer/julian_date_conversions.rb

@@ -1,5 +1,3 @@
-require 'ndr_support/ourdate'
-
 # Extend Integer for use in our Daterange class
 class Integer
   # Julian date number to Ruby Date

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/ourdate.rb

@@ -31,6 +31,8 @@ class Ourdate
   # with strings arguments only after the 1970 epoch; before, it returns nil.
   #++
   def self.build_datetime(year, month = 1, day = 1, hour = 0, min = 0, sec = 0, usec = 0)
+    return nil if year.nil?
+
     if ActiveRecord::Base.default_timezone == :local
       # Time.local_time(year, month, day, hour, min, sec, usec).to_datetime
       # Behave like oracle_adapter.rb
@@ -72,8 +74,8 @@ class Ourdate
   end
 
   def empty?
-    # An unspecified date will be empty. A valid or invalid date will not.
-    @thedate.nil? && @source.blank?
+    # An unspecified date will be empty. A valid date will not.
+    @thedate.nil?
   end
 
   def source=(s)

data/lib/ndr_support/ourtime.rb

@@ -28,8 +28,8 @@ class Ourtime
   end
 
   def empty?
-    # An unspecified time will be empty. A valid or invalid time will not.
-    @thetime.nil? && @source.blank?
+    # An unspecified time will be empty. A valid time will not.
+    @thetime.nil?
   end
 
   private

data/lib/ndr_support/safe_path.rb

@@ -118,6 +118,7 @@ class SafePath
 
     @path_space = path_space
     @maximum_prms = fs_paths[platform][path_space]['prms']
+    @prm = nil
 
     self.path = @root
   end

data/lib/ndr_support/string/cleaning.rb

@@ -10,6 +10,7 @@ class String
       [A-Z][0-9][0-9]      |
       [A-Z][0-9][A-Z]      |
       [A-Z][A-Z][0-9]      |
+      NPT                  |
       [A-Z][A-Z][0-9][0-9] |
       [A-Z][A-Z][0-9][A-Z]
     )

data/lib/ndr_support/string/conversions.rb

@@ -84,8 +84,7 @@ class String
 
   # Try to convert the string value into a date.
   # If given a pattern, use it to parse date, otherwise use default setting to parse it
-  def to_date(pattern = nil)
-    return ''  if empty? # TODO: check if this is used... :/
+  redefine_method :to_date do |pattern = nil|
     return nil if blank?
 
     pattern = '%d%m%Y' if 'ddmmyyyy' == pattern
@@ -118,7 +117,7 @@ class String
         year += 100 if year <= Ourdate.today.year % 100
         year += 1900
       elsif 9 == length && self =~ /\A\d{2}[^A-Z0-9][A-Z]{3}[^A-Z0-9]\d{2}\z/i
-        # dd/mmm/yy, rare case.
+        # dd/mon/yy, rare case.
         year += 100 if year <= Ourdate.today.year % 100
         year += 1900
       end

data/lib/ndr_support/threat_scanner.rb

@@ -1,4 +1,5 @@
 require 'English'
+require 'shellwords'
 
 # Runs a virus/malware check against the given path, using ClamAV.
 #

data/lib/ndr_support/utf8_encoding/control_characters.rb

@@ -1,5 +1,3 @@
-require 'ndr_support/utf8_encoding'
-
 module UTF8Encoding
   # Allows any supported object to have control characters
   # escaped, using standard replacement scheme.

data/lib/ndr_support/utf8_encoding/force_binary.rb

@@ -1,5 +1,3 @@
-require 'ndr_support/utf8_encoding'
-
 module UTF8Encoding
   # Allows any supported object to have any high-ascii string
   # content to be force-encoded from UTF-8 to BINARY (/ASCII-8BIT).

data/lib/ndr_support/utf8_encoding/object_support.rb

@@ -1,5 +1,3 @@
-require 'ndr_support/utf8_encoding'
-
 # Allows any object (if supported) to have all related
 # strings encoded in place to UTF-8.
 module UTF8Encoding

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.8.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

@@ -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 'ndr_support/version'
 
@@ -13,9 +13,7 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT'
 
   # Exclude older versions of this gem from the package.
-  spec.files         = `git ls-files -z`.split("\x0").reject { |s| s =~ /^pkg\// }
-  # SECURE BNS 2018-08-06: Minimise sharing of (public-key encrypted) slack secrets in .travis.yml
-  spec.files         -= %w[.travis.yml] # Not needed in the gem
+  spec.files         = `git ls-files -z`.split("\x0").reject { |s| s =~ %r{^(\.github|pkg/)} }
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
@@ -24,15 +22,15 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'activesupport', '>= 5.2.0', '< 7'
 
   spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '>= 12.3.3'
 
-  spec.required_ruby_version = '>= 2.5.0'
+  spec.required_ruby_version = '>= 2.6.0'
 
   # Avoid std-lib minitest (which has different namespace)
   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/concerns/working_days_test.rb

@@ -119,4 +119,22 @@ class WorkingDaysTest < Minitest::Test
     assert_equal 253, @normal_time.working_days_until(@normal_time + 1.year)
     assert_equal 253, @normal_date_time.working_days_until(@normal_date_time + 1.year)
   end
+
+  test 'against GOV.UK holidays' do
+    require 'net/http'
+    require 'json'
+
+    url = 'https://www.gov.uk/bank-holidays/england-and-wales.json'
+    response = Net::HTTP.get(URI(url))
+
+    events = JSON.parse(response)['events']
+    events.each do |event|
+      event_date = event['date']
+      parsed_date = Date.parse(event_date)
+
+      assert parsed_date.public_holiday?, "#{event_date} should be a public holiday"
+      # next if parsed_date.public_holiday?
+      # puts "'#{event_date}', # #{parsed_date.strftime('%A')} - #{event['title']}"
+    end
+  end
 end

data/test/daterange_test.rb

@@ -24,19 +24,47 @@ class DaterangeTest < Minitest::Test
     # assert_match(/\d\d\.\d\d\.\d\d\d\d to \d\d.\d\d.\d\d\d\d/, dr.to_s)
   end
 
-  def test_dates_in_reverse_order
-    d = Date.today
-    dr = Daterange.new d, d + 1
-    dr2 = Daterange.new d + 1, d
+  def test_date_time_dates_in_reverse_order_with_do_not_sort_dates_false
+    d = Time.zone.today
+    dr = Daterange.new(d, d + 1)
+    dr2 = Daterange.new(d + 1, d)
     assert_equal(dr.to_s, dr2.to_s)
   end
 
+  def test_date_time_dates_in_reverse_order_with_do_not_sort_dates_true
+    d = Time.zone.today
+    Daterange.new(d, d + 1, do_not_sort_dates: true)
+    assert_raises(Daterange::WrongDateOrderError) do
+      Daterange.new(d + 1, d, do_not_sort_dates: true)
+    end
+  end
+
+  def test_string_dates_in_reverse_order_with_do_not_sort_dates_false
+    dr = Daterange.new('01/01/2019 to 01/01/2020')
+    dr2 = Daterange.new('01/01/2020 to 01/01/2019')
+    assert_equal(dr.to_s, dr2.to_s)
+  end
+
+  def test_string_dates_in_reverse_order_with_do_not_sort_dates_true
+    Daterange.new('01/01/2019 to 01/01/2020', do_not_sort_dates: true)
+    assert_raises(Daterange::WrongDateOrderError) do
+      Daterange.new('01/01/2020 to 01/01/2019', do_not_sort_dates: true)
+    end
+  end
+
   def test_illegal_strings
     dr = Daterange.new('01/o1/2000')
     assert_equal '', dr.to_s
     assert_nil dr.date1
     assert_nil dr.date2
-    refute dr.empty?  # Illegal dates do not count as empty / blank,
+    refute dr.empty? # Illegal dates do not count as empty / blank,
+    refute_nil dr.source # but the illegal string is preserved
+
+    dr = Daterange.new('01_01_2000')
+    assert_equal '', dr.to_s
+    assert_nil dr.date1
+    assert_nil dr.date2
+    refute dr.empty? # Illegal dates do not count as empty / blank,
     refute_nil dr.source # but the illegal string is preserved
   end
 
@@ -63,6 +91,12 @@ class DaterangeTest < Minitest::Test
     assert_equal '1880 2020', dr.source
   end
 
+  def test_year_range_future
+    s = 2.years.from_now.strftime('%Y')
+    dr = Daterange.new(s)
+    assert_equal s, dr.to_s, "Daterange should support future years up to #{s}"
+  end
+
   def test_hyphen_month_input_style
     dr = Daterange.new('2000-05')
     assert_equal '05.2000', dr.to_s
@@ -220,4 +254,42 @@ class DaterangeTest < Minitest::Test
     refute_equal dr1, nil
     refute_equal dr1, 0
   end
+
+  def test_three_char_months
+    dr1 = Daterange.new('01-APR-2020')
+    assert_equal '01.04.2020', dr1.date1.to_s
+    assert_equal '01.04.2020', dr1.date2.to_s
+
+    dr2 = Daterange.new('APR-2020')
+    assert_equal '01.04.2020', dr2.date1.to_s
+    assert_equal '30.04.2020', dr2.date2.to_s
+
+    dr3 = Daterange.new('JAN-2020 TO apr-2020')
+    assert_equal '01.01.2020', dr3.date1.to_s
+    assert_equal '30.04.2020', dr3.date2.to_s
+
+    dr4 = Daterange.new('20-JAN-2020 TO 12-Apr-2020')
+    assert_equal '20.01.2020', dr4.date1.to_s
+    assert_equal '12.04.2020', dr4.date2.to_s
+
+    dr5 = Daterange.new('01-BOB-2020')
+    assert_nil dr5.date1
+    assert_nil dr5.date2
+
+    dr6 = Daterange.new('01/APR/2020')
+    assert_equal '01.04.2020', dr6.date1.to_s
+    assert_equal '01.04.2020', dr6.date2.to_s
+
+    dr7 = Daterange.new('APR/2020')
+    assert_equal '01.04.2020', dr7.date1.to_s
+    assert_equal '30.04.2020', dr7.date2.to_s
+
+    dr8 = Daterange.new('JAN/2020 TO apr.2020')
+    assert_equal '01.01.2020', dr8.date1.to_s
+    assert_equal '30.04.2020', dr8.date2.to_s
+
+    dr9 = Daterange.new('20.JAN.2020 TO 12/Apr/2020')
+    assert_equal '20.01.2020', dr9.date1.to_s
+    assert_equal '12.04.2020', dr9.date2.to_s
+  end
 end

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

data/test/string/cleaning_test.rb

@@ -23,6 +23,9 @@ class String
       assert_equal 'AA9 9AA', 'AA9 9AA'.postcodeize(:db)
       assert_equal 'AA999AA', 'AA99 9AA'.postcodeize(:db)
       assert_equal 'AA9A9AA', 'AA9A 9AA'.postcodeize(:db)
+      # Old Newport postcodes until end 1984
+      assert_equal 'NPT 1AA' , 'NPT  1AA'.postcodeize(:db)
+      assert_equal 'NPT 1AA' , 'NPT 1AA'.postcodeize(:db)
       # Examples of legacy postcodes, that should be unchanged
       assert_equal 'IP222', 'IP222'.postcodeize(:db)
       assert_equal 'IP222E', 'IP222E'.postcodeize(:db)

data/test/string/conversions_test.rb

@@ -244,8 +244,8 @@ class String::ConversionsTest < Minitest::Test
     assert_equal Ourdate.build_datetime(1998, 02, 13), '1998-02-13'.to_date('%Y-%m-%d')
     assert_equal Ourdate.build_datetime(1998, 05, 03), '1998-05-03'.to_date('%Y-%m-%d')
 
-    assert ''.to_date('%Y-%m-%d').blank?
-    assert '  '.to_date('%Y-%m-%d').blank?
+    assert_nil ''.to_date('%Y-%m-%d') # Should behave like Rails-defined to_date
+    assert_nil '  '.to_date('%Y-%m-%d')
   end
 
   test '%d-%m-%Y string to_date' do
@@ -311,7 +311,7 @@ class String::ConversionsTest < Minitest::Test
     assert_equal Ourdate.build_datetime(2008, 05, 03), '03/05/08'.to_date
   end
 
-  test 'inferred dd/mmm/yy string to_date' do
+  test 'inferred dd/mon/yy string to_date' do
     # pre_epoch
     assert_equal Ourdate.build_datetime(1945, 02, 13), '13/FEB/45'.to_date
     assert_equal Ourdate.build_datetime(1945, 06, 03), '03/JUN/45'.to_date
@@ -357,9 +357,9 @@ class String::ConversionsTest < Minitest::Test
   end
 
   def assert_ymd(ymd, date)
-    assert_equal ymd.first,  date.year,  'years were not equal'
-    assert_equal ymd.second, date.month, 'months were not equal'
-    assert_equal ymd.third,  date.day,   'days were not equal'
+    assert_equal ymd[0],  date.year,  'years were not equal'
+    assert_equal ymd[1], date.month, 'months were not equal'
+    assert_equal ymd[2],  date.day,   'days were not equal'
   end
 
   def assert_ymd_parsed(ymd, parse_results)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_support
 version: !ruby/object:Gem::Version
-  version: 5.5.1
+  version: 5.8.0
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-15 00:00:00.000000000 Z
+date: 2021-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -68,16 +68,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -306,7 +309,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -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