psych-shopifork 2.0.5 → 2.0.13

data/test/psych/test_exception.rb

@@ -16,6 +16,12 @@ module Psych
       @wups = Wups.new
     end
 
+    def test_naming_exception
+      err     = String.xxx rescue $!
+      new_err = Psych.load(Psych.dump(err))
+      assert_equal err.message, new_err.message
+    end
+
     def test_load_takes_file
       ex = assert_raises(Psych::SyntaxError) do
         Psych.load '--- `'

data/test/psych/test_hash.rb

@@ -5,11 +5,61 @@ module Psych
     class X < Hash
     end
 
+    class HashWithCustomInit < Hash
+      attr_reader :obj
+      def initialize(obj)
+        @obj = obj
+      end
+    end
+
+    class HashWithCustomInitNoIvar < Hash
+      def initialize(obj)
+        # *shrug*
+      end
+    end
+
     def setup
       super
       @hash = { :a => 'b' }
     end
 
+    def test_referenced_hash_with_ivar
+      a = [1,2,3,4,5]
+      t1 = [HashWithCustomInit.new(a)]
+      t1 << t1.first
+      assert_cycle t1
+    end
+
+    def test_custom_initialized
+      a = [1,2,3,4,5]
+      t1 = HashWithCustomInit.new(a)
+      t2 = Psych.load(Psych.dump(t1))
+      assert_equal t1, t2
+      assert_cycle t1
+    end
+
+    def test_custom_initialize_no_ivar
+      t1 = HashWithCustomInitNoIvar.new(nil)
+      t2 = Psych.load(Psych.dump(t1))
+      assert_equal t1, t2
+      assert_cycle t1
+    end
+
+    def test_hash_subclass_with_ivars
+      x = X.new
+      x[:a] = 'b'
+      x.instance_variable_set :@foo, 'bar'
+      dup = Psych.load Psych.dump x
+      assert_cycle x
+      assert_equal 'bar', dup.instance_variable_get(:@foo)
+      assert_equal X, dup.class
+    end
+
+    def test_load_with_class_syck_compatibility
+      hash = Psych.load "--- !ruby/object:Hash\n:user_id: 7\n:username: Lucas\n"
+      assert_equal({ user_id: 7, username: 'Lucas'}, hash)
+    end
+
     def test_empty_subclass
       assert_match "!ruby/hash:#{X}", Psych.dump(X.new)
       x = Psych.load Psych.dump X.new

data/test/psych/test_json_tree.rb

@@ -45,7 +45,7 @@ module Psych
     def test_list_to_json
       list = %w{ one two }
       json = Psych.to_json(list)
-      assert_match(/]$/, json)
+      assert_match(/\]$/, json)
       assert_match(/^\[/, json)
       assert_match(/"one"/, json)
       assert_match(/"two"/, json)

data/test/psych/test_merge_keys.rb

@@ -6,6 +6,36 @@ module Psych
       attr_reader :bar
     end
 
+    def test_merge_key_with_bare_hash
+      doc = Psych.load <<-eodoc
+map:
+  <<:
+    hello: world
+      eodoc
+      hash = { "map" => { "hello" => "world" } }
+      assert_equal hash, doc
+    end
+
+    def test_roundtrip_with_chevron_key
+      h = {}
+      v = { 'a' => h, '<<' => h }
+      assert_cycle v
+    end
+
+    def test_explicit_string
+      doc = Psych.load <<-eoyml
+a: &me { hello: world }
+b: { !!str '<<': *me }
+eoyml
+      expected = {
+        "a" => { "hello" => "world" },
+        "b" => {
+          "<<" => { "hello" => "world" }
+        }
+      }
+      assert_equal expected, doc
+    end
+
     def test_mergekey_with_object
       s = <<-eoyml
 foo: &foo

data/test/psych/test_string.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require_relative 'helper'
 
 module Psych
@@ -15,13 +16,76 @@ module Psych
       end
     end
 
+    def test_string_with_newline
+      assert_equal "1\n2", Psych.load("--- ! '1\n\n  2'\n")
+    end
+
     def test_no_doublequotes_with_special_characters
       assert_equal 2, Psych.dump(%Q{<%= ENV["PATH"] %>}).count('"')
     end
 
+    def test_no_quotes_when_start_with_non_ascii_character
+      yaml = Psych.dump 'Český non-ASCII'.encode(Encoding::UTF_8)
+      assert_match(/---\s*[^"'!]+$/, yaml)
+    end
+
     def test_doublequotes_when_there_is_a_single
-      yaml = Psych.dump "@123'abc"
-      assert_match(/---\s*"/, yaml)
+      str = "@123'abc"
+      yaml = Psych.dump str
+      assert_match /---\s*"/, yaml
+      assert_equal str, Psych.load(yaml)
+    end
+
+    def test_plain_when_shorten_than_line_width_and_no_final_line_break
+      str = "Lorem ipsum"
+      yaml = Psych.dump str, line_width: 12
+      assert_match /---\s*[^>|]+\n/, yaml
+      assert_equal str, Psych.load(yaml)
+    end
+
+    def test_plain_when_shorten_than_line_width_and_with_final_line_break
+      str = "Lorem ipsum\n"
+      yaml = Psych.dump str, line_width: 12
+      assert_match /---\s*[^>|]+\n/, yaml
+      assert_equal str, Psych.load(yaml)
+    end
+
+    def test_folded_when_longer_than_line_width_and_with_final_line_break
+      str = "Lorem ipsum dolor sit\n"
+      yaml = Psych.dump str, line_width: 12
+      assert_match /---\s*>\n(.*\n){2}\Z/, yaml
+      assert_equal str, Psych.load(yaml)
+    end
+
+    # http://yaml.org/spec/1.2/2009-07-21/spec.html#id2593651
+    def test_folded_strip_when_longer_than_line_width_and_no_newlines
+      str = "Lorem ipsum dolor sit amet, consectetur"
+      yaml = Psych.dump str, line_width: 12
+      assert_match /---\s*>-\n(.*\n){3}\Z/, yaml
+      assert_equal str, Psych.load(yaml)
+    end
+
+    def test_literal_when_inner_and_final_line_break
+      [
+        "Lorem ipsum\ndolor\n",
+        "Lorem ipsum\nZolor\n",
+      ].each do |str|
+        yaml = Psych.dump str, line_width: 12
+        assert_match /---\s*\|\n(.*\n){2}\Z/, yaml
+        assert_equal str, Psych.load(yaml)
+      end
+    end
+
+    # http://yaml.org/spec/1.2/2009-07-21/spec.html#id2593651
+    def test_literal_strip_when_inner_line_break_and_no_final_line_break
+      [
+        "Lorem ipsum\ndolor",
+        "Lorem ipsum\nZolor",
+      ].each do |str|
+        yaml = Psych.dump str, line_width: 12
+        assert_match /---\s*\|-\n(.*\n){2}\Z/, yaml
+        assert_equal str, Psych.load(yaml)
+      end
     end
 
     def test_cycle_x

data/test/psych/test_symbol.rb

@@ -2,6 +2,14 @@ require_relative 'helper'
 
 module Psych
   class TestSymbol < TestCase
+    def test_cycle_empty
+      assert_cycle :''
+    end
+
+    def test_cycle_colon
+      assert_cycle :':'
+    end
+
     def test_cycle
       assert_cycle :a
     end

data/test/psych/test_to_yaml_properties.rb

@@ -1,7 +1,7 @@
 require_relative 'helper'
 
 module Psych
-  class TestToYamlProperties < MiniTest::Unit::TestCase
+  class TestToYamlProperties < Psych::TestCase
     class Foo
       attr_accessor :a, :b, :c
       def initialize

data/test/psych/test_yaml.rb

@@ -27,6 +27,10 @@ class Psych_Unit_Tests < Psych::TestCase
       assert_match "2010-10-10 00:00:00.000000000 Z", yaml
     end
 
+    def test_multiline_regexp
+        assert_cycle(Regexp.new("foo\nbar"))
+    end
+
     # [ruby-core:34969]
     def test_regexp_with_n
         assert_cycle(Regexp.new('',0,'n'))

data/test/psych/test_yamldbm.rb

@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 require_relative 'helper'
 require 'tmpdir'
 
@@ -13,7 +11,6 @@ module Psych
 
   class YAMLDBMTest < TestCase
     def setup
-      @engine, YAML::ENGINE.yamler = YAML::ENGINE.yamler, 'psych'
       @dir = Dir.mktmpdir("rubytest-file")
       File.chown(-1, Process.gid, @dir)
       @yamldbm_file = make_tmp_filename("yamldbm")
@@ -21,7 +18,6 @@ module Psych
     end
 
     def teardown
-      YAML::ENGINE.yamler = @engine
       @yamldbm.clear
       @yamldbm.close
       FileUtils.remove_entry_secure @dir

data/test/psych/test_yamlstore.rb

@@ -7,7 +7,6 @@ module Psych
 
   class YAMLStoreTest < TestCase
     def setup
-      @engine, YAML::ENGINE.yamler = YAML::ENGINE.yamler, 'psych'
       @dir = Dir.mktmpdir("rubytest-file")
       File.chown(-1, Process.gid, @dir)
       @yamlstore_file = make_tmp_filename("yamlstore")
@@ -15,7 +14,6 @@ module Psych
     end
 
     def teardown
-      YAML::ENGINE.yamler = @engine
       FileUtils.remove_entry_secure @dir
     end
 

data/test/psych/visitors/test_to_ruby.rb

@@ -321,6 +321,13 @@ description:
         assert_equal %w{ foo foo }, list
         assert_equal list[0].object_id, list[1].object_id
       end
+
+      def test_mapping_with_str_tag
+        mapping = Nodes::Mapping.new(nil, '!strawberry')
+        mapping.children << Nodes::Scalar.new('foo')
+        mapping.children << Nodes::Scalar.new('bar')
+        assert_equal({'foo' => 'bar'}, mapping.to_ruby)
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: psych-shopifork
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.13
 platform: ruby
 authors:
 - Aaron Patterson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-29 00:00:00.000000000 Z
+date: 2015-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -38,20 +38,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.1
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.13'
 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
@@ -149,7 +163,6 @@ files:
 - test/psych/test_document.rb
 - test/psych/test_emitter.rb
 - test/psych/test_encoding.rb
-- test/psych/test_engine_manager.rb
 - test/psych/test_exception.rb
 - test/psych/test_hash.rb
 - test/psych/test_json_tree.rb
@@ -203,53 +216,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.6
 signing_key: 
 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
-- test/psych/test_array.rb
-- test/psych/test_boolean.rb
-- test/psych/test_class.rb
-- test/psych/test_coder.rb
-- test/psych/test_date_time.rb
-- test/psych/test_deprecated.rb
-- test/psych/test_document.rb
-- test/psych/test_emitter.rb
-- test/psych/test_encoding.rb
-- test/psych/test_engine_manager.rb
-- test/psych/test_exception.rb
-- test/psych/test_hash.rb
-- test/psych/test_json_tree.rb
-- test/psych/test_merge_keys.rb
-- test/psych/test_nil.rb
-- 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
-- test/psych/test_safe_load.rb
-- test/psych/test_scalar.rb
-- test/psych/test_scalar_scanner.rb
-- test/psych/test_serialize_subclasses.rb
-- test/psych/test_set.rb
-- test/psych/test_stream.rb
-- test/psych/test_string.rb
-- test/psych/test_struct.rb
-- test/psych/test_symbol.rb
-- test/psych/test_tainted.rb
-- test/psych/test_to_yaml_properties.rb
-- test/psych/test_tree_builder.rb
-- test/psych/test_yaml.rb
-- test/psych/test_yamldbm.rb
-- test/psych/test_yamlstore.rb
-- test/psych/visitors/test_depth_first.rb
-- test/psych/visitors/test_emitter.rb
-- test/psych/visitors/test_to_ruby.rb
-- test/psych/visitors/test_yaml_tree.rb
+test_files: []

data/test/psych/test_engine_manager.rb

@@ -1,47 +0,0 @@
-require_relative 'helper'
-require 'yaml'
-
-module Psych
- class TestEngineManager < TestCase
-   def test_bad_engine
-     assert_raises(ArgumentError) do
-       YAML::ENGINE.yamler = 'foooo'
-     end
-   end
-
-   def test_set_psych
-     YAML::ENGINE.yamler = 'psych'
-     assert_equal Psych, YAML
-     assert_equal 'psych', YAML::ENGINE.yamler
-   end
-
-   A = Struct.new(:name)
-
-   def test_dump_types
-     YAML::ENGINE.yamler = 'psych'
-
-     assert_to_yaml ::Object.new
-     assert_to_yaml Time.now
-     assert_to_yaml Date.today
-     assert_to_yaml('a' => 'b')
-     assert_to_yaml A.new('foo')
-     assert_to_yaml %w{a b}
-     assert_to_yaml Exception.new('foo')
-     assert_to_yaml "hello!"
-     assert_to_yaml :fooo
-     assert_to_yaml(1..10)
-     assert_to_yaml(/hello!~/)
-     assert_to_yaml 1
-     assert_to_yaml 1.2
-     assert_to_yaml Rational(1, 2)
-     assert_to_yaml Complex(1, 2)
-     assert_to_yaml true
-     assert_to_yaml false
-     assert_to_yaml nil
-   end
-
-   def assert_to_yaml obj
-     assert obj.to_yaml, "#{obj.class} to_yaml works"
-   end
- end
-end