summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-10-03 21:31:43 +0000
committertenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-10-03 21:31:43 +0000
commit1c60db55ac07b238d9d4e1443f5b6f8dd1fa9da0 (patch)
tree228a5a5273452b8a04ae4d07cb14198342cc646f
parentbd3b0d470c12fbdb48efcdb310d00eaa0fea84e5 (diff)
* ext/psych/lib/psych.rb: calling `yaml` rather than `to_yaml`.
* ext/psych/lib/psych/nodes/node.rb: Rename `to_yaml` to just `yaml` in order to avoid YAML::ENGINE switching from replacing this method. * test/psych/helper.rb: fix tests for method name change. * test/psych/test_document.rb: ditto * test/psych/visitors/test_emitter.rb: ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33384 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog9
-rw-r--r--ext/psych/lib/psych.rb6
-rw-r--r--ext/psych/lib/psych/nodes/node.rb3
-rw-r--r--test/psych/helper.rb2
-rw-r--r--test/psych/test_document.rb8
-rw-r--r--test/psych/visitors/test_emitter.rb16
6 files changed, 27 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog
index 7be3dc36517..1ee34e82f59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Tue Oct 4 06:29:55 2011 Aaron Patterson <aaron@tenderlovemaking.com>
+
+ * ext/psych/lib/psych.rb: calling `yaml` rather than `to_yaml`.
+ * ext/psych/lib/psych/nodes/node.rb: Rename `to_yaml` to just `yaml`
+ in order to avoid YAML::ENGINE switching from replacing this method.
+ * test/psych/helper.rb: fix tests for method name change.
+ * test/psych/test_document.rb: ditto
+ * test/psych/visitors/test_emitter.rb: ditto
+
Tue Oct 4 06:20:19 2011 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/psych/lib/psych/scalar_scanner.rb: Match values against the
diff --git a/ext/psych/lib/psych.rb b/ext/psych/lib/psych.rb
index 24f90b0bb49..aaf883f4b26 100644
--- a/ext/psych/lib/psych.rb
+++ b/ext/psych/lib/psych.rb
@@ -190,7 +190,7 @@ module Psych
visitor = Psych::Visitors::YAMLTree.new options
visitor << o
- visitor.tree.to_yaml io, options
+ visitor.tree.yaml io, options
end
###
@@ -204,7 +204,7 @@ module Psych
objects.each do |o|
visitor << o
end
- visitor.tree.to_yaml
+ visitor.tree.yaml
end
###
@@ -212,7 +212,7 @@ module Psych
def self.to_json o
visitor = Psych::Visitors::JSONTree.new
visitor << o
- visitor.tree.to_yaml
+ visitor.tree.yaml
end
###
diff --git a/ext/psych/lib/psych/nodes/node.rb b/ext/psych/lib/psych/nodes/node.rb
index 2a5573a2bd0..0cefe44e446 100644
--- a/ext/psych/lib/psych/nodes/node.rb
+++ b/ext/psych/lib/psych/nodes/node.rb
@@ -40,13 +40,14 @@ module Psych
# Convert this node to YAML.
#
# See also Psych::Visitors::Emitter
- def to_yaml io = nil, options = {}
+ def yaml io = nil, options = {}
real_io = io || StringIO.new(''.encode('utf-8'))
Visitors::Emitter.new(real_io, options).accept self
return real_io.string unless io
io
end
+ alias :to_yaml :yaml
end
end
end
diff --git a/test/psych/helper.rb b/test/psych/helper.rb
index fd23c3be07e..f5800303fd0 100644
--- a/test/psych/helper.rb
+++ b/test/psych/helper.rb
@@ -33,7 +33,7 @@ module Psych
def assert_cycle( obj )
v = Visitors::YAMLTree.new
v << obj
- assert_equal(obj, Psych.load(v.tree.to_yaml))
+ assert_equal(obj, Psych.load(v.tree.yaml))
assert_equal( obj, Psych::load(Psych.dump(obj)))
assert_equal( obj, Psych::load( obj.psych_to_yaml ) )
end
diff --git a/test/psych/test_document.rb b/test/psych/test_document.rb
index 55add5f4dd2..05d9bbfb87b 100644
--- a/test/psych/test_document.rb
+++ b/test/psych/test_document.rb
@@ -18,12 +18,12 @@ module Psych
end
def test_emit_tag
- assert_match('%TAG ! tag:tenderlovemaking.com,2009:', @stream.to_yaml)
+ assert_match('%TAG ! tag:tenderlovemaking.com,2009:', @stream.yaml)
end
def test_emit_multitag
@doc.tag_directives << ['!!', 'foo.com,2009:']
- yaml = @stream.to_yaml
+ yaml = @stream.yaml
assert_match('%TAG ! tag:tenderlovemaking.com,2009:', yaml)
assert_match('%TAG !! foo.com,2009:', yaml)
end
@@ -31,7 +31,7 @@ module Psych
def test_emit_bad_tag
assert_raises(RuntimeError) do
@doc.tag_directives = [['!']]
- @stream.to_yaml
+ @stream.yaml
end
end
@@ -40,7 +40,7 @@ module Psych
end
def test_emit_version
- assert_match('%YAML 1.1', @stream.to_yaml)
+ assert_match('%YAML 1.1', @stream.yaml)
end
end
end
diff --git a/test/psych/visitors/test_emitter.rb b/test/psych/visitors/test_emitter.rb
index de27b4588c0..780c9536931 100644
--- a/test/psych/visitors/test_emitter.rb
+++ b/test/psych/visitors/test_emitter.rb
@@ -46,7 +46,7 @@ module Psych
@visitor.accept s
assert_match(/1.1/, @io.string)
- assert_equal @io.string, s.to_yaml
+ assert_equal @io.string, s.yaml
end
def test_document_implicit_end
@@ -61,8 +61,8 @@ module Psych
@visitor.accept s
assert_match(/key: value/, @io.string)
- assert_equal @io.string, s.to_yaml
- assert(/\.\.\./ !~ s.to_yaml)
+ assert_equal @io.string, s.yaml
+ assert(/\.\.\./ !~ s.yaml)
end
def test_scalar
@@ -76,7 +76,7 @@ module Psych
@visitor.accept s
assert_match(/hello/, @io.string)
- assert_equal @io.string, s.to_yaml
+ assert_equal @io.string, s.yaml
end
def test_scalar_with_tag
@@ -91,7 +91,7 @@ module Psych
assert_match(/str/, @io.string)
assert_match(/hello/, @io.string)
- assert_equal @io.string, s.to_yaml
+ assert_equal @io.string, s.yaml
end
def test_sequence
@@ -107,7 +107,7 @@ module Psych
@visitor.accept s
assert_match(/- hello/, @io.string)
- assert_equal @io.string, s.to_yaml
+ assert_equal @io.string, s.yaml
end
def test_mapping
@@ -122,7 +122,7 @@ module Psych
@visitor.accept s
assert_match(/key: value/, @io.string)
- assert_equal @io.string, s.to_yaml
+ assert_equal @io.string, s.yaml
end
def test_alias
@@ -137,7 +137,7 @@ module Psych
@visitor.accept s
assert_match(/&A key: \*A/, @io.string)
- assert_equal @io.string, s.to_yaml
+ assert_equal @io.string, s.yaml
end
end
end