ruby.git/test/psych/test_merge_keys.rb, branch v2_1_5

* ext/psych/lib/psych/visitors/to_ruby.rb: process merge keys before

2013-11-05T19:15:40+00:00

  reviving objects. Fixes GH psych #168
* test/psych/test_merge_keys.rb: test for change
  https://github.com/tenderlove/psych/issues/168

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43541 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

* test/psych/test_*.rb: use require_relative to require local library

2013-03-26T14:55:04+00:00

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39944 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

* ext/psych/lib/psych/visitors/to_ruby.rb: merge key values that

2013-01-12T00:00:12+00:00

  contain something besides a hash should be left in tact.

* test/psych/test_merge_keys.rb: test for change

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38788 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

* ext/psych/lib/psych.rb: define a new BadAlias error class.

2011-07-18T04:38:37+00:00

* ext/psych/lib/psych/visitors/to_ruby.rb: raise an exception when
  deserializing an alias that does not exist.
* test/psych/test_merge_keys.rb: corresponding test.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32578 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

converting require_relative to just regular requires

2011-03-30T03:38:53+00:00

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31213 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

* ext/psych/lib/psych/visitors/to_ruby.rb: fixing merge key support

2011-01-22T02:51:14+00:00

  when multiple merge keys are specified.
* test/psych/test_merge_keys.rb: tests for multi-merge key support

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30630 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

* ext/psych/lib/psych/visitors/to_ruby.rb: merge keys are actually

2011-01-22T02:34:50+00:00

  part of YAML 1.1, so they should be supported.  Remove warning and
  merge keys to parent.  [ruby-core:34679]
* test/psych/test_merge_keys.rb: test for merge keys

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30629 b2dd03c8-39d4-4d8f-98ff-823fe69b080e