Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

* ext/psych/lib/psych/visitors/to_ruby.rb: Added support for loading

  subclasses of String with ivars
* ext/psych/lib/psych/visitors/yaml_tree.rb: Added support for dumping
  subclasses of String with ivars
* test/psych/test_string.rb: corresponding tests
  • Loading branch information...
commit e2fcf9af9e95535401f816bc893839b9ad743a9e 1 parent 59ecddb
@tenderlove authored
View
8 CHANGELOG.rdoc
@@ -1,3 +1,11 @@
+Wed Jan 18 12:49:15 2012 Aaron Patterson <aaron@tenderlovemaking.com>
+
+ * ext/psych/lib/psych/visitors/to_ruby.rb: Added support for loading
+ subclasses of String with ivars
+ * ext/psych/lib/psych/visitors/yaml_tree.rb: Added support for dumping
+ subclasses of String with ivars
+ * test/psych/test_string.rb: corresponding tests
+
Sun Dec 18 12:42:48 2011 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/psych/lib/psych/visitors/to_ruby.rb: BigDecimals can be restored
View
18 lib/psych/visitors/to_ruby.rb
@@ -50,8 +50,13 @@ def deserialize o
case o.tag
when '!binary', 'tag:yaml.org,2002:binary'
o.value.unpack('m').first
- when '!str', 'tag:yaml.org,2002:str'
- o.value
+ when /^!(?:str|ruby\/string)(?::(.*))?/, 'tag:yaml.org,2002:str'
+ klass = resolve_class($1)
+ if klass
+ klass.allocate.replace o.value
+ else
+ o.value
+ end
when '!ruby/object:BigDecimal'
require 'bigdecimal'
BigDecimal._load o.value
@@ -136,9 +141,16 @@ def visit_Psych_Nodes_Mapping o
return revive_hash({}, o) unless o.tag
case o.tag
- when '!str', 'tag:yaml.org,2002:str'
+ when /^!(?:str|ruby\/string)(?::(.*))?/, 'tag:yaml.org,2002:str'
+ klass = resolve_class($1)
members = Hash[*o.children.map { |c| accept c }]
string = members.delete 'str'
+
+ if klass
+ string = klass.allocate
+ string.replace string
+ end
+
init_with(string, members.map { |k,v| [k.to_s.sub(/^@/, ''),v] }, o)
when /^!ruby\/array:(.*)$/
klass = resolve_class($1)
View
8 lib/psych/visitors/yaml_tree.rb
@@ -245,9 +245,15 @@ def visit_String o
ivars = find_ivars o
if ivars.empty?
+ unless o.class == ::String
+ tag = "!ruby/string:#{o.class}"
+ end
@emitter.scalar str, nil, tag, plain, quote, style
else
- @emitter.start_mapping nil, '!str', false, Nodes::Mapping::BLOCK
+ maptag = '!ruby/string'
+ maptag << ":#{o.class}" unless o.class == ::String
+
+ @emitter.start_mapping nil, maptag, false, Nodes::Mapping::BLOCK
@emitter.scalar 'str', nil, nil, true, false, Nodes::Scalar::ANY
@emitter.scalar str, nil, tag, plain, quote, style
View
25 test/psych/test_string.rb
@@ -2,6 +2,31 @@
module Psych
class TestString < TestCase
+ class X < String
+ end
+
+ class Y < String
+ attr_accessor :val
+ end
+
+ def test_backwards_with_syck
+ x = Psych.load "--- !str:#{X.name} foo\n\n"
+ assert_equal X, x.class
+ assert_equal 'foo', x
+ end
+
+ def test_empty_subclass
+ assert_match "!ruby/string:#{X}", Psych.dump(X.new)
+ x = Psych.load Psych.dump X.new
+ assert_equal X, x.class
+ end
+
+ def test_subclass_with_attributes
+ y = Psych.load Psych.dump Y.new.tap {|y| y.val = 1}
+ assert_equal Y, y.class
+ assert_equal 1, y.val
+ end
+
def test_string_with_base_60
yaml = Psych.dump '01:03:05'
assert_match "'01:03:05'", yaml
Please sign in to comment.
Something went wrong with that request. Please try again.