summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/psych/handler.rb2
-rw-r--r--lib/psych/nodes/scalar.rb2
-rw-r--r--lib/psych/versions.rb4
-rw-r--r--lib/psych/visitors/to_ruby.rb6
4 files changed, 7 insertions, 7 deletions
diff --git a/lib/psych/handler.rb b/lib/psych/handler.rb
index 8f23e36..ad7249f 100644
--- a/lib/psych/handler.rb
+++ b/lib/psych/handler.rb
@@ -119,7 +119,7 @@ module Psych
# +tag+ is an associated tag or nil
# +plain+ is a boolean value
# +quoted+ is a boolean value
- # +style+ is an integer idicating the string style
+ # +style+ is an integer indicating the string style
#
# See the constants in Psych::Nodes::Scalar for the possible values of
# +style+
diff --git a/lib/psych/nodes/scalar.rb b/lib/psych/nodes/scalar.rb
index e2616b6..5550b61 100644
--- a/lib/psych/nodes/scalar.rb
+++ b/lib/psych/nodes/scalar.rb
@@ -50,7 +50,7 @@ module Psych
# +tag+ is an associated tag or nil
# +plain+ is a boolean value
# +quoted+ is a boolean value
- # +style+ is an integer idicating the string style
+ # +style+ is an integer indicating the string style
#
# == See Also
#
diff --git a/lib/psych/versions.rb b/lib/psych/versions.rb
index 488f86e..b0ec018 100644
--- a/lib/psych/versions.rb
+++ b/lib/psych/versions.rb
@@ -2,9 +2,9 @@
# frozen_string_literal: true
module Psych
# The version of Psych you are using
- VERSION = '3.3.0'
+ VERSION = '3.3.1'
if RUBY_ENGINE == 'jruby'
- DEFAULT_SNAKEYAML_VERSION = '1.26'.freeze
+ DEFAULT_SNAKEYAML_VERSION = '1.28'.freeze
end
end
diff --git a/lib/psych/visitors/to_ruby.rb b/lib/psych/visitors/to_ruby.rb
index a100188..4de7f80 100644
--- a/lib/psych/visitors/to_ruby.rb
+++ b/lib/psych/visitors/to_ruby.rb
@@ -339,7 +339,7 @@ module Psych
list
end
- def revive_hash hash, o
+ def revive_hash hash, o, tagged= false
o.children.each_slice(2) { |k,v|
key = accept(k)
val = accept(v)
@@ -366,7 +366,7 @@ module Psych
hash[key] = val
end
else
- if @symbolize_names
+ if !tagged && @symbolize_names && key.is_a?(String)
key = key.to_sym
elsif !@freeze
key = deduplicate(key)
@@ -404,7 +404,7 @@ module Psych
def revive klass, node
s = register(node, klass.allocate)
- init_with(s, revive_hash({}, node), node)
+ init_with(s, revive_hash({}, node, true), node)
end
def init_with o, h, node