lib/yaml-write-stream/yielding.rb in yaml-write-stream-1.0.4 vs lib/yaml-write-stream/yielding.rb in yaml-write-stream-2.0.0

@@ -1,15 +1,17 @@
 # encoding: UTF-8
 
 class YamlWriteStream
   class YieldingWriter
-    attr_reader :emitter, :stream, :first
+    attr_reader :emitter, :stream, :first, :closed
+    alias_method :closed?, :closed
 
     def initialize(emitter, stream)
       @emitter = emitter
       @stream = stream
       @first = true
+      @closed = false
     end
 
     def flush
       # psych gets confused if you open a file and don't at least
       # pretend to write something
@@ -20,19 +22,20 @@
     end
 
     def close
       flush
       stream.close
+      @closed = true
       nil
     end
 
     def write_sequence
       @first = false
 
       # anchor, tag, implicit, style
       emitter.start_sequence(
-        nil, nil, true, Psych::Nodes::Sequence::ANY
+        nil, nil, false, Psych::Nodes::Sequence::ANY
       )
 
       yield YieldingSequenceWriter.new(emitter, stream)
       emitter.end_sequence
     end
@@ -40,38 +43,51 @@
     def write_map
       @first = false
 
       # anchor, tag, implicit, style
       emitter.start_mapping(
-        nil, nil, true, Psych::Nodes::Sequence::ANY
+        nil, nil, false, Psych::Nodes::Sequence::ANY
       )
 
       yield YieldingMappingWriter.new(emitter, stream)
       emitter.end_mapping
     end
 
     protected
 
     def write_scalar(value, quote = false)
-      @first = false
+      case value
+        when Numeric
+          write_numeric_scalar(value)
+        when NilClass
+          write_nil_scalar
+        else
+          write_string_scalar(value.to_s, quote)
+      end
+    end
 
-      style = if value == ''
+    def write_string_scalar(value, quote = false)
+      style = if quote
         Psych::Nodes::Scalar::DOUBLE_QUOTED
       else
-        if !quote || !value
-          Psych::Nodes::Scalar::ANY
-        else
-          Psych::Nodes::Scalar::DOUBLE_QUOTED
-        end
+        Psych::Nodes::Scalar::PLAIN
       end
 
-      quoted = value == ''
-      value = value ? value : ''
+      # value, anchor, tag, plain, quoted, style
+      emitter.scalar(
+        value, nil, nil, true, true, style
+      )
+    end
 
+    def write_numeric_scalar(value)
       # value, anchor, tag, plain, quoted, style
       emitter.scalar(
-        value, nil, nil, true, quoted, style
+        value.to_s, nil, nil, true, false, Psych::Nodes::Scalar::PLAIN
       )
+    end
+
+    def write_nil_scalar
+      write_string_scalar('')
     end
   end
 
   class YieldingMappingWriter < YieldingWriter
     def write_map(key)