psych 1.2.0 → 1.2.1

data/CHANGELOG.rdoc

@@ -1,3 +1,15 @@
+Thu Aug 25 06:11:35 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/nodes/node.rb: default `to_yaml` encoding to be
+	  UTF-8.
+	* test/psych/test_encoding.rb: test yaml dump encoding.
+
+Wed Jun 22 03:20:52 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: Fix cyclic references of
+	  objects.  Thanks to CvX for reporting the bug and a test case.
+	* test/psych/test_object.rb: test for cyclic object references.
+
 Thu Jun  9 10:57:03 2011  Aaron Patterson <aaron@tenderlovemaking.com>
 
 	* ext/psych/lib/psych/visitors/to_ruby.rb: Hash subclasses can be read

data/Rakefile

@@ -11,10 +11,10 @@ end
 gem 'rake-compiler', '>= 0.4.1'
 require "rake/extensiontask"
 
-Hoe.plugin :debugging, :doofus, :git
+Hoe.plugin :debugging, :doofus, :git, :gemspec
 
 Hoe.spec 'psych' do
-  developer 'Aaron Patterson', 'aaronp@rubyforge.org'
+  developer 'Aaron Patterson', 'aaron@tenderlovemaking.com'
 
   self.extra_rdoc_files  = Dir['*.rdoc']
   self.history_file      = 'CHANGELOG.rdoc'

data/lib/psych.rb

@@ -90,7 +90,7 @@ require 'psych/json'
 
 module Psych
   # The version is Psych you're using
-  VERSION         = '1.2.0'
+  VERSION         = '1.2.1'
 
   # The version of libyaml Psych is using
   LIBYAML_VERSION = Psych.libyaml_version.join '.'
@@ -98,6 +98,9 @@ module Psych
   class Exception < RuntimeError
   end
 
+  class BadAlias < Exception
+  end
+
   autoload :Stream, 'psych/stream'
 
   ###

data/lib/psych/core_ext.rb

@@ -36,4 +36,5 @@ module Kernel
   end
   remove_method :y rescue nil
   alias y psych_y
+  private :y
 end

data/lib/psych/deprecated.rb

@@ -76,6 +76,7 @@ module Psych
 end
 
 class Object
+  undef :to_yaml_properties rescue nil
   def to_yaml_properties # :nodoc:
     instance_variables
   end

data/lib/psych/nodes/node.rb

@@ -41,7 +41,7 @@ module Psych
       #
       # See also Psych::Visitors::Emitter
       def to_yaml io = nil, options = {}
-        real_io = io || StringIO.new
+        real_io = io || StringIO.new(''.encode('utf-8'))
 
         Visitors::Emitter.new(real_io, options).accept self
         return real_io.string unless io

data/lib/psych/scalar_scanner.rb

@@ -68,8 +68,11 @@ module Psych
         end
         i
       else
-        return Integer(string.gsub(/[,_]/, '')) rescue ArgumentError
-        return Float(string.gsub(/[,_]/, '')) rescue ArgumentError
+        if string.count('.') < 2
+          return Integer(string.gsub(/[,_]/, '')) rescue ArgumentError
+          return Float(string.gsub(/[,_]/, '')) rescue ArgumentError
+        end
+
         @string_cache[string] = true
         string
       end

data/lib/psych/visitors/to_ruby.rb

@@ -182,7 +182,6 @@ module Psych
         when /^!ruby\/object:?(.*)?$/
           name = $1 || 'Object'
           obj = revive((resolve_class(name) || Object), o)
-          @st[o.anchor] = obj if o.anchor
           obj
 
         when /^!map:(.*)$/, /^!ruby\/hash:(.*)$/
@@ -202,7 +201,7 @@ module Psych
       end
 
       def visit_Psych_Nodes_Alias o
-        @st[o.anchor]
+        @st.fetch(o.anchor) { raise BadAlias, "Unknown alias: #{o.anchor}" }
       end
 
       private
@@ -233,6 +232,7 @@ module Psych
 
       def revive klass, node
         s = klass.allocate
+        @st[node.anchor] = s if node.anchor
         h = Hash[*node.children.map { |c| accept c }]
         init_with(s, h, node)
       end

data/test/psych/test_encoding.rb

@@ -40,6 +40,22 @@ module Psych
       assert_match(/alias value/, e.message)
     end
 
+    def test_to_yaml_is_valid
+      ext_before = Encoding.default_external
+      int_before = Encoding.default_internal
+
+      Encoding.default_external = Encoding::US_ASCII
+      Encoding.default_internal = nil
+
+      s = "こんにちは！"
+      # If no encoding is specified, use UTF-8
+      assert_equal Encoding::UTF_8, Psych.dump(s).encoding
+      assert_equal s, Psych.load(Psych.dump(s))
+    ensure
+      Encoding.default_external = ext_before
+      Encoding.default_internal = int_before
+    end
+
     def test_start_mapping
       foo = 'foo'
       bar = 'バー'

data/test/psych/test_engine_manager.rb

@@ -21,7 +21,7 @@ module Psych
 
    def test_set_syck
      YAML::ENGINE.yamler = 'syck'
-     assert_equal Syck, YAML
+     assert_equal ::Syck, YAML
      assert_equal 'syck', YAML::ENGINE.yamler
    end
 

data/test/psych/test_merge_keys.rb

@@ -2,6 +2,15 @@ require 'psych/helper'
 
 module Psych
   class TestMergeKeys < TestCase
+    def test_missing_merge_key
+      yaml = <<-eoyml
+bar:
+  << : *foo
+      eoyml
+      exp = assert_raises(Psych::BadAlias) { Psych.load yaml }
+      assert_match 'foo', exp.message
+    end
+
     # [ruby-core:34679]
     def test_merge_key
       yaml = <<-eoyml

data/test/psych/test_nil.rb

@@ -4,8 +4,8 @@ module Psych
   class TestNil < TestCase
     def test_nil
       yml = Psych.dump nil
-      assert_equal "--- \n...\n", yml
-      assert_equal nil, Psych.load(yml)
+      assert_match(/--- \n(?:\.\.\.\n)?/, yml)
+      assert_nil Psych.load(yml)
     end
 
     def test_array_nil

data/test/psych/test_object.rb

@@ -11,6 +11,14 @@ module Psych
     end
   end
 
+  class Foo
+    attr_accessor :parent
+
+    def initialize parent
+      @parent = parent
+    end
+  end
+
   class TestObject < TestCase
     def test_dump_with_tag
       tag = Tagged.new
@@ -23,5 +31,14 @@ module Psych
       assert_equal tag.baz, tag2.baz
       assert_instance_of(Tagged, tag2)
     end
+
+    def test_cyclic_references
+      foo = Foo.new(nil)
+      foo.parent = foo
+      loaded = Psych.load Psych.dump foo
+
+      assert_instance_of(Foo, loaded)
+      assert_equal loaded, loaded.parent
+    end
   end
 end

data/test/psych/test_yaml.rb

@@ -3,6 +3,7 @@
 # $Id$
 #
 require 'psych/helper'
+require 'ostruct'
 
 # [ruby-core:01946]
 module Psych_Tests
@@ -14,6 +15,12 @@ class Psych_Unit_Tests < Psych::TestCase
         Psych.domain_types.clear
     end
 
+    def test_y_method
+      assert_raises(NoMethodError) do
+        OpenStruct.new.y 1
+      end
+    end
+
     def test_syck_compat
       time = Time.utc(2010, 10, 10)
       yaml = Psych.dump time

metadata

@@ -1,55 +1,69 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: psych
-version: !ruby/object:Gem::Version
-  version: 1.2.0
+version: !ruby/object:Gem::Version 
+  hash: 29
   prerelease: 
+  segments: 
+  - 1
+  - 2
+  - 1
+  version: 1.2.1
 platform: ruby
-authors:
+authors: 
 - Aaron Patterson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-09 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-08-24 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rake-compiler
-  requirement: &2152339440 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 0
+        - 4
+        - 1
         version: 0.4.1
   type: :development
-  prerelease: false
-  version_requirements: *2152339440
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: hoe
-  requirement: &2152316780 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.9.4
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 2
+        - 12
+        version: "2.12"
   type: :development
-  prerelease: false
-  version_requirements: *2152316780
-description: ! 'Psych is a YAML parser and emitter.  Psych leverages libyaml[http://libyaml.org]
-
+  version_requirements: *id002
+description: |-
+  Psych is a YAML parser and emitter.  Psych leverages libyaml[http://libyaml.org]
   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.'
-email:
-- aaronp@rubyforge.org
+  to and from the YAML format.
+email: 
+- aaron@tenderlovemaking.com
 executables: []
-extensions:
+
+extensions: 
 - ext/psych/extconf.rb
-extra_rdoc_files:
+extra_rdoc_files: 
 - Manifest.txt
 - CHANGELOG.rdoc
 - README.rdoc
-files:
+files: 
 - .autotest
 - CHANGELOG.rdoc
 - Manifest.txt
@@ -141,31 +155,41 @@ files:
 - .gemtest
 homepage: http://github.com/tenderlove/psych
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --main
 - README.rdoc
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 55
+      segments: 
+      - 1
+      - 9
+      - 2
       version: 1.9.2
-required_rubygems_version: !ruby/object:Gem::Requirement
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: psych
-rubygems_version: 1.8.5
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: Psych is a YAML parser and emitter
-test_files:
+test_files: 
 - test/psych/json/test_stream.rb
 - test/psych/nodes/test_enumerable.rb
 - test/psych/test_alias_and_anchor.rb