diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | lib/yaml/baseemitter.rb | 29 | ||||
| -rw-r--r-- | lib/yaml/encoding.rb | 8 | ||||
| -rw-r--r-- | lib/yaml/rubytypes.rb | 14 |
4 files changed, 39 insertions, 21 deletions
@@ -1,3 +1,12 @@ +Thu Aug 19 03:07:00 2004 why the lucky stiff <why@ruby-lang.org> + + * lib/yaml/baseemitter.rb: folding now handles double-quoted strings, + fixed problem with extra line feeds at end of folding, whitespace + opening scalar blocks. + + * lib/yaml/rubytypes.rb: subtelties in handling strings with + non-printable characters and odd whitespace patterns. + Wed Aug 18 23:44:20 2004 Minero Aoki <aamine@loveruby.net> * lib/net/protocol.rb (rbuf_fill): OpenSSL::SSLSocket has its own diff --git a/lib/yaml/baseemitter.rb b/lib/yaml/baseemitter.rb index 2881d424b4..1aef152749 100644 --- a/lib/yaml/baseemitter.rb +++ b/lib/yaml/baseemitter.rb @@ -47,7 +47,7 @@ module YAML end indt = $&.to_i if block =~ /\d+/ - if valx =~ /(\A[ \t#]|^---\s+)/ + if valx =~ /(\A\n*[ \t#]|^---\s+)/ indt = options(:Indent) unless indt.to_i > 0 block += indt.to_s end @@ -61,14 +61,18 @@ module YAML "-" end end - if valx =~ /#{YAML::ESCAPE_CHAR}/ - valx = YAML::escape( valx ) - end - if block[0] == ?> - valx = fold( valx ) - end - #p [block, indt] - self << block + indent_text( valx, indt ) + "\n" + block += "\n" + if block[0] == ?" + esc_skip = ( "\t\n" unless valx =~ /^[ \t]/ ) || "" + valx = fold( YAML::escape( valx, esc_skip ) + "\"" ).chomp + self << '"' + indent_text( valx, indt, false ) + else + if block[0] == ?> + valx = fold( valx ) + end + #p [block, indt] + self << block + indent_text( valx, indt ) + end end # @@ -96,10 +100,11 @@ module YAML # # Write a text block with the current indent # - def indent_text( text, mod = nil ) + def indent_text( text, mod, first_line = true ) return "" if text.to_s.empty? spacing = indent( mod ) - return "\n" + text.gsub( /^([^\n])/, "#{spacing}\\1" ) + text = text.gsub( /\A([^\n])/, "#{ spacing }\\1" ) if first_line + return text.gsub( /\n^([^\n])/, "\n#{spacing}\\1" ) end # @@ -127,7 +132,7 @@ module YAML # Folding paragraphs within a column # def fold( value ) - value.gsub( /(^[ \t]+.*$)|(\S.{0,#{options(:BestWidth) - 1}})(?:[ \t]+|(\n+(?=[ \t]))|$)/ ) do |s| + value.gsub( /(^[ \t]+.*$)|(\S.{0,#{options(:BestWidth) - 1}})(?:[ \t]+|(\n+(?=[ \t]|\Z))|$)/ ) do |s| $1 || $2 + ( $3 || "\n" ) end end diff --git a/lib/yaml/encoding.rb b/lib/yaml/encoding.rb index e361163ac6..37f5cfda64 100644 --- a/lib/yaml/encoding.rb +++ b/lib/yaml/encoding.rb @@ -7,8 +7,12 @@ module YAML # # Escape the string, condensing common escapes # - def YAML.escape( value ) - value.gsub( /\\/, "\\\\\\" ).gsub( /"/, "\\\"" ).gsub( /([\x00-\x1f])/ ) { |x| ESCAPES[ x.unpack("C")[0] ] } + def YAML.escape( value, skip = "" ) + value.gsub( /\\/, "\\\\\\" ). + gsub( /"/, "\\\"" ). + gsub( /([\x00-\x1f])/ ) do |x| + skip[x] || ESCAPES[ x.unpack("C")[0] ] + end end # diff --git a/lib/yaml/rubytypes.rb b/lib/yaml/rubytypes.rb index bd91bc039d..47f591ea0c 100644 --- a/lib/yaml/rubytypes.rb +++ b/lib/yaml/rubytypes.rb @@ -1,5 +1,6 @@ # -*- mode: ruby; ruby-indent-level: 4; tab-width: 4 -*- vim: sw=4 ts=4 require 'date' +require 'yaml/compat' # # Type conversions # @@ -315,25 +316,24 @@ class String } elsif self.is_binary_data? out.binary_base64( self ) - # elsif self =~ /^ |#{YAML::ESCAPE_CHAR}| $/ - # complex = false + elsif self =~ /#{YAML::ESCAPE_CHAR}/ + out.node_text( self, '"' ) else out.node_text( self, to_yaml_fold ) end - end - if not complex + else ostr = if out.options(:KeepValue) self elsif empty? "''" elsif self =~ /^[^#{YAML::WORD_CHAR}\/]| \#|#{YAML::ESCAPE_CHAR}|[#{YAML::SPACE_INDICATORS}]( |$)| $|\n|\'/ - "\"#{YAML.escape( self )}\"" + out.node_text( self, '"' ); nil elsif YAML.detect_implicit( self ) != 'str' - "\"#{YAML.escape( self )}\"" + out.node_text( self, '"' ); nil else self end - out.simple( ostr ) + out.simple( ostr ) unless ostr.nil? end } end |