8000 merge revision(s) r45221: [Backport #9798] · github/ruby@f55b93f · GitHub
[go: up one dir, main page]
Skip to content

Commit f55b93f

Browse files
nagachikanagachika
committed
merge revision(s) r45221: [Backport ruby#9798]
 * ext/psych/lib/psych/visitors/yaml_tree.rb: support dumping Encoding objects. * ext/psych/lib/psych/visitors/to_ruby.rb: support loading Encoding objects. * test/psych/test_encoding.rb: add test * ext/psych/lib/psych.rb: add version git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45811 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
1 parent 1b814b5 commit f55b93f

File tree

6 files changed

+26
-2
lines changed

6 files changed

+26
-2
lines changed

‎ChangeLog

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
Mon May 5 00:35:20 2014 Aaron Patterson <aaron@tenderlovemaking.com>
2+
3+
* ext/psych/lib/psych/visitors/yaml_tree.rb: support dumping Encoding
4+
objects.
5+
6+
* ext/psych/lib/psych/visitors/to_ruby.rb: support loading Encoding
7+
objects.
8+
9+
* test/psych/test_encoding.rb: add test
10+
11+
* ext/psych/lib/psych.rb: add version
12+
113
Mon May 5 00:16:35 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
214

315
* gc.c: Fix up default GC params by @csfrancis [fix GH-556]

‎ext/psych/lib/psych.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@
217217

218218
module Psych
219219
# The version is Psych you're using
220-
VERSION = '2.0.3'
220+
VERSION = '2.0.4'
221221

222222
# The version of libyaml Psych is using
223223
LIBYAML_VERSION = Psych.libyaml_version.join '.'

‎ext/psych/lib/psych/visitors/to_ruby.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ def deserialize o
7575
class_loader.date_time
7676
require 'date'
7777
@ss.parse_time(o.value).to_datetime
78+
when '!ruby/encoding'
79+
::Encoding.find o.value
7880
when "!ruby/object:Complex"
7981
class_loader.complex
8082
Complex(o.value)

‎ext/psych/lib/psych/visitors/yaml_tree.rb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,11 @@ def visit_Psych_Omap o
157157
@emitter.end_sequence
158158
end
159159

160+
def visit_Encoding o
161+
tag = "!ruby/encoding"
162+
@emitter.scalar o.name, nil, tag, false, false, Nodes::Scalar::ANY
163+
end
164+
160165
def visit_Object o
161166
tag = Psych.dump_tags[o.class]
162167
unless tag

‎test/psych/test_encoding.rb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ def setup
3131
@emitter = Psych::Emitter.new @buffer
3232
end
3333

34+
def test_dump_load_encoding_object
35+
assert_cycle Encoding::US_ASCII
36+
assert_cycle Encoding::UTF_8
37+
end
38+
3439
def test_transcode_shiftjis
3540
str = "こんにちは！"
3641
loaded = Psych.load("--- こんにちは！".encode('SHIFT_JIS'))

‎version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#define RUBY_VERSION "2.1.2"
22
#define RUBY_RELEASE_DATE "2014-05-05"
3-
#define RUBY_PATCHLEVEL 84
3+
#define RUBY_PATCHLEVEL 85
44

55
#define RUBY_RELEASE_YEAR 2014
66
#define RUBY_RELEASE_MONTH 5

0 commit comments

Comments
 (0)
0