psych 1.1.1 → 1.2.0

data/CHANGELOG.rdoc

@@ -1,3 +1,28 @@
-=== 1.0.0 / 2009-09-26
+Thu Jun  9 10:57:03 2011  Aaron Patterson <aaron@tenderlovemaking.com>
 
-* Birthday!
+	* ext/psych/lib/psych/visitors/to_ruby.rb: Hash subclasses can be read
+	  from YAML files.
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: Hash subclasses can be
+	  dumped to YAML files.
+	* test/psych/test_hash.rb: corresponding test.
+
+Thu Jun  9 09:18:51 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: Ruby modules can be loaded
+	  from YAML files.
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: Ruby modules can be
+	  dumped to YAML files.
+	* test/psych/test_class.rb: corresponding test.
+
+Thu Jun  9 09:05:04 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: Ruby classes can be loaded
+	  from YAML files.
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: Ruby classes can be
+	  dumped to YAML files.
+	* test/psych/test_class.rb: corresponding test.
+
+Mon Jun  6 09:39:43 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/parser.c (parse): release event objects to plug memory
+	leak.  Thanks Mark J. Titorenko!

data/README.rdoc

@@ -5,7 +5,7 @@
 == Description
 
 Psych is a YAML parser and emitter.  Psych leverages libyaml[http://libyaml.org]
-for it's YAML parsing and emitting capabilities.  In addition to wrapping
+for its YAML parsing and emitting capabilities.  In addition to wrapping
 libyaml, Psych also knows how to serialize and de-serialize most Ruby objects
 to and from the YAML format.
 

data/ext/psych/parser.c

@@ -304,6 +304,7 @@ static VALUE parse(VALUE self, VALUE yaml)
 	    done = 1;
 	    break;
 	}
+	yaml_event_delete(&event);
     }
 
     return self;

data/lib/psych.rb

@@ -90,7 +90,7 @@ require 'psych/json'
 
 module Psych
   # The version is Psych you're using
-  VERSION         = '1.1.1'
+  VERSION         = '1.2.0'
 
   # The version of libyaml Psych is using
   LIBYAML_VERSION = Psych.libyaml_version.join '.'

data/lib/psych/nodes.rb

@@ -31,7 +31,7 @@ module Psych
   #   doc    = Psych::Nodes::Document.new
   #   seq    = Psych::Nodes::Sequence.new
   #   scalar = Psych::Nodes::Scalar.new('foo')
-  #   
+  #
   #   # Build up our tree
   #   stream.children << doc
   #   doc.children    << seq

data/lib/psych/visitors/to_ruby.rb

@@ -57,6 +57,8 @@ module Psych
           Complex(o.value)
         when "!ruby/object:Rational"
           Rational(o.value)
+        when "!ruby/class", "!ruby/module"
+          resolve_class o.value
         when "tag:yaml.org,2002:float", "!float"
           Float(@ss.tokenize(o.value))
         when "!ruby/regexp"
@@ -118,6 +120,7 @@ module Psych
 
       def visit_Psych_Nodes_Mapping o
         return revive(Psych.load_tags[o.tag], o) if Psych.load_tags[o.tag]
+        return revive_hash({}, o) unless o.tag
 
         case o.tag
         when '!str', 'tag:yaml.org,2002:str'
@@ -181,30 +184,12 @@ module Psych
           obj = revive((resolve_class(name) || Object), o)
           @st[o.anchor] = obj if o.anchor
           obj
-        else
-          hash = {}
-          @st[o.anchor] = hash if o.anchor
 
-          o.children.each_slice(2) { |k,v|
-            key = accept(k)
-
-            if key == '<<'
-              case v
-              when Nodes::Alias
-                hash.merge! accept(v)
-              when Nodes::Sequence
-                accept(v).reverse_each do |value|
-                  hash.merge! value
-                end
-              else
-                hash[key] = accept(v)
-              end
-            else
-              hash[key] = accept(v)
-            end
+        when /^!map:(.*)$/, /^!ruby\/hash:(.*)$/
+          revive_hash resolve_class($1).new, o
 
-          }
-          hash
+        else
+          revive_hash({}, o)
         end
       end
 
@@ -221,6 +206,31 @@ module Psych
       end
 
       private
+      def revive_hash hash, o
+        @st[o.anchor] = hash if o.anchor
+
+          o.children.each_slice(2) { |k,v|
+          key = accept(k)
+
+          if key == '<<'
+            case v
+            when Nodes::Alias
+              hash.merge! accept(v)
+            when Nodes::Sequence
+              accept(v).reverse_each do |value|
+                hash.merge! value
+              end
+            else
+              hash[key] = accept(v)
+            end
+          else
+            hash[key] = accept(v)
+          end
+
+        }
+        hash
+      end
+
       def revive klass, node
         s = klass.allocate
         h = Hash[*node.children.map { |c| accept c }]

data/lib/psych/visitors/yaml_tree.rb

@@ -246,8 +246,14 @@ module Psych
         end
       end
 
+      def visit_Module o
+        raise TypeError, "can't dump anonymous module: #{o}" unless o.name
+        @emitter.scalar o.name, nil, '!ruby/module', false, false, Nodes::Scalar::SINGLE_QUOTED
+      end
+
       def visit_Class o
-        raise TypeError, "can't dump anonymous class #{o.class}"
+        raise TypeError, "can't dump anonymous class: #{o}" unless o.name
+        @emitter.scalar o.name, nil, '!ruby/class', false, false, Nodes::Scalar::SINGLE_QUOTED
       end
 
       def visit_Range o
@@ -259,7 +265,10 @@ module Psych
       end
 
       def visit_Hash o
-        register(o, @emitter.start_mapping(nil, nil, true, Psych::Nodes::Mapping::BLOCK))
+        tag      = o.class == ::Hash ? nil : "!ruby/hash:#{o.class}"
+        implicit = !tag
+
+        register(o, @emitter.start_mapping(nil, tag, implicit, Psych::Nodes::Mapping::BLOCK))
 
         o.each do |k,v|
           accept k

data/test/psych/test_class.rb

@@ -2,16 +2,35 @@ require 'psych/helper'
 
 module Psych
   class TestClass < TestCase
-    def test_cycle
+    module Foo
+    end
+
+    def test_cycle_anonymous_class
       assert_raises(::TypeError) do
-        assert_cycle(TestClass)
+        assert_cycle(Class.new)
       end
     end
 
-    def test_dump
+    def test_cycle_anonymous_module
       assert_raises(::TypeError) do
-        Psych.dump TestClass
+        assert_cycle(Module.new)
       end
     end
+
+    def test_cycle
+      assert_cycle(TestClass)
+    end
+
+    def test_dump
+      Psych.dump TestClass
+    end
+
+    def test_cycle_module
+      assert_cycle(Foo)
+    end
+
+    def test_dump_module
+      Psych.dump Foo
+    end
   end
 end

data/test/psych/test_hash.rb

@@ -2,11 +2,25 @@ require 'psych/helper'
 
 module Psych
   class TestHash < TestCase
+    class X < Hash
+    end
+
     def setup
       super
       @hash = { :a => 'b' }
     end
 
+    def test_empty_subclass
+      assert_match "!ruby/hash:#{X}", Psych.dump(X.new)
+      x = Psych.load Psych.dump X.new
+      assert_equal X, x.class
+    end
+
+    def test_map
+      x = Psych.load "--- !map:#{X} { }\n"
+      assert_equal X, x.class
+    end
+
     def test_self_referential
       @hash['self'] = @hash
       assert_cycle(@hash)

data/test/psych/test_null.rb

@@ -10,7 +10,7 @@ module Psych
 ---
 - ~
 - null
-- 
+-
 - Null
 - NULL
       eoyml

data/test/psych/test_struct.rb

@@ -39,7 +39,7 @@ module Psych
 
     def test_load
       obj = Psych.load(<<-eoyml)
---- !ruby/struct:PsychStructWithIvar 
+--- !ruby/struct:PsychStructWithIvar
 :foo: bar
 :@bar: hello
       eoyml

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psych
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-13 00:00:00.000000000 Z
+date: 2011-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &2153250500 !ruby/object:Gem::Requirement
+  requirement: &2152339440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: 0.4.1
   type: :development
   prerelease: false
-  version_requirements: *2153250500
+  version_requirements: *2152339440
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &2153250040 !ruby/object:Gem::Requirement
+  requirement: &2152316780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.9.1
+        version: 2.9.4
   type: :development
   prerelease: false
-  version_requirements: *2153250040
+  version_requirements: *2152316780
 description: ! 'Psych is a YAML parser and emitter.  Psych leverages libyaml[http://libyaml.org]
 
-  for it''s YAML parsing and emitting capabilities.  In addition to wrapping
+  for its YAML parsing and emitting capabilities.  In addition to wrapping
 
   libyaml, Psych also knows how to serialize and de-serialize most Ruby objects
 
@@ -161,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: psych
-rubygems_version: 1.8.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Psych is a YAML parser and emitter