ndr_support 5.10.0 → 5.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 452da481cc47dceb02b62e7eb832db07ba61985fb2cdc8267a40b6194d0ef108
-  data.tar.gz: e06b9a9845389b639c2fbe55aab1f4008d6dad69843a24113bf55b2b88fd7d56
+  metadata.gz: '096f063918140b27d2136df336b1ce9cc749236002d62c0c3ac6ac383b5f2295'
+  data.tar.gz: eeb407d4d7fa47c7d803b03383da810fe7ba914569923e6f8888e580f492c208
 SHA512:
-  metadata.gz: 7d06a0fb2e4adae1cbc71b7e89fd4fc45b527a419ad313d6440dd199ddb845df637b4dd505dce4220dae16bc6f059e96a2faddc455c1901a54bd8acba86b4b3e
-  data.tar.gz: d5abcaa621cf18823123cd1241a519c2c2a9dd856ac6659a9f4d4497adcd11ec4b57beeade25c7e799b9924de02736344b91ef079b2bef5a65785a41a6d20333
+  metadata.gz: 7dfffec2a85e3692e25b464ca232d1e42e4a783b5f23a6f08a3fcc0dc566ab8687b746b4fde6c206fc6f30b9e7ca674d8097b7e4b4def9928d174a19ff7fc760
+  data.tar.gz: 995d2de405da83acc432b42f3f551057537c648f3aded0d2f2625962a36069a9a37019c5fc6031880495a649389410534e30cc501a9b88df4cfd847001405e37

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 ## [Unreleased]
 * No unreleased changes
 
+## 5.10.1 / 2024-01-04
+## Fixed
+* Add 2026 bank holidays
+* Allow YAML aliases when using `yaml_safe_classes`
+
 ## 5.10.0 / 2023-11-17
 ## Changed
 * Generate UTF-8 encoded YAML by default. Disable with `utf8_storage = false`

data/code_safety.yml

@@ -23,7 +23,7 @@ file safety:
   CHANGELOG.md:
     comments:
     reviewed_by: brian.shand
-    safe_revision: 646eaebdf824490150e991225f9e15abb67dd4c1
+    safe_revision: c764a4d8c251b5076ed3d60391c8271bb5a099bc
   CODE_OF_CONDUCT.md:
     comments:
     reviewed_by: timgentry
@@ -71,7 +71,7 @@ file safety:
   lib/ndr_support/concerns/working_days.rb:
     comments:
     reviewed_by: brian.shand
-    safe_revision: bac214f4c93d8753268825408fc560171fac91c0
+    safe_revision: 6fb8c080befbb9c741c2bc3a2fadb29fe1c3d0aa
   lib/ndr_support/date_and_time_extensions.rb:
     comments:
     reviewed_by: brian.shand
@@ -171,7 +171,7 @@ file safety:
   lib/ndr_support/version.rb:
     comments:
     reviewed_by: brian.shand
-    safe_revision: 765520ebaf3652bed7105995c815afe681dd5363
+    safe_revision: 3a4b0a4acb1d6dfbfc79b17ee11577cb22ab8923
   lib/ndr_support/working_days.rb:
     comments:
     reviewed_by: josh.pencheon
@@ -179,7 +179,7 @@ file safety:
   lib/ndr_support/yaml/serialization_migration.rb:
     comments:
     reviewed_by: brian.shand
-    safe_revision: 646eaebdf824490150e991225f9e15abb67dd4c1
+    safe_revision: c764a4d8c251b5076ed3d60391c8271bb5a099bc
   ndr_support.gemspec:
     comments:
     reviewed_by: brian.shand
@@ -283,4 +283,4 @@ file safety:
   test/yaml/serialization_test.rb:
     comments:
     reviewed_by: brian.shand
-    safe_revision: 646eaebdf824490150e991225f9e15abb67dd4c1
+    safe_revision: c764a4d8c251b5076ed3d60391c8271bb5a099bc

data/lib/ndr_support/concerns/working_days.rb

@@ -136,6 +136,15 @@ module WorkingDays
     '2025-08-25', # Monday    - Summer bank holiday
     '2025-12-25', # Thursday  - Christmas Day
     '2025-12-26', # Friday    - Boxing Day
+    # 2026
+    '2026-01-01', # Thursday  - New Year’s Day
+    '2026-04-03', # Friday    - Good Friday
+    '2026-04-06', # Monday    - Easter Monday
+    '2026-05-04', # Monday    - Early May bank holiday
+    '2026-05-25', # Monday    - Spring bank holiday
+    '2026-08-31', # Monday    - Summer bank holiday
+    '2026-12-25', # Friday    - Christmas Day
+    '2026-12-28', # Monday    - Boxing Day
   ].map { |str| Date.parse(str) }
 
   def self.check_lookup

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.10.0'
+  VERSION = '5.10.1'
 end

data/lib/ndr_support/yaml/serialization_migration.rb

@@ -43,13 +43,11 @@ module NdrSupport
 
         # TODO: Bump NdrSupport major version, and switch to safe_load by default
         object = if yaml_safe_classes == :unsafe
-                   unless Psych::VERSION.start_with?('3.')
-                     raise(SecurityError, 'Unsafe YAML no longer supported')
-                   end
+                   raise(SecurityError, 'Unsafe YAML no longer supported') unless Psych::VERSION.start_with?('3.')
 
                    Psych.load(string)
                  else
-                   Psych.safe_load(string, permitted_classes: yaml_safe_classes)
+                   Psych.safe_load(string, permitted_classes: yaml_safe_classes, aliases: true)
                  end
 
         # Ensure that any string related to the object

data/test/yaml/serialization_test.rb

@@ -8,6 +8,14 @@ class SerializationTest < Minitest::Test
     assert_equal hash, load_yaml(dump_yaml(hash))
   end
 
+  test 'should support aliases correctly' do
+    x = { 'c' => 5 }
+    hash = { 'a' => x, 'b' => x }
+    hash_yaml = "---\na: &1\n  c: 5\nb: *1\n"
+    assert_equal hash, load_yaml(hash_yaml), 'Deserialising known YAML with an alias'
+    assert_equal hash, load_yaml(dump_yaml(hash)), 'Deserialising a structure with repeated objects'
+  end
+
   test 'should handle syck-encoded characters' do
     assert_syck_1_8_yaml_loads_correctly
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_support
 version: !ruby/object:Gem::Version
-  version: 5.10.0
+  version: 5.10.1
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-17 00:00:00.000000000 Z
+date: 2024-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord