ndr_support 5.10.3 → 5.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f9ac10bd29787e3ff5b382618cc9389e09c1f5c1b3684a5083ca3babaa0fe99
-  data.tar.gz: d7b0273dee82913349ecc33fbd87310749e4190912ee5349000402e89e0e3e2b
+  metadata.gz: fdc9d0e0da9c4d1972f21825ddadb65b08a1a3330652d57db7e3b50be1359881
+  data.tar.gz: 922f511682c6ff5a834f32ce95707ed0c5fb4bff2ba53f5130c8e276ac07a715
 SHA512:
-  metadata.gz: 746812be4b4685cd841e7ba69eb56fa81e8f34d5d62fc5c4db1fbfdfe88dd06052df35429dcc927d43c6c1fe5b383768eec751d8c191d84283bb15737bb06138
-  data.tar.gz: 7fa1f87906e1701528f5d83268d60a664e053dd200341722c24e488eb2af4dc83ccd6d91014ecc5c893176afc71ea64510ea7e34708265b3b472432f8d2da225
+  metadata.gz: 74ec310d2107170ad7243e468ebc093b5edbf47e0d65b60eaa65d5b395b68c92591d780f7ab1a6937c96389dff6404498cd59a2626c50bf879ad7a4d2b58ebf4
+  data.tar.gz: 63dadd4b6b6c415a59a7f6174a1befd581b05695200a4fd3a5f62d2efcd10be3aa811a2063959b22c0a74dfc9a4ad007c5a1de3800e5d0e882a2c41469115f08

data/CHANGELOG.md

@@ -1,7 +1,18 @@
 ## [Unreleased]
 * no unreleased changes
 
-## 5.10.3 / 2023-02-12
+## 5.10.5 / 2025-11-05
+## Fixed
+* Exclude unneeded files from gem package
+* Add 2027 bank holidays
+* Replace Public Health England naming with NHS England
+* Support Ruby 3.4. Drop support for Rails 7.0, Ruby 3.0, 3.1
+
+## 5.10.4 / 2024-11-13
+### Added
+* Support Rails 7.1, 7.2, 8.0, Ruby 3.2, 3.3. Drop support for Rails 6.1
+
+## 5.10.3 / 2024-02-12
 ## Fixed
 * Fixed issue with constant in wrong file/concern
 * Added tests for roman5 cleaning method

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2011-2016 Public Health England
+Copyright (c) 2011-2025 NHS England
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,6 +1,6 @@
-# NdrSupport [![Build Status](https://github.com/publichealthengland/ndr_support/workflows/Test/badge.svg)](https://github.com/publichealthengland/ndr_support/actions?query=workflow%3Atest) [![Gem Version](https://badge.fury.io/rb/ndr_support.svg)](https://rubygems.org/gems/ndr_support)
+# NdrSupport [![Build Status](https://github.com/NHSDigital/ndr_support/workflows/Test/badge.svg)](https://github.com/NHSDigital/ndr_support/actions?query=workflow%3Atest) [![Gem Version](https://badge.fury.io/rb/ndr_support.svg)](https://rubygems.org/gems/ndr_support)
 
-This is the Public Health England (PHE) National Disease Registers (NDR) Support ruby gem, providing:
+This is the NHS England (NHS-E) National Disease Registration Service (NDRS) Support ruby gem, providing:
 
 1. core ruby class extensions;
 2. additional time, regular expression, file security, password checking/generation, and encoding classes.
@@ -55,7 +55,7 @@ include NdrSupport::YAML::SerializationMigration
 
 ## Contributing
 
-1. Fork it ( https://github.com/PublicHealthEngland/ndr_support/fork )
+1. Fork it ( https://github.com/NHSDigital/ndr_support/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/ndr_support/concerns/working_days.rb

@@ -1,10 +1,11 @@
 require 'active_support/time'
 
 # This module contains logic for #working_days_until, #weekday?, and #public_holiday?.
-module WorkingDays
+module WorkingDays # rubocop:disable Metrics/ModuleLength
   WEEK_DAYS = 1..5
   
   # TODO: could we use https://github.com/alphagov/gds-api-adapters ?
+  # rubocop:disable Style/TrailingCommaInArrayLiteral
   HOLIDAYS  = [ # Sourced from https://www.gov.uk/bank-holidays
     # 2012
     '2012-01-02', # Monday    - New Year's Day (substitute day)
@@ -145,7 +146,17 @@ module WorkingDays
     '2026-08-31', # Monday    - Summer bank holiday
     '2026-12-25', # Friday    - Christmas Day
     '2026-12-28', # Monday    - Boxing Day
+    # 2027
+    '2027-01-01', # Friday    - New Year’s Day
+    '2027-03-26', # Friday    - Good Friday
+    '2027-03-29', # Monday    - Easter Monday
+    '2027-05-03', # Monday    - Early May bank holiday
+    '2027-05-31', # Monday    - Spring bank holiday
+    '2027-08-30', # Monday    - Summer bank holiday
+    '2027-12-27', # Monday    - Christmas Day
+    '2027-12-28', # Tuesday   - Boxing Day
   ].map { |str| Date.parse(str) }
+  # rubocop:enable Style/TrailingCommaInArrayLiteral
 
   def self.check_lookup
     return true if HOLIDAYS.max >= 1.year.from_now

data/lib/ndr_support/date_and_time_extensions.rb

@@ -2,6 +2,7 @@ require 'yaml'
 require 'date'
 require 'ndr_support/working_days'
 
+# Extend standard Date class with our custom to_s overrides
 class Date
   # to_iso output must be SQL safe for security reasons
   def to_iso
@@ -12,11 +13,7 @@ class Date
 
   def to_datetime
     # Default timezone for Date is GMT, not local timezone
-    default_timezone = if ActiveRecord.respond_to?(:default_timezone)
-                         ActiveRecord.default_timezone
-                       else
-                         ActiveRecord::Base.default_timezone # Rails <= 6.1
-                       end
+    default_timezone = ActiveRecord.default_timezone
     return in_time_zone.to_datetime if default_timezone == :local
 
     orig_to_datetime
@@ -29,7 +26,7 @@ class Date
   # We keep overriding this for compatibility
   def to_s(format = :default)
     if format == :default
-      to_formatted_s(:default)
+      DATE_FORMATS.key?(:default) ? to_fs(:default) : orig_to_s
     else
       orig_to_s(format)
     end
@@ -38,6 +35,7 @@ end
 
 #-------------------------------------------------------------------------------
 
+# Extend standard Time class with our custom to_s overrides
 class Time
   # to_iso output must be SQL safe for security reasons
   def to_iso
@@ -51,7 +49,7 @@ class Time
   # We keep overriding this for compatibility
   def to_s(format = :default)
     if format == :default
-      to_formatted_s(:default)
+      DATE_FORMATS.key?(:default) ? to_fs(:default) : orig_to_s
     else
       orig_to_s(format)
     end
@@ -60,6 +58,7 @@ end
 
 #-------------------------------------------------------------------------------
 
+# Extend standard DateTime class with our custom to_s overrides
 class DateTime
   alias orig_to_s to_s
 
@@ -68,7 +67,7 @@ class DateTime
   # We keep overriding this for compatibility
   def to_s(format = :default)
     if format == :default
-      to_formatted_s(:default)
+      Time::DATE_FORMATS.key?(:default) ? to_fs(:default) : orig_to_s
     else
       orig_to_s(format)
     end
@@ -78,6 +77,7 @@ end
 #-------------------------------------------------------------------------------
 
 module ActiveSupport
+  # Extend ActiveSupport::TimeWithZone with our custom to_s overrides
   class TimeWithZone
     alias orig_to_s to_s
 
@@ -86,7 +86,7 @@ module ActiveSupport
     # We keep overriding this for compatibility
     def to_s(format = :default)
       if format == :default
-        to_formatted_s(:default)
+        Time::DATE_FORMATS.key?(:default) ? to_fs(:default) : orig_to_s
       else
         orig_to_s(format)
       end
@@ -96,6 +96,7 @@ end
 
 #-------------------------------------------------------------------------------
 
+# NdrSupport module
 module NdrSupport
   class << self
     # Within the NDR, we change default date formatting, as below.
@@ -120,8 +121,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_formatted_s(:yaml), nil, nil, true, false, Psych::Nodes::Scalar::ANY
+        def visit_Date(o) # rubocop:disable Naming/MethodName, Naming/MethodParameterName
+          @emitter.scalar o.to_fs(:yaml), nil, nil, true, false, Psych::Nodes::Scalar::ANY
         end
       end
     end

data/lib/ndr_support/ourdate/build_datetime.rb

@@ -10,11 +10,7 @@ class Ourdate
   def self.build_datetime(year, month = 1, day = 1, hour = 0, min = 0, sec = 0, usec = 0)
     return nil if year.nil?
 
-    default_timezone = if ActiveRecord.respond_to?(:default_timezone)
-                         ActiveRecord.default_timezone
-                       else
-                         ActiveRecord::Base.default_timezone # Rails <= 6.1
-                       end
+    default_timezone = ActiveRecord.default_timezone
     if default_timezone == :local
       # Time.local_time(year, month, day, hour, min, sec, usec).to_datetime
       # Behave like oracle_adapter.rb

data/lib/ndr_support/ourdate.rb

@@ -15,11 +15,7 @@ class Ourdate
     #--
     # TODO: Use Ourdate.build_datetime everywhere below:
     #++
-    default_timezone = if ActiveRecord.respond_to?(:default_timezone)
-                         ActiveRecord.default_timezone
-                       else
-                         ActiveRecord::Base.default_timezone # Rails <= 6.1
-                       end
+    default_timezone = ActiveRecord.default_timezone
     if default_timezone == :local
       build_datetime(current_time.year, current_time.month, current_time.day)
     else

data/lib/ndr_support/string/clean_methodable.rb

@@ -125,11 +125,11 @@ module CleanMethodable
   end
 
   def clean_tnmcategory
-    sub!(/\A[tnm]/i, '')
-    if self =~ /\Ax\z/i
-      upcase
+    without_prefix = sub(/\A[tnm]/i, '')
+    if without_prefix =~ /\Ax\z/i
+      without_prefix.upcase
     else
-      downcase
+      without_prefix.downcase
     end
   end
 

data/lib/ndr_support/string/conversions.rb

@@ -129,11 +129,7 @@ class String
 
   def to_datetime
     # Default timezone for to_datetime conversion is GMT, not local timezone
-    default_timezone = if ActiveRecord.respond_to?(:default_timezone)
-                         ActiveRecord.default_timezone
-                       else
-                         ActiveRecord::Base.default_timezone # Rails <= 6.1
-                       end
+    default_timezone = ActiveRecord.default_timezone
     return to_time.to_datetime if default_timezone == :local
 
     orig_to_datetime

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.3'
+  VERSION = '5.10.5'
 end

data/ndr_support.gemspec

@@ -9,22 +9,24 @@ Gem::Specification.new do |spec|
   spec.email         = []
   spec.summary       = 'NDR Support library'
   spec.description   = 'Provides NDR classes and class extensions'
-  spec.homepage      = 'https://github.com/PublicHealthEngland/ndr_support'
+  spec.homepage      = 'https://github.com/NHSDigital/ndr_support'
   spec.license       = 'MIT'
 
-  # Exclude older versions of this gem from the package.
-  spec.files         = `git ls-files -z`.split("\x0").reject { |s| s =~ %r{^(\.github|pkg/)} }
+  gem_files          = %w[CHANGELOG.md CODE_OF_CONDUCT.md LICENSE.txt README.md
+                          lib ndr_support.gemspec]
+  spec.files         = `git ls-files -z`.split("\x0").
+                       select { |f| gem_files.include?(f.split('/')[0]) }
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activerecord',  '>= 6.1', '< 7.2'
-  spec.add_dependency 'activesupport', '>= 6.1', '< 7.2'
+  spec.add_dependency 'activerecord',  '>= 7.1', '< 8.1'
+  spec.add_dependency 'activesupport', '>= 7.1', '< 8.1'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake', '>= 12.3.3'
 
-  spec.required_ruby_version = '>= 3.0'
+  spec.required_ruby_version = '>= 3.2'
 
   # Avoid std-lib minitest (which has different namespace)
   spec.add_development_dependency 'minitest', '>= 5.0.0'

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ndr_support
 version: !ruby/object:Gem::Version
-  version: 5.10.3
+  version: 5.10.5
 platform: ruby
 authors:
 - NCRS Development Team
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-12 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,40 +15,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -210,19 +209,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rubocop.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
-- Gemfile
-- Guardfile
 - LICENSE.txt
 - README.md
-- Rakefile
-- code_safety.yml
-- gemfiles/Gemfile.rails61
-- gemfiles/Gemfile.rails70
-- gemfiles/Gemfile.rails71
 - lib/ndr_support.rb
 - lib/ndr_support/array.rb
 - lib/ndr_support/concerns/working_days.rb
@@ -255,36 +245,10 @@ files:
 - lib/ndr_support/working_days.rb
 - lib/ndr_support/yaml/serialization_migration.rb
 - 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
-- test/integer/rounding_test.rb
-- test/integer/working_days_test.rb
-- test/nil_test.rb
-- test/obfuscator_test.rb
-- test/ourdate_test.rb
-- test/ourtime_test.rb
-- test/password_test.rb
-- test/regexp_range_test.rb
-- test/resources/filesystem_paths.yml
-- test/safe_file_test.rb
-- test/safe_path_test.rb
-- test/string/cleaning_test.rb
-- test/string/conversions_test.rb
-- test/test_helper.rb
-- test/threat_scanner_test.rb
-- test/utf8_encoding/control_characters_test.rb
-- test/utf8_encoding/force_binary_test.rb
-- test/utf8_encoding_test.rb
-- test/yaml/serialization_test.rb
-homepage: https://github.com/PublicHealthEngland/ndr_support
+homepage: https://github.com/NHSDigital/ndr_support
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -292,40 +256,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.6.9
 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
-- test/integer/rounding_test.rb
-- test/integer/working_days_test.rb
-- test/nil_test.rb
-- test/obfuscator_test.rb
-- test/ourdate_test.rb
-- test/ourtime_test.rb
-- test/password_test.rb
-- test/regexp_range_test.rb
-- test/resources/filesystem_paths.yml
-- test/safe_file_test.rb
-- test/safe_path_test.rb
-- test/string/cleaning_test.rb
-- test/string/conversions_test.rb
-- test/test_helper.rb
-- test/threat_scanner_test.rb
-- test/utf8_encoding/control_characters_test.rb
-- test/utf8_encoding/force_binary_test.rb
-- test/utf8_encoding_test.rb
-- test/yaml/serialization_test.rb
+test_files: []

data/.gitignore

@@ -1,19 +0,0 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/gemfiles/*.lock
-/pkg/
-/spec/reports/
-/tmp/
-*.bundle
-*.so
-*.o
-*.a
-mkmf.log
-
-# Ignore RuboCop's cache.
-.rubocop-https---raw-githubusercontent-com-PublicHealthEngland-ndr-dev-support-master--rubocop-yml
-

data/.rubocop.yml

@@ -1 +0,0 @@
-require: ndr_dev_support

data/Gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in ndr_support.gemspec
-gemspec

data/Guardfile

@@ -1,24 +0,0 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-
-# This group allows to skip running rubocop when tests fail.
-group :red_green_refactor, halt_on_fail: true do
-  guard :minitest do
-    watch(%r{^test/.+_test\.rb$})
-    watch('test/test_helper.rb')  { 'test' }
-
-    # Non-rails
-    watch(%r{^lib/ndr_support/(.+)\.rb$}) { |m| "test/#{m[1]}_test.rb" }
-  end
-
-  # automatically check Ruby code style with Rubocop when files are modified
-  guard :shell do
-    watch(/.+\.(rb|rake)$/) do |m|
-      unless system("bundle exec rake rubocop:diff #{m[0]}")
-        Notifier.notify "#{File.basename(m[0])} inspected, offenses detected",
-                        title: 'RuboCop results (partial)', image: :failed
-      end
-      nil
-    end
-  end
-end

data/Rakefile

@@ -1,12 +0,0 @@
-require 'bundler/gem_tasks'
-require 'rake/testtask'
-require 'ndr_dev_support/tasks'
-
-Rake::TestTask.new do |t|
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
-
-desc 'Run tests'
-task :default => :test