ndr_support 5.10.2 → 5.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbbca09887dac304f0a29b687893c47c70ae8b7bd600a646baa1f2d8a3d0e13f
-  data.tar.gz: e162d4c2ca88fe68c4f6a6e0af88d9d86b69e409fe5d7fbe8b72daec4d6ac516
+  metadata.gz: 8b6a369bc1e742569d0aa4d950f9a816c9e22f3625b3acaf67b9bd75a5355328
+  data.tar.gz: 7e6e2054579563d87ad5db6a79cbb9fb059613bfac985ee8aeaf2d12e2db4b3d
 SHA512:
-  metadata.gz: dd29e398e40a4eee8ad4da3ad27421a92fc1587f10b96334b981b97de9796961850101132c6fa37389b748b5cb5bad285f7bf6ba736dff47c104ff2cf86e5465
-  data.tar.gz: '059894e4a5a942d7f4a158fa82f8df14ec0f8899eae140ebcabf3d9235209301ad750f9659d7e6e87eecf236a2aaa35af92703025be3a6f189354cac241f75dd'
+  metadata.gz: 870d809da96700fddaf9610a3631b18906327ed75fd72205f75bd98527454c3c1b44c07429b7630e8cf83d989683ea503422cef020829cbf1583e602bd272085
+  data.tar.gz: 7ce414782c185518b9e87665cc0563192a6b8f54f1f9ca5aeaf8055b17ac7c08c81fb8da5238b2af3ea841c320d33b81221d243422c6df64135c5d64f91a64a3

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 ## [Unreleased]
-* No unreleased changes
+* no unreleased changes
+
+## 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
+* Separated log10 tests
 
 ## 5.10.2 / 2024-02-09
 ## Fixed

data/code_safety.yml

@@ -11,7 +11,7 @@ file safety:
   ".github/workflows/test.yml":
     comments:
     reviewed_by: brian.shand
-    safe_revision: 2253a90ec8db872590a8167fdebe95d6ed677cc2
+    safe_revision: 931e0ac50f7843abd80aa907245936fe907d96f8
   ".gitignore":
     comments:
     reviewed_by: josh.pencheon
@@ -23,7 +23,7 @@ file safety:
   CHANGELOG.md:
     comments:
     reviewed_by: brian.shand
-    safe_revision: af6c7ddedf6627de8ec823ff33399c7938cd64b1
+    safe_revision: 931e0ac50f7843abd80aa907245936fe907d96f8
   CODE_OF_CONDUCT.md:
     comments:
     reviewed_by: timgentry
@@ -48,10 +48,6 @@ file safety:
     comments:
     reviewed_by: timgentry
     safe_revision: e33e9dae7f38bc449ce9276515a539836dbbbd53
-  gemfiles/Gemfile.rails61:
-    comments:
-    reviewed_by: brian.shand
-    safe_revision: 16254a4332aab074a27c8e13859dc4712e707122
   gemfiles/Gemfile.rails70:
     comments:
     reviewed_by: brian.shand
@@ -60,6 +56,14 @@ file safety:
     comments:
     reviewed_by: brian.shand
     safe_revision: 2253a90ec8db872590a8167fdebe95d6ed677cc2
+  gemfiles/Gemfile.rails72:
+    comments:
+    reviewed_by: brian.shand
+    safe_revision: 931e0ac50f7843abd80aa907245936fe907d96f8
+  gemfiles/Gemfile.rails80:
+    comments:
+    reviewed_by: brian.shand
+    safe_revision: 931e0ac50f7843abd80aa907245936fe907d96f8
   lib/ndr_support.rb:
     comments:
     reviewed_by: brian.shand
@@ -75,7 +79,7 @@ file safety:
   lib/ndr_support/date_and_time_extensions.rb:
     comments:
     reviewed_by: brian.shand
-    safe_revision: 8796a1a32273a106a6b1a134a48077cff0176659
+    safe_revision: 931e0ac50f7843abd80aa907245936fe907d96f8
   lib/ndr_support/daterange.rb:
     comments:
     reviewed_by: brian.shand
@@ -107,11 +111,11 @@ file safety:
   lib/ndr_support/ourdate.rb:
     comments:
     reviewed_by: brian.shand
-    safe_revision: 8796a1a32273a106a6b1a134a48077cff0176659
+    safe_revision: 931e0ac50f7843abd80aa907245936fe907d96f8
   lib/ndr_support/ourdate/build_datetime.rb:
     comments:
     reviewed_by: brian.shand
-    safe_revision: 8796a1a32273a106a6b1a134a48077cff0176659
+    safe_revision: 931e0ac50f7843abd80aa907245936fe907d96f8
   lib/ndr_support/ourtime.rb:
     comments:
     reviewed_by: brian.shand
@@ -138,16 +142,16 @@ file safety:
     safe_revision: f4f7cb0803ea34a2f1ba83495d8bcbd942786bce
   lib/ndr_support/string/clean_methodable.rb:
     comments:
-    reviewed_by: brian.shand
-    safe_revision: af6c7ddedf6627de8ec823ff33399c7938cd64b1
+    reviewed_by: ollietulloch
+    safe_revision: ff21f98e6608eedb4b33f977778736b38f9fbacb
   lib/ndr_support/string/cleaning.rb:
     comments:
-    reviewed_by: brian.shand
-    safe_revision: af6c7ddedf6627de8ec823ff33399c7938cd64b1
+    reviewed_by: ollietulloch
+    safe_revision: d99c4bf5d2cbbfe78101beff399e7da8645417b2
   lib/ndr_support/string/conversions.rb:
     comments:
     reviewed_by: brian.shand
-    safe_revision: 8796a1a32273a106a6b1a134a48077cff0176659
+    safe_revision: 931e0ac50f7843abd80aa907245936fe907d96f8
   lib/ndr_support/tasks.rb:
     comments:
     reviewed_by: timgentry
@@ -174,8 +178,8 @@ file safety:
     safe_revision: '09b3f97fb4c1afc88d0d070c39796b1f60c39d25'
   lib/ndr_support/version.rb:
     comments:
-    reviewed_by: brian.shand
-    safe_revision: a58c1057a2829284ae527bdd66401b1891f28196
+    reviewed_by: ollietulloch
+    safe_revision: 8cb498126d68a19f880b0cd1b83b127c8ec90a89
   lib/ndr_support/working_days.rb:
     comments:
     reviewed_by: josh.pencheon
@@ -187,7 +191,7 @@ file safety:
   ndr_support.gemspec:
     comments:
     reviewed_by: brian.shand
-    safe_revision: 2253a90ec8db872590a8167fdebe95d6ed677cc2
+    safe_revision: 931e0ac50f7843abd80aa907245936fe907d96f8
   test/array_test.rb:
     comments:
     reviewed_by: timgentry
@@ -199,11 +203,11 @@ file safety:
   test/date_and_time_extensions_test.rb:
     comments:
     reviewed_by: brian.shand
-    safe_revision: e977f8c0f8a5c6a1952bd1565b75e16850ef11e0
+    safe_revision: 931e0ac50f7843abd80aa907245936fe907d96f8
   test/daterange_test.rb:
     comments:
     reviewed_by: brian.shand
-    safe_revision: 8796a1a32273a106a6b1a134a48077cff0176659
+    safe_revision: 931e0ac50f7843abd80aa907245936fe907d96f8
   test/hash_test.rb:
     comments:
     reviewed_by: timgentry
@@ -258,16 +262,16 @@ file safety:
     safe_revision: b562d0c15ff1b1d565522a47e6bae47ea09706f0
   test/string/cleaning_test.rb:
     comments:
-    reviewed_by: brian.shand
-    safe_revision: af6c7ddedf6627de8ec823ff33399c7938cd64b1
+    reviewed_by: ollietulloch
+    safe_revision: d99c4bf5d2cbbfe78101beff399e7da8645417b2
   test/string/conversions_test.rb:
     comments:
     reviewed_by: brian.shand
-    safe_revision: 8796a1a32273a106a6b1a134a48077cff0176659
+    safe_revision: 931e0ac50f7843abd80aa907245936fe907d96f8
   test/test_helper.rb:
     comments:
     reviewed_by: brian.shand
-    safe_revision: 8796a1a32273a106a6b1a134a48077cff0176659
+    safe_revision: 931e0ac50f7843abd80aa907245936fe907d96f8
   test/threat_scanner_test.rb:
     comments:
     reviewed_by: ollietulloch

data/gemfiles/Gemfile.rails72

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'activerecord',  '~> 7.2.0'
+gem 'activesupport', '~> 7.2.0'

data/gemfiles/Gemfile.rails80

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'activerecord',  '~> 8.0.0'
+gem 'activesupport', '~> 8.0.0'

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

@@ -3,6 +3,8 @@
 module CleanMethodable
   extend ActiveSupport::Concern
 
+  ROMAN_ONE_TO_FIVE_MAPPING = { 'I' => '1', 'II' => '2', 'III' => '3', 'IIII' => '4', 'IV' => '4', 'V' => '5' }.freeze
+
   CLEAN_METHODS = {
     nhsnumber: :clean_nhsnumber,
     postcode: :clean_postcode, get_postcode: :clean_postcode,

data/lib/ndr_support/string/cleaning.rb

@@ -7,7 +7,6 @@ class String
   include CleanMethodable
 
   INVALID_CONTROL_CHARS = /[\x00-\x08\x0b-\x0c\x0e-\x1f]/
-  ROMAN_ONE_TO_FIVE_MAPPING = { 'I' => '1', 'II' => '2', 'III' => '3', 'IIII' => '4', 'IV' => '4', 'V' => '5' }
 
   POSTCODE_REGEXP = /
     ^(

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.2'
+  VERSION = '5.10.4'
 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',  '>= 6.1', '< 7.2'
-  spec.add_dependency 'activesupport', '>= 6.1', '< 7.2'
+  spec.add_dependency 'activerecord',  '>= 7.0', '< 8.1'
+  spec.add_dependency 'activesupport', '>= 7.0', '< 8.1'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake', '>= 12.3.3'

data/test/date_and_time_extensions_test.rb

@@ -6,7 +6,11 @@ require 'test_helper'
 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'
+    if d.respond_to?(:to_default_s) # Only defined on Rails <= 7.1
+      assert_equal '2000-02-01', d.to_default_s, 'Rails 7 default to_s'
+    else
+      assert_equal '2000-02-01', d.orig_to_s, 'Rails 7 default to_s (via our shim)'
+    end
     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'
@@ -14,20 +18,33 @@ class DateAndTimeExtensionsTest < Minitest::Test
 
   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'
+    if bst_datetime.respond_to?(:to_default_s) # Only defined on Rails <= 7.1
+      assert_equal '2014-04-01T00:00:00+01:00', bst_datetime.to_default_s, 'Rails 7 default to_s'
+    else
+      assert_equal '2014-04-01T00:00:00+01:00', bst_datetime.orig_to_s, 'Rails 7 default to_s (via our shim)'
+    end
     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'
+    if gmt_datetime.respond_to?(:to_default_s) # Only defined on Rails <= 7.1
+      assert_equal '2014-03-01T00:00:00+00:00', gmt_datetime.to_default_s, 'Rails 7 default to_s'
+    else
+      assert_equal '2014-03-01T00:00:00+00:00', gmt_datetime.orig_to_s, 'Rails 7 default to_s (via our shim)'
+    end
     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'
+    if datetime_with_hhmmss.respond_to?(:to_default_s) # Only defined on Rails <= 7.1
+      assert_equal '2014-04-01T12:35:11+00:00', datetime_with_hhmmss.to_default_s,
+                   'Rails 7 default to_s'
+    else
+      assert_equal '2014-04-01T12:35:11+00:00', datetime_with_hhmmss.orig_to_s,
+                   'Rails 7 default to_s (via our shim)'
+    end
     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,
@@ -36,7 +53,11 @@ class DateAndTimeExtensionsTest < Minitest::Test
 
   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'
+    if time.respond_to?(:to_default_s) # Only defined on Rails <= 7.1
+      assert_equal '2014-04-01 12:35:11 +0100', time.to_default_s, 'Rails 7 default to_s'
+    else
+      assert_equal '2014-04-01 12:35:11 +0100', time.orig_to_s, 'Rails 7 default to_s (via our shim)'
+    end
     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'
@@ -47,8 +68,13 @@ class DateAndTimeExtensionsTest < Minitest::Test
     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'
+    if time_with_zone.respond_to?(:to_default_s) # Only defined on Rails <= 7.1
+      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'
+    else
+      assert_equal '2014-04-01 12:35:11 +0100', time_with_zone.orig_to_s,
+                   'Rails 7 default to_s with our date and time formatting (via our shim)'
+    end
     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'

data/test/daterange_test.rb

@@ -166,11 +166,7 @@ class DaterangeTest < Minitest::Test
   def test_date_with_daylight_saving
     dr = Daterange.new(Date.new(2017, 9, 2)) # During daylight saving
     assert_equal '02.09.2017', dr.to_s
-    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 unless default_timezone == :local
 
     assert_equal Date.new(2017, 9, 2).in_time_zone.utc_offset, dr.date1.utc_offset, 'Expect consistent offset'

data/test/string/cleaning_test.rb

@@ -30,7 +30,9 @@ class String
       assert_equal 'IP222', 'IP222'.postcodeize(:db)
       assert_equal 'IP222E', 'IP222E'.postcodeize(:db)
       assert_equal 'HANTS', 'HANTS'.postcodeize(:db)
-      # Log10
+    end
+
+    test 'clean_log10' do
       assert_equal '0.0', '0'.clean(:log10)
       assert_equal '-10.1', '-10.1'.clean(:log10)
       assert_match(/\A0.041392685158225[0-9]*\z/, '1.1'.clean(:log10),
@@ -38,6 +40,17 @@ class String
       assert_equal 'BILBO', 'BILBO'.clean(:log10)
     end
 
+    test 'clean_roman5' do
+      assert_equal '12345', 'I2345'.clean(:roman5)
+      assert_equal '12345', '1II345'.clean(:roman5)
+      assert_equal '12345', '12III45'.clean(:roman5)
+      assert_equal '12345', '123IIII5'.clean(:roman5)
+      assert_equal '12345', '123IIII5'.clean(:roman5)
+      assert_equal '12345', '123IV5'.clean(:roman5)
+      assert_equal '12345', '1234V'.clean(:roman5)
+      assert_equal '12345', '1II34V'.clean(:roman5)
+    end
+
     test 'xml_unsafe?' do
       without_control = 'hello world!'
       refute without_control.xml_unsafe?

data/test/string/conversions_test.rb

@@ -84,11 +84,7 @@ class String::ConversionsTest < Minitest::Test
 
   test 'should convert strings to DateTime correctly' do
     assert_equal 0, '2018-01-02'.to_datetime.utc_offset
-    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 unless default_timezone == :local
 
     assert_equal Time.new(2017, 9, 2).utc_offset, '2017-09-02'.to_datetime.utc_offset, 'Expect consistent offset'

data/test/test_helper.rb

@@ -16,11 +16,7 @@ NdrSupport.apply_era_date_formats!
 # require all dates to be stored in UTC in the database.
 # Thus a birth date of 1975-06-01 would be stored as 1975-05-31 23.00.00.
 # Instead, we want to store all times in local time.
-if ActiveRecord.respond_to?(:default_timezone=)
-  ActiveRecord.default_timezone = :local
-else
-  ActiveRecord::Base.default_timezone = :local # Rails <= 6.1
-end
+ActiveRecord.default_timezone = :local
 ActiveRecord::Base.time_zone_aware_attributes = false
 Time.zone = 'London'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_support
 version: !ruby/object:Gem::Version
-  version: 5.10.2
+  version: 5.10.4
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-09 00:00:00.000000000 Z
+date: 2024-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,40 +16,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
     - - "<"
       - !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.0'
     - - "<"
       - !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.0'
     - - "<"
       - !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.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -220,9 +220,10 @@ files:
 - README.md
 - Rakefile
 - code_safety.yml
-- gemfiles/Gemfile.rails61
 - gemfiles/Gemfile.rails70
 - gemfiles/Gemfile.rails71
+- gemfiles/Gemfile.rails72
+- gemfiles/Gemfile.rails80
 - lib/ndr_support.rb
 - lib/ndr_support/array.rb
 - lib/ndr_support/concerns/working_days.rb
@@ -299,7 +300,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.3.27
 signing_key:
 specification_version: 4
 summary: NDR Support library

data/gemfiles/Gemfile.rails61

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-gem 'activerecord',  '~> 6.1.0'
-gem 'activesupport', '~> 6.1.0'