kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/psych/lib/psych/visitors/yaml_tree.rb: dumping strings with

Browse source 
quotes should not have changed.  [ruby-core:59316] [Bug #9300]

* ext/psych/lib/psych.rb: fixed missing require.

* test/psych/test_string.rb: test

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44531 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tenderlove 2014-01-09 00:56:45 +00:00
parent 73b046d0f1
commit b90076e85c
4 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
Thu Jan 9 09:55:20 2014 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/psych/lib/psych/visitors/yaml_tree.rb: dumping strings with
quotes should not have changed. [ruby-core:59316] [Bug #9300]
* ext/psych/lib/psych.rb: fixed missing require.
* test/psych/test_string.rb: test
Thu Jan 9 09:51:00 2014 Aaron Patterson <aaron@tenderlovemaking.com> Thu Jan 9 09:51:00 2014 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/psych/lib/psych/visitors/to_ruby.rb: anonymous structs * ext/psych/lib/psych/visitors/to_ruby.rb: anonymous structs

1
ext/psych/lib/psych.rb
View file

@ -14,6 +14,7 @@ require 'psych/stream'
require 'psych/json/tree_builder' require 'psych/json/tree_builder'
require 'psych/json/stream' require 'psych/json/stream'
require 'psych/handlers/document_stream' require 'psych/handlers/document_stream'
require 'psych/class_loader'
### ###
# = Overview # = Overview

2
ext/psych/lib/psych/visitors/yaml_tree.rb
View file

@ -284,7 +284,7 @@ module Psych
quote = false quote = false
elsif o =~ /\n/ elsif o =~ /\n/
style = Nodes::Scalar::LITERAL style = Nodes::Scalar::LITERAL
elsif o =~ /^\W/ elsif o =~ /^\W[^"]*$/
style = Nodes::Scalar::DOUBLE_QUOTED style = Nodes::Scalar::DOUBLE_QUOTED
else else
unless String === @ss.tokenize(o) unless String === @ss.tokenize(o)

4
test/psych/test_string.rb
View file

@ -15,6 +15,10 @@ module Psych
end end
end end
def test_no_doublequotes_with_special_characters
assert_equal 2, Psych.dump(%Q{<%= ENV["PATH"] %>}).count('"')
end
def test_doublequotes_when_there_is_a_single def test_doublequotes_when_there_is_a_single
yaml = Psych.dump "@123'abc" yaml = Psych.dump "@123'abc"
assert_match(/---\s*"/, yaml) assert_match(/---\s*"/, yaml)