psych 1.2.2 → 1.3.0

data/test/psych/test_string.rb

@@ -2,6 +2,37 @@ require 'psych/helper'
 
 module Psych
   class TestString < TestCase
+    class X < String
+    end
+
+    class Y < String
+      attr_accessor :val
+    end
+
+    def test_backwards_with_syck
+      x = Psych.load "--- !str:#{X.name} foo\n\n"
+      assert_equal X, x.class
+      assert_equal 'foo', x
+    end
+
+    def test_empty_subclass
+      assert_match "!ruby/string:#{X}", Psych.dump(X.new)
+      x = Psych.load Psych.dump X.new
+      assert_equal X, 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
+      assert_equal 1, y.val
+    end
+
+    def test_string_with_base_60
+      yaml = Psych.dump '01:03:05'
+      assert_match "'01:03:05'", yaml
+      assert_equal '01:03:05', Psych.load(yaml)
+    end
+
     def test_tagged_binary_should_be_dumped_as_binary
       string = "hello world!"
       string.force_encoding 'ascii-8bit'

data/test/psych/test_struct.rb

@@ -24,9 +24,7 @@ module Psych
       loaded = Psych.load(Psych.dump(ss))
       assert_instance_of(StructSubclass, loaded.foo)
 
-      # FIXME: This seems to cause an infinite loop.  wtf.  Must report a bug
-      # in ruby.
-      # assert_equal(ss, loaded)
+      assert_equal(ss, loaded)
     end
 
     def test_roundtrip

data/test/psych/test_tainted.rb

@@ -121,7 +121,9 @@ module Psych
       t.binmode
       t.write string
       t.close
-      File.open(t.path) { |f| @parser.parse f }
+      File.open(t.path, 'r:bom|utf-8') { |f|
+        @parser.parse f
+      }
       t.close(true)
     end
   end

data/test/psych/test_yamldbm.rb

@@ -1,11 +1,17 @@
 # -*- coding: UTF-8 -*-
-require 'test/unit'
-require 'yaml/dbm'
+
+require 'psych/helper'
 require 'tmpdir'
-Psych::DBM = YAML::DBM unless defined?(Psych::DBM)
+
+begin
+  require 'yaml/dbm'
+rescue LoadError
+end
 
 module Psych
-  class YAMLDBMTest < Test::Unit::TestCase
+  ::Psych::DBM = ::YAML::DBM unless defined?(::Psych::DBM)
+
+  class YAMLDBMTest < TestCase
     def setup
       @engine, YAML::ENGINE.yamler = YAML::ENGINE.yamler, 'psych'
       @dir = Dir.mktmpdir("rubytest-file")
@@ -44,7 +50,7 @@ module Psych
     def test_to_a
       @yamldbm['a'] = 'b'
       @yamldbm['c'] = 'd'
-      assert_equal([['a','b'],['c','d']], @yamldbm.to_a)
+      assert_equal([['a','b'],['c','d']], @yamldbm.to_a.sort)
     end
 
     def test_to_hash
@@ -75,6 +81,7 @@ module Psych
     # end
 
     def test_key
+      skip 'only on ruby 2.0.0' if RUBY_VERSION < '2.0.0'
       @yamldbm['a'] = 'b'
       @yamldbm['c'] = 'd'
       assert_equal 'a', @yamldbm.key('b')
@@ -93,8 +100,8 @@ module Psych
     def test_shift
       @yamldbm['a'] = 'b'
       @yamldbm['c'] = 'd'
-      assert_equal(['a','b'], @yamldbm.shift)
-      assert_equal(['c','d'], @yamldbm.shift)
+      assert_equal([['a','b'], ['c','d']],
+                   [@yamldbm.shift, @yamldbm.shift].sort)
       assert_nil @yamldbm.shift
     end
 
@@ -162,7 +169,7 @@ module Psych
       assert_equal [], @yamldbm.values
       @yamldbm['a'] = 'b'
       @yamldbm['c'] = 'd'
-      assert_equal ['b','d'], @yamldbm.values
+      assert_equal ['b','d'], @yamldbm.values.sort
     end
 
     def test_values_at
@@ -187,4 +194,4 @@ module Psych
       assert_equal([], @yamldbm.select {false})
     end
   end
-end
+end if defined?(YAML::DBM) && defined?(Psych)

data/test/psych/test_yamlstore.rb

@@ -1,11 +1,11 @@
-require 'test/unit'
+require 'psych/helper'
 require 'yaml/store'
 require 'tmpdir'
 
-Psych::Store = YAML::Store unless defined?(Psych::Store)
-
 module Psych
-  class YAMLStoreTest < Test::Unit::TestCase
+  Psych::Store = YAML::Store unless defined?(Psych::Store)
+
+  class YAMLStoreTest < TestCase
     def setup
       @engine, YAML::ENGINE.yamler = YAML::ENGINE.yamler, 'psych'
       @dir = Dir.mktmpdir("rubytest-file")
@@ -77,11 +77,11 @@ module Psych
     end
 
     def test_writing_inside_readonly_transaction_raises_error
-      assert_raise(PStore::Error) do
+      assert_raises(PStore::Error) do
         @yamlstore.transaction(true) do
           @yamlstore[:foo] = "bar"
         end
       end
     end
   end
-end
+end if defined?(Psych)

metadata

@@ -1,73 +1,69 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: psych
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 1.3.0
   prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 2
-  version: 1.2.2
 platform: ruby
-authors: 
+authors:
 - Aaron Patterson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-03 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake-compiler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70343314971360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 4
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.4.1
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70343314971360
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &70343314970560 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
+  type: :development
+  prerelease: false
+  version_requirements: *70343314970560
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: &70343314969460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 12
-        version: "2.12"
+      - !ruby/object:Gem::Version
+        version: '2.13'
   type: :development
-  version_requirements: *id002
-description: |-
-  Psych is a YAML parser and emitter.  Psych leverages libyaml[http://libyaml.org]
+  prerelease: false
+  version_requirements: *70343314969460
+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.
-email: 
+
+  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
 - .travis.yml
 - CHANGELOG.rdoc
-- Gemfile
 - Manifest.txt
 - README.rdoc
 - Rakefile
@@ -87,7 +83,7 @@ files:
 - lib/psych/core_ext.rb
 - lib/psych/deprecated.rb
 - lib/psych/handler.rb
-- lib/psych/json.rb
+- lib/psych/handlers/document_stream.rb
 - lib/psych/json/ruby_events.rb
 - lib/psych/json/stream.rb
 - lib/psych/json/tree_builder.rb
@@ -106,6 +102,7 @@ files:
 - lib/psych/set.rb
 - lib/psych/stream.rb
 - lib/psych/streaming.rb
+- lib/psych/syntax_error.rb
 - lib/psych/tree_builder.rb
 - lib/psych/visitors.rb
 - lib/psych/visitors/depth_first.rb
@@ -136,6 +133,7 @@ files:
 - test/psych/test_null.rb
 - test/psych/test_numeric.rb
 - test/psych/test_object.rb
+- test/psych/test_object_references.rb
 - test/psych/test_omap.rb
 - test/psych/test_parser.rb
 - test/psych/test_psych.rb
@@ -160,41 +158,31 @@ 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 
-      hash: 55
-      segments: 
-      - 1
-      - 9
-      - 2
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: psych
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 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
@@ -216,6 +204,7 @@ test_files:
 - test/psych/test_null.rb
 - test/psych/test_numeric.rb
 - test/psych/test_object.rb
+- test/psych/test_object_references.rb
 - test/psych/test_omap.rb
 - test/psych/test_parser.rb
 - test/psych/test_psych.rb

data/Gemfile

@@ -1,11 +0,0 @@
-# -*- ruby -*-
-
-# DO NOT EDIT THIS FILE. Instead, edit Rakefile, and run `rake bundler:gemfile`.
-
-source :gemcutter
-
-
-gem "rake-compiler", ">=0.4.1", :group => [:development, :test]
-gem "hoe", "~>2.10", :group => [:development, :test]
-
-# vim: syntax=ruby

data/lib/psych/json.rb

@@ -1,6 +0,0 @@
-module Psych
-  module JSON
-    autoload :TreeBuilder, 'psych/json/tree_builder'
-    autoload :Stream, 'psych/json/stream'
-  end
-end