ndr_support 5.10.0 → 5.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 452da481cc47dceb02b62e7eb832db07ba61985fb2cdc8267a40b6194d0ef108
-  data.tar.gz: e06b9a9845389b639c2fbe55aab1f4008d6dad69843a24113bf55b2b88fd7d56
+  metadata.gz: fbbca09887dac304f0a29b687893c47c70ae8b7bd600a646baa1f2d8a3d0e13f
+  data.tar.gz: e162d4c2ca88fe68c4f6a6e0af88d9d86b69e409fe5d7fbe8b72daec4d6ac516
 SHA512:
-  metadata.gz: 7d06a0fb2e4adae1cbc71b7e89fd4fc45b527a419ad313d6440dd199ddb845df637b4dd505dce4220dae16bc6f059e96a2faddc455c1901a54bd8acba86b4b3e
-  data.tar.gz: d5abcaa621cf18823123cd1241a519c2c2a9dd856ac6659a9f4d4497adcd11ec4b57beeade25c7e799b9924de02736344b91ef079b2bef5a65785a41a6d20333
+  metadata.gz: dd29e398e40a4eee8ad4da3ad27421a92fc1587f10b96334b981b97de9796961850101132c6fa37389b748b5cb5bad285f7bf6ba736dff47c104ff2cf86e5465
+  data.tar.gz: '059894e4a5a942d7f4a158fa82f8df14ec0f8899eae140ebcabf3d9235209301ad750f9659d7e6e87eecf236a2aaa35af92703025be3a6f189354cac241f75dd'

data/CHANGELOG.md

@@ -1,6 +1,18 @@
 ## [Unreleased]
 * No unreleased changes
 
+## 5.10.2 / 2024-02-09
+## Fixed
+* Refactored the cleaning code to fix Rubcocop issues
+
+## Added
+* Added a new 'log10' cleaning method
+
+## 5.10.1 / 2024-01-04
+## Fixed
+* Add 2026 bank holidays
+* Allow YAML aliases when using `yaml_safe_classes`
+
 ## 5.10.0 / 2023-11-17
 ## Changed
 * Generate UTF-8 encoded YAML by default. Disable with `utf8_storage = false`

data/code_safety.yml

@@ -23,7 +23,7 @@ file safety:
   CHANGELOG.md:
     comments:
     reviewed_by: brian.shand
-    safe_revision: 646eaebdf824490150e991225f9e15abb67dd4c1
+    safe_revision: af6c7ddedf6627de8ec823ff33399c7938cd64b1
   CODE_OF_CONDUCT.md:
     comments:
     reviewed_by: timgentry
@@ -71,7 +71,7 @@ file safety:
   lib/ndr_support/concerns/working_days.rb:
     comments:
     reviewed_by: brian.shand
-    safe_revision: bac214f4c93d8753268825408fc560171fac91c0
+    safe_revision: 6fb8c080befbb9c741c2bc3a2fadb29fe1c3d0aa
   lib/ndr_support/date_and_time_extensions.rb:
     comments:
     reviewed_by: brian.shand
@@ -136,10 +136,14 @@ file safety:
     comments:
     reviewed_by: brian.shand
     safe_revision: f4f7cb0803ea34a2f1ba83495d8bcbd942786bce
+  lib/ndr_support/string/clean_methodable.rb:
+    comments:
+    reviewed_by: brian.shand
+    safe_revision: af6c7ddedf6627de8ec823ff33399c7938cd64b1
   lib/ndr_support/string/cleaning.rb:
     comments:
-    reviewed_by: brianshand
-    safe_revision: b7b033ad9773cc9037c408a7763b113d31cbf191
+    reviewed_by: brian.shand
+    safe_revision: af6c7ddedf6627de8ec823ff33399c7938cd64b1
   lib/ndr_support/string/conversions.rb:
     comments:
     reviewed_by: brian.shand
@@ -171,7 +175,7 @@ file safety:
   lib/ndr_support/version.rb:
     comments:
     reviewed_by: brian.shand
-    safe_revision: 765520ebaf3652bed7105995c815afe681dd5363
+    safe_revision: a58c1057a2829284ae527bdd66401b1891f28196
   lib/ndr_support/working_days.rb:
     comments:
     reviewed_by: josh.pencheon
@@ -179,7 +183,7 @@ file safety:
   lib/ndr_support/yaml/serialization_migration.rb:
     comments:
     reviewed_by: brian.shand
-    safe_revision: 646eaebdf824490150e991225f9e15abb67dd4c1
+    safe_revision: c764a4d8c251b5076ed3d60391c8271bb5a099bc
   ndr_support.gemspec:
     comments:
     reviewed_by: brian.shand
@@ -254,8 +258,8 @@ file safety:
     safe_revision: b562d0c15ff1b1d565522a47e6bae47ea09706f0
   test/string/cleaning_test.rb:
     comments:
-    reviewed_by: brianshand
-    safe_revision: b7b033ad9773cc9037c408a7763b113d31cbf191
+    reviewed_by: brian.shand
+    safe_revision: af6c7ddedf6627de8ec823ff33399c7938cd64b1
   test/string/conversions_test.rb:
     comments:
     reviewed_by: brian.shand
@@ -283,4 +287,4 @@ file safety:
   test/yaml/serialization_test.rb:
     comments:
     reviewed_by: brian.shand
-    safe_revision: 646eaebdf824490150e991225f9e15abb67dd4c1
+    safe_revision: c764a4d8c251b5076ed3d60391c8271bb5a099bc

data/lib/ndr_support/concerns/working_days.rb

@@ -136,6 +136,15 @@ module WorkingDays
     '2025-08-25', # Monday    - Summer bank holiday
     '2025-12-25', # Thursday  - Christmas Day
     '2025-12-26', # Friday    - Boxing Day
+    # 2026
+    '2026-01-01', # Thursday  - New Year’s Day
+    '2026-04-03', # Friday    - Good Friday
+    '2026-04-06', # Monday    - Easter Monday
+    '2026-05-04', # Monday    - Early May bank holiday
+    '2026-05-25', # Monday    - Spring bank holiday
+    '2026-08-31', # Monday    - Summer bank holiday
+    '2026-12-25', # Friday    - Christmas Day
+    '2026-12-28', # Monday    - Boxing Day
   ].map { |str| Date.parse(str) }
 
   def self.check_lookup

data/lib/ndr_support/string/clean_methodable.rb

@@ -0,0 +1,149 @@
+# Adds the 'clean' method to String, which can be used to clean strings in various ways
+# depending on the contents
+module CleanMethodable
+  extend ActiveSupport::Concern
+
+  CLEAN_METHODS = {
+    nhsnumber: :clean_nhsnumber,
+    postcode: :clean_postcode, get_postcode: :clean_postcode,
+    lpi: :clean_lpi,
+    gender: :clean_gender, sex: :clean_sex, sex_c: :clean_sex_c,
+    name: :clean_name,
+    ethniccategory: :clean_ethniccategory,
+    code: :clean_code, code_icd: :clean_code_icd, icd: :clean_icd,
+    code_opcs: :clean_code_opcs,
+    hospitalnumber: :clean_hospitalnumber,
+    xmlsafe: :clean_xmlsafe, make_xml_safe: :clean_xmlsafe,
+    roman5: :clean_roman5,
+    tnmcategory: :clean_tnmcategory,
+    strip: :strip, upcase: :upcase, itself: :itself,
+    log10: :clean_log10
+  }.freeze
+
+  def clean(what)
+    cleaning_method = CLEAN_METHODS[what]
+    return send(cleaning_method) if cleaning_method
+
+    gsub(' ?', ' ')
+  end
+
+  private
+
+  def clean_nhsnumber
+    delete('^0-9')[0..9]
+  end
+
+  def clean_postcode
+    postcodeize(:db)
+  end
+
+  def clean_lpi
+    upcase.delete('^0-9A-Z')
+  end
+
+  def clean_gender
+    return '1' if self =~ /\AM(ale)?/i
+    return '2' if self =~ /\AF(emale)?/i
+
+    self
+  end
+
+  def clean_sex
+    # SECURE: BNS 2012-10-09: But may behave oddly for multi-line input
+    return '1' if self =~ /^M|1/i
+    return '2' if self =~ /^F|2/i
+
+    '0'
+  end
+
+  def clean_sex_c
+    return 'M' if self =~ /^M|1/i
+    return 'F' if self =~ /^F|2/i
+
+    ''
+  end
+
+  def clean_name
+    substitutions = {
+      '.'      => '',
+      /,|;/    => ' ',
+      /\s{2,}/ => ' ',
+      '`'      => '\''
+    }
+    substitutions.inject(upcase) { |a, e| a.gsub(*e) }.strip
+  end
+
+  def clean_ethniccategory
+    replace_ethniccategory = {
+      '0' => '0', '1' => 'M', '2' => 'N',
+      '3' => 'H', '4' => 'J', '5' => 'K',
+      '6' => 'R', '7' => '8', '&' => 'X',
+      ' ' => 'X', '99' => 'X'
+    }
+    replace_ethniccategory[self] || upcase
+  end
+
+  def clean_code
+    split_on_separators.map do |code|
+      code.blank? ? next : code.delete('.')
+    end.compact.join(' ')
+  end
+
+  def clean_code_icd
+    warn '[DEPRECATION] clean(:code_icd) is deprecated - consider using clean(:icd) instead.'
+    # regexp = /[A-Z][0-9]{2}(\.(X|[0-9]{1,2})|[0-9]?)( *(D|A)( |,|;|$))/
+    codes = upcase.split_on_separators.delete_if { |x| x.squash.blank? }
+    cleaned_codes = []
+    codes.each do |code|
+      if %w[A D].include?(code)
+        cleaned_codes[-1] += code
+      else
+        cleaned_codes << code
+      end
+    end
+    cleaned_codes.join(' ')
+  end
+
+  def clean_icd
+    codes = upcase.squish.split_on_separators.reject(&:blank?)
+    codes.map { |code| code.gsub(/(?<=\d)(\.?X?)/, '') }.join(' ')
+  end
+
+  def clean_hospitalnumber
+    self[-1..] =~ /\d/ ? self : self[0..-2]
+  end
+
+  def clean_xmlsafe
+    strip_xml_unsafe_characters
+  end
+
+  def clean_roman5
+    # This deromanises roman numerals between 1 and 5
+    gsub(/[IV]+/i) { |match| ROMAN_ONE_TO_FIVE_MAPPING[match.upcase] }
+  end
+
+  def clean_tnmcategory
+    sub!(/\A[tnm]/i, '')
+    if self =~ /\Ax\z/i
+      upcase
+    else
+      downcase
+    end
+  end
+
+  def clean_code_opcs
+    split_on_separators.map do |code|
+      db_code = code.squash
+      next unless 4 == db_code.length || db_code =~ /CZ00[12]/
+
+      db_code
+    end.compact.join(' ')
+  end
+
+  def clean_log10
+    f_value = Float(self, exception: false)
+    return self if f_value.nil? || f_value.negative?
+
+    f_value.zero? ? '0.0' : Math.log10(f_value).to_s
+  end
+end

data/lib/ndr_support/string/cleaning.rb

@@ -1,6 +1,11 @@
 require 'active_support/core_ext/string/filters'
+require 'ndr_support/string/clean_methodable'
 
+# Extends String clean with various methods of cleaning strings
+# zand polishing them
 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' }
 
@@ -26,9 +31,8 @@ class String
   # Parameter "option" can be :user, :compact, :db
   def postcodeize(option = :user)
     nspce = gsub(/[[:space:]]/, '').upcase
-    unless nspce.blank? || POSTCODE_REGEXP =~ nspce
-      return self # Don't change old-style or malformed postcodes
-    end
+    return self unless nspce.blank? || POSTCODE_REGEXP =~ nspce # Don't change old-style or malformed postcodes
+
     case option
     when :compact
       nspce
@@ -43,106 +47,6 @@ class String
     end
   end
 
-  def clean(what)
-    case what
-    when :nhsnumber
-      delete('^0-9')[0..9]
-    when :postcode, :get_postcode
-      postcodeize(:db)
-    when :lpi
-      upcase.delete('^0-9A-Z')
-    when :gender
-      if self =~ /\AM(ale)?/i
-        '1'
-      elsif self =~ /\AF(emale)?/i
-        '2'
-      else
-        self
-      end
-    when :sex
-      # SECURE: BNS 2012-10-09: But may behave oddly for multi-line input
-      if self =~ /^M|1/i
-        '1'
-      elsif self =~ /^F|2/i
-        '2'
-      else
-        '0'
-      end
-    when :sex_c
-      if self =~ /^M|1/i
-        'M'
-      elsif self =~ /^F|2/i
-        'F'
-      else
-        ''
-      end
-    when :name
-      substitutions = {
-        '.'      => '',
-        /,|;/    => ' ',
-        /\s{2,}/ => ' ',
-        '`'      => '\''
-      }
-      substitutions.inject(upcase) { |a, e| a.gsub(*e) }.strip
-    when :ethniccategory
-      replace_ethniccategory = {
-        '0' => '0',
-        '1' => 'M',
-        '2' => 'N',
-        '3' => 'H',
-        '4' => 'J',
-        '5' => 'K',
-        '6' => 'R',
-        '7' => '8',
-        '&' => 'X',
-        ' ' => 'X',
-        '99' => 'X'
-      }
-      replace_ethniccategory[self] || upcase
-    when :code
-      split_on_separators.map do |code|
-        code.blank? ? next : code.delete('.')
-      end.compact.join(' ')
-    when :code_icd
-      warn '[DEPRECATION] clean(:code_icd) is deprecated - consider using clean(:icd) instead.'
-      # regexp = /[A-Z][0-9]{2}(\.(X|[0-9]{1,2})|[0-9]?)( *(D|A)( |,|;|$))/
-      codes = upcase.split_on_separators.delete_if { |x| x.squash.blank? }
-      cleaned_codes = []
-      codes.each do |code|
-        if code == 'D' || code == 'A'
-          cleaned_codes[-1] += code
-        else
-          cleaned_codes << code
-        end
-      end
-      cleaned_codes.join(' ')
-    when :icd
-      codes = upcase.squish.split_on_separators.reject(&:blank?)
-      codes.map { |code| code.gsub(/(?<=\d)(\.?X?)/, '') }.join(' ')
-    when :code_opcs
-      clean_code_opcs
-    when :hospitalnumber
-      self[-1..-1] =~ /\d/ ? self : self[0..-2]
-    when :xmlsafe, :make_xml_safe
-      strip_xml_unsafe_characters
-    when :roman5
-      # This deromanises roman numerals between 1 and 5
-      gsub(/[IV]+/i) { |match| ROMAN_ONE_TO_FIVE_MAPPING[match.upcase] }
-    when :tnmcategory
-      sub!(/\A[tnm]/i, '')
-      if self =~ /\Ax\z/i
-        upcase
-      else
-        downcase
-      end
-    when :strip, :upcase, :itself
-      # SECURE: 14-06-2017 TPG Fixed list of executable methods (whats)
-      send(what)
-    else
-      gsub(' ?', ' ')
-    end
-  end
-
   def strip_xml_unsafe_characters
     gsub(String::INVALID_CONTROL_CHARS, '')
   end
@@ -156,14 +60,4 @@ class String
   def split_on_separators(regexp = / |,|;/)
     split(regexp)
   end
-
-  private
-
-  def clean_code_opcs
-    split_on_separators.map do |code|
-      db_code = code.squash
-      next unless 4 == db_code.length || db_code =~ /CZ00[12]/
-      db_code
-    end.compact.join(' ')
-  end
 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.10.0'
+  VERSION = '5.10.2'
 end

data/lib/ndr_support/yaml/serialization_migration.rb

@@ -43,13 +43,11 @@ module NdrSupport
 
         # TODO: Bump NdrSupport major version, and switch to safe_load by default
         object = if yaml_safe_classes == :unsafe
-                   unless Psych::VERSION.start_with?('3.')
-                     raise(SecurityError, 'Unsafe YAML no longer supported')
-                   end
+                   raise(SecurityError, 'Unsafe YAML no longer supported') unless Psych::VERSION.start_with?('3.')
 
                    Psych.load(string)
                  else
-                   Psych.safe_load(string, permitted_classes: yaml_safe_classes)
+                   Psych.safe_load(string, permitted_classes: yaml_safe_classes, aliases: true)
                  end
 
         # Ensure that any string related to the object

data/test/string/cleaning_test.rb

@@ -30,6 +30,12 @@ class String
       assert_equal 'IP222', 'IP222'.postcodeize(:db)
       assert_equal 'IP222E', 'IP222E'.postcodeize(:db)
       assert_equal 'HANTS', 'HANTS'.postcodeize(:db)
+      # Log10
+      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),
+                   "Different ruby versions give '0.04139268515822507' or '0.04139268515822508'")
+      assert_equal 'BILBO', 'BILBO'.clean(:log10)
     end
 
     test 'xml_unsafe?' do
@@ -153,7 +159,8 @@ class String
     end
 
     test 'clean code_icd' do
-      # TODO
+      assert_equal 'C449 Q123A Q455', 'C449,Q123,A,Q455'.clean(:code_icd)
+      assert_equal 'C449 Q123D Q455', 'C449,Q123,D,Q455'.clean(:code_icd)
     end
 
     test 'clean icd' do

data/test/yaml/serialization_test.rb

@@ -8,6 +8,14 @@ class SerializationTest < Minitest::Test
     assert_equal hash, load_yaml(dump_yaml(hash))
   end
 
+  test 'should support aliases correctly' do
+    x = { 'c' => 5 }
+    hash = { 'a' => x, 'b' => x }
+    hash_yaml = "---\na: &1\n  c: 5\nb: *1\n"
+    assert_equal hash, load_yaml(hash_yaml), 'Deserialising known YAML with an alias'
+    assert_equal hash, load_yaml(dump_yaml(hash)), 'Deserialising a structure with repeated objects'
+  end
+
   test 'should handle syck-encoded characters' do
     assert_syck_1_8_yaml_loads_correctly
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_support
 version: !ruby/object:Gem::Version
-  version: 5.10.0
+  version: 5.10.2
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-17 00:00:00.000000000 Z
+date: 2024-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -242,6 +242,7 @@ files:
 - lib/ndr_support/regexp_range.rb
 - lib/ndr_support/safe_file.rb
 - lib/ndr_support/safe_path.rb
+- lib/ndr_support/string/clean_methodable.rb
 - lib/ndr_support/string/cleaning.rb
 - lib/ndr_support/string/conversions.rb
 - lib/ndr_support/tasks.rb