psych 5.0.1 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc1559e1a3c085056b502328c463bcb7e7f04380d3eb71f675d048e67a253874
-  data.tar.gz: c0e50cb546c0d18405469dc7d7354dcb85243c7ad6d7e3c5a0c8b053d6886101
+  metadata.gz: c1f8d034b29af61d3960b0cdca87e3c8cac106e7dde3176c1e67df223ab03472
+  data.tar.gz: a1e3eed89394ce7c16c156eafae3c32a65f687efb68336c5b43aeede9d472538
 SHA512:
-  metadata.gz: 9569dd428b0f16dfc74a2b8d423307aedbb5775e3b307ca5522053522d3fd99252157e3e189f312fd0818fe642473601ce5ce69522fb6ad0ba21a5bf45d701fa
-  data.tar.gz: e81f9003fd4c955987c21fde92a2f27734682d04557291a321049b626185a8440cbf800843929555b4ee044c82ace532ed27181dd2b347343f56b0d1f0a8b27a
+  metadata.gz: 105915165cc399dd19accfcccfbf742798b2923215fe9c50e19f20b0433eade76830c604e6c0598e7ea4117f82bada4e5a0d6a8d503c1621da9a440633e6441a
+  data.tar.gz: ce05ea8f197089797e302833cb520bb4a8b2b01ca40080013fadce49aa141763c6ea4edd0df909e3c5abf6b29c687b8fd37fce177990f9f0f79bab926841e314

data/Mavenfile

@@ -1,6 +1,6 @@
 #-*- mode: ruby -*-
 
-jar 'org.yaml:snakeyaml:${snakeyaml.version}'
+jar 'org.snakeyaml:snakeyaml-engine:${snakeyaml.version}'
 
 plugin :dependency, '2.8', :outputFile => 'pkg/classpath'
 

data/Rakefile

@@ -21,8 +21,8 @@ if RUBY_PLATFORM =~ /java/
     # this is basically the same as running from the commandline:
     # rmvn dependency:build-classpath -Dsnakeyaml.version='use version from Psych::DEFAULT_SNAKEYAML_VERSION here'
     Maven::Ruby::Maven.new.exec('dependency:build-classpath', "-Dsnakeyaml.version=#{Psych::DEFAULT_SNAKEYAML_VERSION}", '-Dverbose=true')
-    ext.source_version = '1.7'
-    ext.target_version = '1.7'
+    ext.source_version = '1.8'
+    ext.target_version = '1.8'
     ext.classpath = File.read('pkg/classpath')
     ext.ext_dir = 'ext/java'
   end

data/ext/psych/extconf.rb

@@ -22,7 +22,7 @@ if yaml_source
   args = [
     yaml_configure,
     "--enable-#{shared ? 'shared' : 'static'}",
-    "--host=#{RbConfig::CONFIG['host'].sub(/-unknown-/, '-')}",
+    "--host=#{RbConfig::CONFIG['host'].sub(/-unknown-/, '-').sub(/arm64/, 'arm')}",
     "CC=#{RbConfig::CONFIG['CC']}",
     *(["CFLAGS=-w"] if RbConfig::CONFIG["GCC"] == "yes"),
   ]

data/lib/psych/class_loader.rb

@@ -35,7 +35,7 @@ module Psych
 
     constants.each do |const|
       konst = const_get const
-      class_eval <<~RUBY
+      class_eval <<~RUBY, __FILE__, __LINE__ + 1
         def #{const.to_s.downcase}
           load #{konst.inspect}
         end

data/lib/psych/tree_builder.rb

@@ -41,7 +41,7 @@ module Psych
       Sequence
       Mapping
     }.each do |node|
-      class_eval %{
+      class_eval <<~RUBY, __FILE__, __LINE__ + 1
         def start_#{node.downcase}(anchor, tag, implicit, style)
           n = Nodes::#{node}.new(anchor, tag, implicit, style)
           set_start_location(n)
@@ -54,7 +54,7 @@ module Psych
           set_end_location(n)
           n
         end
-      }
+        RUBY
     end
 
     ###

data/lib/psych/versions.rb

@@ -2,9 +2,9 @@
 
 module Psych
   # The version of Psych you are using
-  VERSION = '5.0.1'
+  VERSION = '5.1.0'
 
   if RUBY_ENGINE == 'jruby'
-    DEFAULT_SNAKEYAML_VERSION = '1.33'.freeze
+    DEFAULT_SNAKEYAML_VERSION = '2.6'.freeze
   end
 end

data/lib/psych/visitors/yaml_tree.rb

@@ -568,7 +568,7 @@ module Psych
           raise BadAlias, "Tried to dump an aliased object"
         end
 
-        unless @permitted_classes[target.class]
+        unless Symbol === target || @permitted_classes[target.class]
           raise DisallowedClass.new('dump', target.class.name || target.class.inspect)
         end
 
@@ -576,7 +576,7 @@ module Psych
       end
 
       def visit_Symbol sym
-        unless @permitted_symbols[sym]
+        unless @permitted_classes[Symbol] || @permitted_symbols[sym]
           raise DisallowedClass.new('dump', "Symbol(#{sym.inspect})")
         end
 

data/psych.gemspec

@@ -52,15 +52,16 @@ DESCRIPTION
       "ext/java/org/jruby/ext/psych/PsychLibrary.java",
       "ext/java/org/jruby/ext/psych/PsychParser.java",
       "ext/java/org/jruby/ext/psych/PsychToRuby.java",
-      "ext/java/org/jruby/ext/psych/PsychYamlTree.java",
       "lib/psych_jars.rb",
       "lib/psych.jar"
     ]
-    s.requirements = "jar org.yaml:snakeyaml, #{version_module::Psych::DEFAULT_SNAKEYAML_VERSION}"
+    s.requirements = "jar org.snakeyaml:snakeyaml-engine, #{version_module::Psych::DEFAULT_SNAKEYAML_VERSION}"
     s.add_dependency 'jar-dependencies', '>= 0.1.7'
   else
     s.extensions = ["ext/psych/extconf.rb"]
     s.add_dependency 'stringio'
   end
 
+  s.metadata['msys2_mingw_dependencies'] = 'libyaml'
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psych
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.1.0
 platform: ruby
 authors:
 - Aaron Patterson
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-08 00:00:00.000000000 Z
+date: 2023-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stringio
@@ -101,7 +101,8 @@ files:
 homepage: https://github.com/ruby/psych
 licenses:
 - MIT
-metadata: {}
+metadata:
+  msys2_mingw_dependencies: libyaml
 post_install_message:
 rdoc_options:
 - "--main"
@@ -119,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.0.dev
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Psych is a YAML parser and emitter