ndr_support 5.9.4 → 5.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ca42961473b3e0f614709e4506f7f37e44b14e4f212db71e59e5386f7f4b852
-  data.tar.gz: 3d213bdfe03991c73f7bffe451208fec727d52337cdaf659e1a815d503962929
+  metadata.gz: 7447cd235fe9715cc6e6c868b0f0048c7ec516b70ea88e323dcdc1fd01e24f11
+  data.tar.gz: 16b4237428fdf1258327ebc86928c4f3cc8db292289ff8151db364f77c505439
 SHA512:
-  metadata.gz: cc033dac0c4eb88222a0b75630fad6505902f680b153ea2a8024cf5fa1ba8823d935e0f75f1384f9e716bfbe6265ba980ea3fb892a263f506737bb146356eff3
-  data.tar.gz: 7930201e594ad93153ff833e76e7ed5ced7eb3c35f4c57a88404a36e5e1e64b36bf79c2f764449bccc5eb5a139a03a9edf9b7f427efd4a78e97697f68b7e3096
+  metadata.gz: 186d4b1f8f053e9fa2cba311d7f9760e496ea8597dbea5c7e3e1d34c62fe6237df8c51692ff40a18f98085b58dc9a98942a54b94854b0e32ea30e4033e9d9aa3
+  data.tar.gz: 68ada778e3d6d7b9187f5b95398f408ff08940e0c77f5019a99611279ff4e1bbb9a5bfacd32ed3c0082bfb607ecc93df158ef2399b414d53a0e0bc7c53c0727a

data/CHANGELOG.md

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

data/code_safety.yml

@@ -11,7 +11,7 @@ file safety:
   ".github/workflows/test.yml":
     comments:
     reviewed_by: brian.shand
-    safe_revision: 8796a1a32273a106a6b1a134a48077cff0176659
+    safe_revision: 2253a90ec8db872590a8167fdebe95d6ed677cc2
   ".gitignore":
     comments:
     reviewed_by: josh.pencheon
@@ -23,7 +23,7 @@ file safety:
   CHANGELOG.md:
     comments:
     reviewed_by: brian.shand
-    safe_revision: 8796a1a32273a106a6b1a134a48077cff0176659
+    safe_revision: '09ad2e0c210d3e4377de68dac3d54932df6c1994'
   CODE_OF_CONDUCT.md:
     comments:
     reviewed_by: timgentry
@@ -48,10 +48,6 @@ file safety:
     comments:
     reviewed_by: timgentry
     safe_revision: e33e9dae7f38bc449ce9276515a539836dbbbd53
-  gemfiles/Gemfile.rails52:
-    comments:
-    reviewed_by: josh.pencheon
-    safe_revision: 8a6bedae77d33d0db1b67eaed7972870b6afc993
   gemfiles/Gemfile.rails61:
     comments:
     reviewed_by: brian.shand
@@ -60,6 +56,10 @@ file safety:
     comments:
     reviewed_by: brian.shand
     safe_revision: 16254a4332aab074a27c8e13859dc4712e707122
+  gemfiles/Gemfile.rails71:
+    comments:
+    reviewed_by: brian.shand
+    safe_revision: 2253a90ec8db872590a8167fdebe95d6ed677cc2
   lib/ndr_support.rb:
     comments:
     reviewed_by: brian.shand
@@ -171,7 +171,7 @@ file safety:
   lib/ndr_support/version.rb:
     comments:
     reviewed_by: brian.shand
-    safe_revision: c3bc30b08a2fbe089fcde6989ca49ca40004a83e
+    safe_revision: 26236a310377036e1a27eb9534b4167430da6f3c
   lib/ndr_support/working_days.rb:
     comments:
     reviewed_by: josh.pencheon
@@ -179,11 +179,11 @@ 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
-    safe_revision: 8796a1a32273a106a6b1a134a48077cff0176659
+    safe_revision: 2253a90ec8db872590a8167fdebe95d6ed677cc2
   test/array_test.rb:
     comments:
     reviewed_by: timgentry
@@ -283,4 +283,4 @@ file safety:
   test/yaml/serialization_test.rb:
     comments:
     reviewed_by: brian.shand
-    safe_revision: f4f7cb0803ea34a2f1ba83495d8bcbd942786bce
+    safe_revision: '09ad2e0c210d3e4377de68dac3d54932df6c1994'

data/gemfiles/Gemfile.rails71

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

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.4'
+  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/ndr_support.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activerecord',  '>= 6.1', '< 7.1'
-  spec.add_dependency 'activesupport', '>= 6.1', '< 7.1'
+  spec.add_dependency 'activerecord',  '>= 6.1', '< 7.2'
+  spec.add_dependency 'activesupport', '>= 6.1', '< 7.2'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake', '>= 12.3.3'
@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest', '>= 5.0.0'
   spec.add_development_dependency 'mocha', '~> 2.0'
 
-  spec.add_development_dependency 'ndr_dev_support', '~> 6.0.2'
+  spec.add_development_dependency 'ndr_dev_support', '~> 7.0'
 
   spec.add_development_dependency 'guard'
   spec.add_development_dependency 'guard-rubocop'

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.4
+  version: 5.9.6
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-13 00:00:00.000000000 Z
+date: 2023-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -112,14 +112,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.2
+        version: '7.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.2
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -220,9 +220,9 @@ files:
 - README.md
 - Rakefile
 - code_safety.yml
-- gemfiles/Gemfile.rails52
 - gemfiles/Gemfile.rails61
 - gemfiles/Gemfile.rails70
+- gemfiles/Gemfile.rails71
 - lib/ndr_support.rb
 - lib/ndr_support/array.rb
 - lib/ndr_support/concerns/working_days.rb

data/gemfiles/Gemfile.rails52

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