fix YAML encoder for Psych (damn!)

2 files changed, 14 insertions, 26 deletions

diff --git a/lib/coderay/encoders/yaml.rb b/lib/coderay/encoders/yaml.rb
index 69d397c..ba6e715 100644
--- a/lib/coderay/encoders/yaml.rb
+++ b/lib/coderay/encoders/yaml.rb
@@ -20,9 +20,7 @@ module Encoders
     end
     
     def finish options
-      ::YAML.dump @data, @out
-      
-      super
+      output ::YAML.dump(@data)
     end
     
   public
diff --git a/test/unit/duo.rb b/test/unit/duo.rb
index 62bd57b..05c26a5 100644
--- a/test/unit/duo.rb
+++ b/test/unit/duo.rb
@@ -1,4 +1,5 @@
 require 'test/unit'
+require 'yaml'
 require 'coderay'
 
 class DuoTest < Test::Unit::TestCase
@@ -17,29 +18,18 @@ class DuoTest < Test::Unit::TestCase
   
   def test_call
     duo = CodeRay::Duo[:python => :yml]
-    assert_equal <<-'YAML', duo.call('def test: "pass"')
---- 
-- - def
-  - :keyword
-- - " "
-  - :space
-- - test
-  - :method
-- - ":"
-  - :operator
-- - " "
-  - :space
-- - :begin_group
-  - :string
-- - "\""
-  - :delimiter
-- - pass
-  - :content
-- - "\""
-  - :delimiter
-- - :end_group
-  - :string
-    YAML
+    yaml = [["def", :keyword],
+            [" ", :space],
+            ["test", :method],
+            [":", :operator],
+            [" ", :space],
+            [:begin_group, :string],
+            ["\"", :delimiter],
+            ["pass", :content],
+            ["\"", :delimiter],
+            [:end_group, :string]]
+    
+    assert_equal yaml, YAML.load(duo.call('def test: "pass"'))
   end
   
 end