ndr_support 5.8.2 → 5.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3f90df368cddc8835eb228b45b2e03088caf7ff494c6dd71538a255ed81ee17
-  data.tar.gz: b7efe09d5283db3ee78934b727893817c772bb1564c02eaa453e216d562e23b1
+  metadata.gz: dc18cac2fe1d6de32316e751a1f4f9cd8050bdb2c3972e14c62a490a5cb10f15
+  data.tar.gz: 627714611718a64058082b873dddd855b6b6434395082d78381e8ad1954f7da6
 SHA512:
-  metadata.gz: 3b5dd0eeb3aec3bf88b4bc71620a661f3fe8a76eb9deef2c6dd8ec8e4d42faf9328f4934531fc0b36e65947f62d7163e4d0165324c8f17df8a1dfa042d942dc1
-  data.tar.gz: ba3cad435e924c140fd528a1cee8bd2e1aa8ccc2431f852d093e01bf7d16e8db21ceecdde3bd3cc53aed7465ffcaa0568f67b0226cbce1f957ced9d35a221ba8
+  metadata.gz: 7f2849f48fa7316c6ae326f87b17b95d225a975716d80ad5ae56e4b7a0b01b2f6bf82976c65070b144a5833cb7765516f383c378cccd96a9c60b52daa4e12a31
+  data.tar.gz: 862f14d702ebaccd054860aeaae4b93fac9b724dfeeb99581cd8ff0967169a3c267cd205e0ee1893c8b86d03f834db6d1afd7bed59e17f2881a2e80e75824f3c

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 ## [Unreleased]
-*no unreleased changes*
+* No unreleased changes
+
+## 5.9.0 / 2022-04-26
+## Fixed
+* Support Rails 6.1
+* Support Ruby 3.1
+
+## Changed
+* Drop support for Ruby 2.6
+
+## 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
@@ -11,7 +27,6 @@
 
 ## 5.8.0 / 2021-04-19
 ## Added
-
 * Add ability to disable date reversing in Daterange
 
 ## Fixed

data/code_safety.yml

@@ -1,115 +1,123 @@
 ---
 file safety:
   ".github/CODEOWNERS":
-    comments: 
+    comments:
     reviewed_by: ollietulloch
     safe_revision: 993f7719b57eb6ddd8dffa7230ed9ffc69f48749
   ".github/workflows/lint.yml":
-    comments: 
+    comments:
     reviewed_by: ollietulloch
     safe_revision: 993f7719b57eb6ddd8dffa7230ed9ffc69f48749
   ".github/workflows/test.yml":
-    comments: 
-    reviewed_by: ollietulloch
-    safe_revision: 993f7719b57eb6ddd8dffa7230ed9ffc69f48749
+    comments:
+    reviewed_by: brian.shand
+    safe_revision: e91fab5ac8474b001ca3805c6cce8eefa6b49f2d
   ".gitignore":
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: a02f14cbf1fc36fbaf820365fdedfdc9af326db1
   ".rubocop.yml":
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: a02f14cbf1fc36fbaf820365fdedfdc9af326db1
   CHANGELOG.md:
-    comments: 
-    reviewed_by: ollietulloch
-    safe_revision: de292b8dd286a0164a67cda49bbbbc8ba75409cc
+    comments:
+    reviewed_by: brian.shand
+    safe_revision: '0317988580be42bc3a3b64680e340223268c525f'
   CODE_OF_CONDUCT.md:
-    comments: 
+    comments:
     reviewed_by: timgentry
     safe_revision: c752769b91c0e782be0acf44e56bbc066a275365
   Gemfile:
-    comments: 
+    comments:
     reviewed_by: timgentry
     safe_revision: 6a7c3764e5315981070eba27b9f0be9d9182476c
   Guardfile:
-    comments: 
+    comments:
     reviewed_by: timgentry
     safe_revision: e33e9dae7f38bc449ce9276515a539836dbbbd53
   LICENSE.txt:
-    comments: 
+    comments:
     reviewed_by: timgentry
     safe_revision: 90328cca8494539257e192a63b240a91c89f0616
   README.md:
-    comments: 
+    comments:
     reviewed_by: ollietulloch
     safe_revision: 993f7719b57eb6ddd8dffa7230ed9ffc69f48749
   Rakefile:
-    comments: 
+    comments:
     reviewed_by: timgentry
     safe_revision: e33e9dae7f38bc449ce9276515a539836dbbbd53
   gemfiles/Gemfile.rails52:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 8a6bedae77d33d0db1b67eaed7972870b6afc993
   gemfiles/Gemfile.rails60:
-    comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: 0cfcfac5ddcd721a67dcd23f04cbf6bc2278b922
+    comments:
+    reviewed_by: brian.shand
+    safe_revision: 16254a4332aab074a27c8e13859dc4712e707122
+  gemfiles/Gemfile.rails61:
+    comments:
+    reviewed_by: brian.shand
+    safe_revision: 16254a4332aab074a27c8e13859dc4712e707122
+  gemfiles/Gemfile.rails70:
+    comments:
+    reviewed_by: brian.shand
+    safe_revision: 16254a4332aab074a27c8e13859dc4712e707122
   lib/ndr_support.rb:
-    comments: 
+    comments:
     reviewed_by: brian.shand
     safe_revision: 44fbdf72f47f4022c7dc9148150ebc18589dac8f
   lib/ndr_support/array.rb:
-    comments: 
+    comments:
     reviewed_by: pauleves
     safe_revision: 4a4ed24d2cfe7e1736baadf4cf6e0fece6823be1
   lib/ndr_support/concerns/working_days.rb:
-    comments: 
-    reviewed_by: brianshand
-    safe_revision: b72baa322dc58820ccd615a178371c2e5dab113c
+    comments:
+    reviewed_by: brian.shand
+    safe_revision: 42b82bdc466503800c021263899cdbbe444b78b0
   lib/ndr_support/date_and_time_extensions.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: c1158eccb843b637b4dd82815dc7c081f12b93e4
   lib/ndr_support/daterange.rb:
-    comments: 
-    reviewed_by: ollietulloch
-    safe_revision: fc52184297e0a3bcd52b119e2e0add952c8ab7f1
+    comments:
+    reviewed_by: brian.shand
+    safe_revision: 9d19593cc45a9f1724c4b34a1a05a5ff48003084
   lib/ndr_support/hash.rb:
-    comments: 
+    comments:
     reviewed_by: pauleves
     safe_revision: 506a317e59d0ccb5b32d813b74d822f35a55cea9
   lib/ndr_support/integer/calculations.rb:
-    comments: 
+    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: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 2685f35c907af6968a69eabb5ab9424b490d0f40
   lib/ndr_support/integer/working_days.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: c1158eccb843b637b4dd82815dc7c081f12b93e4
   lib/ndr_support/nil.rb:
-    comments: 
+    comments:
     reviewed_by: pauleves
     safe_revision: 4a4ed24d2cfe7e1736baadf4cf6e0fece6823be1
   lib/ndr_support/obfuscator.rb:
-    comments: 
+    comments:
     reviewed_by: brian.shand
     safe_revision: 50a4293953f9ae227823c390b069a3ed4825074c
   lib/ndr_support/ourdate.rb:
-    comments: 
-    reviewed_by: ollietulloch
-    safe_revision: '09b3f97fb4c1afc88d0d070c39796b1f60c39d25'
+    comments:
+    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: 
+    comments:
     reviewed_by: ollietulloch
     safe_revision: '09b3f97fb4c1afc88d0d070c39796b1f60c39d25'
   lib/ndr_support/password.rb:
@@ -121,107 +129,107 @@ file safety:
     reviewed_by: josh.pencheon
     safe_revision: f5d1ba50d378286c0541f300d73844240e2eb7c1
   lib/ndr_support/regexp_range.rb:
-    comments: 
+    comments:
     reviewed_by: pauleves
     safe_revision: f9341d1c7f797f9fe81af937c383d41c23872b2f
   lib/ndr_support/safe_file.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 2685f35c907af6968a69eabb5ab9424b490d0f40
   lib/ndr_support/safe_path.rb:
-    comments: 
-    reviewed_by: ollietulloch
-    safe_revision: '09b3f97fb4c1afc88d0d070c39796b1f60c39d25'
+    comments:
+    reviewed_by: brian.shand
+    safe_revision: f4f7cb0803ea34a2f1ba83495d8bcbd942786bce
   lib/ndr_support/string/cleaning.rb:
-    comments: 
+    comments:
     reviewed_by: brianshand
     safe_revision: b7b033ad9773cc9037c408a7763b113d31cbf191
   lib/ndr_support/string/conversions.rb:
-    comments: 
+    comments:
     reviewed_by: ollietulloch
     safe_revision: '09b3f97fb4c1afc88d0d070c39796b1f60c39d25'
   lib/ndr_support/tasks.rb:
-    comments: 
+    comments:
     reviewed_by: timgentry
     safe_revision: 62337584a32e5c30c2e9af7cd998a9df684885cc
   lib/ndr_support/threat_scanner.rb:
-    comments: 
+    comments:
     reviewed_by: brianshand
     safe_revision: befa1d4f27448d5be4e133f442c2b5fbac7d8f25
   lib/ndr_support/utf8_encoding.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 8e024a4bacfd36e172aad4b800f1960faae0b4b6
   lib/ndr_support/utf8_encoding/control_characters.rb:
-    comments: 
+    comments:
     reviewed_by: ollietulloch
     safe_revision: '09b3f97fb4c1afc88d0d070c39796b1f60c39d25'
   lib/ndr_support/utf8_encoding/force_binary.rb:
-    comments: 
+    comments:
     reviewed_by: ollietulloch
     safe_revision: '09b3f97fb4c1afc88d0d070c39796b1f60c39d25'
   lib/ndr_support/utf8_encoding/object_support.rb:
-    comments: 
+    comments:
     reviewed_by: ollietulloch
     safe_revision: '09b3f97fb4c1afc88d0d070c39796b1f60c39d25'
   lib/ndr_support/version.rb:
-    comments: 
-    reviewed_by: ollietulloch
-    safe_revision: de292b8dd286a0164a67cda49bbbbc8ba75409cc
+    comments:
+    reviewed_by: brian.shand
+    safe_revision: '0317988580be42bc3a3b64680e340223268c525f'
   lib/ndr_support/working_days.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: c1158eccb843b637b4dd82815dc7c081f12b93e4
   lib/ndr_support/yaml/serialization_migration.rb:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 29595e6431587ff9b7db6e3ad3abbb3577bff99c
+    comments:
+    reviewed_by: brian.shand
+    safe_revision: f4f7cb0803ea34a2f1ba83495d8bcbd942786bce
   ndr_support.gemspec:
-    comments: 
-    reviewed_by: ollietulloch
-    safe_revision: 993f7719b57eb6ddd8dffa7230ed9ffc69f48749
+    comments:
+    reviewed_by: brian.shand
+    safe_revision: e91fab5ac8474b001ca3805c6cce8eefa6b49f2d
   test/array_test.rb:
-    comments: 
+    comments:
     reviewed_by: timgentry
     safe_revision: 2a5d30674dc9dde336e1dbbbf3c8a98905647432
   test/concerns/working_days_test.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: fe6c3beff445e3c84ed0c89f08e1ab10bfb00587
   test/daterange_test.rb:
-    comments: 
+    comments:
     reviewed_by: ollietulloch
     safe_revision: ccca1dc67e3742efb154e01e01243e7b38180936
   test/hash_test.rb:
-    comments: 
+    comments:
     reviewed_by: timgentry
     safe_revision: 2a5d30674dc9dde336e1dbbbf3c8a98905647432
   test/integer/calculations_test.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 2685f35c907af6968a69eabb5ab9424b490d0f40
   test/integer/rounding_test.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 2685f35c907af6968a69eabb5ab9424b490d0f40
   test/integer/working_days_test.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: c1158eccb843b637b4dd82815dc7c081f12b93e4
   test/nil_test.rb:
-    comments: 
+    comments:
     reviewed_by: timgentry
     safe_revision: 2a5d30674dc9dde336e1dbbbf3c8a98905647432
   test/obfuscator_test.rb:
-    comments: 
+    comments:
     reviewed_by: brian.shand
     safe_revision: 50a4293953f9ae227823c390b069a3ed4825074c
   test/ourdate_test.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 7c32f5a80c1fb7aaf6e850d4b0651a7b47640e15
   test/ourtime_test.rb:
-    comments: 
+    comments:
     reviewed_by: brian.shand
     safe_revision: b9bc1e18464a27f84e69ebea083dd6a8d351c8cb
   test/password_test.rb:
@@ -229,50 +237,50 @@ file safety:
     reviewed_by: josh.pencheon
     safe_revision: f5d1ba50d378286c0541f300d73844240e2eb7c1
   test/regexp_range_test.rb:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 29595e6431587ff9b7db6e3ad3abbb3577bff99c
+    comments:
+    reviewed_by: brian.shand
+    safe_revision: f4f7cb0803ea34a2f1ba83495d8bcbd942786bce
   test/resources/filesystem_paths.yml:
-    comments: 
+    comments:
     reviewed_by: timgentry
     safe_revision: 81061f85ccdf8933adc7f104d7eeaef1e2d71e26
   test/safe_file_test.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 24ba08d3a8f4b284678244aaffa2aaa347256900
   test/safe_path_test.rb:
-    comments: 
+    comments:
     reviewed_by: timgentry
     safe_revision: b562d0c15ff1b1d565522a47e6bae47ea09706f0
   test/string/cleaning_test.rb:
-    comments: 
+    comments:
     reviewed_by: brianshand
     safe_revision: b7b033ad9773cc9037c408a7763b113d31cbf191
   test/string/conversions_test.rb:
-    comments: 
+    comments:
     reviewed_by: ollietulloch
     safe_revision: '09b3f97fb4c1afc88d0d070c39796b1f60c39d25'
   test/test_helper.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 34ae80f2952f0bfd18688541862774cbaaa6c5f5
   test/threat_scanner_test.rb:
-    comments: 
+    comments:
     reviewed_by: ollietulloch
     safe_revision: fbb6ef9804040aa2e38257d9f5c487bde18a490d
   test/utf8_encoding/control_characters_test.rb:
-    comments: 
+    comments:
     reviewed_by: timgentry
     safe_revision: d210b982841611381a0df02d8f2db9c13e41e42f
   test/utf8_encoding/force_binary_test.rb:
-    comments: 
+    comments:
     reviewed_by: timgentry
     safe_revision: 29595e6431587ff9b7db6e3ad3abbb3577bff99c
   test/utf8_encoding_test.rb:
-    comments: 
+    comments:
     reviewed_by: timgentry
     safe_revision: 2a5d30674dc9dde336e1dbbbf3c8a98905647432
   test/yaml/serialization_test.rb:
-    comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: 4daf43bf8cb48761471b32ad45c4d1cf97aab476
+    comments:
+    reviewed_by: brian.shand
+    safe_revision: f4f7cb0803ea34a2f1ba83495d8bcbd942786bce

data/gemfiles/Gemfile.rails60

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

data/gemfiles/Gemfile.rails61

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

data/gemfiles/Gemfile.rails70

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

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
@@ -188,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/safe_path.rb

@@ -64,13 +64,12 @@ class SafePath
   # should be used. Attempting to reconfigure with
   # new settings will raise a security error.
   def self.configure!(filepath)
-    if defined?(@@fs_paths)
-      fail SecurityError, 'Attempt to re-assign SafePath config!'
-    else
-      File.open(filepath, 'r') do |file|
-        @@fs_paths = YAML.load(ERB.new(file.read).result)
-        @@fs_paths.freeze
-      end
+    raise SecurityError, 'Attempt to re-assign SafePath config!' if defined?(@@fs_paths)
+
+    File.open(filepath, 'r') do |file|
+      @@fs_paths = YAML.safe_load(ERB.new(file.read).result,
+                                  permitted_classes: [Regexp], aliases: true)
+      @@fs_paths.freeze
     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.8.2'
+  VERSION = '5.9.0'
 end

data/lib/ndr_support/yaml/serialization_migration.rb

@@ -8,6 +8,10 @@ module NdrSupport
     module SerializationMigration
       include UTF8Encoding
 
+      # Classes we routinely allow to be included in our YAML serialisations, automatically
+      # accepted by load_yaml
+      YAML_SAFE_CLASSES = [Date, DateTime, Time, Symbol].freeze
+
       # Wrapper around: YAML.load(string)
       def load_yaml(string, coerce_invalid_chars = false)
         fix_encoding!(string, coerce_invalid_chars)
@@ -16,7 +20,12 @@ module NdrSupport
         handle_special_characters!(string, coerce_invalid_chars)
         fix_encoding!(string, coerce_invalid_chars)
 
-        object = Psych.load(string)
+        # TODO: Bump NdrSupport major version, and switch to safe_load by default
+        object = if Psych::VERSION.start_with?('3.')
+                   Psych.load(string)
+                 else
+                   Psych.safe_load(string, permitted_classes: YAML_SAFE_CLASSES)
+                 end
 
         # Ensure that any string related to the object
         # we've loaded is also valid UTF-8.

data/ndr_support.gemspec

@@ -24,15 +24,15 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake', '>= 12.3.3'
 
-  spec.required_ruby_version = '>= 2.6.0'
+  spec.required_ruby_version = '>= 2.7'
 
   # 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', '~> 5.4', '>= 5.4.5'
+  spec.add_development_dependency 'ndr_dev_support', '~> 6.0.2'
+
   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'
   spec.add_development_dependency 'guard-shell'
   spec.add_development_dependency 'guard-minitest'

data/test/regexp_range_test.rb

@@ -16,7 +16,8 @@ class RegexpRangeTest < Minitest::Test
     regexp_range = RegexpRange.new(0, /^3Ut/)
 
     # Don't test YAML serialisation directly, but make it can be loaded:
-    deserialized_regexp_range = YAML.load(regexp_range.to_yaml)
+    deserialized_regexp_range = YAML.safe_load(regexp_range.to_yaml,
+                                               permitted_classes: [RegexpRange, Regexp])
     assert_instance_of RegexpRange, deserialized_regexp_range
     assert_equal regexp_range.begin, deserialized_regexp_range.begin
     assert_equal regexp_range.end, deserialized_regexp_range.end

data/test/yaml/serialization_test.rb

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 require 'test_helper'
 
 class SerializationTest < Minitest::Test
@@ -70,7 +68,7 @@ class SerializationTest < Minitest::Test
 
   def assert_times
     # Dumped by 1.9.3 syck, within era.
-    loaded = YAML.load("--- !timestamp 2014-03-01\n")
+    loaded = YAML.safe_load("--- !timestamp 2014-03-01\n", permitted_classes: YAML_SAFE_CLASSES)
     assert [Date, Time].include?(loaded.class), '1.9.3 era timestamp class'
     assert_equal 2014, loaded.year,  '1.9.3 era timestamp year'
     assert_equal 3,    loaded.month, '1.9.3 era timestamp month'
@@ -81,17 +79,17 @@ class SerializationTest < Minitest::Test
     date = Date.new(2014, 3, 1)
 
     # Dumped by 1.8.7 syck, within era.
-    loaded = YAML.load("--- 2014-03-01\n")
+    loaded = YAML.safe_load("--- 2014-03-01\n", permitted_classes: YAML_SAFE_CLASSES)
     assert_equal date, loaded, '1.8.7 era date'
 
     # Check default formatting does not affect serialisation:
     assert_equal '01.03.2014', date.to_s
-    assert_equal date, YAML.load(date.to_yaml)
+    assert_equal date, YAML.safe_load(date.to_yaml, permitted_classes: YAML_SAFE_CLASSES)
   end
 
   def assert_datetimes
     datetime = DateTime.new(2014, 3, 1, 12, 45, 15)
-    loaded   = YAML.load(datetime.to_yaml)
+    loaded   = YAML.safe_load(datetime.to_yaml, permitted_classes: YAML_SAFE_CLASSES)
 
     assert [DateTime, Time].include?(loaded.class), 'datetime class'
     assert_equal datetime, loaded.to_datetime

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_support
 version: !ruby/object:Gem::Version
-  version: 5.8.2
+  version: 5.9.0
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-11 00:00:00.000000000 Z
+date: 2022-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -112,20 +112,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.4.5
+        version: 6.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.4.5
+        version: 6.0.2
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -140,20 +134,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: listen
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: guard-rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -242,6 +222,8 @@ files:
 - code_safety.yml
 - gemfiles/Gemfile.rails52
 - gemfiles/Gemfile.rails60
+- gemfiles/Gemfile.rails61
+- gemfiles/Gemfile.rails70
 - lib/ndr_support.rb
 - lib/ndr_support/array.rb
 - lib/ndr_support/concerns/working_days.rb
@@ -249,12 +231,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
@@ -309,14 +291,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !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