* ext/psych/lib/psych/visitors/yaml_tree.rb: fix time dumping so that

Syck can load UTC times that Psych dumps.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31418 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

ChangeLog

@@ -1,3 +1,8 @@
+Wed May  4 08:04:59 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: fix time dumping so that
+	  Syck can load UTC times that Psych dumps.
+
 Wed May  4 07:33:00 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
 	* thread.c (rb_fd_copy): fix wrong argument.This issue was pointed

ext/psych/lib/psych/visitors/yaml_tree.rb

@@ -297,7 +297,7 @@ module Psych
       private
       def format_time time
         if time.utc?
-          time.strftime("%Y-%m-%d %H:%M:%S.%9NZ")
+          time.strftime("%Y-%m-%d %H:%M:%S.%9N Z")
         else
           time.strftime("%Y-%m-%d %H:%M:%S.%9N %:z")
         end

test/psych/json/test_stream.rb

@@ -95,7 +95,7 @@ module Psych
         time = Time.utc(2010, 10, 10)
         @stream.push({'a' => time })
         json = @io.string
-        assert_match "{\"a\": \"2010-10-10 00:00:00.000000000Z\"}\n", json
+        assert_match "{\"a\": \"2010-10-10 00:00:00.000000000 Z\"}\n", json
       end
 
       def test_datetime

test/psych/test_json_tree.rb

@@ -53,7 +53,7 @@ module Psych
 
     def test_time
       time = Time.utc(2010, 10, 10)
-      assert_equal "{\"a\": \"2010-10-10 00:00:00.000000000Z\"}\n",
+      assert_equal "{\"a\": \"2010-10-10 00:00:00.000000000 Z\"}\n",
 Psych.to_json({'a' => time })
     end
 

test/psych/test_yaml.rb

@@ -14,6 +14,12 @@ class Psych_Unit_Tests < Psych::TestCase
         Psych.domain_types.clear
     end
 
+    def test_syck_compat
+      time = Time.utc(2010, 10, 10)
+      yaml = Psych.dump time
+      assert_match "2010-10-10 00:00:00.000000000 Z", yaml
+    end
+
     # [ruby-core:34969]
     def test_regexp_with_n
         assert_cycle(Regexp.new('',0,'n'))