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

6 files changed, 54 insertions, 4 deletions

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(':')
 
diff --git a/ext/psych/psych.gemspec b/ext/psych/psych.gemspec
index 73e3c34cbf..c0ec5c5334 100644
--- a/ext/psych/psych.gemspec
+++ b/ext/psych/psych.gemspec
@@ -2,10 +2,10 @@
 
 Gem::Specification.new do |s|
   s.name = "psych"
-  s.version = "3.0.0.beta1"
+  s.version = "3.0.0.beta2"
   s.authors = ["Aaron Patterson", "SHIBATA Hiroshi", "Charles Oliver Nutter"]
   s.email = ["aaron@tenderlovemaking.com", "hsbt@ruby-lang.org", "headius@headius.com"]
-  s.date = "2016-11-14"
+  s.date = "2017-06-16"
   s.summary = "Psych is a YAML parser and emitter"
   s.description = <<-DESCRIPTION
 Psych is a YAML parser and emitter. Psych leverages libyaml[http://pyyaml.org/wiki/LibYAML]
diff --git a/test/psych/test_date_time.rb b/test/psych/test_date_time.rb
index 443669d17f..3c8b436098 100644
--- a/test/psych/test_date_time.rb
+++ b/test/psych/test_date_time.rb
@@ -9,10 +9,41 @@ module Psych
       assert_cycle time
     end
 
+    def test_usec
+      time = Time.utc(2017, 4, 13, 12, 0, 0, 5)
+      assert_cycle time
+    end
+
+    def test_non_utc
+      time = Time.new(2017, 4, 13, 12, 0, 0.5, "+09:00")
+      assert_cycle time
+    end
+
+    def test_timezone_offset
+      times = [Time.new(2017, 4, 13, 12, 0, 0, "+09:00"),
+               Time.new(2017, 4, 13, 12, 0, 0, "-05:00")]
+      cycled = Psych::load(Psych.dump times)
+      assert_match(/12:00:00 \+0900/, cycled.first.to_s)
+      assert_match(/12:00:00 -0500/,  cycled.last.to_s)
+    end
+
     def test_new_datetime
       assert_cycle DateTime.new
     end
 
+    def test_datetime_non_utc
+      dt = DateTime.new(2017, 4, 13, 12, 0, 0.5, "+09:00")
+      assert_cycle dt
+    end
+
+    def test_datetime_timezone_offset
+      times = [DateTime.new(2017, 4, 13, 12, 0, 0, "+09:00"),
+               DateTime.new(2017, 4, 13, 12, 0, 0, "-05:00")]
+      cycled = Psych::load(Psych.dump times)
+      assert_match(/12:00:00\+09:00/, cycled.first.to_s)
+      assert_match(/12:00:00-05:00/,  cycled.last.to_s)
+    end
+
     def test_invalid_date
       assert_cycle "2013-10-31T10:40:07-000000000000033"
     end
diff --git a/test/psych/visitors/test_yaml_tree.rb b/test/psych/visitors/test_yaml_tree.rb
index ea38f6d6d4..8fc18f2fe6 100644
--- a/test/psych/visitors/test_yaml_tree.rb
+++ b/test/psych/visitors/test_yaml_tree.rb
@@ -4,6 +4,15 @@ require 'psych/helper'
 module Psych
   module Visitors
     class TestYAMLTree < TestCase
+      class TestDelegatorClass < Delegator
+        def initialize(obj); super; @obj = obj; end
+        def __setobj__(obj); @obj = obj; end
+        def __getobj__; @obj; end
+      end
+
+      class TestSimpleDelegatorClass < SimpleDelegator
+      end
+
       def setup
         super
         @v = Visitors::YAMLTree.create
@@ -175,6 +184,14 @@ module Psych
         assert_cycle 'nUll'
         assert_cycle '~'
       end
+
+      def test_delegator
+        assert_cycle(TestDelegatorClass.new([1, 2, 3]))
+      end
+
+      def test_simple_delegator
+        assert_cycle(TestSimpleDelegatorClass.new([1, 2, 3]))
+      end
     end
   end
 end