RbYAML 0.1.0 → 0.2.0

data/lib/rbyaml/dumper.rb.~1.3.~

@@ -0,0 +1,36 @@
+require 'rbyaml/emitter'
+require 'rbyaml/serializer'
+require 'rbyaml/representer'
+require 'rbyaml/resolver'
+
+module RbYAML
+  class CommonDumper
+    attr_accessor :emitter, :serializer, :representer, :resolver
+    def initialize(stream,default_style=nil,default_flow_style=nil,canonical=nil,indent=nil,width=nil,line_break=nil,explicit_start=nil,explicit_end=nil,version=nil,tags=nil,emitter=Emitter,serializer=Serializer,representer=Representer,resolver=Resolver)
+      super()
+      @emitter = emitter.new(stream,canonical,indent,width,line_break)
+      @resolver = resolver.new
+      @serializer = serializer.new(@emitter,@resolver,explicit_start,explicit_end,version,tags)
+      @representer = representer.new(@serializer,default_style,default_flow_style)
+    end
+  end
+  
+  class BaseDumper < CommonDumper
+    attr_accessor 
+    def initialize(stream,default_style=nil,default_flow_style=nil,canonical=nil,indent=nil,width=nil,line_break=nil,explicit_start=nil,explicit_end=nil,version=nil,tags=nil,emitter=Emitter,serializer=Serializer,representer=BaseRepresenter,resolver=BaseResolver)
+      super
+    end
+  end
+  
+  class SafeDumper < CommonDumper
+    def initialize(stream,default_style=nil,default_flow_style=nil,canonical=nil,indent=nil,width=nil,line_break=nil,explicit_start=nil,explicit_end=nil,version=nil,tags=nil,emitter=Emitter,serializer=Serializer,representer=SafeRepresenter,resolver=Resolver)
+      super
+    end
+  end
+  
+  class Dumper < CommonDumper
+    def initialize(stream,default_style=nil,default_flow_style=nil,canonical=nil,indent=nil,width=nil,line_break=nil,explicit_start=nil,explicit_end=nil,version=nil,tags=nil,emitter=Emitter,serializer=Serializer,representer=Representer,resolver=Resolver)
+      super
+    end
+  end
+end

data/lib/rbyaml/emitter.rb

@@ -20,9 +20,10 @@ module RbYAML
       "tag:yaml.org,2002:" => "!!"
     }
 
-    def initialize(stream, canonical=nil, indent=nil, width=nil,line_break=nil)
+    def initialize(stream, opts={})
       # The stream should have the methods `write` and possibly `flush`.
       @stream = stream
+      @options = opts
 
       # Emitter is a state machine with a stack of states to handle nested
       # structures.
@@ -57,15 +58,14 @@ module RbYAML
       @indention = true
 
       # Formatting details.
-      @canonical = canonical
+      @canonical = opts[:Canonical]
       @best_indent = 2
-      @best_indent = indent if indent && indent!=0 && 1 < indent && indent < 10
+      @best_indent = opts[:Indent] if 2...10 === opts[:Indent]
 
       @best_width = 80
-      @best_width = width if width && width != 0 && width > @best_indent*2
+      @best_width = opts[:BestWidth] if opts[:BestWidth] != 0 && opts[:BestWidth] > @best_indent*2
       
       @best_line_break = "\n"
-      @best_line_break = line_break if ["\r", "\n", "\r\n"].include?(line_break)
 
       # Tag prefixes.
       @tag_prefixes = nil
@@ -178,7 +178,7 @@ module RbYAML
         implicit = first && !@event.explicit && !@canonical && !@event.version && !@event.tags && !check_empty_document
         if !implicit
           write_indent
-          write_indicator("---",true)
+          write_indicator("--- ",true,true)
           if @canonical
             write_indent
           end
@@ -349,14 +349,14 @@ module RbYAML
     end
     
     def expect_flow_mapping_simple_value
-      write_indicator(":", false)
+      write_indicator(": ", false,true)
       @states << :expect_flow_mapping_key
       expect_node(false,false,true)
     end
 
     def expect_flow_mapping_value
       write_indent if @canonical || @column > @best_width
-      write_indicator(":", true)
+      write_indicator(": ", false,true)
       @states << :expect_flow_mapping_key
       expect_node(false,false,true)
     end
@@ -414,14 +414,14 @@ module RbYAML
     end
     
     def expect_block_mapping_simple_value
-      write_indicator(":", false)
+      write_indicator(": ", false,true)
       @states << :expect_block_mapping_key
       expect_node(false,false,true)
     end
 
     def expect_block_mapping_value
       write_indent
-      write_indicator(":",true,false,true)
+      write_indicator(": ",true,true,true)
       @states << :expect_block_mapping_key
       expect_node(false,false,true)
     end
@@ -506,7 +506,6 @@ module RbYAML
           return ""
         end
       end
-
       if !@event.style && @event.implicit && (!(@simple_key_context && (@analysis.empty || @analysis.multiline)) && 
                                               (@flow_level!=0 && @analysis.allow_flow_plain || (@flow_level==0 && @analysis.allow_block_plain)))
         return ""
@@ -758,6 +757,10 @@ module RbYAML
       # allowed for double quoted scalars.
       allow_flow_plain = allow_block_plain = allow_single_quoted = allow_block = false if mixed_breaks_spaces || special_characters
 
+      # This seem to have been missed...
+      allow_flow_plain = allow_block_plain = allow_single_quoted = false if inline_breaks
+      allow_single_quoted = false if trailing_breaks
+
       # We don't emit multiline plain scalars.
       allow_flow_plain = allow_block_plain = false if line_breaks
 
@@ -852,7 +855,6 @@ module RbYAML
           end
         elsif breaks
           if ch.nil? or !"\n\x85".include?(ch)
-            write_line_break if text[start] == ?\n
             (text[start...ending]).each_byte { |br|
               if br == ?\n
                 write_line_break
@@ -890,22 +892,6 @@ module RbYAML
       write_indicator("'", false)
     end
 
-    ESCAPE_REPLACEMENTS = {
-      ?\0   =>   "0",
-      ?\x07 =>   "a",
-      ?\x08 =>   "b",
-      ?\x09 =>   "t",
-      ?\x0A =>   "n",
-      ?\x0B =>   "v",
-      ?\x0C =>   "f",
-      ?\x0D =>   "r",
-      ?\x1B =>   "e",
-      ?"    =>   "\"",
-      ?\\   =>   "\\",
-      ?\x85 =>   "N",
-      ?\xA0 =>   "_"
-    }
-
     def write_double_quoted(text, split=true)
       write_indicator('"', true)
       start = ending = 0

data/lib/rbyaml/{emitter.rb.~1.2.~ → emitter.rb.~1.6.~}

@@ -12,27 +12,15 @@ module RbYAML
   class EmitterError < YAMLError
   end
 
-  class ScalarAnalysis
-    attr_accessor :scalar,:empty,:multiline,:allow_flow_plain,:allow_block_plain,:allow_single_quoted,:allow_double_quoted,:allow_block
-    def initialize(scalar,empty,multiline,allow_flow_plain, allow_block_plain,allow_single_quoted, allow_double_quoted,allow_block)
-      @scalar = scalar
-      @empty = empty
-      @multiline = multiline
-      @allow_flow_plain = allow_flow_plain
-      @allow_block_plain = allow_block_plain
-      @allow_single_quoted = allow_single_quoted
-      @allow_double_quoted = allow_double_quoted
-      @allow_block = allow_block
-    end
-  end
+  ScalarAnalysis = Struct.new(:scalar,:empty,:multiline,:allow_flow_plain,:allow_block_plain,:allow_single_quoted,:allow_double_quoted,:allow_block)
 
-  module Emitter
+  class Emitter
     DEFAULT_TAG_PREFIXES = {
       "!" => "!",
       "tag:yaml.org,2002:" => "!!"
     }
 
-    def initialize_emitter(stream, canonical=nil, indent=nil, width=nil,line_break=nil)
+    def initialize(stream, canonical=nil, indent=nil, width=nil,line_break=nil)
       # The stream should have the methods `write` and possibly `flush`.
       @stream = stream
 
@@ -190,7 +178,7 @@ module RbYAML
         implicit = first && !@event.explicit && !@canonical && !@event.version && !@event.tags && !check_empty_document
         if !implicit
           write_indent
-          write_indicator("---",true)
+          write_indicator("--- ",true,true)
           if @canonical
             write_indent
           end
@@ -361,14 +349,14 @@ module RbYAML
     end
     
     def expect_flow_mapping_simple_value
-      write_indicator(":", false)
+      write_indicator(": ", false,true)
       @states << :expect_flow_mapping_key
       expect_node(false,false,true)
     end
 
     def expect_flow_mapping_value
       write_indent if @canonical || @column > @best_width
-      write_indicator(":", true)
+      write_indicator(": ", false,true)
       @states << :expect_flow_mapping_key
       expect_node(false,false,true)
     end
@@ -426,14 +414,14 @@ module RbYAML
     end
     
     def expect_block_mapping_simple_value
-      write_indicator(":", false)
+      write_indicator(": ", false,true)
       @states << :expect_block_mapping_key
       expect_node(false,false,true)
     end
 
     def expect_block_mapping_value
       write_indent
-      write_indicator(":",true,false,true)
+      write_indicator(": ",true,true,true)
       @states << :expect_block_mapping_key
       expect_node(false,false,true)
     end
@@ -441,36 +429,35 @@ module RbYAML
     # Checkers.
 
     def check_empty_sequence
-      SequenceStartEvent === @event && !@events.empty? && SequenceEndEvent === @events.first
+      @event.__is_sequence_start && !@events.empty? && @events.first.__is_sequence_end
     end
     
     def check_empty_mapping
-      MappingStartEvent === @event && !@events.empty? && MappingEndEvent === @events.first
+      @event.__is_mapping_start && !@events.empty? && @events.first.__is_mapping_end
     end
 
     def check_empty_document
-      return false if !DocumentStartEvent === @event || @events.empty?
+      return false if !@event.__is_document_start || @events.empty?
       event = @events.first
-      ScalarEvent === event && event.anchor.nil? && event.tag.nil? && event.implicit && event.value == ""
+      event.__is_scalar && event.anchor.nil? && event.tag.nil? && event.implicit && event.value == ""
     end
 
     def check_simple_key
       length = 0
-      if NodeEvent === @event && !@event.anchor.nil?
+      if @event.__is_node && !@event.anchor.nil?
         @prepared_anchor = prepare_anchor(@event.anchor) if @prepared_anchor.nil?
         length += @prepared_anchor.length
       end
-      if (ScalarEvent === @event || CollectionStartEvent === @event) && !@event.tag.nil?
+      if (@event.__is_scalar || @event.__is_collection_start) && !@event.tag.nil?
         @prepared_tag = prepare_tag(@event.tag) if @prepared_tag.nil?
         length += @prepared_tag.length
       end
-      if ScalarEvent === @event
+      if @event.__is_scalar
         @analysis = analyze_scalar(@event.value) if @analysis.nil?
         length += @analysis.scalar.length
       end
 
-      (length < 128 && (AliasEvent === @event || 
-                        (ScalarEvent === @event && !@analysis.empty && !@analysis.multiline) || 
+      (length < 128 && (@event.__is_alias || (@event.__is_scalar && !@analysis.empty && !@analysis.multiline) || 
                         check_empty_sequence || check_empty_mapping))
     end
 
@@ -519,7 +506,6 @@ module RbYAML
           return ""
         end
       end
-
       if !@event.style && @event.implicit && (!(@simple_key_context && (@analysis.empty || @analysis.multiline)) && 
                                               (@flow_level!=0 && @analysis.allow_flow_plain || (@flow_level==0 && @analysis.allow_block_plain)))
         return ""
@@ -570,7 +556,7 @@ module RbYAML
       ending = 1 if prefix[0] == ?!
       ending += 1 while ending < prefix.length
       chunks << prefix[start...ending] if start < ending
-      chunks.join("")
+      chunks.to_s
     end
 
     def prepare_tag(tag)
@@ -588,7 +574,7 @@ module RbYAML
       start = ending = 0
       ending += 1 while ending < suffix.length
       chunks << suffix[start...ending] if start < ending
-      suffix_text = chunks.join("")
+      suffix_text = chunks.to_s
       if handle
         "#{handle}#{suffix_text}"
       else
@@ -771,6 +757,10 @@ module RbYAML
       # allowed for double quoted scalars.
       allow_flow_plain = allow_block_plain = allow_single_quoted = allow_block = false if mixed_breaks_spaces || special_characters
 
+      # This seem to have been missed...
+      allow_flow_plain = allow_block_plain = allow_single_quoted = false if inline_breaks
+      allow_single_quoted = false if trailing_breaks
+
       # We don't emit multiline plain scalars.
       allow_flow_plain = allow_block_plain = false if line_breaks
 
@@ -865,7 +855,6 @@ module RbYAML
           end
         elsif breaks
           if ch.nil? or !"\n\x85".include?(ch)
-            write_line_break if text[start] == ?\n
             (text[start...ending]).each_byte { |br|
               if br == ?\n
                 write_line_break

data/lib/rbyaml/error.rb

@@ -1,75 +1,22 @@
 
 module RbYAML
-  Mark = Struct.new(:name,:column,:buffer,:pointer)
-  class Mark
-    def get_snippet(indent=4, max_length=75)
-      return nil if buffer.nil?
-      head = ""
-      start = pointer
-      while start > 0 && !"\0\r\n\x85".include?(buffer[start-1])
-        start -= 1
-        if pointer-start > max_length/2-1
-          head = " ... "
-          start += 5
-          break
-        end
-      end
-      tail = ""
-      tend = pointer
-      while tend < buffer.length && !"\0\r\n\x85".include?(buffer[tend])
-        tend += 1
-        if tend-pointer > max_length/2-1
-          tail = " ... "
-          tend -= 5
-          break
-        end
-      end
-      snippet = buffer[start..tend]
-      ' ' * indent + "#{head}#{snippet}#{tail}\n" + ' '*(indent+pointer-start+head.length) + ' '
-    end
-    
-    def to_s
-      snippet = get_snippet()
-      where = "  in \"#{name}\", line ?, column #{column+1}"
-      if snippet
-        where << ":\n" << snippet
-      end
-    end
-
-    def hash
-      object_id
-    end
-  end
-  
   class YAMLError < StandardError
-  end
-
-  class TypeError < YAMLError
-  end
-  
-  class MarkedYAMLError < YAMLError
-    def initialize(context=nil, context_mark=nil, problem=nil, problem_mark=nil, note=nil)
+    def initialize(context=nil, problem=nil, note=nil)
       super()
       @context = context
-      @context_mark = context_mark
       @problem = problem
-      @problem_mark = problem_mark
       @note = note
     end
     
     def to_s
       lines = []
-      
       lines << @context if @context
-      if @context_mark && (@problem.nil? || @problem_mark.nil? || 
-                           @context_mark.name != @problem_mark.name ||
-                           @context_mark.column != @problem_mark.column)
-        lines << @context_mark.to_s          
-      end
       lines << @problem if @problem
-      lines << @problem_mark.to_s if @problem_mark
       lines << @note if @note
       lines.join("\n")
     end
   end
+
+  class TypeError < YAMLError
+  end
 end

data/lib/rbyaml/error.rb.~1.2.~

@@ -0,0 +1,75 @@
+
+module RbYAML
+  Mark = Struct.new(:name,:column,:buffer,:pointer)
+  class Mark
+    def get_snippet(indent=4, max_length=75)
+      return nil if buffer.nil?
+      head = ""
+      start = pointer
+      while start > 0 && !"\0\r\n\x85".include?(buffer[start-1])
+        start -= 1
+        if pointer-start > max_length/2-1
+          head = " ... "
+          start += 5
+          break
+        end
+      end
+      tail = ""
+      tend = pointer
+      while tend < buffer.length && !"\0\r\n\x85".include?(buffer[tend])
+        tend += 1
+        if tend-pointer > max_length/2-1
+          tail = " ... "
+          tend -= 5
+          break
+        end
+      end
+      snippet = buffer[start..tend]
+      ' ' * indent + "#{head}#{snippet}#{tail}\n" + ' '*(indent+pointer-start+head.length) + ' '
+    end
+    
+    def to_s
+      snippet = get_snippet()
+      where = "  in \"#{name}\", line ?, column #{column+1}"
+      if snippet
+        where << ":\n" << snippet
+      end
+    end
+
+    def hash
+      object_id
+    end
+  end
+  
+  class YAMLError < StandardError
+  end
+
+  class TypeError < YAMLError
+  end
+  
+  class MarkedYAMLError < YAMLError
+    def initialize(context=nil, context_mark=nil, problem=nil, problem_mark=nil, note=nil)
+      super()
+      @context = context
+      @context_mark = context_mark
+      @problem = problem
+      @problem_mark = problem_mark
+      @note = note
+    end
+    
+    def to_s
+      lines = []
+      
+      lines << @context if @context
+      if @context_mark && (@problem.nil? || @problem_mark.nil? || 
+                           @context_mark.name != @problem_mark.name ||
+                           @context_mark.column != @problem_mark.column)
+        lines << @context_mark.to_s          
+      end
+      lines << @problem if @problem
+      lines << @problem_mark.to_s if @problem_mark
+      lines << @note if @note
+      lines.join("\n")
+    end
+  end
+end