ndr_support 5.9.5 → 5.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bfe7ed2fab4ae654340e7aef5838dc71d904635ac4aa0d78dcee8b6d00ead31
-  data.tar.gz: 4d2b22e57baaffd236846e3505fc1303391202a48e6b3e64867dd84ca9c4e61e
+  metadata.gz: 7447cd235fe9715cc6e6c868b0f0048c7ec516b70ea88e323dcdc1fd01e24f11
+  data.tar.gz: 16b4237428fdf1258327ebc86928c4f3cc8db292289ff8151db364f77c505439
 SHA512:
-  metadata.gz: 6d4eccd2e2c6fcf7813da447cac43f3e359057edb17af8476666ee9e40ecf71735738a5b0a0919f284a213e87c7c7d19750a78a5c17e9ac15bd7c1d3ee6a8445
-  data.tar.gz: 424d016b5959104a7778724fb71d65d205b3b3d2f9c9bfca54ca3a3c1fb4b9f8d622f2d5bb3d5584fe81d138870613ba8ae28c01982d656be754e00efa44faab
+  metadata.gz: 186d4b1f8f053e9fa2cba311d7f9760e496ea8597dbea5c7e3e1d34c62fe6237df8c51692ff40a18f98085b58dc9a98942a54b94854b0e32ea30e4033e9d9aa3
+  data.tar.gz: 68ada778e3d6d7b9187f5b95398f408ff08940e0c77f5019a99611279ff4e1bbb9a5bfacd32ed3c0082bfb607ecc93df158ef2399b414d53a0e0bc7c53c0727a

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 ## [Unreleased]
 * No unreleased changes
 
+## 5.9.6 / 2023-11-14
+## Fixed
+* YAMLSupport should preserve escape sequences in JSON text
+
 ## 5.9.5 / 2023-10-26
 * Support Rails 7.1
 

data/code_safety.yml

@@ -23,7 +23,7 @@ file safety:
   CHANGELOG.md:
     comments:
     reviewed_by: brian.shand
-    safe_revision: 2253a90ec8db872590a8167fdebe95d6ed677cc2
+    safe_revision: '09ad2e0c210d3e4377de68dac3d54932df6c1994'
   CODE_OF_CONDUCT.md:
     comments:
     reviewed_by: timgentry
@@ -171,7 +171,7 @@ file safety:
   lib/ndr_support/version.rb:
     comments:
     reviewed_by: brian.shand
-    safe_revision: 45fa90daa2dd131ac0286ef7f4af1447bd01bc6c
+    safe_revision: 26236a310377036e1a27eb9534b4167430da6f3c
   lib/ndr_support/working_days.rb:
     comments:
     reviewed_by: josh.pencheon
@@ -179,7 +179,7 @@ file safety:
   lib/ndr_support/yaml/serialization_migration.rb:
     comments:
     reviewed_by: brian.shand
-    safe_revision: f4f7cb0803ea34a2f1ba83495d8bcbd942786bce
+    safe_revision: '09ad2e0c210d3e4377de68dac3d54932df6c1994'
   ndr_support.gemspec:
     comments:
     reviewed_by: brian.shand
@@ -283,4 +283,4 @@ file safety:
   test/yaml/serialization_test.rb:
     comments:
     reviewed_by: brian.shand
-    safe_revision: f4f7cb0803ea34a2f1ba83495d8bcbd942786bce
+    safe_revision: '09ad2e0c210d3e4377de68dac3d54932df6c1994'

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.5'
+  VERSION = '5.9.6'
 end

data/lib/ndr_support/yaml/serialization_migration.rb

@@ -57,6 +57,9 @@ module NdrSupport
       # While `psych` emits UTF-8 YAML, `syck` double escapes
       # higher characters. We need to unescape any we find:
       def handle_special_characters!(string, coerce_invalid_chars)
+        # TODO: Change to only handle syck control characters
+        return unless string.start_with?('---') # Only handle YAML that is not JSON
+
         # Replace any encoded hex chars with their actual value:
         string.gsub!(/((?:\\x[0-9A-F]{2})+)/) do
           byte_sequence = $1.scan(/[0-9A-F]{2}/)

data/test/yaml/serialization_test.rb

@@ -29,6 +29,11 @@ class SerializationTest < Minitest::Test
     assert_equal "control 0x01 char \n whoops!", load_yaml(chr_1_yaml)
   end
 
+  test 'should leave non-binary JSON with things that look like control chars unchanged' do
+    hash = { 'report' => ' \x09 ' }
+    assert_equal hash, load_yaml(hash.to_json)
+  end
+
   test 'load_yaml should not coerce to UTF-8 by default' do
     assert_yaml_coercion_behaviour
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_support
 version: !ruby/object:Gem::Version
-  version: 5.9.5
+  version: 5.9.6
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-26 00:00:00.000000000 Z
+date: 2023-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord