ndr_support 5.9.2 → 5.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b92349bb86b84b6c5cc6c836613fadec463e824e87e6ccbe02fc07dd3f7049b5
-  data.tar.gz: eb4312735ea0f25e517ec7b3d6676ab1b40c9ee64e36044b7b17f518cef0f592
+  metadata.gz: 4ca42961473b3e0f614709e4506f7f37e44b14e4f212db71e59e5386f7f4b852
+  data.tar.gz: 3d213bdfe03991c73f7bffe451208fec727d52337cdaf659e1a815d503962929
 SHA512:
-  metadata.gz: 3d1edb198422ec9e566680943988f090762bd3fe2f254cb9237631a54ed0feb2e4dda45801574319e745487a11fee6f1540a5c7b5562c516d4b9e7a9004266cc
-  data.tar.gz: d2dfa5bc36ece2a23b50d2406563604f6f5989a0706d7981382f9d6738e46cb89bfe3a4dfb7e1e0ab50b18971d8b07b2241d76e59bcf01f818da646898decf12
+  metadata.gz: cc033dac0c4eb88222a0b75630fad6505902f680b153ea2a8024cf5fa1ba8823d935e0f75f1384f9e716bfbe6265ba980ea3fb892a263f506737bb146356eff3
+  data.tar.gz: 7930201e594ad93153ff833e76e7ed5ced7eb3c35f4c57a88404a36e5e1e64b36bf79c2f764449bccc5eb5a139a03a9edf9b7f427efd4a78e97697f68b7e3096

data/.rubocop.yml

@@ -1 +1 @@
-inherit_from: 'https://raw.githubusercontent.com/PublicHealthEngland/ndr_dev_support/master/.rubocop.yml'
+require: ndr_dev_support

data/CHANGELOG.md

@@ -1,6 +1,17 @@
 ## [Unreleased]
 * No unreleased changes
 
+## 5.9.4 / 2023-07-13
+### Added
+* Support Ruby 3.2. Drop support for Ruby 2.7, Rails 6.0
+
+## 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

data/code_safety.yml

@@ -11,19 +11,19 @@ file safety:
   ".github/workflows/test.yml":
     comments:
     reviewed_by: brian.shand
-    safe_revision: e91fab5ac8474b001ca3805c6cce8eefa6b49f2d
+    safe_revision: 8796a1a32273a106a6b1a134a48077cff0176659
   ".gitignore":
     comments:
     reviewed_by: josh.pencheon
     safe_revision: a02f14cbf1fc36fbaf820365fdedfdc9af326db1
   ".rubocop.yml":
     comments:
-    reviewed_by: josh.pencheon
-    safe_revision: a02f14cbf1fc36fbaf820365fdedfdc9af326db1
+    reviewed_by: brian.shand
+    safe_revision: 8796a1a32273a106a6b1a134a48077cff0176659
   CHANGELOG.md:
     comments:
     reviewed_by: brian.shand
-    safe_revision: bac214f4c93d8753268825408fc560171fac91c0
+    safe_revision: 8796a1a32273a106a6b1a134a48077cff0176659
   CODE_OF_CONDUCT.md:
     comments:
     reviewed_by: timgentry
@@ -52,10 +52,6 @@ file safety:
     comments:
     reviewed_by: josh.pencheon
     safe_revision: 8a6bedae77d33d0db1b67eaed7972870b6afc993
-  gemfiles/Gemfile.rails60:
-    comments:
-    reviewed_by: brian.shand
-    safe_revision: 16254a4332aab074a27c8e13859dc4712e707122
   gemfiles/Gemfile.rails61:
     comments:
     reviewed_by: brian.shand
@@ -78,12 +74,12 @@ file safety:
     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: 8796a1a32273a106a6b1a134a48077cff0176659
   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 +107,15 @@ file safety:
   lib/ndr_support/ourdate.rb:
     comments:
     reviewed_by: brian.shand
-    safe_revision: 9d19593cc45a9f1724c4b34a1a05a5ff48003084
+    safe_revision: 8796a1a32273a106a6b1a134a48077cff0176659
   lib/ndr_support/ourdate/build_datetime.rb:
     comments:
     reviewed_by: brian.shand
-    safe_revision: 9d19593cc45a9f1724c4b34a1a05a5ff48003084
+    safe_revision: 8796a1a32273a106a6b1a134a48077cff0176659
   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
@@ -146,8 +142,8 @@ file safety:
     safe_revision: b7b033ad9773cc9037c408a7763b113d31cbf191
   lib/ndr_support/string/conversions.rb:
     comments:
-    reviewed_by: ollietulloch
-    safe_revision: '09b3f97fb4c1afc88d0d070c39796b1f60c39d25'
+    reviewed_by: brian.shand
+    safe_revision: 8796a1a32273a106a6b1a134a48077cff0176659
   lib/ndr_support/tasks.rb:
     comments:
     reviewed_by: timgentry
@@ -175,7 +171,7 @@ file safety:
   lib/ndr_support/version.rb:
     comments:
     reviewed_by: brian.shand
-    safe_revision: 8321c488b8a7342762ee8c322ce3ffd5b1a1a880
+    safe_revision: c3bc30b08a2fbe089fcde6989ca49ca40004a83e
   lib/ndr_support/working_days.rb:
     comments:
     reviewed_by: josh.pencheon
@@ -187,7 +183,7 @@ file safety:
   ndr_support.gemspec:
     comments:
     reviewed_by: brian.shand
-    safe_revision: e91fab5ac8474b001ca3805c6cce8eefa6b49f2d
+    safe_revision: 8796a1a32273a106a6b1a134a48077cff0176659
   test/array_test.rb:
     comments:
     reviewed_by: timgentry
@@ -196,10 +192,14 @@ file safety:
     comments:
     reviewed_by: brian.shand
     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
-    safe_revision: ccca1dc67e3742efb154e01e01243e7b38180936
+    reviewed_by: brian.shand
+    safe_revision: 8796a1a32273a106a6b1a134a48077cff0176659
   test/hash_test.rb:
     comments:
     reviewed_by: timgentry
@@ -226,8 +226,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
@@ -258,12 +258,12 @@ file safety:
     safe_revision: b7b033ad9773cc9037c408a7763b113d31cbf191
   test/string/conversions_test.rb:
     comments:
-    reviewed_by: ollietulloch
-    safe_revision: '09b3f97fb4c1afc88d0d070c39796b1f60c39d25'
+    reviewed_by: brian.shand
+    safe_revision: 8796a1a32273a106a6b1a134a48077cff0176659
   test/test_helper.rb:
     comments:
-    reviewed_by: josh.pencheon
-    safe_revision: 34ae80f2952f0bfd18688541862774cbaaa6c5f5
+    reviewed_by: brian.shand
+    safe_revision: 8796a1a32273a106a6b1a134a48077cff0176659
   test/threat_scanner_test.rb:
     comments:
     reviewed_by: ollietulloch

data/lib/ndr_support/date_and_time_extensions.rb

@@ -12,9 +12,28 @@ class Date
 
   def to_datetime
     # Default timezone for Date is GMT, not local timezone
-    return in_time_zone.to_datetime if ActiveRecord::Base.default_timezone == :local
+    default_timezone = if ActiveRecord.respond_to?(:default_timezone)
+                         ActiveRecord.default_timezone
+                       else
+                         ActiveRecord::Base.default_timezone # Rails <= 6.1
+                       end
+    return in_time_zone.to_datetime if 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 +43,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 +120,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/build_datetime.rb

@@ -10,7 +10,12 @@ class Ourdate
   def self.build_datetime(year, month = 1, day = 1, hour = 0, min = 0, sec = 0, usec = 0)
     return nil if year.nil?
 
-    if ActiveRecord::Base.default_timezone == :local
+    default_timezone = if ActiveRecord.respond_to?(:default_timezone)
+                         ActiveRecord.default_timezone
+                       else
+                         ActiveRecord::Base.default_timezone # Rails <= 6.1
+                       end
+    if default_timezone == :local
       # Time.local_time(year, month, day, hour, min, sec, usec).to_datetime
       # Behave like oracle_adapter.rb
       seconds = sec + Rational(usec, 10**6)
@@ -21,9 +26,9 @@ class Ourdate
         #       but the risk is we lose the usec component unnecesssarily.
         #       Investigate removing .to_datetime below.
         #++
-        Time.send(ActiveRecord::Base.default_timezone, *time_array).to_datetime
+        Time.send(default_timezone, *time_array).to_datetime
       rescue
-        zone_offset = ActiveRecord::Base.default_timezone == :local ? DateTime.now.offset : 0
+        zone_offset = default_timezone == :local ? DateTime.now.offset : 0
         # Append zero calendar reform start to account for dates skipped by calendar reform
         DateTime.new(*time_array[0..5] << zone_offset << 0) rescue nil
       end

data/lib/ndr_support/ourdate.rb

@@ -15,7 +15,12 @@ class Ourdate
     #--
     # TODO: Use Ourdate.build_datetime everywhere below:
     #++
-    if ActiveRecord::Base.default_timezone == :local
+    default_timezone = if ActiveRecord.respond_to?(:default_timezone)
+                         ActiveRecord.default_timezone
+                       else
+                         ActiveRecord::Base.default_timezone # Rails <= 6.1
+                       end
+    if default_timezone == :local
       build_datetime(current_time.year, current_time.month, current_time.day)
     else
       #--
@@ -39,7 +44,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/string/conversions.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'active_support/core_ext/string/conversions'
 require 'ndr_support/daterange'
 require 'ndr_support/ourdate'
@@ -130,7 +129,13 @@ class String
 
   def to_datetime
     # Default timezone for to_datetime conversion is GMT, not local timezone
-    return to_time.to_datetime if ActiveRecord::Base.default_timezone == :local
+    default_timezone = if ActiveRecord.respond_to?(:default_timezone)
+                         ActiveRecord.default_timezone
+                       else
+                         ActiveRecord::Base.default_timezone # Rails <= 6.1
+                       end
+    return to_time.to_datetime if default_timezone == :local
+
     orig_to_datetime
   end
 

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.2'
+  VERSION = '5.9.4'
 end

data/ndr_support.gemspec

@@ -18,17 +18,17 @@ 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.1', '< 7.1'
+  spec.add_dependency 'activesupport', '>= 6.1', '< 7.1'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake', '>= 12.3.3'
 
-  spec.required_ruby_version = '>= 2.7'
+  spec.required_ruby_version = '>= 3.0'
 
   # 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/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/daterange_test.rb

@@ -166,7 +166,13 @@ 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
-    return unless ActiveRecord::Base.default_timezone == :local
+    default_timezone = if ActiveRecord.respond_to?(:default_timezone)
+                         ActiveRecord.default_timezone
+                       else
+                         ActiveRecord::Base.default_timezone # Rails <= 6.1
+                       end
+    return unless default_timezone == :local
+
     assert_equal Date.new(2017, 9, 2).in_time_zone.utc_offset, dr.date1.utc_offset, 'Expect consistent offset'
     assert_equal '2017-09-02'.thetime, dr.date1
   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

data/test/string/conversions_test.rb

@@ -84,7 +84,13 @@ class String::ConversionsTest < Minitest::Test
 
   test 'should convert strings to DateTime correctly' do
     assert_equal 0, '2018-01-02'.to_datetime.utc_offset
-    return unless ActiveRecord::Base.default_timezone == :local
+    default_timezone = if ActiveRecord.respond_to?(:default_timezone)
+                         ActiveRecord.default_timezone
+                       else
+                         ActiveRecord::Base.default_timezone # Rails <= 6.1
+                       end
+    return unless default_timezone == :local
+
     assert_equal Time.new(2017, 9, 2).utc_offset, '2017-09-02'.to_datetime.utc_offset, 'Expect consistent offset'
   end
 

data/test/test_helper.rb

@@ -16,7 +16,11 @@ 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.
-ActiveRecord::Base.default_timezone = :local
+if ActiveRecord.respond_to?(:default_timezone=)
+  ActiveRecord.default_timezone = :local
+else
+  ActiveRecord::Base.default_timezone = :local # Rails <= 6.1
+end
 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.9.2
+  version: 5.9.4
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-17 00:00:00.000000000 Z
+date: 2023-07-13 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.1'
     - - "<"
       - !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.1'
     - - "<"
       - !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.1'
     - - "<"
       - !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.1'
     - - "<"
       - !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
@@ -221,7 +221,6 @@ files:
 - Rakefile
 - code_safety.yml
 - gemfiles/Gemfile.rails52
-- gemfiles/Gemfile.rails60
 - gemfiles/Gemfile.rails61
 - gemfiles/Gemfile.rails70
 - lib/ndr_support.rb
@@ -257,6 +256,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
@@ -291,7 +291,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -305,6 +305,7 @@ 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

data/gemfiles/Gemfile.rails60

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