json_mend 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c8f01b52f6eed3640e4be622b142646276e1253a33ec1404bc0c87415e01948
-  data.tar.gz: bd40c8087d7a94795daff1a89b2cc3aab79df833bc35daf59d130e84ebd0af70
+  metadata.gz: 923008e3c63e24de16c3ee6b26097cf4064a32a16bac749c5501e313996238f1
+  data.tar.gz: c6c6040f9d54fe7604ae7126402886af159aae5e001dca93cbceebf254839a55
 SHA512:
-  metadata.gz: 9f7ea495a91444ff58ae0f2dfa082c7b3ee6bc110bad0c2cef758f93c844edabfaff8622e15306f28b4fba8f440abc926f47728d9df6c0267c1039fab879b789
-  data.tar.gz: 37493919d5d08baf3ae589070fb74105097c541363e6864e1b848d289642848f0e763ffd3d4a7ded437d2ccae793f933ce94e437fc3d90feb51d593c62425d46
+  metadata.gz: c869c17b06f5ed0e46e3f74ccf59c8c374af1431b43ee7d9d59be2170e5ba88e10f83753db36af1e4ebba2cf519273b5f5c32c42fa386978f6a96c22095b063d
+  data.tar.gz: 770eb1238b3f73261a2130b2a900dfff0bd2770cf0f6b3b38ecee30cafdbfb09e59b87e4df4dd8aba722c5dbbd14bb1b35df509fdc92efbe081d8342ed7e435b

data/.rubocop.yml

@@ -7,13 +7,13 @@ AllCops:
   SuggestExtensions: false
 
 Metrics/AbcSize:
-  Max: 75
+  Max: 78
 
 Metrics/ClassLength:
   Max: 950
 
 Metrics/CyclomaticComplexity:
-  Max: 35
+  Max: 36
 
 Metrics/MethodLength:
   Max: 85

data/lib/json_mend/parser.rb

@@ -70,7 +70,7 @@ module JsonMend
             break
           else
             # Ignore strings that look like closing braces garbage (e.g. "}", " ] ")
-            next if new_json.is_a?(String) && new_json.strip.match?(/^[}\]]+$/)
+            next if new_json.is_a?(String) && new_json.match?(/\A\s*[}\]]+\s*\z/)
 
             if both_hash?(json.last, new_json)
               json[-1] = deep_merge_hashes(json.last, new_json)
@@ -265,20 +265,14 @@ module JsonMend
 
       if value == :inferred_true
         if %w[true false null].include?(key.downcase)
-          # Look back: If it's concatenated to the previous value (like falsetrue), keep it.
-          # If it's separated by space/delimiters, it's trailing garbage, so drop it.
-          if pos_before_key.positive?
-            prev_byte = @scanner.string.getbyte(pos_before_key - 1)
-            # Check ASCII byte ranges for a-z, A-Z, 0-9, $, -, and _
-            is_concatenated = prev_byte && (
-              prev_byte.between?(48, 57)  || # 0-9
-              prev_byte.between?(65, 90)  || # A-Z
-              prev_byte.between?(97, 122) || # a-z
-              [36, 45, 95].include?(prev_byte) # $, -, _
-            )
-          else
-            is_concatenated = false
-          end
+          prev_byte = @scanner.string.getbyte(pos_before_key - 1)
+          # Check ASCII byte ranges for a-z, A-Z, 0-9, $, -, and _
+          is_concatenated = prev_byte && (
+            prev_byte.between?(48, 57)  || # 0-9
+            prev_byte.between?(65, 90)  || # A-Z
+            prev_byte.between?(97, 122) || # a-z
+            [36, 45, 95].include?(prev_byte) # $, -, _
+          )
 
           return [nil, nil, false] unless is_concatenated
         end
@@ -335,7 +329,7 @@ module JsonMend
       @context.pop
 
       # If parse_json returned JSON_STOP_TOKEN (nothing found due to garbage->terminator),
-      # treat it as nil (null) for object values to be safe.
+      # treat it as empty string for object values to be safe.
       value == JSON_STOP_TOKEN ? '' : value
     end
 
@@ -426,10 +420,10 @@ module JsonMend
     # many common errors found in LLM-generated JSON, such as missing quotes,
     # incorrect escape sequences, and ambiguous string terminators
     def parse_string
-      char = prepare_string_parsing
+      char = peek_char
 
       # A valid string can only start with a valid quote or, in our case, with a literal
-      while !@scanner.eos? && !STRING_DELIMITERS.include?(char) && !char.match?(/[\p{L}0-9$_-]/)
+      while !@scanner.eos? && !STRING_DELIMITERS.include?(char) && !char&.match?(/[\p{L}0-9$_-]/)
         return '' if TERMINATORS_STRING_GUESSED.include?(char)
 
         @scanner.getch
@@ -485,18 +479,6 @@ module JsonMend
 
     # string helper methods
 
-    def prepare_string_parsing
-      char = peek_char
-
-      # Consume comments that appear before the string starts
-      while COMMENT_DELIMETERS.include?(char)
-        parse_comment
-        char = peek_char
-      end
-
-      char
-    end
-
     def determine_delimiters(char:)
       missing_quotes = false
       lstring_delimiter = rstring_delimiter = '"'
@@ -581,7 +563,6 @@ module JsonMend
     )
       char = peek_char
       unmatched_delimiter = false
-      safe_string_until = -1 # Fast-forward pointer to safely bypass O(N^2) lookaheads
       # --- Main Parsing Loop ---
       while !@scanner.eos? && char != rstring_delimiter
         # Fast-path for unquoted keys (e.g. { key: val })
@@ -600,33 +581,30 @@ module JsonMend
           missing_quotes:
         )
 
-        # Bypass expensive comma/bracket checks because we already validated this segment extends to the next quote
-        if @scanner.pos > safe_string_until
-          if current_context?(:object_value) && TERMINATORS_OBJECT_VALUE.include?(char) &&
-             (string_parts.empty? || string_parts.last != rstring_delimiter)
-
-            is_break = check_rstring_delimiter_missing(
-              string_parts:,
-              lstring_delimiter:,
-              rstring_delimiter:,
-              missing_quotes:
-            )
-            break if is_break
-          end
+        if current_context?(:object_value) && TERMINATORS_OBJECT_VALUE.include?(char) &&
+           (string_parts.empty? || string_parts.last != rstring_delimiter)
 
-          if char == ']' && context_contain?(:array) && string_parts.last != rstring_delimiter
-            i = skip_to_character(rstring_delimiter)
-            # No delimiter found
-            break unless peek_char(i)
-          end
+          is_break = check_rstring_delimiter_missing(
+            string_parts:,
+            lstring_delimiter:,
+            rstring_delimiter:,
+            missing_quotes:
+          )
+          break if is_break
+        end
 
-          if current_context?(:object_value) && char == '}'
-            # We found the end of an object while parsing a value
-            # Check if the object is really over, to avoid doubling the closing brace
-            i = skip_whitespaces_at(start_idx: 1)
-            next_c = peek_char(i)
-            break unless next_c
-          end
+        if char == ']' && context_contain?(:array) && string_parts.last != rstring_delimiter
+          i = skip_to_character(rstring_delimiter)
+          # No delimiter found
+          break unless peek_char(i)
+        end
+
+        if current_context?(:object_value) && char == '}'
+          # We found the end of an object while parsing a value
+          # Check if the object is really over, to avoid doubling the closing brace
+          i = skip_whitespaces_at(start_idx: 1)
+          next_c = peek_char(i)
+          break unless next_c
         end
 
         string_parts << char
@@ -644,7 +622,7 @@ module JsonMend
         end
 
         # If we are in object key context and we find a colon, it could be a missing right quote
-        if @scanner.pos > safe_string_until && char == ':' && !missing_quotes && current_context?(:object_key)
+        if char == ':' && !missing_quotes && current_context?(:object_key)
           is_break = handle_missing_quotes_termination(
             lstring_delimiter:,
             rstring_delimiter:
@@ -670,8 +648,6 @@ module JsonMend
               string_parts << char.to_s
               @scanner.getch
               char = peek_char
-
-              safe_string_until = @scanner.pos + skip_to_character(rstring_delimiter)
             end
           end
         end
@@ -1257,10 +1233,12 @@ module JsonMend
     # returns the index (offset) from the scanner
     def skip_to_character(characters, start_idx: 0)
       pattern = SKIP_CHARS_REGEX_CACHE.fetch(characters, nil)
+      # :nocov:
       if pattern.nil?
         chars = Array(characters).map { |c| Regexp.escape(c.to_s) }
         pattern = Regexp.new(chars.join('|'))
       end
+      # :nocov:
 
       saved_pos = @scanner.pos
       # Skip start_idx
@@ -1321,7 +1299,7 @@ module JsonMend
               (matched.length - 1) + start_idx
             else
               # No non-space found.
-              @scanner.rest.length + start_idx
+              (@scanner.string.length - @scanner.charpos) + start_idx
             end
 
       @scanner.pos = saved_pos
@@ -1352,12 +1330,12 @@ module JsonMend
       # Handle the common 0-offset case
       if offset.zero?
         # peek(1) returns the next BYTE, not character
-        byte_str = @scanner.peek(1)
-        return nil if byte_str.empty?
+        byte = @scanner.string.getbyte(@scanner.pos)
+        return nil unless byte
 
         # Fast path: If it's a standard ASCII char (0-127), return it directly.
-        # This avoids the regex overhead for standard JSON characters ({, [, ", etc).
-        return byte_str if byte_str.getbyte(0) < 128
+        # Enforcing UTF-8 ensures we don't mix US-ASCII and UTF-8 strings later.
+        return byte.chr(Encoding::UTF_8) if byte < 128
 
         # Slow path: If it's a multibyte char (e.g. “), use regex to match the full character.
         return @scanner.check(/./m)

data/lib/json_mend/version.rb

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

metadata

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