tenderlove	2010-02-05 02:11:00 +0900 (Fri, 05 Feb 2010)

  New Revision: 26576

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

  Log:
    * lib/yaml/rubytypes.rb: Struct members are emitted without a leading
      colon.  Thanks Yusuke Endoh! [ruby-core:28052]
    * test/yaml/test_struct.rb: fixed tests to go with Struct changes
    * test/yaml/test_yaml.rb: fixed tests to go with Struct changes

  Modified files:
    trunk/ChangeLog
    trunk/lib/yaml/rubytypes.rb
    trunk/test/yaml/test_struct.rb
    trunk/test/yaml/test_yaml.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 26575)
+++ ChangeLog	(revision 26576)
@@ -1,3 +1,12 @@
+Fri Feb  5 02:06:57 2010  Aaron Patterson <tenderlove@r...>
+
+	* lib/yaml/rubytypes.rb: Struct members are emitted without a leading
+	  colon.  Thanks Yusuke Endoh! [ruby-core:28052]
+
+	* test/yaml/test_struct.rb: fixed tests to go with Struct changes
+
+	* test/yaml/test_yaml.rb: fixed tests to go with Struct changes
+
 Fri Feb  5 00:34:24 2010  Yusuke Endoh  <mame@t...>
 
 	* bignum.c (big_gt, big_ge, big_lt, big_ge): added Bignum#>, >=, < and
Index: lib/yaml/rubytypes.rb
===================================================================
--- lib/yaml/rubytypes.rb	(revision 26575)
+++ lib/yaml/rubytypes.rb	(revision 26576)
@@ -72,7 +72,7 @@
             #
             st = YAML::object_maker( struct_type, {} )
             st.members.each do |m|
-                st.send( "#{m}=", val[m] )
+                st.send( "#{m}=", val[m.to_s] )
             end
             props.each do |k,v|
                 st.instance_variable_set(k, v)
@@ -89,7 +89,7 @@
 			#
             out.map( taguri, to_yaml_style ) do |map|
 				self.members.each do |m|
-                    map.add( m, self[m] )
+                    map.add( m.to_s, self[m.to_s] )
                 end
 				self.to_yaml_properties.each do |m|
                     map.add( m, instance_variable_get( m ) )
Index: test/yaml/test_yaml.rb
===================================================================
--- test/yaml/test_yaml.rb	(revision 26575)
+++ test/yaml/test_yaml.rb	(revision 26576)
@@ -1082,27 +1082,27 @@
 				book_struct.new( "This should be the ISBN", "but I have another struct here", 2002, "None" )
 			  ) ], <<EOY
 - !ruby/struct:BookStruct
-  :author: Yukihiro Matsumoto
-  :title: Ruby in a Nutshell
-  :year: 2002
-  :isbn: 0-596-00214-9
+  author: Yukihiro Matsumoto
+  title: Ruby in a Nutshell
+  year: 2002
+  isbn: 0-596-00214-9
 - !ruby/struct:BookStruct
-  :author:
+  author:
     - Dave Thomas
     - Andy Hunt
-  :title: The Pickaxe
-  :year: 2002
-  :isbn: !ruby/struct:BookStruct
-    :author: This should be the ISBN
-    :title: but I have another struct here
-    :year: 2002
-    :isbn: None
+  title: The Pickaxe
+  year: 2002
+  isbn: !ruby/struct:BookStruct
+    author: This should be the ISBN
+    title: but I have another struct here
+    year: 2002
+    isbn: None
 EOY
 		)
 
         assert_to_yaml( YAML_Tests::StructTest.new( 123 ), <<EOY )
 --- !ruby/struct:YAML_Tests::StructTest
-:c: 123
+c: 123
 EOY
 
 	end
Index: test/yaml/test_struct.rb
===================================================================
--- test/yaml/test_struct.rb	(revision 26575)
+++ test/yaml/test_struct.rb	(revision 26576)
@@ -22,8 +22,8 @@
     def test_load
       obj = YAML.load(<<-eoyml)
 --- !ruby/struct:StructWithIvar 
-:foo: bar
-:@bar: hello
+foo: bar
+@bar: hello
       eoyml
 
       assert_equal 'hello', obj.bar

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