lib/json/pure/generator.rb in json_pure-1.7.1 vs lib/json/pure/generator.rb in json_pure-1.7.2

@@ -39,42 +39,42 @@
   # Convert a UTF8 encoded Ruby string _string_ to a JSON string, encoded with
   # UTF16 big endian characters as \u????, and return it.
   if defined?(::Encoding)
     def utf8_to_json(string) # :nodoc:
       string = string.dup
-      string << '' # XXX workaround: avoid buffer sharing
       string.force_encoding(::Encoding::ASCII_8BIT)
       string.gsub!(/["\\\x0-\x1f]/) { MAP[$&] }
       string.force_encoding(::Encoding::UTF_8)
       string
     end
 
     def utf8_to_json_ascii(string) # :nodoc:
       string = string.dup
-      string << '' # XXX workaround: avoid buffer sharing
       string.force_encoding(::Encoding::ASCII_8BIT)
-      string.gsub!(/["\\\x0-\x1f]/) { MAP[$&] }
+      string.gsub!(/["\\\x0-\x1f]/n) { MAP[$&] }
       string.gsub!(/(
                       (?:
                         [\xc2-\xdf][\x80-\xbf]    |
                         [\xe0-\xef][\x80-\xbf]{2} |
                         [\xf0-\xf4][\x80-\xbf]{3}
                       )+ |
                       [\x80-\xc1\xf5-\xff]       # invalid
                     )/nx) { |c|
                       c.size == 1 and raise GeneratorError, "invalid utf8 byte: '#{c}'"
                       s = JSON.iconv('utf-16be', 'utf-8', c).unpack('H*')[0]
+                      s.force_encoding(::Encoding::ASCII_8BIT)
                       s.gsub!(/.{4}/n, '\\\\u\&')
+                      s.force_encoding(::Encoding::UTF_8)
                     }
       string.force_encoding(::Encoding::UTF_8)
       string
     rescue => e
-      raise GeneratorError, "Caught #{e.class}: #{e}"
+      raise GeneratorError.wrap(e)
     end
   else
     def utf8_to_json(string) # :nodoc:
-      string.gsub(/["\\\x0-\x1f]/) { MAP[$&] }
+      string.gsub(/["\\\x0-\x1f]/n) { MAP[$&] }
     end
 
     def utf8_to_json_ascii(string) # :nodoc:
       string = string.gsub(/["\\\x0-\x1f]/) { MAP[$&] }
       string.gsub!(/(
@@ -89,10 +89,10 @@
         s = JSON.iconv('utf-16be', 'utf-8', c).unpack('H*')[0]
         s.gsub!(/.{4}/n, '\\\\u\&')
       }
       string
     rescue => e
-      raise GeneratorError, "Caught #{e.class}: #{e}"
+      raise GeneratorError.wrap(e)
     end
   end
   module_function :utf8_to_json, :utf8_to_json_ascii
 
   module Pure