json_mend 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d35f7c9f36e19aad3676320c0d23913ee95f9e92d391587732baa6ab849aeb03
-  data.tar.gz: fbf7a08168984cd2d8c5cd3efcdd93559df98c749d3c8b0dff5393d7b16b6817
+  metadata.gz: 9a3bfc54ceae164d2837fbcdf3751e79359397b735693ec990954fee19bfa60e
+  data.tar.gz: 2dfea1b0a6ada799891385ec4c35a83153005f5b344e23b7a9921c726a94c220
 SHA512:
-  metadata.gz: dd89121f4e73649f762d01e360838364f91f88cb0fe8f56ef158840d41f2c863e916c572625a913a90334332adeb2e2f8e4213f0962a26e34704616d4756b071
-  data.tar.gz: fe6fd2bc78b8d25b7ee25f00148e8f65b75cdeeef5faadf45efd514d1463f793cf80390d2be00d5af1d4e5b2f5a211079e91f85682dd5dd050a5679d4542a274
+  metadata.gz: '0592fea3e3859aaafbc6b2508b03de3a54eefd17e4520375ce1163e929ed24be10ad16b2936db2175ec79d9f9f4dd7acbd82ba72b50c3df3ea347ffe8436ded6'
+  data.tar.gz: 6708504ef9b2c1f68f0bdc1da889c254580a169066d37db99993468f78bcb9c3f8ca351dfaafecbc62780d319c12e51a4536b6da70a589d450ead3f407ed8ea7

data/lib/json_mend/parser.rb

@@ -787,7 +787,9 @@ module JsonMend
         bk = 1
         slashes = 0
         # Look back in the string buffer directly for speed
-        while (char_code = @scanner.string.getbyte(@scanner.pos - 1 - bk)) && char_code == 92 # 92 is backslash
+        while (@scanner.pos - 1 - bk >= 0) &&
+              (char_code = @scanner.string.getbyte(@scanner.pos - 1 - bk)) &&
+              char_code == 92 # 92 is backslash
           slashes += 1
           bk += 1
         end
@@ -1144,20 +1146,24 @@ module JsonMend
 
         if context_contain?(:object_key)
           # If parsing a key, we must stop at ':' and structural closers
-          @scanner.scan_until(/(?=[\n\r:}\]])/)
+          @scanner.scan_until(/(?=[\n\r:}\]]|\\n|\\r)/) || @scanner.terminate
         elsif in_array && in_object
           # Nested ambiguity, stop at any closer
-          @scanner.scan_until(/(?=[\n\r}\]])/)
+          @scanner.scan_until(/(?=[\n\r}\]]|\\n|\\r)/) || @scanner.terminate
         elsif in_array
           # Inside array, stop at ']'
-          @scanner.scan_until(/(?=[\n\r\]])/)
+          @scanner.scan_until(/(?=[\n\r\]]|\\n|\\r)/) || @scanner.terminate
         elsif in_object
           # Inside object value, stop at '}'
-          @scanner.scan_until(/(?=[\n\r}])/)
+          @scanner.scan_until(/(?=[\n\r}]|\\n|\\r)/) || @scanner.terminate
         else
           # Top level or neutral, stop at newline
-          @scanner.scan_until(/(?=[\n\r])/)
+          @scanner.scan_until(/(?=[\n\r]|\\n|\\r)/) || @scanner.terminate
         end
+
+        # Consume literal escaped newlines so they don't break subsequent parsing.
+        # (Real newlines will be left alone here and consumed normally by skip_whitespaces).
+        @scanner.skip(/\\n|\\r/)
       else
         # The character at the current position (likely '/') is not the start of a
         # valid comment. To prevent an infinite loop in the calling parser, we must

data/lib/json_mend/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JsonMend
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json_mend
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Oleksii Vasyliev