ndr_support 5.10.2 → 5.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbbca09887dac304f0a29b687893c47c70ae8b7bd600a646baa1f2d8a3d0e13f
-  data.tar.gz: e162d4c2ca88fe68c4f6a6e0af88d9d86b69e409fe5d7fbe8b72daec4d6ac516
+  metadata.gz: 5f9ac10bd29787e3ff5b382618cc9389e09c1f5c1b3684a5083ca3babaa0fe99
+  data.tar.gz: d7b0273dee82913349ecc33fbd87310749e4190912ee5349000402e89e0e3e2b
 SHA512:
-  metadata.gz: dd29e398e40a4eee8ad4da3ad27421a92fc1587f10b96334b981b97de9796961850101132c6fa37389b748b5cb5bad285f7bf6ba736dff47c104ff2cf86e5465
-  data.tar.gz: '059894e4a5a942d7f4a158fa82f8df14ec0f8899eae140ebcabf3d9235209301ad750f9659d7e6e87eecf236a2aaa35af92703025be3a6f189354cac241f75dd'
+  metadata.gz: 746812be4b4685cd841e7ba69eb56fa81e8f34d5d62fc5c4db1fbfdfe88dd06052df35429dcc927d43c6c1fe5b383768eec751d8c191d84283bb15737bb06138
+  data.tar.gz: 7fa1f87906e1701528f5d83268d60a664e053dd200341722c24e488eb2af4dc83ccd6d91014ecc5c893176afc71ea64510ea7e34708265b3b472432f8d2da225

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## [Unreleased]
-* No unreleased changes
+* no unreleased changes
+
+## 5.10.3 / 2023-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

@@ -22,8 +22,8 @@ file safety:
     safe_revision: 8796a1a32273a106a6b1a134a48077cff0176659
   CHANGELOG.md:
     comments:
-    reviewed_by: brian.shand
-    safe_revision: af6c7ddedf6627de8ec823ff33399c7938cd64b1
+    reviewed_by: ollietulloch
+    safe_revision: 8cb498126d68a19f880b0cd1b83b127c8ec90a89
   CODE_OF_CONDUCT.md:
     comments:
     reviewed_by: timgentry
@@ -138,12 +138,12 @@ 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
@@ -174,8 +174,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
@@ -258,8 +258,8 @@ 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

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/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.3'
 end

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?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_support
 version: !ruby/object:Gem::Version
-  version: 5.10.2
+  version: 5.10.3
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-09 00:00:00.000000000 Z
+date: 2024-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -299,7 +299,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: NDR Support library