Project

General

Profile

Backport #6815

Backport Psych 1.3.3 and 1.3.4 to stable branch

Added by tenderlovemaking (Aaron Patterson) about 7 years ago. Updated about 7 years ago.

Status:
Closed
Priority:
Normal
Assignee:
-
[ruby-core:46884]

Description

Hi, I'd like to backport Psych 1.3.3 and 1.3.4 to the ruby_1_9_3 branch. It's 10 commits:

r36583, r36458, r36414, r36103, r35690, r35681, r35658, r35657, r35655, r35492

I've attached a patch. Can someone please review? Thank you!


Files

backport.patch (14.4 KB) backport.patch tenderlovemaking (Aaron Patterson), 07/31/2012 10:57 AM

Associated revisions

Revision 6b3bac29
Added by tenderlove about 7 years ago

merge revision(s) r36583, r36458, r36414, r36103, r35690, r35681, r35658, r35657, r35655, r35492: [Backport #6815]

* ext/psych/lib/psych.rb: updated to released version.

* ext/psych/psych.gemspec: ditto

* ext/psych/emitter.c (initialize): allow a configuration object to be
  passed to the constructor so that mutation isn't required after
  instantiation.

* ext/psych/lib/psych/handler.rb: add configuration object

* ext/psych/lib/psych/visitors/emitter.rb: use configuration object if
  extra configuration is present.

* ext/psych/lib/psych/visitors/to_ruby.rb: strings with YAML anchors
  are properly referenced. Patched by Joe Rafaniello via Github:
    https://github.com/tenderlove/psych/pull/69
* ext/psych/lib/psych/visitors/yaml_tree.rb: ditto
* test/psych/test_alias_and_anchor.rb: test for change

* ext/psych/lib/psych.rb: bumping psych to 1.3.3
* ext/psych/psych.gemspec: ditto

* ext/psych/extconf.rb: Use an exception instaed of bare abort.

* ext/psych/parser.c (transcode_string): fix encoding index names.
  Thanks markizko for reporting.

* ext/psych/lib/psych/visitors/to_ruby.rb: fix a bug with string
  subclass dumping and loading.

* test/psych/test_array.rb: pertinent tests

* test/psych/test_string.rb: ditto

* ext/psych/lib/psych/visitors/to_ruby.rb: convert omap tagged maps to
  Psych::Omap objects rather than hashes. [Bug #6425]

* test/psych/test_omap.rb: pertinent test.

* ext/psych/lib/psych/visitors/yaml_tree.rb: keep a reference to
  custom coders so that GC does not impact dumped yaml reference ids.

* ext/psych/lib/psych/json/yaml_events.rb: implicit styles should not
  be changeable for JSON events.

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

Revision 36654
Added by tenderlove about 7 years ago

merge revision(s) r36583, r36458, r36414, r36103, r35690, r35681, r35658, r35657, r35655, r35492: [Backport #6815]

* ext/psych/lib/psych.rb: updated to released version.

* ext/psych/psych.gemspec: ditto

* ext/psych/emitter.c (initialize): allow a configuration object to be
  passed to the constructor so that mutation isn't required after
  instantiation.

* ext/psych/lib/psych/handler.rb: add configuration object

* ext/psych/lib/psych/visitors/emitter.rb: use configuration object if
  extra configuration is present.

* ext/psych/lib/psych/visitors/to_ruby.rb: strings with YAML anchors
  are properly referenced. Patched by Joe Rafaniello via Github:
    https://github.com/tenderlove/psych/pull/69
* ext/psych/lib/psych/visitors/yaml_tree.rb: ditto
* test/psych/test_alias_and_anchor.rb: test for change

* ext/psych/lib/psych.rb: bumping psych to 1.3.3
* ext/psych/psych.gemspec: ditto

* ext/psych/extconf.rb: Use an exception instaed of bare abort.

* ext/psych/parser.c (transcode_string): fix encoding index names.
  Thanks markizko for reporting.

* ext/psych/lib/psych/visitors/to_ruby.rb: fix a bug with string
  subclass dumping and loading.

* test/psych/test_array.rb: pertinent tests

* test/psych/test_string.rb: ditto

* ext/psych/lib/psych/visitors/to_ruby.rb: convert omap tagged maps to
  Psych::Omap objects rather than hashes. [Bug #6425]

* test/psych/test_omap.rb: pertinent test.

* ext/psych/lib/psych/visitors/yaml_tree.rb: keep a reference to
  custom coders so that GC does not impact dumped yaml reference ids.

* ext/psych/lib/psych/json/yaml_events.rb: implicit styles should not
  be changeable for JSON events.

History

Updated by naruse (Yui NARUSE) about 7 years ago

r36458 extends an API, Psych::Emitter.new(io) to Psych::Emitter.new(io, options = Psych::Emitter::OPTIONS).
Such change shouldn't be in patch release.
Additional to say generally such change shouldn't be in teeny release like 1.3.3->1.3.4.
See also http://semver.org/

Anyway, it seems too late and seems not reasonable importing different one, so you can backport them at this time.

#2

Updated by Anonymous about 7 years ago

  • Status changed from Open to Closed
  • % Done changed from 0 to 100

This issue was solved with changeset r36654.
Aaron, thank you for reporting this issue.
Your contribution to Ruby is greatly appreciated.
May Ruby be with you.


merge revision(s) r36583, r36458, r36414, r36103, r35690, r35681, r35658, r35657, r35655, r35492: [Backport #6815]

* ext/psych/lib/psych.rb: updated to released version.

* ext/psych/psych.gemspec: ditto

* ext/psych/emitter.c (initialize): allow a configuration object to be
  passed to the constructor so that mutation isn't required after
  instantiation.

* ext/psych/lib/psych/handler.rb: add configuration object

* ext/psych/lib/psych/visitors/emitter.rb: use configuration object if
  extra configuration is present.

* ext/psych/lib/psych/visitors/to_ruby.rb: strings with YAML anchors
  are properly referenced. Patched by Joe Rafaniello via Github:
    https://github.com/tenderlove/psych/pull/69
* ext/psych/lib/psych/visitors/yaml_tree.rb: ditto
* test/psych/test_alias_and_anchor.rb: test for change

* ext/psych/lib/psych.rb: bumping psych to 1.3.3
* ext/psych/psych.gemspec: ditto

* ext/psych/extconf.rb: Use an exception instaed of bare abort.

* ext/psych/parser.c (transcode_string): fix encoding index names.
  Thanks markizko for reporting.

* ext/psych/lib/psych/visitors/to_ruby.rb: fix a bug with string
  subclass dumping and loading.

* test/psych/test_array.rb: pertinent tests

* test/psych/test_string.rb: ditto

* ext/psych/lib/psych/visitors/to_ruby.rb: convert omap tagged maps to
  Psych::Omap objects rather than hashes. [Bug #6425]

* test/psych/test_omap.rb: pertinent test.

* ext/psych/lib/psych/visitors/yaml_tree.rb: keep a reference to
  custom coders so that GC does not impact dumped yaml reference ids.

* ext/psych/lib/psych/json/yaml_events.rb: implicit styles should not
  be changeable for JSON events.

Also available in: Atom PDF