archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-16 17:14:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merges r30475 from trunk into ruby_1_9_2.

Browse source 
--
* ext/psych/lib/psych/json/tree_builder.rb (start_mapping): tags
  should not be included in JSON mapping

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30566 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2011-01-16 12:34:53 +00:00
parent e94bc25729
commit d97f1d3b37
4 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Thu Jan 6 11:27:01 2011 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/psych/lib/psych/json/tree_builder.rb (start_mapping): tags
should not be included in JSON mapping
Thu Jan 6 05:14:41 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/stringio/stringio.c (get_strio, strio_set_string)

2
ext/psych/lib/psych/json/tree_builder.rb
View file

@ -13,7 +13,7 @@ module Psych
end
def start_mapping anchor, tag, implicit, style
super(anchor, tag, implicit, Nodes::Mapping::FLOW)
super(anchor, nil, implicit, Nodes::Mapping::FLOW)
end
def start_sequence anchor, tag, implicit, style

4
test/psych/test_coder.rb
View file

@ -89,6 +89,10 @@ module Psych
end
end
def test_json_dump_exclude_tag
refute_match('TestCoder::InitApi', Psych.to_json(InitApi.new))
end
def test_map_takes_block
coder = Psych::Coder.new 'foo'
tag = coder.tag

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2"
#define RUBY_PATCHLEVEL 146
#define RUBY_PATCHLEVEL 147
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1