Permalink
Browse files

Use `yaml` rather than `to_yaml` to avoid ENGINE changes removing this

method.
  • Loading branch information...
1 parent 2422a9f commit cda70ad5dde3d8cfda2e9fb31bdb106a0924c4d4 @tenderlove tenderlove committed Oct 3, 2011
Showing with 27 additions and 17 deletions.
  1. +9 −0 CHANGELOG.rdoc
  2. +3 −3 lib/psych.rb
  3. +2 −1 lib/psych/nodes/node.rb
  4. +1 −1 test/psych/helper.rb
  5. +4 −4 test/psych/test_document.rb
  6. +8 −8 test/psych/visitors/test_emitter.rb
View
@@ -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
View
@@ -190,7 +190,7 @@ def self.dump o, io = nil, options = {}
visitor = Psych::Visitors::YAMLTree.new options
visitor << o
- visitor.tree.to_yaml io, options
+ visitor.tree.yaml io, options
end
###
@@ -204,15 +204,15 @@ def self.dump_stream *objects
objects.each do |o|
visitor << o
end
- visitor.tree.to_yaml
+ visitor.tree.yaml
end
###
# Dump Ruby object +o+ to a JSON string.
def self.to_json o
visitor = Psych::Visitors::JSONTree.new
visitor << o
- visitor.tree.to_yaml
+ visitor.tree.yaml
end
###
View
@@ -40,13 +40,14 @@ def to_ruby
# 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
View
@@ -33,7 +33,7 @@ def assert_parse_only( obj, yaml )
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
@@ -18,20 +18,20 @@ def test_parse_tag
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
def test_emit_bad_tag
assert_raises(RuntimeError) do
@doc.tag_directives = [['!']]
- @stream.to_yaml
+ @stream.yaml
end
end
@@ -40,7 +40,7 @@ def test_parse_version
end
def test_emit_version
- assert_match('%YAML 1.1', @stream.to_yaml)
+ assert_match('%YAML 1.1', @stream.yaml)
end
end
end
@@ -46,7 +46,7 @@ def test_document
@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 @@ def test_document_implicit_end
@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 @@ def test_scalar
@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 @@ def test_scalar_with_tag
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 @@ def test_sequence
@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 @@ def test_mapping
@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 @@ def test_alias
@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

0 comments on commit cda70ad

Please sign in to comment.