yugui	2011-01-16 21:34:53 +0900 (Sun, 16 Jan 2011)

  New Revision: 30566

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30566

  Log:
    merges r30475 from trunk into ruby_1_9_2.
    --
    * ext/psych/lib/psych/json/tree_builder.rb (start_mapping): tags
      should not be included in JSON mapping

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/ext/psych/lib/psych/json/tree_builder.rb
    branches/ruby_1_9_2/test/psych/test_coder.rb
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 30565)
+++ ruby_1_9_2/ChangeLog	(revision 30566)
@@ -1,3 +1,8 @@
+Thu Jan  6 11:27:01 2011  Aaron Patterson <aaron@t...>
+
+	* 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@r...>
 
 	* ext/stringio/stringio.c (get_strio, strio_set_string)
Index: ruby_1_9_2/ext/psych/lib/psych/json/tree_builder.rb
===================================================================
--- ruby_1_9_2/ext/psych/lib/psych/json/tree_builder.rb	(revision 30565)
+++ ruby_1_9_2/ext/psych/lib/psych/json/tree_builder.rb	(revision 30566)
@@ -13,7 +13,7 @@
       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
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 30565)
+++ ruby_1_9_2/version.h	(revision 30566)
@@ -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
Index: ruby_1_9_2/test/psych/test_coder.rb
===================================================================
--- ruby_1_9_2/test/psych/test_coder.rb	(revision 30565)
+++ ruby_1_9_2/test/psych/test_coder.rb	(revision 30566)
@@ -89,6 +89,10 @@
       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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/