ndr_support 5.9.3 → 5.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a2a7eee626500b24dda836864fbbe45061c73a01c1c0d8767084ef94feb4391
-  data.tar.gz: '084bd2b9c1d5d7dc13d45597ecd9d16c410d3653445af9790c1556da7e2d2f1d'
+  metadata.gz: 4ca42961473b3e0f614709e4506f7f37e44b14e4f212db71e59e5386f7f4b852
+  data.tar.gz: 3d213bdfe03991c73f7bffe451208fec727d52337cdaf659e1a815d503962929
 SHA512:
-  metadata.gz: 595af1c7799843cc6283cef5b5c77bf955f09c6d06bc316bf41e7f9fc0851639c9cb2f44f662c07b0b7e7b10a0b291ced307b9f1b109b5e1efe85fda2a018b40
-  data.tar.gz: 62651ee7d25752f68b9ff9ae197878b12003e0b0363b73b5bb2d48cb42624373f8ffa0d85fc61f5b0cc2f3c9026f22e0279b50fc94a829158a09a5ca03f1f34a
+  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,10 @@
 ## [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

data/code_safety.yml

@@ -11,19 +11,19 @@ file safety:
   ".github/workflows/test.yml":
     comments:
     reviewed_by: brian.shand
-    safe_revision: e977f8c0f8a5c6a1952bd1565b75e16850ef11e0
+    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: e977f8c0f8a5c6a1952bd1565b75e16850ef11e0
+    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
@@ -79,7 +75,7 @@ file safety:
   lib/ndr_support/date_and_time_extensions.rb:
     comments:
     reviewed_by: brian.shand
-    safe_revision: e977f8c0f8a5c6a1952bd1565b75e16850ef11e0
+    safe_revision: 8796a1a32273a106a6b1a134a48077cff0176659
   lib/ndr_support/daterange.rb:
     comments:
     reviewed_by: brian.shand
@@ -111,11 +107,11 @@ file safety:
   lib/ndr_support/ourdate.rb:
     comments:
     reviewed_by: brian.shand
-    safe_revision: e977f8c0f8a5c6a1952bd1565b75e16850ef11e0
+    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: brian.shand
@@ -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: 3ccb4e78a657f33e80c10550ba8f25978cf548db
+    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: e977f8c0f8a5c6a1952bd1565b75e16850ef11e0
+    safe_revision: 8796a1a32273a106a6b1a134a48077cff0176659
   test/array_test.rb:
     comments:
     reviewed_by: timgentry
@@ -202,8 +198,8 @@ file safety:
     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
@@ -262,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,7 +12,13 @@ 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
 

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
       #--

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

data/ndr_support.gemspec

@@ -18,13 +18,13 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activerecord',  '>= 6.0.0', '< 7.1'
-  spec.add_dependency 'activesupport', '>= 6.0.0', '< 7.1'
+  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'

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/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.3
+  version: 5.9.4
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-02 00:00:00.000000000 Z
+date: 2023-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.1'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.1'
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.1'
@@ -46,7 +46,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.1'
@@ -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
@@ -292,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:
   - - ">="

data/gemfiles/Gemfile.rails60

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