ndr_support 5.9.1 → 5.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c761169c89e5350e2c7d2e21b827bf563e232b1a8fff4c47d3fdc9981034bfcc
-  data.tar.gz: 4edb6647f55b5831a63863aee85cb0035e6bc6728e2f7f98d4922fff3ef67cc3
+  metadata.gz: 4a2a7eee626500b24dda836864fbbe45061c73a01c1c0d8767084ef94feb4391
+  data.tar.gz: '084bd2b9c1d5d7dc13d45597ecd9d16c410d3653445af9790c1556da7e2d2f1d'
 SHA512:
-  metadata.gz: 8c86b027a28c063306b738e975dd592b1304dbd6cbfaec6a8cb67cbfa39203f866d1dbba367fe13eeb3d8c4ddc6e16957073e721e36f642da32fa9b66431ed3d
-  data.tar.gz: 6244f12d273857cb9b1f4db4ec00adfc103e301b6c2ce9f7a273499fd0da5da8b58477de85689c96fc63615d3973813c5469eba5b5896bd27ba26cc5860e4d3f
+  metadata.gz: 595af1c7799843cc6283cef5b5c77bf955f09c6d06bc316bf41e7f9fc0851639c9cb2f44f662c07b0b7e7b10a0b291ced307b9f1b109b5e1efe85fda2a018b40
+  data.tar.gz: 62651ee7d25752f68b9ff9ae197878b12003e0b0363b73b5bb2d48cb42624373f8ffa0d85fc61f5b0cc2f3c9026f22e0279b50fc94a829158a09a5ca03f1f34a

data/CHANGELOG.md

@@ -1,6 +1,17 @@
 ## [Unreleased]
 * No unreleased changes
 
+## 5.9.3 / 2022-12-02
+## Fixed
+* Support Rails 7.0
+
+## Changed
+* Drop support for Rails 5.2
+
+## 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

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
@@ -11,7 +11,7 @@ file safety:
   ".github/workflows/test.yml":
     comments:
     reviewed_by: brian.shand
-    safe_revision: e91fab5ac8474b001ca3805c6cce8eefa6b49f2d
+    safe_revision: e977f8c0f8a5c6a1952bd1565b75e16850ef11e0
   ".gitignore":
     comments:
     reviewed_by: josh.pencheon
@@ -23,7 +23,7 @@ file safety:
   CHANGELOG.md:
     comments:
     reviewed_by: brian.shand
-    safe_revision: '0317988580be42bc3a3b64680e340223268c525f'
+    safe_revision: e977f8c0f8a5c6a1952bd1565b75e16850ef11e0
   CODE_OF_CONDUCT.md:
     comments:
     reviewed_by: timgentry
@@ -75,15 +75,15 @@ file safety:
   lib/ndr_support/concerns/working_days.rb:
     comments:
     reviewed_by: brian.shand
-    safe_revision: f35774faa74bfe6f7d2f1e7447388f11914ecab8
+    safe_revision: bac214f4c93d8753268825408fc560171fac91c0
   lib/ndr_support/date_and_time_extensions.rb:
     comments:
-    reviewed_by: josh.pencheon
-    safe_revision: c1158eccb843b637b4dd82815dc7c081f12b93e4
+    reviewed_by: brian.shand
+    safe_revision: e977f8c0f8a5c6a1952bd1565b75e16850ef11e0
   lib/ndr_support/daterange.rb:
     comments:
     reviewed_by: brian.shand
-    safe_revision: 9d19593cc45a9f1724c4b34a1a05a5ff48003084
+    safe_revision: e977f8c0f8a5c6a1952bd1565b75e16850ef11e0
   lib/ndr_support/hash.rb:
     comments:
     reviewed_by: pauleves
@@ -111,15 +111,15 @@ file safety:
   lib/ndr_support/ourdate.rb:
     comments:
     reviewed_by: brian.shand
-    safe_revision: 9d19593cc45a9f1724c4b34a1a05a5ff48003084
+    safe_revision: e977f8c0f8a5c6a1952bd1565b75e16850ef11e0
   lib/ndr_support/ourdate/build_datetime.rb:
     comments:
     reviewed_by: brian.shand
     safe_revision: 9d19593cc45a9f1724c4b34a1a05a5ff48003084
   lib/ndr_support/ourtime.rb:
     comments:
-    reviewed_by: ollietulloch
-    safe_revision: '09b3f97fb4c1afc88d0d070c39796b1f60c39d25'
+    reviewed_by: brian.shand
+    safe_revision: e977f8c0f8a5c6a1952bd1565b75e16850ef11e0
   lib/ndr_support/password.rb:
     comments: with input from brian.shand
     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: 3ccb4e78a657f33e80c10550ba8f25978cf548db
   lib/ndr_support/working_days.rb:
     comments:
     reviewed_by: josh.pencheon
@@ -187,7 +187,7 @@ file safety:
   ndr_support.gemspec:
     comments:
     reviewed_by: brian.shand
-    safe_revision: e91fab5ac8474b001ca3805c6cce8eefa6b49f2d
+    safe_revision: e977f8c0f8a5c6a1952bd1565b75e16850ef11e0
   test/array_test.rb:
     comments:
     reviewed_by: timgentry
@@ -195,7 +195,11 @@ file safety:
   test/concerns/working_days_test.rb:
     comments:
     reviewed_by: brian.shand
-    safe_revision: f35774faa74bfe6f7d2f1e7447388f11914ecab8
+    safe_revision: bac214f4c93d8753268825408fc560171fac91c0
+  test/date_and_time_extensions_test.rb:
+    comments:
+    reviewed_by: brian.shand
+    safe_revision: e977f8c0f8a5c6a1952bd1565b75e16850ef11e0
   test/daterange_test.rb:
     comments:
     reviewed_by: ollietulloch
@@ -226,8 +230,8 @@ file safety:
     safe_revision: 50a4293953f9ae227823c390b069a3ed4825074c
   test/ourdate_test.rb:
     comments:
-    reviewed_by: josh.pencheon
-    safe_revision: 7c32f5a80c1fb7aaf6e850d4b0651a7b47640e15
+    reviewed_by: brian.shand
+    safe_revision: e977f8c0f8a5c6a1952bd1565b75e16850ef11e0
   test/ourtime_test.rb:
     comments:
     reviewed_by: brian.shand

data/lib/ndr_support/concerns/working_days.rb

@@ -113,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   - 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/date_and_time_extensions.rb

@@ -15,6 +15,19 @@ class Date
     return in_time_zone.to_datetime if ActiveRecord::Base.default_timezone == :local
     orig_to_datetime
   end
+
+  alias orig_to_s to_s
+
+  # Rails 7 stops overriding to_s (without a format specification) (for performance on Ruby 3.1)
+  # cf. activesupport-7.0.4/lib/active_support/core_ext/date/deprecated_conversions.rb
+  # We keep overriding this for compatibility
+  def to_s(format = :default)
+    if format == :default
+      to_formatted_s(:default)
+    else
+      orig_to_s(format)
+    end
+  end
 end
 
 #-------------------------------------------------------------------------------
@@ -24,6 +37,55 @@ class Time
   def to_iso
     strftime('%Y-%m-%dT%H:%M:%S')
   end
+
+  alias orig_to_s to_s
+
+  # Rails 7 stops overriding to_s (without a format specification) (for performance on Ruby 3.1)
+  # cf. activesupport-7.0.4/lib/active_support/core_ext/date/deprecated_conversions.rb
+  # We keep overriding this for compatibility
+  def to_s(format = :default)
+    if format == :default
+      to_formatted_s(:default)
+    else
+      orig_to_s(format)
+    end
+  end
+end
+
+#-------------------------------------------------------------------------------
+
+class DateTime
+  alias orig_to_s to_s
+
+  # Rails 7 stops overriding to_s (without a format specification) (for performance on Ruby 3.1)
+  # cf. activesupport-7.0.4/lib/active_support/core_ext/date/deprecated_conversions.rb
+  # We keep overriding this for compatibility
+  def to_s(format = :default)
+    if format == :default
+      to_formatted_s(:default)
+    else
+      orig_to_s(format)
+    end
+  end
+end
+
+#-------------------------------------------------------------------------------
+
+module ActiveSupport
+  class TimeWithZone
+    alias orig_to_s to_s
+
+    # Rails 7 stops overriding to_s (without a format specification) (for performance on Ruby 3.1)
+    # cf. activesupport-7.0.4/lib/active_support/core_ext/date/deprecated_conversions.rb
+    # We keep overriding this for compatibility
+    def to_s(format = :default)
+      if format == :default
+        to_formatted_s(:default)
+      else
+        orig_to_s(format)
+      end
+    end
+  end
 end
 
 #-------------------------------------------------------------------------------
@@ -52,8 +114,8 @@ module NdrSupport
     def apply_date_patch!
       # Ensure we emit "yaml-formatted" string, instead of the revised default format.
       Psych::Visitors::YAMLTree.class_eval do
-        def visit_Date o
-          @emitter.scalar o.to_s(:yaml), nil, nil, true, false, Psych::Nodes::Scalar::ANY
+        def visit_Date(o)
+          @emitter.scalar o.to_formatted_s(:yaml), nil, nil, true, false, Psych::Nodes::Scalar::ANY
         end
       end
     end

data/lib/ndr_support/daterange.rb

@@ -56,7 +56,7 @@ class Daterange
   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)
+  # TODO: possibly add support for to_formatted_s(format) e.g. to_formatted_s(:short)
   def to_s
     return '' unless @date1 && @date2
     if @date1 == @date2 # single date
@@ -139,9 +139,9 @@ class Daterange
   def tidy_string_if_midnight(datetime)
     if datetime.hour == 0 && datetime.min == 0 && datetime.sec == 0
       # it's midnight
-      datetime.to_date.to_s(:ui)
+      datetime.to_date.to_formatted_s(:ui)
     else
-      return datetime.to_time.to_s(:ui)
+      datetime.to_time.to_formatted_s(:ui)
     end
   end
 

data/lib/ndr_support/ourdate.rb

@@ -39,7 +39,7 @@ class Ourdate
   end
 
   def to_s
-    @thedate ? @thedate.to_date.to_s(:ui) : ''
+    @thedate ? @thedate.to_date.to_formatted_s(:ui) : ''
   end
 
   def empty?

data/lib/ndr_support/ourtime.rb

@@ -24,7 +24,7 @@ class Ourtime
   end
 
   def to_s
-    @thetime ? @thetime.to_time.to_s(:ui) : ''
+    @thetime ? @thetime.to_time.to_formatted_s(:ui) : ''
   end
 
   def empty?

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.1'
+  VERSION = '5.9.3'
 end

data/ndr_support.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activerecord',  '>= 5.2.0', '< 7'
-  spec.add_dependency 'activesupport', '>= 5.2.0', '< 7'
+  spec.add_dependency 'activerecord',  '>= 6.0.0', '< 7.1'
+  spec.add_dependency 'activesupport', '>= 6.0.0', '< 7.1'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake', '>= 12.3.3'
@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
 
   # 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 'mocha', '~> 2.0'
 
   spec.add_development_dependency 'ndr_dev_support', '~> 6.0.2'
 

data/test/concerns/working_days_test.rb

@@ -134,7 +134,9 @@ class WorkingDaysTest < Minitest::Test
       if parsed_date.public_holiday?
         nil
       else
-        [event_date, "    '#{event_date}', # #{parsed_date.strftime('%A')} - #{event['title']}"]
+        [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?

data/test/date_and_time_extensions_test.rb

@@ -0,0 +1,56 @@
+require 'test_helper'
+
+# This tests our various date and time class extensions
+# Note that these will probably all need to be changed in a major bump of ndr_support
+# once we've moved everything to Rails 7.
+class DateAndTimeExtensionsTest < Minitest::Test
+  def test_date_to_s
+    d = Date.new(2000, 2, 1)
+    assert_equal '2000-02-01', d.to_default_s, 'Rails 7 default to_s'
+    assert_equal '01.02.2000', d.to_formatted_s(:default), 'Rails 6 default to_s'
+    assert_equal d.to_formatted_s(:default), d.to_s,
+                 'We plan to change default to_s behaviour in a major version bump'
+  end
+
+  def test_datetime_to_s
+    bst_datetime = DateTime.new(2014, 4, 1, 0, 0, 0, '+1')
+    assert_equal '2014-04-01T00:00:00+01:00', bst_datetime.to_default_s, 'Rails 7 default to_s'
+    assert_equal '01.04.2014', bst_datetime.to_formatted_s(:default), 'Rails 6 default to_s'
+    assert_equal bst_datetime.to_formatted_s(:default), bst_datetime.to_s,
+                 'We plan to change default to_s behaviour in a major version bump'
+
+    gmt_datetime = DateTime.new(2014, 3, 1, 0, 0, 0, '+0')
+    assert_equal '2014-03-01T00:00:00+00:00', gmt_datetime.to_default_s, 'Rails 7 default to_s'
+    assert_equal '01.03.2014', gmt_datetime.to_formatted_s(:default), 'Rails 6 default to_s'
+    assert_equal gmt_datetime.to_formatted_s(:default), gmt_datetime.to_s,
+                 'We plan to change default to_s behaviour in a major version bump'
+
+    datetime_with_hhmmss = DateTime.new(2014, 4, 1, 12, 35, 11, '+0')
+    assert_equal '2014-04-01T12:35:11+00:00', datetime_with_hhmmss.to_default_s,
+                 'Rails 7 default to_s'
+    assert_equal '01.04.2014 12:35', datetime_with_hhmmss.to_formatted_s(:default),
+                 'Rails 6 default to_s'
+    assert_equal datetime_with_hhmmss.to_formatted_s(:default), datetime_with_hhmmss.to_s,
+                 'We plan to change default to_s behaviour in a major version bump'
+  end
+
+  def test_time_to_s
+    time = Time.new(2014, 4, 1, 12, 35, 11.5, '+01:00')
+    assert_equal '2014-04-01 12:35:11 +0100', time.to_default_s, 'Rails 7 default to_s'
+    assert_equal '01.04.2014 12:35', time.to_formatted_s(:default), 'Rails 6 default to_s'
+    assert_equal time.to_formatted_s(:default), time.to_s,
+                 'We plan to change default to_s behaviour in a major version bump'
+  end
+
+  def test_time_with_zone_to_s
+    time_with_zone = Time.find_zone('Europe/London').local(2014, 4, 1, 12, 35, 11.5)
+    assert_equal 'BST', time_with_zone.zone
+    # Without ndr_support extensions, we'd expect "2014-04-01 12:35:11 +0100"
+    # but we have to trick the database into assuming all times are UTC to retain local time
+    assert_equal '2014-04-01 12:35:11 UTC', time_with_zone.to_default_s,
+                 'Rails 7 default to_s with our date and time formatting'
+    assert_equal '01.04.2014 12:35', time_with_zone.to_formatted_s(:default), 'Rails 6 default to_s'
+    assert_equal time_with_zone.to_formatted_s(:default), time_with_zone.to_s,
+                 'We plan to change default to_s behaviour in a major version bump'
+  end
+end

data/test/ourdate_test.rb

@@ -5,13 +5,14 @@ class OurdateTest < Minitest::Test
   def test_date_and_time
     d = Ourdate.build_datetime(2003, 11, 30)
     assert_equal '2003-11-30', d.to_iso
+    assert_equal '30.11.2003', d.to_formatted_s
     assert_equal '30.11.2003', d.to_s
   end
 
   def test_ourdate
     # Creating an Ourdate from a String
     od = Ourdate.new('01.02.2000')
-    assert_equal Date.new(2000, 2, 1).to_s(:ui), od.to_s
+    assert_equal Date.new(2000, 2, 1).to_formatted_s(:ui), od.to_s
     assert_kind_of Date, od.thedate
     assert_equal '01.02.2000', od.thedate.to_s
     # Creating an Ourdate from a Date

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_support
 version: !ruby/object:Gem::Version
-  version: 5.9.1
+  version: 5.9.3
 platform: ruby
 authors:
 - NCRS Development Team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-12 00:00:00.000000000 Z
+date: 2022-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,40 +16,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -98,14 +98,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: ndr_dev_support
   requirement: !ruby/object:Gem::Requirement
@@ -257,6 +257,7 @@ files:
 - ndr_support.gemspec
 - test/array_test.rb
 - test/concerns/working_days_test.rb
+- test/date_and_time_extensions_test.rb
 - test/daterange_test.rb
 - test/hash_test.rb
 - test/integer/calculations_test.rb
@@ -283,7 +284,7 @@ homepage: https://github.com/PublicHealthEngland/ndr_support
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -298,13 +299,14 @@ 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:
 - test/array_test.rb
 - test/concerns/working_days_test.rb
+- test/date_and_time_extensions_test.rb
 - test/daterange_test.rb
 - test/hash_test.rb
 - test/integer/calculations_test.rb