psych 2.0.13 → 2.1.0

data/lib/psych/visitors/yaml_tree.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'psych/tree_builder'
 require 'psych/scalar_scanner'
 require 'psych/class_loader'
@@ -70,6 +71,14 @@ module Psych
         @ss         = ss
         @options    = options
         @line_width = options[:line_width]
+        if @line_width && @line_width < 0
+          if @line_width == -1
+            # Treat -1 as unlimited line-width, same as libyaml does.
+            @line_width = nil
+          else
+            fail(ArgumentError, "Invalid line_width #{@line_width}, must be non-negative or -1 for unlimited.")
+          end
+        end
         @coders     = []
 
         @dispatch_cache = Hash.new do |h,klass|
@@ -156,7 +165,7 @@ module Psych
       end
 
       def visit_Psych_Omap o
-        seq = @emitter.start_sequence(nil, '!omap', false, Nodes::Sequence::BLOCK)
+        seq = @emitter.start_sequence(nil, 'tag:yaml.org,2002:omap', false, Nodes::Sequence::BLOCK)
         register(o, seq)
 
         o.each { |k,v| visit_Hash k => v }
@@ -305,7 +314,7 @@ module Psych
         tag   = nil
 
         if binary?(o)
-          o     = [o].pack('m').chomp
+          o     = [o].pack('m0')
           tag   = '!binary' # FIXME: change to below when syck is removed
           #tag   = 'tag:yaml.org,2002:binary'
           style = Nodes::Scalar::LITERAL
@@ -322,7 +331,7 @@ module Psych
           style = Nodes::Scalar::FOLDED
         elsif o =~ /^[^[:word:]][^"]*$/
           style = Nodes::Scalar::DOUBLE_QUOTED
-        elsif not String === @ss.tokenize(o)
+        elsif not String === @ss.tokenize(o) or /\A0[0-7]*[89]/ =~ o
           style = Nodes::Scalar::SINGLE_QUOTED
         end
 
@@ -510,27 +519,11 @@ module Psych
       def dump_list o
       end
 
-      # '%:z' was no defined until 1.9.3
-      if RUBY_VERSION < '1.9.3'
-        def format_time time
-          formatted = time.strftime("%Y-%m-%d %H:%M:%S.%9N")
-
-          if time.utc?
-            formatted += " Z"
-          else
-            zone = time.strftime('%z')
-            formatted += " #{zone[0,3]}:#{zone[3,5]}"
-          end
-
-          formatted
-        end
-      else
-        def format_time time
-          if time.utc?
-            time.strftime("%Y-%m-%d %H:%M:%S.%9N Z")
-          else
-            time.strftime("%Y-%m-%d %H:%M:%S.%9N %:z")
-          end
+      def format_time time
+        if time.utc?
+          time.strftime("%Y-%m-%d %H:%M:%S.%9N Z")
+        else
+          time.strftime("%Y-%m-%d %H:%M:%S.%9N %:z")
         end
       end
 

data/lib/psych/visitors.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'psych/visitors/visitor'
 require 'psych/visitors/to_ruby'
 require 'psych/visitors/emitter'

data/lib/psych/y.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 module Kernel
   ###
   # An alias for Psych.dump_stream meant to be used with IRB.

data/lib/psych.rb

@@ -1,4 +1,11 @@
-require 'psych.so'
+# frozen_string_literal: false
+case RUBY_ENGINE
+when 'jruby'
+  require 'psych_jars'
+  org.jruby.ext.psych.PsychLibrary.new.load(JRuby.runtime, false)
+else
+  require 'psych.so'
+end
 require 'psych/nodes'
 require 'psych/streaming'
 require 'psych/visitors'
@@ -217,11 +224,13 @@ require 'psych/class_loader'
 
 module Psych
   # The version is Psych you're using
-  VERSION         = '2.0.13'
+  VERSION         = '2.1.0'
 
   # The version of libyaml Psych is using
   LIBYAML_VERSION = Psych.libyaml_version.join '.'
 
+  FALLBACK        = Struct.new :to_ruby # :nodoc:
+
   ###
   # Load +yaml+ in to a Ruby data structure.  If multiple documents are
   # provided, the object contained in the first document will be returned.
@@ -241,8 +250,8 @@ module Psych
   #     ex.file    # => 'file.txt'
   #     ex.message # => "(file.txt): found character that cannot start any token"
   #   end
-  def self.load yaml, filename = nil
-    result = parse(yaml, filename)
+  def self.load yaml, filename = nil, fallback = false
+    result = parse(yaml, filename, fallback)
     result ? result.to_ruby : result
   end
 
@@ -314,11 +323,11 @@ module Psych
   #   end
   #
   # See Psych::Nodes for more information about YAML AST.
-  def self.parse yaml, filename = nil
+  def self.parse yaml, filename = nil, fallback = false
     parse_stream(yaml, filename) do |node|
       return node
     end
-    false
+    fallback
   end
 
   ###
@@ -459,9 +468,12 @@ module Psych
 
   ###
   # Load the document contained in +filename+.  Returns the yaml contained in
-  # +filename+ as a Ruby object
-  def self.load_file filename
-    File.open(filename, 'r:bom|utf-8') { |f| self.load f, filename }
+  # +filename+ as a Ruby object, or if the file is empty, it returns
+  # the specified default return value, which defaults to an empty Hash 
+  def self.load_file filename, fallback = false
+    File.open(filename, 'r:bom|utf-8') { |f|
+      self.load f, filename, FALLBACK.new(fallback)
+    }
   end
 
   # :stopdoc:

data/lib/psych_jars.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: false
+require 'psych/versions'
+require 'psych.jar'
+
+require 'jar-dependencies'
+require_jar('org.yaml', 'snakeyaml', Psych::DEFAULT_SNAKEYAML_VERSION)

data/test/psych/handlers/test_recorder.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'psych/helper'
 require 'psych/handlers/recorder'
 

data/test/psych/helper.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: false
 require 'minitest/autorun'
 require 'stringio'
 require 'tempfile'
 require 'date'
+
 require 'psych'
 
 module Psych
@@ -90,7 +92,7 @@ module Psych
   end
 end
 
-# backport so that tests will run on 1.9 and 2.0.0
+# backport so that tests will run on 2.0.0
 unless Tempfile.respond_to? :create
   def Tempfile.create(basename, *rest)
     tmpfile = nil

data/test/psych/json/test_stream.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'psych/helper'
 
 module Psych

data/test/psych/nodes/test_enumerable.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'psych/helper'
 
 module Psych

data/test/psych/test_alias_and_anchor.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'helper'
 
 class ObjectWithInstanceVariables

data/test/psych/test_array.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'helper'
 
 module Psych

data/test/psych/test_boolean.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'helper'
 
 module Psych

data/test/psych/test_class.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'helper'
 
 module Psych

data/test/psych/test_coder.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'helper'
 
 module Psych

data/test/psych/test_date_time.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'helper'
 require 'date'
 

data/test/psych/test_deprecated.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'helper'
 
 module Psych

data/test/psych/test_document.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'helper'
 
 module Psych

data/test/psych/test_emitter.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: false
 
 require_relative 'helper'
 
@@ -89,5 +90,22 @@ module Psych
         @emitter.start_sequence(nil, nil, true, :foo)
       end
     end
+
+    def test_resizing_tags
+      @emitter.start_stream Psych::Nodes::Stream::UTF8
+
+      tags = []
+      version = [1,1]
+      obj = Object.new
+      obj.instance_variable_set(:@tags, tags)
+      def obj.to_str
+        (1..10).map{|x| @tags.push(["AAAA","BBBB"])}
+        return "x"
+      end
+
+      tags.push([obj, "tag:TALOS"])
+      @emitter.start_document(version, tags, 0)
+      assert(true)
+    end
   end
 end

data/test/psych/test_encoding.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: false
 
 require_relative 'helper'
 
@@ -249,6 +250,15 @@ module Psych
       assert_encodings @utf8, @handler.strings
     end
 
+    def test_dump_non_ascii_string_to_file
+      Tempfile.create(['utf8', 'yml'], :encoding => 'UTF-8') do |t|
+        h = {'one' => 'いち'}
+        Psych.dump(h, t)
+        t.close
+        assert_equal h, Psych.load_file(t.path)
+      end
+    end
+
     private
     def assert_encodings encoding, strings
       strings.each do |str|

data/test/psych/test_exception.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'helper'
 
 module Psych

data/test/psych/test_hash.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'helper'
 
 module Psych

data/test/psych/test_json_tree.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'helper'
 
 module Psych

data/test/psych/test_merge_keys.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'helper'
 
 module Psych

data/test/psych/test_nil.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'helper'
 
 module Psych

data/test/psych/test_null.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'helper'
 
 module Psych

data/test/psych/test_numeric.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'helper'
 require 'bigdecimal'
 

data/test/psych/test_object.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'helper'
 
 module Psych

data/test/psych/test_object_references.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'helper'
 
 module Psych

data/test/psych/test_omap.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'helper'
 
 module Psych

data/test/psych/test_parser.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: false
 
 require_relative 'helper'
 

data/test/psych/test_psych.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'helper'
 
 require 'stringio'
@@ -8,7 +9,17 @@ class TestPsych < Psych::TestCase
     Psych.domain_types.clear
   end
 
-  def test_line_width
+  def test_line_width_invalid
+    assert_raises(ArgumentError) { Psych.dump('x', { :line_width => -2 }) }
+  end
+
+  def test_line_width_no_limit
+    data = { 'a' => 'a b' * 50}
+    expected = "---\na: #{'a b' * 50}\n"
+    assert_equal(expected, Psych.dump(data, { :line_width => -1 }))
+  end
+
+  def test_line_width_limit
     yml = Psych.dump('123456 7', { :line_width => 5 })
     assert_match(/^\s*7/, yml)
   end
@@ -133,6 +144,11 @@ class TestPsych < Psych::TestCase
     }
   end
 
+  def test_load_file_with_fallback
+    t = Tempfile.create(['empty', 'yml'])
+    assert_equal Hash.new, Psych.load_file(t.path, Hash.new)
+  end
+
   def test_parse_file
     Tempfile.create(['yikes', 'yml']) {|t|
       t.binmode

data/test/psych/test_safe_load.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'psych/helper'
 
 module Psych

data/test/psych/test_scalar.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: false
 
 require_relative 'helper'
 

data/test/psych/test_scalar_scanner.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'helper'
 require 'date'
 

data/test/psych/test_serialize_subclasses.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'helper'
 
 module Psych

data/test/psych/test_set.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'helper'
 
 module Psych

data/test/psych/test_stream.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'helper'
 
 module Psych

data/test/psych/test_string.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: false
 require_relative 'helper'
 
 module Psych

data/test/psych/test_struct.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'helper'
 
 class PsychStructWithIvar < Struct.new(:foo)

data/test/psych/test_symbol.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'helper'
 
 module Psych

data/test/psych/test_tainted.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'helper'
 
 module Psych

data/test/psych/test_to_yaml_properties.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'helper'
 
 module Psych

data/test/psych/test_tree_builder.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'helper'
 
 module Psych

data/test/psych/test_yaml.rb

@@ -1,4 +1,5 @@
 # -*- coding: us-ascii; mode: ruby; ruby-indent-level: 4; tab-width: 4 -*-
+# frozen_string_literal: false
 #												vim:sw=4:ts=4
 # $Id$
 #

data/test/psych/test_yamldbm.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'helper'
 require 'tmpdir'
 
@@ -77,7 +78,6 @@ 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')

data/test/psych/test_yamlstore.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'helper'
 require 'yaml/store'
 require 'tmpdir'

data/test/psych/visitors/test_depth_first.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'psych/helper'
 
 module Psych

data/test/psych/visitors/test_emitter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'psych/helper'
 
 module Psych

data/test/psych/visitors/test_to_ruby.rb

@@ -1,4 +1,5 @@
 # coding: US-ASCII
+# frozen_string_literal: false
 require 'psych/helper'
 
 module Psych
@@ -166,16 +167,14 @@ description:
         assert_equal Complex(1,2), mapping.to_ruby
       end
 
-      if RUBY_VERSION >= '1.9'
-        def test_complex_string
-          node = Nodes::Scalar.new '3+4i', nil, "!ruby/object:Complex"
-          assert_equal Complex(3, 4), node.to_ruby
-        end
+      def test_complex_string
+        node = Nodes::Scalar.new '3+4i', nil, "!ruby/object:Complex"
+        assert_equal Complex(3, 4), node.to_ruby
+      end
 
-        def test_rational_string
-          node = Nodes::Scalar.new '1/2', nil, "!ruby/object:Rational"
-          assert_equal Rational(1, 2), node.to_ruby
-        end
+      def test_rational_string
+        node = Nodes::Scalar.new '1/2', nil, "!ruby/object:Rational"
+        assert_equal Rational(1, 2), node.to_ruby
       end
 
       def test_range_string
@@ -321,6 +320,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

data/test/psych/visitors/test_yaml_tree.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'psych/helper'
 
 module Psych
@@ -155,6 +156,12 @@ module Psych
         assert_equal(-1, Psych.load(Psych.dump(-1 / 0.0)).infinite?)
       end
 
+      def test_string
+        assert_match(/'017'/, Psych.dump({'a' => '017'}))
+        assert_match(/'019'/, Psych.dump({'a' => '019'}))
+        assert_match(/'01818'/, Psych.dump({'a' => '01818'}))
+      end
+
       # http://yaml.org/type/null.html
       def test_nil
         assert_cycle nil