* ext/psych/lib/psych/visitors/yaml_tree.rb (push): adding version

and header emit options.
* test/psych/test_psych.rb: corresponding test.

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

ChangeLog

@@ -1,3 +1,10 @@
+Thu Jul  8 08:16:57 2010  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/yaml_tree.rb (push): adding version
+	  and header emit options.
+	
+	* test/psych/test_psych.rb: corresponding test.
+
 Thu Jul  8 08:01:03 2010  Aaron Patterson <aaron@tenderlovemaking.com>
 
 	* ext/psych/emitter.c: updating documentation about emit options

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

@@ -13,6 +13,7 @@ module Psych
         @emitter  = emitter
         @st       = {}
         @ss       = ScalarScanner.new
+        @options  = options
 
         @dispatch_cache = Hash.new do |h,klass|
           method = "visit_#{(klass.name || '').split('::').join('_')}"
@@ -43,7 +44,19 @@ module Psych
 
       def push object
         start unless started?
-        @emitter.start_document [], [], false
+        version = []
+        version = [1,1] if @options[:header]
+
+        case @options[:version]
+        when Array
+          version = @options[:version]
+        when String
+          version = @options[:version].split('.').map { |x| x.to_i }
+        else
+          version = [1,1]
+        end if @options[:version]
+
+        @emitter.start_document version, [], false
         accept object
         @emitter.end_document
       end

test/psych/test_psych.rb

@@ -18,6 +18,26 @@ class TestPsych < Psych::TestCase
     assert_match(/\? ! "b/, yml)
   end
 
+  def test_header
+    yml = Psych.dump({:a => {'b' => 'c'}}, {:header => true})
+    assert_match(/YAML/, yml)
+  end
+
+  def test_version_array
+    yml = Psych.dump({:a => {'b' => 'c'}}, {:version => [1,1]})
+    assert_match(/1.1/, yml)
+  end
+
+  def test_version_string
+    yml = Psych.dump({:a => {'b' => 'c'}}, {:version => '1.1'})
+    assert_match(/1.1/, yml)
+  end
+
+  def test_version_bool
+    yml = Psych.dump({:a => {'b' => 'c'}}, {:version => true})
+    assert_match(/1.1/, yml)
+  end
+
   def test_load_argument_error
     assert_raises(TypeError) do
       Psych.load nil