ruby.git/test/psych, branch ruby_2_2

* ext/psych/lib/psych/visitors/to_ruby.rb: support objects that are

2014-12-01T21:35:11+00:00

  marshalable, but inherit from basic object.
  Thanks Sean Griffin 

* ext/psych/lib/psych/visitors/yaml_tree.rb: ditto

* test/psych/test_marshalable.rb: test for fix

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

* test/psych/json/test_stream.rb (Psych::JSON::TestStream::test_list_to_json):

2014-11-20T08:04:29+00:00

  escape `]`.

* test/psych/test_json_tree.rb (Psych::JSON::TestJSONTree#test_list_to_json):
  ditto.


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

* test/psych/test_emitter.rb: Fix line_width test...initial value

2014-10-31T19:37:38+00:00

  is impl-specific and attr assignment always returns LHS.

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

* ext/psych/lib/psych/visitors/yaml_tree.rb: fix NameError dumping and

2014-08-29T21:41:02+00:00

  loading. Fixes GH #85. Thanks @brentdax for the patch!
* test/psych/test_exception.rb: test for fix

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

* ext/psych/lib/psych/scalar_scanner.rb: fix loading strings that

2014-08-29T21:24:33+00:00

  look like integers but have a newline. Fixes GH #189
* test/psych/test_string.rb: test for fix

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

* ext/psych/lib/psych/visitors/to_ruby.rb: merge keys with a hash

2014-08-29T21:11:47+00:00

  should merge the hash in to the parent.
* test/psych/test_merge_keys.rb: test for change. Fixes GH #202

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

* ext/psych/lib/psych/visitors/to_ruby.rb: quoted "<<" strings

2014-08-29T21:02:19+00:00

  should not be treated as merge keys.
* ext/psych/lib/psych/visitors/yaml_tree.rb: hashes with keys
  containing "<<" should roundtrip.
* test/psych/test_merge_keys.rb: test for change. Fixes GH #203

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

* ext/psych/lib/psych/visitors/to_ruby.rb: backwards compatibility for

2014-08-05T18:41:46+00:00

  hashes emitted by Syck. Github #198
* test/psych/test_hash.rb: test for change.

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

fix encoding spec

2014-07-25T07:55:58+00:00

"UTF-8" is invalid encoding name in Emacs, use "utf-8" instead.

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

Revert "Revert "* lib/yaml.rb: Remove Psych::EngineManager [Bug #8344]""

2014-06-26T02:52:46+00:00

syck-1.0.3 gem support this imcompatible changes.

This reverts commit r46102

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