ndr_support 5.8.0 → 5.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 902f81bfb91abe5145aebc693e0f200b621db63183963e6c1bc0d2c7ef783c7e
-  data.tar.gz: 8bb91d0cfa4e64493330d9fa1eeb2765452e45547d751df43daf954da5a06ddd
+  metadata.gz: 34884f8080512729d26a5b99ee45bcde3abf4761557539f5d2dd3c7e29744e8f
+  data.tar.gz: 6e82d6aba23372b53d809f3ab245a507100874cb41f000897a488c7cab197287
 SHA512:
-  metadata.gz: b006ab6c6ea53f6ce5b47dc38fd290d1b9679995eacea4cbd269477e79e06bc2a1a752b273d707dce3a127e8c605b08fae8dfa6c1a606bb272f290521f66d971
-  data.tar.gz: 193a182ca039ba2113d1701c75511eb00bd8c4ce3e52e5797c7a6846c3963fdca392b3374faa79b9fdf78e25ad3514f87d1bbc2bc6545f68092f698b7ab93a33
+  metadata.gz: 3cc130d188abf756e32c59ad3f077bc696b17c0bbbb233e1c9f0f60f8cc8c111a719a605eea7be216af4ac91100335ca324cef32067b550c420b4440e41b37c8
+  data.tar.gz: 34dd278940652be4ac9b840c47a4bb80c1ae6379eb46f3d4c700b178f7ccd02a448d301bf79edbaeefa0866a0ef98b04b58f3dddd922540960cc233803f5083a

data/CHANGELOG.md

@@ -1,6 +1,22 @@
 ## [Unreleased]
 *no unreleased changes*
 
+## 5.8.4 / 2021-12-27
+## Fixed
+* Support 2023 public holidays
+
+## 5.8.3 / 2021-11-25
+## Fixed
+* remove circular dependencies between Ourdate and Daterange
+
+## 5.8.2 / 2021-10-11
+## Fixed
+* fix issue with blank date causing error for dateranges
+
+## 5.8.1 / 2021-10-11
+### Patched
+* Added fix for failing threat scanner tests (#22)
+
 ## 5.8.0 / 2021-04-19
 ## Added
 

data/code_safety.yml

@@ -22,8 +22,8 @@ file safety:
     safe_revision: a02f14cbf1fc36fbaf820365fdedfdc9af326db1
   CHANGELOG.md:
     comments: 
-    reviewed_by: ollietulloch
-    safe_revision: b0dc20ab24516ac5c3ecb6c7078b56a20dd2fbd5
+    reviewed_by: brian.shand
+    safe_revision: 3c246b08d80a424d160914a6597197b8925826ec
   CODE_OF_CONDUCT.md:
     comments: 
     reviewed_by: timgentry
@@ -66,16 +66,16 @@ file safety:
     safe_revision: 4a4ed24d2cfe7e1736baadf4cf6e0fece6823be1
   lib/ndr_support/concerns/working_days.rb:
     comments: 
-    reviewed_by: brianshand
-    safe_revision: b72baa322dc58820ccd615a178371c2e5dab113c
+    reviewed_by: brian.shand
+    safe_revision: 42b82bdc466503800c021263899cdbbe444b78b0
   lib/ndr_support/date_and_time_extensions.rb:
     comments: 
     reviewed_by: josh.pencheon
     safe_revision: c1158eccb843b637b4dd82815dc7c081f12b93e4
   lib/ndr_support/daterange.rb:
     comments: 
-    reviewed_by: ollietulloch
-    safe_revision: 7b9c9525a5d9d319ddec75d5106c85a53f77e3f4
+    reviewed_by: brian.shand
+    safe_revision: 9d19593cc45a9f1724c4b34a1a05a5ff48003084
   lib/ndr_support/hash.rb:
     comments: 
     reviewed_by: pauleves
@@ -84,10 +84,6 @@ file safety:
     comments: 
     reviewed_by: josh.pencheon
     safe_revision: 2685f35c907af6968a69eabb5ab9424b490d0f40
-  lib/ndr_support/integer/julian_date_conversions.rb:
-    comments: 
-    reviewed_by: ollietulloch
-    safe_revision: '09b3f97fb4c1afc88d0d070c39796b1f60c39d25'
   lib/ndr_support/integer/rounding.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -106,8 +102,12 @@ file safety:
     safe_revision: 50a4293953f9ae227823c390b069a3ed4825074c
   lib/ndr_support/ourdate.rb:
     comments: 
-    reviewed_by: ollietulloch
-    safe_revision: '09b3f97fb4c1afc88d0d070c39796b1f60c39d25'
+    reviewed_by: brian.shand
+    safe_revision: 9d19593cc45a9f1724c4b34a1a05a5ff48003084
+  lib/ndr_support/ourdate/build_datetime.rb:
+    comments: 
+    reviewed_by: brian.shand
+    safe_revision: 9d19593cc45a9f1724c4b34a1a05a5ff48003084
   lib/ndr_support/ourtime.rb:
     comments: 
     reviewed_by: ollietulloch
@@ -166,8 +166,8 @@ file safety:
     safe_revision: '09b3f97fb4c1afc88d0d070c39796b1f60c39d25'
   lib/ndr_support/version.rb:
     comments: 
-    reviewed_by: ollietulloch
-    safe_revision: b0dc20ab24516ac5c3ecb6c7078b56a20dd2fbd5
+    reviewed_by: brian.shand
+    safe_revision: 3c246b08d80a424d160914a6597197b8925826ec
   lib/ndr_support/working_days.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -191,7 +191,7 @@ file safety:
   test/daterange_test.rb:
     comments: 
     reviewed_by: ollietulloch
-    safe_revision: 7b9c9525a5d9d319ddec75d5106c85a53f77e3f4
+    safe_revision: ccca1dc67e3742efb154e01e01243e7b38180936
   test/hash_test.rb:
     comments: 
     reviewed_by: timgentry
@@ -258,8 +258,8 @@ file safety:
     safe_revision: 34ae80f2952f0bfd18688541862774cbaaa6c5f5
   test/threat_scanner_test.rb:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: ed8ff421cc9353456af13a37049a07ce2545aac1
+    reviewed_by: ollietulloch
+    safe_revision: fbb6ef9804040aa2e38257d9f5c487bde18a490d
   test/utf8_encoding/control_characters_test.rb:
     comments: 
     reviewed_by: timgentry

data/lib/ndr_support/concerns/working_days.rb

@@ -107,6 +107,15 @@ module WorkingDays
     '2022-08-29', # Monday   - Summer bank holiday
     '2022-12-26', # Monday   - Boxing Day
     '2022-12-27', # Tuesday  - Christmas Day (substitute day)
+    # 2023
+    '2023-01-02', # Monday   - New Year’s Day (substitute day)
+    '2023-04-07', # Friday   - Good Friday
+    '2023-04-10', # Monday   - Easter Monday
+    '2023-05-01', # Monday   - Early May bank holiday
+    '2023-05-29', # Monday   - Spring bank holiday
+    '2023-08-28', # Monday   - Summer bank holiday
+    '2023-12-25', # Monday   - Boxing Day
+    '2023-12-26', # Tuesday  - Christmas Day (substitute day)
   ].map { |str| Date.parse(str) }
 
   def self.check_lookup

data/lib/ndr_support/daterange.rb

@@ -1,6 +1,6 @@
 require 'active_support/core_ext/enumerable'
 require 'active_support/time'
-require 'ndr_support/integer/julian_date_conversions'
+require 'ndr_support/ourdate/build_datetime'
 
 # Our "vague date" class, which can represent a single date or a date range.
 class Daterange
@@ -43,11 +43,18 @@ class Daterange
       @date2 = nil
       @source = nil
     end
-    raise WrongDateOrderError, 'Invalid date range order' if do_not_sort_dates && @date1 > @date2
+    raise WrongDateOrderError, 'Invalid date range order' if wrong_date_order?(do_not_sort_dates)
 
     self.freeze
   end
 
+  def wrong_date_order?(do_not_sort_dates)
+    return false unless do_not_sort_dates
+    return false unless @date1.present? && @date2.present?
+
+    @date1 > @date2
+  end
+
   # If we have a valid date range, return a string representation of it
   # TODO: possibly add support for to_s(format) e.g. to_s(:short)
   def to_s
@@ -181,7 +188,10 @@ class Daterange
       j1 = j2 = Date.new(parts[0], parts[1], parts[2]).jd
     end
 
-    [j1.jd_to_datetime, j2.jd_to_datetime]
+    [j1, j2].collect do |jd|
+      date = Date.jd(jd) # Julian date number to Ruby Date
+      Ourdate.build_datetime(date.year, date.month, date.day)
+    end
   rescue
     nil
   end

data/lib/ndr_support/ourdate/build_datetime.rb

@@ -0,0 +1,36 @@
+require 'active_record'
+require 'active_support/time'
+
+class Ourdate
+  # Construct a daylight saving time safe datetime, with arguments
+  #--
+  # FIXME: Note that the arguments should be numbers, not strings -- it works
+  # 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
+      seconds = sec + Rational(usec, 10**6)
+      time_array = [year, month, day, hour, min, seconds]
+      begin
+        #--
+        # TODO: Fails unit tests unless we .to_datetime here
+        #       but the risk is we lose the usec component unnecesssarily.
+        #       Investigate removing .to_datetime below.
+        #++
+        Time.send(ActiveRecord::Base.default_timezone, *time_array).to_datetime
+      rescue
+        zone_offset = ActiveRecord::Base.default_timezone == :local ? DateTime.now.offset : 0
+        # Append zero calendar reform start to account for dates skipped by calendar reform
+        DateTime.new(*time_array[0..5] << zone_offset << 0) rescue nil
+      end
+    else
+      # Only supports fake GMT time -- needs improvement
+      # Maybe use Time.zone.local or Time.local_time(year, month, day)
+      Time.utc(year, month, day, hour, min, sec, usec).to_datetime
+    end
+  end
+end

data/lib/ndr_support/ourdate.rb

@@ -1,5 +1,6 @@
 require 'active_record'
 require 'active_support/time'
+require 'ndr_support/ourdate/build_datetime'
 require 'ndr_support/date_and_time_extensions'
 require 'ndr_support/daterange'
 
@@ -25,38 +26,6 @@ class Ourdate
     end
   end
 
-  # Construct a daylight saving time safe datetime, with arguments
-  #--
-  # FIXME: Note that the arguments should be numbers, not strings -- it works
-  # 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
-      seconds = sec + Rational(usec, 10**6)
-      time_array = [year, month, day, hour, min, seconds]
-      begin
-        #--
-        # TODO: Fails unit tests unless we .to_datetime here
-        #       but the risk is we lose the usec component unnecesssarily.
-        #       Investigate removing .to_datetime below.
-        #++
-        Time.send(ActiveRecord::Base.default_timezone, *time_array).to_datetime
-      rescue
-        zone_offset = ActiveRecord::Base.default_timezone == :local ? DateTime.now.offset : 0
-        # Append zero calendar reform start to account for dates skipped by calendar reform
-        DateTime.new(*time_array[0..5] << zone_offset << 0) rescue nil
-      end
-    else
-      # Only supports fake GMT time -- needs improvement
-      # Maybe use Time.zone.local or Time.local_time(year, month, day)
-      Time.utc(year, month, day, hour, min, sec, usec).to_datetime
-    end
-  end
-
   def initialize(x = nil)
     if x.is_a?(Date)
       @thedate = x

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.8.0'
+  VERSION = '5.8.4'
 end

data/test/daterange_test.rb

@@ -31,6 +31,12 @@ class DaterangeTest < Minitest::Test
     assert_equal(dr.to_s, dr2.to_s)
   end
 
+  def test_blank_does_not_trigger_error_and_returns_nil_in_dates
+    dr = Daterange.new('', do_not_sort_dates: true)
+    assert_nil dr.date1
+    assert_nil dr.date2
+  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)

data/test/threat_scanner_test.rb

@@ -8,6 +8,8 @@ class ThreatScannerTest < Minitest::Test
 
     ThreatScanner.stubs(installed?: true)
     ThreatScanner.any_instance.stubs(:`)
+
+    `pwd` # Ensure that $CHILD_STATUS is not nil, even if we never run any child processes
   end
 
   def teardown

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_support
 version: !ruby/object:Gem::Version
-  version: 5.8.0
+  version: 5.8.4
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-19 00:00:00.000000000 Z
+date: 2021-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -249,12 +249,12 @@ files:
 - lib/ndr_support/daterange.rb
 - lib/ndr_support/hash.rb
 - 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
+- lib/ndr_support/ourdate/build_datetime.rb
 - lib/ndr_support/ourtime.rb
 - lib/ndr_support/password.rb
 - lib/ndr_support/password/constants.rb
@@ -316,7 +316,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: NDR Support library

data/lib/ndr_support/integer/julian_date_conversions.rb

@@ -1,12 +0,0 @@
-# Extend Integer for use in our Daterange class
-class Integer
-  # Julian date number to Ruby Date
-  def jd_to_date
-    Date.jd(self)
-  end
-
-  def jd_to_datetime
-    date = jd_to_date
-    Ourdate.build_datetime(date.year, date.month, date.day)
-  end
-end