psych 1.3.4 → 2.0.0

data/test/psych/test_serialize_subclasses.rb

@@ -1,4 +1,4 @@
-require 'psych/helper'
+require_relative 'helper'
 
 module Psych
   class TestSerializeSubclasses < TestCase

data/test/psych/test_set.rb

@@ -1,4 +1,4 @@
-require 'psych/helper'
+require_relative 'helper'
 
 module Psych
   class TestSet < TestCase

data/test/psych/test_stream.rb

@@ -1,4 +1,4 @@
-require 'psych/helper'
+require_relative 'helper'
 
 module Psych
   class TestStream < TestCase

data/test/psych/test_string.rb

@@ -1,4 +1,4 @@
-require 'psych/helper'
+require_relative 'helper'
 
 module Psych
   class TestString < TestCase
@@ -9,6 +9,37 @@ module Psych
       attr_accessor :val
     end
 
+    class Z < String
+      def initialize
+        force_encoding Encoding::US_ASCII
+      end
+    end
+
+    def test_string_subclass_with_anchor
+      y = Psych.load <<-eoyml
+---
+body:
+  string: &70121654388580 !ruby/string
+    str: ! 'foo'
+  x:
+    body: *70121654388580
+      eoyml
+      assert_equal({"body"=>{"string"=>"foo", "x"=>{"body"=>"foo"}}}, y)
+    end
+
+    def test_self_referential_string
+      y = Psych.load <<-eoyml
+---
+string: &70121654388580 !ruby/string
+  str: ! 'foo'
+  body: *70121654388580
+      eoyml
+
+      assert_equal({"string"=>"foo"}, y)
+      value = y['string']
+      assert_equal value, value.instance_variable_get(:@body)
+    end
+
     def test_another_subclass_with_attributes
       y = Psych.load Psych.dump Y.new("foo").tap {|y| y.val = 1}
       assert_equal "foo", y
@@ -28,6 +59,12 @@ module Psych
       assert_equal X, x.class
     end
 
+    def test_empty_character_subclass
+      assert_match "!ruby/string:#{Z}", Psych.dump(Z.new)
+      x = Psych.load Psych.dump Z.new
+      assert_equal Z, x.class
+    end
+
     def test_subclass_with_attributes
       y = Psych.load Psych.dump Y.new.tap {|y| y.val = 1}
       assert_equal Y, y.class
@@ -40,8 +77,8 @@ module Psych
       assert_equal '01:03:05', Psych.load(yaml)
     end
 
-    def test_tagged_binary_should_be_dumped_as_binary
-      string = "hello world!"
+    def test_nonascii_string_as_binary
+      string = "hello \x80 world!"
       string.force_encoding 'ascii-8bit'
       yml = Psych.dump string
       assert_match(/binary/, yml)
@@ -69,6 +106,13 @@ module Psych
       assert_equal string, Psych.load(yml)
     end
 
+    def test_ascii_only_8bit_string
+      string = "abc".encode(Encoding::ASCII_8BIT)
+      yml = Psych.dump string
+      refute_match(/binary/, yml)
+      assert_equal string, Psych.load(yml)
+    end
+
     def test_string_with_ivars
       food = "is delicious"
       ivar = "on rock and roll"
@@ -83,6 +127,10 @@ module Psych
       assert_cycle string
     end
 
+    def test_float_confusion
+      assert_cycle '1.'
+    end
+
     def binary_string percentage = 0.31, length = 100
       string = ''
       (percentage * length).to_i.times do |i|

data/test/psych/test_struct.rb

@@ -1,4 +1,4 @@
-require 'psych/helper'
+require_relative 'helper'
 
 class PsychStructWithIvar < Struct.new(:foo)
   attr_reader :bar

data/test/psych/test_symbol.rb

@@ -1,4 +1,4 @@
-require 'psych/helper'
+require_relative 'helper'
 
 module Psych
   class TestSymbol < TestCase

data/test/psych/test_tainted.rb

@@ -1,4 +1,4 @@
-require 'psych/helper'
+require_relative 'helper'
 
 module Psych
   class TestStringTainted < TestCase
@@ -117,14 +117,14 @@ module Psych
 
   class TestIOTainted < TestStringTainted
     def assert_taintedness string
-      t = Tempfile.new(['something', 'yml'])
-      t.binmode
-      t.write string
-      t.close
-      File.open(t.path, 'r:bom|utf-8') { |f|
-        @parser.parse f
+      Tempfile.create(['something', 'yml']) {|t|
+        t.binmode
+        t.write string
+        t.close
+        File.open(t.path, 'r:bom|utf-8') { |f|
+          @parser.parse f
+        }
       }
-      t.close(true)
     end
   end
 end

data/test/psych/test_to_yaml_properties.rb

@@ -1,4 +1,4 @@
-require 'psych/helper'
+require_relative 'helper'
 
 module Psych
   class TestToYamlProperties < MiniTest::Unit::TestCase

data/test/psych/test_tree_builder.rb

@@ -1,4 +1,4 @@
-require 'psych/helper'
+require_relative 'helper'
 
 module Psych
   class TestTreeBuilder < TestCase

data/test/psych/test_yaml.rb

@@ -1,8 +1,8 @@
-# -*- mode: ruby; ruby-indent-level: 4; tab-width: 4 -*-
+# -*- coding: us-ascii; mode: ruby; ruby-indent-level: 4; tab-width: 4 -*-
 #												vim:sw=4:ts=4
 # $Id$
 #
-require 'psych/helper'
+require_relative 'helper'
 require 'ostruct'
 
 # [ruby-core:01946]
@@ -1266,4 +1266,24 @@ EOY
       Psych.load("2000-01-01 00:00:00.#{"0"*1000} +00:00\n")
       # '[ruby-core:13735]'
     end
+
+    def test_multiline_string_uses_literal_style
+      yaml = Psych.dump("multi\nline\nstring")
+      assert_match("|", yaml)
+    end
+
+    def test_string_starting_with_non_word_character_uses_double_quotes_without_exclamation_mark
+      yaml = Psych.dump("@123'abc")
+      refute_match("!", yaml)
+    end
+
+    def test_string_dump_with_colon
+      yaml = Psych.dump 'x: foo'
+      refute_match '!', yaml
+    end
+
+    def test_string_dump_starting_with_star
+      yaml = Psych.dump '*foo'
+      refute_match '!', yaml
+    end
 end

data/test/psych/test_yamldbm.rb

@@ -1,6 +1,6 @@
 # -*- coding: UTF-8 -*-
 
-require 'psych/helper'
+require_relative 'helper'
 require 'tmpdir'
 
 begin

data/test/psych/test_yamlstore.rb

@@ -1,4 +1,4 @@
-require 'psych/helper'
+require_relative 'helper'
 require 'yaml/store'
 require 'tmpdir'
 

data/test/psych/visitors/test_to_ruby.rb

@@ -1,3 +1,4 @@
+# coding: US-ASCII
 require 'psych/helper'
 
 module Psych
@@ -5,7 +6,7 @@ module Psych
     class TestToRuby < TestCase
       def setup
         super
-        @visitor = ToRuby.new
+        @visitor = ToRuby.create
       end
 
       def test_object
@@ -17,8 +18,8 @@ module Psych
         assert_equal 'bar', o.instance_variable_get(:@foo)
       end
 
-      def test_awesome
-        Psych.load('1900-01-01T00:00:00+00:00')
+      def test_tz_00_00_loads_without_error
+        assert Psych.load('1900-01-01T00:00:00+00:00')
       end
 
       def test_legacy_struct
@@ -87,7 +88,7 @@ description:
       end
 
       def test_exception
-        exc = Exception.new 'hello'
+        exc = ::Exception.new 'hello'
 
         mapping = Nodes::Mapping.new nil, '!ruby/exception'
         mapping.children << Nodes::Scalar.new('message')

data/test/psych/visitors/test_yaml_tree.rb

@@ -5,7 +5,25 @@ module Psych
     class TestYAMLTree < TestCase
       def setup
         super
-        @v = Visitors::YAMLTree.new
+        @v = Visitors::YAMLTree.create
+      end
+
+      def test_tree_can_be_called_twice
+        @v.start
+        @v << Object.new
+        t = @v.tree
+        assert_equal t, @v.tree
+      end
+
+      def test_yaml_tree_can_take_an_emitter
+        io = StringIO.new
+        e  = Psych::Emitter.new io
+        v = Visitors::YAMLTree.create({}, e)
+        v.start
+        v << "hello world"
+        v.finish
+
+        assert_match "hello world", io.string
       end
 
       def test_binary_formatting

metadata

@@ -1,71 +1,62 @@
 --- !ruby/object:Gem::Specification
 name: psych
 version: !ruby/object:Gem::Version
-  version: 1.3.4
-  prerelease: 
+  version: 2.0.0
 platform: ruby
 authors:
 - Aaron Patterson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-31 00:00:00.000000000 Z
+date: 2013-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
-description: ! 'Psych is a YAML parser and emitter.  Psych leverages libyaml[http://pyyaml.org/wiki/LibYAML]
-
+        version: '3.6'
+description: |-
+  Psych is a YAML parser and emitter.  Psych leverages libyaml[http://pyyaml.org/wiki/LibYAML]
   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.'
+  to and from the YAML format.
 email:
 - aaron@tenderlovemaking.com
 executables: []
@@ -82,23 +73,39 @@ files:
 - Manifest.txt
 - README.rdoc
 - Rakefile
-- ext/psych/emitter.c
-- ext/psych/emitter.h
+- ext/psych/depend
 - ext/psych/extconf.rb
-- ext/psych/parser.c
-- ext/psych/parser.h
 - ext/psych/psych.c
 - ext/psych/psych.h
-- ext/psych/to_ruby.c
-- ext/psych/to_ruby.h
-- ext/psych/yaml_tree.c
-- ext/psych/yaml_tree.h
+- ext/psych/psych_emitter.c
+- ext/psych/psych_emitter.h
+- ext/psych/psych_parser.c
+- ext/psych/psych_parser.h
+- ext/psych/psych_to_ruby.c
+- ext/psych/psych_to_ruby.h
+- ext/psych/psych_yaml_tree.c
+- ext/psych/psych_yaml_tree.h
+- ext/psych/yaml/LICENSE
+- ext/psych/yaml/api.c
+- ext/psych/yaml/config.h
+- ext/psych/yaml/dumper.c
+- ext/psych/yaml/emitter.c
+- ext/psych/yaml/loader.c
+- ext/psych/yaml/parser.c
+- ext/psych/yaml/reader.c
+- ext/psych/yaml/scanner.c
+- ext/psych/yaml/writer.c
+- ext/psych/yaml/yaml.h
+- ext/psych/yaml/yaml_private.h
 - lib/psych.rb
+- lib/psych/class_loader.rb
 - lib/psych/coder.rb
 - lib/psych/core_ext.rb
 - lib/psych/deprecated.rb
+- lib/psych/exception.rb
 - lib/psych/handler.rb
 - lib/psych/handlers/document_stream.rb
+- lib/psych/handlers/recorder.rb
 - lib/psych/json/ruby_events.rb
 - lib/psych/json/stream.rb
 - lib/psych/json/tree_builder.rb
@@ -126,6 +133,8 @@ files:
 - lib/psych/visitors/to_ruby.rb
 - lib/psych/visitors/visitor.rb
 - lib/psych/visitors/yaml_tree.rb
+- lib/psych/y.rb
+- test/psych/handlers/test_recorder.rb
 - test/psych/helper.rb
 - test/psych/json/test_stream.rb
 - test/psych/nodes/test_enumerable.rb
@@ -152,6 +161,7 @@ files:
 - test/psych/test_omap.rb
 - test/psych/test_parser.rb
 - test/psych/test_psych.rb
+- test/psych/test_safe_load.rb
 - test/psych/test_scalar.rb
 - test/psych/test_scalar_scanner.rb
 - test/psych/test_serialize_subclasses.rb
@@ -173,6 +183,7 @@ files:
 - .gemtest
 homepage: http://github.com/tenderlove/psych
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --main
@@ -180,24 +191,23 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: psych
-rubygems_version: 1.8.23
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Psych is a YAML parser and emitter
 test_files:
+- test/psych/handlers/test_recorder.rb
 - test/psych/json/test_stream.rb
 - test/psych/nodes/test_enumerable.rb
 - test/psych/test_alias_and_anchor.rb
@@ -223,6 +233,7 @@ test_files:
 - test/psych/test_omap.rb
 - test/psych/test_parser.rb
 - test/psych/test_psych.rb
+- test/psych/test_safe_load.rb
 - test/psych/test_scalar.rb
 - test/psych/test_scalar_scanner.rb
 - test/psych/test_serialize_subclasses.rb