From 6ce27adabe13baefb974fd7ea4d1ff0becd60134 Mon Sep 17 00:00:00 2001 From: tenderlove Date: Wed, 28 Jan 2015 17:37:09 +0000 Subject: * ext/psych/lib/psych/visitors/to_ruby.rb: fix parsing hashes with instance variables when it is referenced multiple times. * ext/psych/lib/psych.rb: bump version * ext/psych/psych.gemspec: bump version * test/psych/test_hash.rb: test for fix git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49432 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/psych/lib/psych.rb | 2 +- ext/psych/lib/psych/visitors/to_ruby.rb | 1 + ext/psych/psych.gemspec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) (limited to 'ext/psych') diff --git a/ext/psych/lib/psych.rb b/ext/psych/lib/psych.rb index 87171d19d5..3e9b7aa1fb 100644 --- a/ext/psych/lib/psych.rb +++ b/ext/psych/lib/psych.rb @@ -217,7 +217,7 @@ require 'psych/class_loader' module Psych # The version is Psych you're using - VERSION = '2.0.10' + VERSION = '2.0.12' # The version of libyaml Psych is using LIBYAML_VERSION = Psych.libyaml_version.join '.' diff --git a/ext/psych/lib/psych/visitors/to_ruby.rb b/ext/psych/lib/psych/visitors/to_ruby.rb index f353e9c301..5bd33b4d7d 100644 --- a/ext/psych/lib/psych/visitors/to_ruby.rb +++ b/ext/psych/lib/psych/visitors/to_ruby.rb @@ -263,6 +263,7 @@ module Psych when /^!ruby\/hash-with-ivars(?::(.*))?$/ hash = $1 ? resolve_class($1).allocate : {} + register o, hash o.children.each_slice(2) do |key, value| case key.value when 'elements' diff --git a/ext/psych/psych.gemspec b/ext/psych/psych.gemspec index a8f16300d2..40b0e2ed5d 100644 --- a/ext/psych/psych.gemspec +++ b/ext/psych/psych.gemspec @@ -2,7 +2,7 @@ Gem::Specification.new do |s| s.name = "psych" - s.version = "2.0.10" + s.version = "2.0.12" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.require_paths = ["lib"] -- cgit v1.2.3