ndr_support 5.9.0 → 5.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc18cac2fe1d6de32316e751a1f4f9cd8050bdb2c3972e14c62a490a5cb10f15
-  data.tar.gz: 627714611718a64058082b873dddd855b6b6434395082d78381e8ad1954f7da6
+  metadata.gz: b92349bb86b84b6c5cc6c836613fadec463e824e87e6ccbe02fc07dd3f7049b5
+  data.tar.gz: eb4312735ea0f25e517ec7b3d6676ab1b40c9ee64e36044b7b17f518cef0f592
 SHA512:
-  metadata.gz: 7f2849f48fa7316c6ae326f87b17b95d225a975716d80ad5ae56e4b7a0b01b2f6bf82976c65070b144a5833cb7765516f383c378cccd96a9c60b52daa4e12a31
-  data.tar.gz: 862f14d702ebaccd054860aeaae4b93fac9b724dfeeb99581cd8ff0967169a3c267cd205e0ee1893c8b86d03f834db6d1afd7bed59e17f2881a2e80e75824f3c
+  metadata.gz: 3d1edb198422ec9e566680943988f090762bd3fe2f254cb9237631a54ed0feb2e4dda45801574319e745487a11fee6f1540a5c7b5562c516d4b9e7a9004266cc
+  data.tar.gz: d2dfa5bc36ece2a23b50d2406563604f6f5989a0706d7981382f9d6738e46cb89bfe3a4dfb7e1e0ab50b18971d8b07b2241d76e59bcf01f818da646898decf12

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 ## [Unreleased]
 * No unreleased changes
 
+## 5.9.2 / 2022-11-17
+## Fixed
+* Add extra 2023 Bank Holiday, and 2024 and 2025 Bank Holidays
+
+## 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

@@ -2,8 +2,8 @@
 file safety:
   ".github/CODEOWNERS":
     comments:
-    reviewed_by: ollietulloch
-    safe_revision: 993f7719b57eb6ddd8dffa7230ed9ffc69f48749
+    reviewed_by: brian.shand
+    safe_revision: ee57573b35d6ef0f1a2d8e774ee95aa41a85d40c
   ".github/workflows/lint.yml":
     comments:
     reviewed_by: ollietulloch
@@ -23,7 +23,7 @@ file safety:
   CHANGELOG.md:
     comments:
     reviewed_by: brian.shand
-    safe_revision: '0317988580be42bc3a3b64680e340223268c525f'
+    safe_revision: bac214f4c93d8753268825408fc560171fac91c0
   CODE_OF_CONDUCT.md:
     comments:
     reviewed_by: timgentry
@@ -75,7 +75,7 @@ file safety:
   lib/ndr_support/concerns/working_days.rb:
     comments:
     reviewed_by: brian.shand
-    safe_revision: 42b82bdc466503800c021263899cdbbe444b78b0
+    safe_revision: bac214f4c93d8753268825408fc560171fac91c0
   lib/ndr_support/date_and_time_extensions.rb:
     comments:
     reviewed_by: josh.pencheon
@@ -175,7 +175,7 @@ file safety:
   lib/ndr_support/version.rb:
     comments:
     reviewed_by: brian.shand
-    safe_revision: '0317988580be42bc3a3b64680e340223268c525f'
+    safe_revision: 8321c488b8a7342762ee8c322ce3ffd5b1a1a880
   lib/ndr_support/working_days.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: bac214f4c93d8753268825408fc560171fac91c0
   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
@@ -112,10 +113,29 @@ module WorkingDays
     '2023-04-07', # Friday   - Good Friday
     '2023-04-10', # Monday   - Easter Monday
     '2023-05-01', # Monday   - Early May bank holiday
+    '2023-05-08', # Monday    - Bank holiday for the coronation of King Charles III
     '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
+    # 2024
+    '2024-01-01', # Monday    - New Year’s Day
+    '2024-03-29', # Friday    - Good Friday
+    '2024-04-01', # Monday    - Easter Monday
+    '2024-05-06', # Monday    - Early May bank holiday
+    '2024-05-27', # Monday    - Spring bank holiday
+    '2024-08-26', # Monday    - Summer bank holiday
+    '2024-12-25', # Wednesday - Christmas Day
+    '2024-12-26', # Thursday  - Boxing Day
+    # 2025
+    '2025-01-01', # Wednesday - New Year’s Day
+    '2025-04-18', # Friday    - Good Friday
+    '2025-04-21', # Monday    - Easter Monday
+    '2025-05-05', # Monday    - Early May bank holiday
+    '2025-05-26', # Monday    - Spring bank holiday
+    '2025-08-25', # Monday    - Summer bank holiday
+    '2025-12-25', # Thursday  - Christmas Day
+    '2025-12-26', # Friday    - 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.2'
 end

data/test/concerns/working_days_test.rb

@@ -128,13 +128,21 @@ 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, format("    '%<date>s', # %<day>-9s - %<title>s",
+                            date: event_date, day: parsed_date.strftime('%A'),
+                            title: 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.2
 platform: ruby
 authors:
 - NCRS Development Team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-26 00:00:00.000000000 Z
+date: 2022-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -283,7 +283,7 @@ homepage: https://github.com/PublicHealthEngland/ndr_support
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -298,8 +298,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
 summary: NDR Support library
 test_files: