ndr_support 5.4.2 → 5.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 07ba3c21f982adf4857b352bf87e1046dd393090
-  data.tar.gz: 5dd49f19587d0071d82565e1912a775ec065d986
+SHA256:
+  metadata.gz: e06c6fad074bb00f7ba16334d194b9fcf369147688dbd1f22dcd1cca86e71073
+  data.tar.gz: 7ede15deb1aec6e6ee02d627437eb7c94810755dbcb717db9212c17c2f09ca3e
 SHA512:
-  metadata.gz: 58504a8eabba9ab32fb4ab2a0e6f935101614f92c7bcd7eb6db606d3404394290cd8f6f8d7921d7606ca42c1924e1183a7301882558a912c15c39c5644484088
-  data.tar.gz: cdcbd43264a63a9427bfdca4c5e0f57e51a8d29fb3273e247d7c06004dba86d98b788effc60823b33e8ba1950ef60ab78217cb4cdba6b67ff2b6d5174c99ce67
+  metadata.gz: f3b03a27b86891d3cb52dcf3fab222cf3bd42b05cb859918142dd6791a6dc18e5ebba0075911d9d177e7451a5b447b0cf6324455641f913ebb86c78808cf5843
+  data.tar.gz: e5d89586818d5a50a1c3211086ce812d485e90b3080c46986be570ec32e7c740f6d5c312a8580ef727243c5910b60d5acd13f8e94276e0fa07dbf922879a9a85

data/CHANGELOG.md

@@ -0,0 +1,41 @@
+## [Unreleased]
+*no unreleased changes*
+
+## 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`
+
+## 5.5.0 / 2018-11-16
+### Added
+* Add `ThreatScanner` to wrap ClamAV for virus detection (#10)
+
+### Fixed
+* Added missing bank holidays for 2017-2019 (#9)
+
+## 5.4.2 / 2018-08-06
+### Fixed
+* Fix Daterange equality comparisons
+
+## 5.4.1 / 2018-07-09
+### Fixed
+* ensure Range#exclude? is available
+
+## 5.4.0 / 2018-05-09
+### Added
+* Support Rails 5.2

data/code_safety.yml

@@ -12,8 +12,12 @@ file safety:
     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: brian.shand
-    safe_revision: c88f5ac8c12fd657bb142144e0d3afaa7f9bc361
+    reviewed_by: josh.pencheon
+    safe_revision: 0cfcfac5ddcd721a67dcd23f04cbf6bc2278b922
+  CHANGELOG.md:
+    comments: 
+    reviewed_by: ollietulloch
+    safe_revision: ce582c10aa4ddddcd22f907d6228cc7bb324a280
   CODE_OF_CONDUCT.md:
     comments: 
     reviewed_by: timgentry
@@ -38,42 +42,34 @@ file safety:
     comments: 
     reviewed_by: timgentry
     safe_revision: e33e9dae7f38bc449ce9276515a539836dbbbd53
-  gemfiles/Gemfile.rails42:
-    comments: 
-    reviewed_by: pauleves
-    safe_revision: f76ad0fe72d42b1ff37553c8194935a8b93a6848
-  gemfiles/Gemfile.rails50:
-    comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: 55ed1c2a18b9cc4d1d996ee69419f5ee38f87746
-  gemfiles/Gemfile.rails51:
-    comments: 
-    reviewed_by: brian.shand
-    safe_revision: 4e87fd9d64fc0f15b359ba60fc48cda54453c647
   gemfiles/Gemfile.rails52:
     comments: 
     reviewed_by: josh.pencheon
     safe_revision: 8a6bedae77d33d0db1b67eaed7972870b6afc993
-  lib/ndr_support.rb:
+  gemfiles/Gemfile.rails60:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 2685f35c907af6968a69eabb5ab9424b490d0f40
+    safe_revision: 0cfcfac5ddcd721a67dcd23f04cbf6bc2278b922
+  lib/ndr_support.rb:
+    comments: 
+    reviewed_by: brian.shand
+    safe_revision: 44fbdf72f47f4022c7dc9148150ebc18589dac8f
   lib/ndr_support/array.rb:
     comments: 
     reviewed_by: pauleves
     safe_revision: 4a4ed24d2cfe7e1736baadf4cf6e0fece6823be1
   lib/ndr_support/concerns/working_days.rb:
     comments: 
-    reviewed_by: pauleves
-    safe_revision: 5f9c98dcad6f6889d2431eb98cf07b1f5c3e57be
+    reviewed_by: josh.pencheon
+    safe_revision: fe6c3beff445e3c84ed0c89f08e1ab10bfb00587
   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: 9a4b8e53f477725c2c2be5000b3c9e66f07d7389
   lib/ndr_support/hash.rb:
     comments: 
     reviewed_by: pauleves
@@ -90,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
@@ -132,20 +132,24 @@ file safety:
     safe_revision: 60cc69774d5aff92252558feae9604544def7583
   lib/ndr_support/string/conversions.rb:
     comments: 
-    reviewed_by: brian.shand
-    safe_revision: 0a06fed3e7530185497f786decdb77a62d35e101
+    reviewed_by: ollietulloch
+    safe_revision: 9a4b8e53f477725c2c2be5000b3c9e66f07d7389
   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
   lib/ndr_support/utf8_encoding.rb:
     comments: 
-    reviewed_by: timgentry
-    safe_revision: 29595e6431587ff9b7db6e3ad3abbb3577bff99c
+    reviewed_by: josh.pencheon
+    safe_revision: 8e024a4bacfd36e172aad4b800f1960faae0b4b6
   lib/ndr_support/utf8_encoding/control_characters.rb:
     comments: 
-    reviewed_by: timgentry
-    safe_revision: d210b982841611381a0df02d8f2db9c13e41e42f
+    reviewed_by: josh.pencheon
+    safe_revision: 8e024a4bacfd36e172aad4b800f1960faae0b4b6
   lib/ndr_support/utf8_encoding/force_binary.rb:
     comments: 
     reviewed_by: timgentry
@@ -156,28 +160,32 @@ file safety:
     safe_revision: f7adf44fc2772e1926df37abfd9041d41c303328
   lib/ndr_support/version.rb:
     comments: 
-    reviewed_by: brian.shand
-    safe_revision: a4ba32dcdab4a08db5851767282008ca3e7d8672
+    reviewed_by: ollietulloch
+    safe_revision: ce582c10aa4ddddcd22f907d6228cc7bb324a280
+  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
     safe_revision: 29595e6431587ff9b7db6e3ad3abbb3577bff99c
   ndr_support.gemspec:
     comments: 
-    reviewed_by: brian.shand
-    safe_revision: e8d08f6466acbdd4cbd6cbf90f1cfa45ffd656ec
+    reviewed_by: josh.pencheon
+    safe_revision: c685e94ddb1cf2814eb145e87a4c8bc6bced59fb
   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: 9a4b8e53f477725c2c2be5000b3c9e66f07d7389
   test/hash_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
@@ -232,12 +244,16 @@ file safety:
     safe_revision: 60cc69774d5aff92252558feae9604544def7583
   test/string/conversions_test.rb:
     comments: 
-    reviewed_by: brian.shand
-    safe_revision: 1955bf30ffe581610981f0148569e252cba02926
+    reviewed_by: ollietulloch
+    safe_revision: 9a4b8e53f477725c2c2be5000b3c9e66f07d7389
   test/test_helper.rb:
     comments: 
-    reviewed_by: brian.shand
-    safe_revision: 4533a155924f8a1415dd64e251a7f8311ece3bd8
+    reviewed_by: josh.pencheon
+    safe_revision: 34ae80f2952f0bfd18688541862774cbaaa6c5f5
+  test/threat_scanner_test.rb:
+    comments: 
+    reviewed_by: josh.pencheon
+    safe_revision: ed8ff421cc9353456af13a37049a07ce2545aac1
   test/utf8_encoding/control_characters_test.rb:
     comments: 
     reviewed_by: timgentry

data/gemfiles/Gemfile.rails60

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'activerecord',  '~> 6.0.0rc1'
+gem 'activesupport', '~> 6.0.0rc1'

data/lib/ndr_support.rb

@@ -13,6 +13,7 @@ require 'ndr_support/safe_file'
 require 'ndr_support/safe_path'
 require 'ndr_support/string/cleaning'
 require 'ndr_support/string/conversions'
+require 'ndr_support/threat_scanner'
 require 'ndr_support/utf8_encoding'
 require 'ndr_support/version'
 require 'ndr_support/yaml/serialization_migration'
@@ -20,3 +21,5 @@ require 'ndr_support/yaml/serialization_migration'
 module NdrSupport
   # Your code goes here...
 end
+
+WorkingDays.check_lookup

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)
@@ -50,14 +52,66 @@ module WorkingDays
     '2016-08-29', # Monday    - Summer bank holiday
     '2016-12-26', # Monday    - Boxing Day
     '2016-12-27', # Tuesday   - Christmas Day (substitute day)
+    # 2017
+    '2017-01-02', # Monday    - New Year's Day
+    '2017-04-14', # Friday    - Good Friday
+    '2017-04-17', # Monday    - Easter Monday
+    '2017-05-01', # Monday    - Early May bank holiday
+    '2017-05-29', # Monday    - Spring bank holiday
+    '2017-08-28', # Monday    - Summer bank holiday
+    '2017-12-25', # Monday    - Christmas Day
+    '2017-12-26', # Tuesday   - Boxing Day
+    # 2018
+    '2018-01-01', # Monday    - New Year's Day
+    '2018-03-30', # Friday    - Good Friday
+    '2018-04-02', # Monday    - Easter Monday
+    '2018-05-07', # Monday    - Early May bank holiday
+    '2018-05-28', # Monday    - Spring bank holiday
+    '2018-08-27', # Monday    - Summer bank holiday
+    '2018-12-25', # Tuesday   - Christmas Day
+    '2018-12-26', # Wednesday - Boxing Day
+    # 2019
+    '2019-01-01', # Tuesday   - New Year's Day
+    '2019-04-19', # Friday    - Good Friday
+    '2019-04-22', # Monday    - Easter Monday
+    '2019-05-06', # Monday    - Early May bank holiday
+    '2019-05-27', # Monday    - Spring bank holiday
+    '2019-08-26', # Monday    - Summer bank holiday
+    '2019-12-25', # Wednesday - Christmas Day
+    '2019-12-26', # Thursday  - Boxing Day
+    # 2020
+    '2020-01-01', # Wednesday - New Year's Day
+    '2020-04-10', # Friday    - Good Friday
+    '2020-04-13', # Monday    - Easter Monday
+    '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-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
   ].map { |str| Date.parse(str) }
 
+  def self.check_lookup
+    return true if HOLIDAYS.max >= 1.year.from_now
+
+    warn "NdrSupport's WorkingDays extension has under a year of future data. Check for updates?"
+    false
+  end
+
   # How many complete working days there are until the given
   # `other`. Returns negative number if `other` is earlier.
   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
@@ -66,7 +120,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?
@@ -81,14 +135,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,7 @@ require 'ndr_support/integer/julian_date_conversions'
 class Daterange
   attr_reader :date1, :date2, :source
 
-  OKYEARS = 1880..2020
+  OKYEARS = 1880..2030
 
   def self.extract(dates_string)
     dates_string.to_s.split(',').map { |str| new(str) }
@@ -135,12 +135,12 @@ 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
+  # 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)
     @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 =~ /[^\w0-9\-\/\. ]/i # only allow letters, digits, hyphen, slash, dot, space
       @date1 = @date2 = nil
     else
       da = [] # temporary array of arrays of dates
@@ -184,7 +184,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 +202,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/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/string/conversions.rb

@@ -85,7 +85,6 @@ 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... :/
     return nil if blank?
 
     pattern = '%d%m%Y' if 'ddmmyyyy' == pattern
@@ -112,13 +111,13 @@ class String
 
       if ['yyyy/dd/mm', 'mm/dd/yyyy'].include?(pattern)
         month, day = day, month
-      elsif 8 == length && self !~ /\d{8}/
+      elsif 8 == length && self =~ /\A\d{2}[^A-Z0-9]\d{2}[^A-Z0-9]\d{2}\z/i
         # dd/mm/yy, rather than yyyymmdd
         year, day = day, year
         year += 100 if year <= Ourdate.today.year % 100
         year += 1900
-      elsif 9 == length
-        # dd/mmm/yy, rare case.
+      elsif 9 == length && self =~ /\A\d{2}[^A-Z0-9][A-Z]{3}[^A-Z0-9]\d{2}\z/i
+        # dd/mon/yy, rare case.
         year += 100 if year <= Ourdate.today.year % 100
         year += 1900
       end

data/lib/ndr_support/threat_scanner.rb

@@ -0,0 +1,64 @@
+require 'English'
+
+# Runs a virus/malware check against the given path, using ClamAV.
+#
+# Sample usage:
+#
+#   # Call with a file object:
+#   ThreatScanner.new(@unknown_tempfile).check!
+#
+#   # ...or with a path:
+#   ThreatScanner.new('path/to/README').check!
+#
+class ThreatScanner
+  class Error < StandardError; end
+
+  class MissingFileError      < Error; end
+  class MissingScannerError   < Error; end
+  class ScannerOperationError < Error; end
+  class ThreatDetectedError   < Error; end
+
+  def self.installed?
+    system('which clamdscan > /dev/null 2>&1')
+  end
+
+  attr_reader :path
+
+  def initialize(path)
+    @path = path.respond_to?(:path) ? path.path : path
+  end
+
+  # Returns true if the given file is deemed safe, and false if it could not
+  # be checked. Raises if a threat is detected, or the file did not exist.
+  def check
+    check!
+  rescue MissingScannerError, ScannerOperationError
+    false
+  end
+
+  # Returns true if the given file is deemed safe, and raises an exception
+  # otherwise (if the file is unsafe / does not exist / scanner broke etc).
+  def check!
+    check_existence! && check_installed! && run_scanner!
+  end
+
+  private
+
+  def check_existence!
+    File.exist?(@path) || raise(MissingFileError, "#{@path} does not exist!")
+  end
+
+  def check_installed!
+    self.class.installed? || raise(MissingScannerError, 'no scanner is available')
+  end
+
+  def run_scanner!
+    `clamdscan --fdpass --quiet #{Shellwords.escape(@path)}`
+
+    case $CHILD_STATUS.exitstatus
+    when 0 then true
+    when 1 then raise(ThreatDetectedError, "possible virus detected at #{@path}!")
+    else        raise(ScannerOperationError, 'the scan was unable to complete')
+    end
+  end
+end

data/lib/ndr_support/utf8_encoding.rb

@@ -16,6 +16,9 @@ module UTF8Encoding
   # How should unmappable characters be escaped, when forcing encoding?
   REPLACEMENT_SCHEME = lambda { |char| '0x' + char.ord.to_s(16).rjust(2, '0') }
 
+  UTF8   = 'UTF-8'.freeze
+  BINARY = 'BINARY'.freeze
+
   # Returns a new string with valid UTF-8 encoding,
   # or raises an exception if encoding fails.
   def ensure_utf8(string, source_encoding = nil)
@@ -51,7 +54,7 @@ module UTF8Encoding
     ensure_utf8!(string, source_encoding)
   rescue UTF8CoercionError
     # ...before going back-to-basics, and replacing things that don't map:
-    string.encode!('UTF-8', 'BINARY', :fallback => REPLACEMENT_SCHEME)
+    string.encode!(UTF8, BINARY, :fallback => REPLACEMENT_SCHEME)
   end
 
   private
@@ -60,7 +63,7 @@ module UTF8Encoding
     candidates.detect do |encoding|
       begin
         # Attempt to encode as UTF-8 from source `encoding`:
-        string.encode!('UTF-8', encoding)
+        string.encode!(UTF8, encoding)
         # If that worked, we're done; otherwise, move on.
         string.valid_encoding?
       rescue EncodingError

data/lib/ndr_support/utf8_encoding/control_characters.rb

@@ -5,9 +5,7 @@ module UTF8Encoding
   # escaped, using standard replacement scheme.
   module ControlCharacters
     # The range of characters we consider:
-    CONTROL_CHARACTERS = /[\x00-\x1f]|\x7f/
-    # Exceptions that are allowed:
-    ALLOWED_CONTROL_CHARACTERS = %W( \x09 \x0a \x0d )
+    CONTROL_CHARACTERS = /[\x00-\x08]|[\x0b-\x0c]|[\x0e-\x1f]|\x7f/
 
     # Recursively escape any control characters in `object`.
     def escape_control_chars_in_object!(object)
@@ -31,11 +29,7 @@ module UTF8Encoding
     # Escapes in-place any control characters in `string`, before returning it.
     def escape_control_chars!(string)
       string.gsub!(CONTROL_CHARACTERS) do |character|
-        if ALLOWED_CONTROL_CHARACTERS.include?(character)
-          character
-        else
-          UTF8Encoding::REPLACEMENT_SCHEME[character]
-        end
+        UTF8Encoding::REPLACEMENT_SCHEME[character]
       end
       string
     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.4.2'
+  VERSION = '5.7.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

@@ -20,19 +20,19 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activerecord',  '>= 4.0.13', '< 5.3'
-  spec.add_dependency 'activesupport', '>= 4.0.13', '< 5.3'
+  spec.add_dependency 'activerecord',  '>= 5.2.0', '< 7'
+  spec.add_dependency 'activesupport', '>= 5.2.0', '< 7'
 
-  spec.add_development_dependency 'bundler', '~> 1.7'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake', '~> 10.0'
 
-  spec.required_ruby_version = '>= 2.1.0'
+  spec.required_ruby_version = '>= 2.5.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.0'
+  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

@@ -63,6 +63,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 +226,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/conversions_test.rb

@@ -58,6 +58,10 @@ class String::ConversionsTest < Minitest::Test
     assert_ymd [2001, 3, 2],  '02/03/2001'.to_date
     assert_ymd [2010, 7, 11], '2010-07-11'.to_date
 
+    assert_ymd [2001, 3, 2],  '2.3.2001'.to_date
+    assert_ymd [2001, 3, 2],  '2/3/2001'.to_date
+    assert_ymd [2010, 7, 11], '2010-7-11'.to_date
+
     assert_ymd [2001, 2, 3], '2001/02/03'.to_date('yyyy/mm/dd')
     assert_ymd [2001, 2, 3], '2001/03/02'.to_date('yyyy/dd/mm')
     assert_ymd [2001, 2, 3], '2001-02-03'.to_date('yyyy-mm-dd')
@@ -240,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
@@ -307,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
@@ -334,6 +338,12 @@ class String::ConversionsTest < Minitest::Test
     assert_equal Ourdate.build_datetime(2008, 05, 03), '03/05/2008 13:38'.to_date
   end
 
+  test 'incorrectly formatted string to_date' do
+    assert_nil '10-1975'.to_date
+    assert_nil '10.1975A'.to_date
+    assert_nil '10.1975AA'.to_date
+  end
+
   test 'to_boolean' do
     assert_equal true, 'true'.to_boolean
     assert_equal true, 'yes'.to_boolean

data/test/test_helper.rb

@@ -3,7 +3,7 @@ SimpleCov.start
 
 require 'minitest/autorun'
 require 'minitest/unit'
-require 'mocha/mini_test'
+require 'mocha/minitest'
 
 require 'active_record'
 require 'active_support/time'

data/test/threat_scanner_test.rb

@@ -0,0 +1,75 @@
+require 'test_helper'
+
+# This tests our ThreatScanner extension
+class ThreatScannerTest < Minitest::Test
+  def setup
+    @tempfile = Tempfile.new
+    @scanner  = ThreatScanner.new(@tempfile)
+
+    ThreatScanner.stubs(installed?: true)
+    ThreatScanner.any_instance.stubs(:`)
+  end
+
+  def teardown
+    @tempfile.close!
+  end
+
+  test 'can be initialised with a file' do
+    assert_equal @tempfile.path, @scanner.path
+  end
+
+  test 'can be initialised with a path' do
+    scanner = ThreatScanner.new(@tempfile.path)
+    assert_equal @tempfile.path, scanner.path
+  end
+
+  test 'returns true if no threat is detected (when being strict)' do
+    Process::Status.any_instance.stubs(exitstatus: 0)
+    assert_equal true, @scanner.check!
+  end
+
+  test 'raises if a threat is detected (when being strict)' do
+    Process::Status.any_instance.stubs(exitstatus: 1)
+    assert_raises(ThreatScanner::ThreatDetectedError) { @scanner.check! }
+  end
+
+  test 'raises if the file does not exist (when being strict)' do
+    @tempfile.close!
+    assert_raises(ThreatScanner::MissingFileError) { @scanner.check! }
+  end
+
+  test 'raises if ClamAV is not installed (when being strict)' do
+    ThreatScanner.stubs(installed?: false)
+    assert_raises(ThreatScanner::MissingScannerError) { @scanner.check! }
+  end
+
+  test 'raises if there is an operational error (when being strict)' do
+    Process::Status.any_instance.stubs(exitstatus: 2)
+    assert_raises(ThreatScanner::ScannerOperationError) { @scanner.check! }
+  end
+
+  test 'returns true if no threat is detected (when being relaxed)' do
+    Process::Status.any_instance.stubs(exitstatus: 0)
+    assert_equal true, @scanner.check
+  end
+
+  test 'raises if a threat is detected (when being relaxed)' do
+    Process::Status.any_instance.stubs(exitstatus: 1)
+    assert_raises(ThreatScanner::ThreatDetectedError) { @scanner.check }
+  end
+
+  test 'raises if the file does not exist (when being relaxed)' do
+    @tempfile.close!
+    assert_raises(ThreatScanner::MissingFileError) { @scanner.check }
+  end
+
+  test 'returns false if ClamAV is not installed (when being relaxed)' do
+    ThreatScanner.stubs(installed?: false)
+    assert_equal false, @scanner.check
+  end
+
+  test 'returns false if there is an operational error (when being relaxed)' do
+    Process::Status.any_instance.stubs(exitstatus: 2)
+    assert_equal false, @scanner.check
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_support
 version: !ruby/object:Gem::Version
-  version: 5.4.2
+  version: 5.7.0
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-07 00:00:00.000000000 Z
+date: 2020-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,54 +16,54 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.13
+        version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.13
+        version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.13
+        version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.13
+        version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -112,14 +112,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.4.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.4.5
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -226,6 +232,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Guardfile
@@ -233,10 +240,8 @@ files:
 - README.md
 - Rakefile
 - code_safety.yml
-- gemfiles/Gemfile.rails42
-- gemfiles/Gemfile.rails50
-- gemfiles/Gemfile.rails51
 - gemfiles/Gemfile.rails52
+- gemfiles/Gemfile.rails60
 - lib/ndr_support.rb
 - lib/ndr_support/array.rb
 - lib/ndr_support/concerns/working_days.rb
@@ -246,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
@@ -258,11 +264,13 @@ files:
 - lib/ndr_support/string/cleaning.rb
 - lib/ndr_support/string/conversions.rb
 - lib/ndr_support/tasks.rb
+- lib/ndr_support/threat_scanner.rb
 - lib/ndr_support/utf8_encoding.rb
 - lib/ndr_support/utf8_encoding/control_characters.rb
 - 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
@@ -271,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
@@ -283,6 +292,7 @@ files:
 - test/string/cleaning_test.rb
 - test/string/conversions_test.rb
 - test/test_helper.rb
+- test/threat_scanner_test.rb
 - test/utf8_encoding/control_characters_test.rb
 - test/utf8_encoding/force_binary_test.rb
 - test/utf8_encoding_test.rb
@@ -299,15 +309,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: NDR Support library
@@ -318,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
@@ -330,6 +340,7 @@ test_files:
 - test/string/cleaning_test.rb
 - test/string/conversions_test.rb
 - test/test_helper.rb
+- test/threat_scanner_test.rb
 - test/utf8_encoding/control_characters_test.rb
 - test/utf8_encoding/force_binary_test.rb
 - test/utf8_encoding_test.rb

data/gemfiles/Gemfile.rails42

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-gem 'activerecord',  '~> 4.2.0'
-gem 'activesupport', '~> 4.2.0'

data/gemfiles/Gemfile.rails50

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-gem 'activerecord',  '~> 5.0.0'
-gem 'activesupport', '~> 5.0.0'

data/gemfiles/Gemfile.rails51

@@ -1,9 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-# Minitest 5.10.2 doesn't work with Rails version
-gem 'minitest',      '< 5.10.2'
-
-gem 'activerecord',  '~> 5.1.0'
-gem 'activesupport', '~> 5.1.0'