From b613a2c5ae03c425bc94771e4eced1b80e4e80d0 Mon Sep 17 00:00:00 2001
From: hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 27 Nov 2017 03:11:18 +0000
Subject: Merge psych-3.0.0.beta4 from upstream.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60917 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/psych/lib/psych.rb | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

(limited to 'ext/psych/lib/psych.rb')

diff --git a/ext/psych/lib/psych.rb b/ext/psych/lib/psych.rb
index e93ac8f406..dfb6c1b00e 100644
--- a/ext/psych/lib/psych.rb
+++ b/ext/psych/lib/psych.rb
@@ -198,12 +198,13 @@ require 'psych/class_loader'
 #
 # ==== Receiving an events stream
 #
-#   parser = Psych::Parser.new(Psych::Handlers::Recorder.new)
+#   recorder = Psych::Handlers::Recorder.new
+#   parser = Psych::Parser.new(recorder)
 #
 #   parser.parse("---\n - a\n - b")
-#   parser.events # => [list of [event, args] lists]
-#                 # event is one of: Psych::Handler::EVENTS
-#                 # args are the arguments passed to the event
+#   recorder.events # => [list of [event, args] lists]
+#                   # event is one of: Psych::Handler::EVENTS
+#                   # args are the arguments passed to the event
 #
 # === Emitting
 #
@@ -251,9 +252,11 @@ module Psych
   #     ex.file    # => 'file.txt'
   #     ex.message # => "(file.txt): found character that cannot start any token"
   #   end
-  def self.load yaml, filename = nil, fallback = false
+  def self.load yaml, filename = nil, fallback = false, symbolize_names: false
     result = parse(yaml, filename, fallback)
-    result ? result.to_ruby : result
+    result = result.to_ruby if result
+    symbolize_names!(result) if symbolize_names
+    result
   end
 
   ###
@@ -502,6 +505,19 @@ module Psych
     @dump_tags[klass] = tag
   end
 
+  def self.symbolize_names!(result)
+    case result
+    when Hash
+      result.keys.each do |key|
+        result[key.to_sym] = symbolize_names!(result.delete(key))
+      end
+    when Array
+      result.map! { |r| symbolize_names!(r) }
+    end
+    result
+  end
+  private_class_method :symbolize_names!
+
   class << self
     attr_accessor :load_tags
     attr_accessor :dump_tags
-- 
cgit v1.2.3