psych 5.2.3-java → 5.2.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d45c3d790110adf9d97e497f2d25341ecc113b430e6ca0c29aa12104d16e98f
-  data.tar.gz: 0b1dd144c01696b7c2be6271e7aee97072180f3bc387c2eb75b9d0705e3a21ad
+  metadata.gz: 8a97e733fa3c4ea8606ef1f5288d033dcf27f4a488d74fe2124ee689c62f1f78
+  data.tar.gz: 577a281e8dcd0dd1cc2508eaab0b3145f490083e323966d3ca4695411e4ff6b0
 SHA512:
-  metadata.gz: 987a2cc829bd9e4ddfe8ec67cdcdec388f70e42e240c333a00980692fd480a52d5c0e9fe7610b6ca6f3c61b2b83b4c74778d6ebc9ce3075772d1519bac62e1e5
-  data.tar.gz: 570dca8b9137bab7c0c41e7f04427176facd27760dd0e641c214bb976917001919997e5b51dd5f753e322e0c7af48d53fe9a9cd594413b9833a7812b46f197b0
+  metadata.gz: 2cd02e8732496426e0a87dad9d4d631136bf7dfe48067e7b5541b9d90d53964367129e20a656a164a0008834585502939902fc4c3af8cbccb273cd8cc10e3238
+  data.tar.gz: 986ce2cc86e399c46f096a30cf8a87c9d3d6f3025f3a48e50bf3838f253b0f213d7f797db7d955d77d8a87a227dfcc8ac97a8baf19910be59c74fd4a539d48b0

data/ext/java/org/jruby/ext/psych/PsychLibrary.java

@@ -41,11 +41,15 @@ import org.jruby.runtime.Visibility;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.runtime.load.Library;
 
+import org.snakeyaml.engine.v2.common.SpecVersion;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
 
 public class PsychLibrary implements Library {
+
+    private static final String POM_PROPERTIES = "META-INF/maven/org.snakeyaml/snakeyaml-engine/pom.properties";
     private static final String DUMMY_VERSION = "0.0";
 
     public void load(final Ruby runtime, boolean wrap) {
@@ -53,23 +57,23 @@ public class PsychLibrary implements Library {
 
         // load version from properties packed with the jar
         Properties props = new Properties();
-        try( InputStream is = runtime.getJRubyClassLoader().getResourceAsStream("META-INF/maven/org.snakeyaml/snakeyaml-engine/pom.properties") ) {
-            props.load(is);
+        try( InputStream is = SpecVersion.class.getResourceAsStream(POM_PROPERTIES) ) {
+            if (is != null) props.load(is);
         }
         catch( IOException e ) {
             // ignored
         }
         String snakeyamlVersion = props.getProperty("version", DUMMY_VERSION);
 
+        RubyString version = runtime.newString(snakeyamlVersion);
+        version.setFrozen(true);
+        psych.setConstant("SNAKEYAML_VERSION", version); // e.g. 2.10-SNAPSHOT
+
         if (snakeyamlVersion.endsWith("-SNAPSHOT")) {
             snakeyamlVersion = snakeyamlVersion.substring(0, snakeyamlVersion.length() - "-SNAPSHOT".length());
         }
 
-        RubyString version = runtime.newString(snakeyamlVersion + ".0");
-        version.setFrozen(true);
-        psych.setConstant("SNAKEYAML_VERSION", version);
-
-        String[] versionParts = version.toString().split("\\.");
+        String[] versionParts = (snakeyamlVersion + ".0").split("\\."); // 2.10-SNAPSHOT -> 2.10.0
         final RubyArray versionElements = runtime.newArray(runtime.newFixnum(Integer.parseInt(versionParts[0])), runtime.newFixnum(Integer.parseInt(versionParts[1])), runtime.newFixnum(Integer.parseInt(versionParts[2])));
         versionElements.setFrozen(true);
 

data/lib/psych/core_ext.rb

@@ -17,3 +17,17 @@ end
 if defined?(::IRB)
   require_relative 'y'
 end
+
+
+# TODO: how best to check for builtin Set?
+if defined?(::Set) && Object.const_source_location(:Set) == ["ruby", 0]
+  class Set
+    def encode_with(coder)
+      coder["hash"] = to_h
+    end
+
+    def init_with(coder)
+      replace(coder["hash"].keys)
+    end
+  end
+end

data/lib/psych/nodes/node.rb

@@ -55,7 +55,8 @@ module Psych
       #
       # See also Psych::Visitors::Emitter
       def yaml io = nil, options = {}
-        require "stringio"
+        require "stringio" unless defined?(StringIO)
+
         real_io = io || StringIO.new(''.encode('utf-8'))
 
         Visitors::Emitter.new(real_io, options).accept self

data/lib/psych/versions.rb

@@ -2,7 +2,7 @@
 
 module Psych
   # The version of Psych you are using
-  VERSION = '5.2.3'
+  VERSION = '5.2.4'
 
   if RUBY_ENGINE == 'jruby'
     DEFAULT_SNAKEYAML_VERSION = '2.9'.freeze

data/lib/psych/visitors/yaml_tree.rb

@@ -189,7 +189,8 @@ module Psych
       end
 
       def visit_Date o
-        register o, visit_Integer(o.gregorian)
+        formatted = format_date o
+        register o, @emitter.scalar(formatted, nil, nil, true, false, Nodes::Scalar::ANY)
       end
 
       def visit_DateTime o
@@ -486,6 +487,10 @@ module Psych
         end
       end
 
+      def format_date date
+        date.strftime("%Y-%m-%d")
+      end
+
       def register target, yaml_obj
         @st.register target, yaml_obj
         yaml_obj

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psych
 version: !ruby/object:Gem::Version
-  version: 5.2.3
+  version: 5.2.4
 platform: java
 authors:
 - Aaron Patterson
@@ -9,7 +9,7 @@ authors:
 - Charles Oliver Nutter
 bindir: bin
 cert_chain: []
-date: 2025-01-17 00:00:00.000000000 Z
+date: 2025-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jar-dependencies