yaml.rb in activesupport-3.0.8.rc1

- old
+ new

@@ -5,18 +5,25 @@
     module Backends
       module Yaml
         ParseError = ::StandardError
         extend self
 
+        EXCEPTIONS = [::ArgumentError] # :nodoc:
+        begin
+          require 'psych'
+          EXCEPTIONS << Psych::SyntaxError
+        rescue LoadError
+        end
+
         # Parses a JSON string or IO and converts it into an object
         def decode(json)
           if json.respond_to?(:read)
             json = json.read
           end
           YAML.load(convert_json_to_yaml(json))
-        rescue ArgumentError
-          raise ParseError, "Invalid JSON string"
+        rescue *EXCEPTIONS => e
+          raise ParseError, "Invalid JSON string: '%s'" % json
         end
 
         protected
           # Ensure that ":" and "," are always followed by a space
           def convert_json_to_yaml(json) #:nodoc:
@@ -30,11 +37,11 @@
                   pos = scanner.pos
                 elsif quoting == char
                   if valid_date?(json[pos..scanner.pos-2])
                     # found a date, track the exact positions of the quotes so we can
                     # overwrite them with spaces later.
-                    times << pos << scanner.pos
+                    times << pos
                   end
                   quoting = false
                 end
               when ":",","
                 marks << scanner.pos - 1 unless quoting
@@ -61,10 +68,10 @@
               left_pos.each_with_index do |left, i|
                 scanner.pos = left.succ
                 chunk = scanner.peek(right_pos[i] - scanner.pos + 1)
                 # overwrite the quotes found around the dates with spaces
                 while times.size > 0 && times[0] <= right_pos[i]
-                  chunk[times.shift - scanner.pos - 1] = ' '
+                  chunk.insert(times.shift - scanner.pos - 1, '! ')
                 end
                 chunk.gsub!(/\\([\\\/]|u[[:xdigit:]]{4})/) do
                   ustr = $1
                   if ustr.start_with?('u')
                     [ustr[1..-1].to_i(16)].pack("U")