ndr_support 5.9.0 → 5.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc18cac2fe1d6de32316e751a1f4f9cd8050bdb2c3972e14c62a490a5cb10f15
-  data.tar.gz: 627714611718a64058082b873dddd855b6b6434395082d78381e8ad1954f7da6
+  metadata.gz: c761169c89e5350e2c7d2e21b827bf563e232b1a8fff4c47d3fdc9981034bfcc
+  data.tar.gz: 4edb6647f55b5831a63863aee85cb0035e6bc6728e2f7f98d4922fff3ef67cc3
 SHA512:
-  metadata.gz: 7f2849f48fa7316c6ae326f87b17b95d225a975716d80ad5ae56e4b7a0b01b2f6bf82976c65070b144a5833cb7765516f383c378cccd96a9c60b52daa4e12a31
-  data.tar.gz: 862f14d702ebaccd054860aeaae4b93fac9b724dfeeb99581cd8ff0967169a3c267cd205e0ee1893c8b86d03f834db6d1afd7bed59e17f2881a2e80e75824f3c
+  metadata.gz: 8c86b027a28c063306b738e975dd592b1304dbd6cbfaec6a8cb67cbfa39203f866d1dbba367fe13eeb3d8c4ddc6e16957073e721e36f642da32fa9b66431ed3d
+  data.tar.gz: 6244f12d273857cb9b1f4db4ec00adfc103e301b6c2ce9f7a273499fd0da5da8b58477de85689c96fc63615d3973813c5469eba5b5896bd27ba26cc5860e4d3f

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 ## [Unreleased]
 * No unreleased changes
 
+## 5.9.1 / 2022-09-12
+## Fixed
+* Add extra 2022 Bank Holiday
+
 ## 5.9.0 / 2022-04-26
 ## Fixed
 * Support Rails 6.1

data/code_safety.yml

@@ -75,7 +75,7 @@ file safety:
   lib/ndr_support/concerns/working_days.rb:
     comments:
     reviewed_by: brian.shand
-    safe_revision: 42b82bdc466503800c021263899cdbbe444b78b0
+    safe_revision: f35774faa74bfe6f7d2f1e7447388f11914ecab8
   lib/ndr_support/date_and_time_extensions.rb:
     comments:
     reviewed_by: josh.pencheon
@@ -194,8 +194,8 @@ file safety:
     safe_revision: 2a5d30674dc9dde336e1dbbbf3c8a98905647432
   test/concerns/working_days_test.rb:
     comments:
-    reviewed_by: josh.pencheon
-    safe_revision: fe6c3beff445e3c84ed0c89f08e1ab10bfb00587
+    reviewed_by: brian.shand
+    safe_revision: f35774faa74bfe6f7d2f1e7447388f11914ecab8
   test/daterange_test.rb:
     comments:
     reviewed_by: ollietulloch

data/lib/ndr_support/concerns/working_days.rb

@@ -105,6 +105,7 @@ module WorkingDays
     '2022-06-02', # Thursday - Spring bank holiday
     '2022-06-03', # Friday   - Platinum Jubilee bank holiday
     '2022-08-29', # Monday   - Summer bank holiday
+    '2022-09-19', # Monday   - Bank Holiday for the State Funeral of Queen Elizabeth II
     '2022-12-26', # Monday   - Boxing Day
     '2022-12-27', # Tuesday  - Christmas Day (substitute day)
     # 2023
@@ -114,8 +115,8 @@ module WorkingDays
     '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)
+    '2023-12-25', # Monday   - Christmas Day
+    '2023-12-26', # Tuesday  - 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.9.0'
+  VERSION = '5.9.1'
 end

data/test/concerns/working_days_test.rb

@@ -128,13 +128,19 @@ class WorkingDaysTest < Minitest::Test
     response = Net::HTTP.get(URI(url))
 
     events = JSON.parse(response)['events']
-    events.each do |event|
+    missing_holidays = events.collect 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']}"
+      if parsed_date.public_holiday?
+        nil
+      else
+        [event_date, "    '#{event_date}', # #{parsed_date.strftime('%A')} - #{event['title']}"]
+      end
+    end.compact
+    if missing_holidays.any?
+      flunk (["#{missing_holidays.collect(&:first).join(', ')} should be public holidays in " \
+              'lib/ndr_support/concerns/working_days.rb:'] +
+             missing_holidays.collect(&:last)).join("\n")
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_support
 version: !ruby/object:Gem::Version
-  version: 5.9.0
+  version: 5.9.1
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-26 00:00:00.000000000 Z
+date: 2022-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord