From 5a13c6bcd9c7c138fdbedb92a56efea6f9535416 Mon Sep 17 00:00:00 2001 From: hsbt Date: Fri, 16 Jun 2017 07:02:22 +0000 Subject: Merge psych-3.0.0.beta2 from https://github.com/ruby/psych It contains following changes from 3.0.0.beta1 * Preserve time zone offset when deserializing times https://github.com/ruby/psych/pull/316 * Enable YAML serialization of Ruby delegators https://github.com/ruby/psych/pull/158 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59101 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/psych/lib/psych/scalar_scanner.rb | 2 +- ext/psych/lib/psych/versions.rb | 2 +- ext/psych/lib/psych/visitors/yaml_tree.rb | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'ext/psych/lib/psych') diff --git a/ext/psych/lib/psych/scalar_scanner.rb b/ext/psych/lib/psych/scalar_scanner.rb index 449efa4e53..67c0cc3d4e 100644 --- a/ext/psych/lib/psych/scalar_scanner.rb +++ b/ext/psych/lib/psych/scalar_scanner.rb @@ -143,7 +143,7 @@ module Psych offset += ((tz[1] || 0) * 60) end - klass.at((time - offset).to_i, us) + klass.new(yy, m, dd, hh, mm, ss+us/(1_000_000r), offset) end end end diff --git a/ext/psych/lib/psych/versions.rb b/ext/psych/lib/psych/versions.rb index 12029f0a68..3d61c8b015 100644 --- a/ext/psych/lib/psych/versions.rb +++ b/ext/psych/lib/psych/versions.rb @@ -1,7 +1,7 @@ # frozen_string_literal: false module Psych # The version is Psych you're using - VERSION = '3.0.0.beta1' + VERSION = '3.0.0.beta2' if RUBY_ENGINE == 'jruby' DEFAULT_SNAKEYAML_VERSION = '1.18'.freeze diff --git a/ext/psych/lib/psych/visitors/yaml_tree.rb b/ext/psych/lib/psych/visitors/yaml_tree.rb index cae876c872..e197a30611 100644 --- a/ext/psych/lib/psych/visitors/yaml_tree.rb +++ b/ext/psych/lib/psych/visitors/yaml_tree.rb @@ -164,6 +164,8 @@ module Psych @emitter.end_mapping end + alias :visit_Delegator :visit_Object + def visit_Struct o tag = ['!ruby/struct', o.class.name].compact.join(':') -- cgit v1.2.3