psych 5.2.2-java → 5.2.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfd64ef73206772ded78ac380177121a32fd32e615ddec1a97e68dced1741612
-  data.tar.gz: df99e64c76c815e6b4e5cdfbb4aebc6384b34149c7934e3108a70d16de56f11f
+  metadata.gz: 8a97e733fa3c4ea8606ef1f5288d033dcf27f4a488d74fe2124ee689c62f1f78
+  data.tar.gz: 577a281e8dcd0dd1cc2508eaab0b3145f490083e323966d3ca4695411e4ff6b0
 SHA512:
-  metadata.gz: a9d355feba5224923015f9d0d8d9fa8f929196f73c8f218f7cd3745714fd46ac67e71819dad4049342b1012eaa035b14cbadf388f2ac74a14cd0b567e93eb794
-  data.tar.gz: dc940e85cd7371b05069a3226903682824b533b13fa4dd58ebdbd04b2fb585495430d62f660b8b51c73985f52cc4fcfe3aafc9d1a0fb2de9f3d6e60a8d45110e
+  metadata.gz: 2cd02e8732496426e0a87dad9d4d631136bf7dfe48067e7b5541b9d90d53964367129e20a656a164a0008834585502939902fc4c3af8cbccb273cd8cc10e3238
+  data.tar.gz: 986ce2cc86e399c46f096a30cf8a87c9d3d6f3025f3a48e50bf3838f253b0f213d7f797db7d955d77d8a87a227dfcc8ac97a8baf19910be59c74fd4a539d48b0

data/README.md

@@ -1,7 +1,7 @@
 # Psych
 
-*   https://github.com/ruby/psych
-*   https://docs.ruby-lang.org/en/master/Psych.html
+* https://github.com/ruby/psych
+* https://docs.ruby-lang.org/en/master/Psych.html
 
 ## Description
 
@@ -22,31 +22,38 @@ Psych.dump("foo")     # => "--- foo\n...\n"
 
 ## Dependencies
 
-*   libyaml
+* libyaml
 
 ## Installation
 
 Psych has been included with MRI since 1.9.2, and is the default YAML parser
 in 1.9.3.
 
-If you want a newer gem release of Psych, you can use rubygems:
-
-    gem install psych
+If you want a newer gem release of Psych, you can use RubyGems:
 
+```bash
+gem install psych
+```
 
 Psych supported the static build with specific version of libyaml sources. You can build psych with libyaml-0.2.5 like this.
 
-    gem install psych -- --with-libyaml-source-dir=/path/to/libyaml-0.2.5
+```bash
+gem install psych -- --with-libyaml-source-dir=/path/to/libyaml-0.2.5
+```
 
 In order to use the gem release in your app, and not the stdlib version,
 you'll need the following:
 
-    gem 'psych'
-    require 'psych'
+```ruby
+gem 'psych'
+require 'psych'
+```
 
 Or if you use Bundler add this to your `Gemfile`:
 
-    gem 'psych'
+```ruby
+gem 'psych'
+```
 
 JRuby ships with a pure Java implementation of Psych.
 

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/ext/psych/psych.c

@@ -34,4 +34,3 @@ void Init_psych(void)
     Init_psych_to_ruby();
     Init_psych_yaml_tree();
 }
-/* vim: set noet sws=4 sw=4: */

data/ext/psych/psych_emitter.c

@@ -587,4 +587,3 @@ void Init_psych_emitter(void)
     id_indentation = rb_intern("indentation");
     id_canonical   = rb_intern("canonical");
 }
-/* vim: set noet sws=4 sw=4: */

data/ext/psych/psych_parser.c

@@ -562,4 +562,3 @@ void Init_psych_parser(void)
     id_end_mapping     = rb_intern("end_mapping");
     id_event_location  = rb_intern("event_location");
 }
-/* vim: set noet sws=4 sw=4: */

data/ext/psych/psych_to_ruby.c

@@ -36,4 +36,3 @@ void Init_psych_to_ruby(void)
     rb_define_private_method(cPsychVisitorsToRuby, "build_exception", build_exception, 2);
     rb_define_private_method(class_loader, "path2class", path2class, 1);
 }
-/* vim: set noet sws=4 sw=4: */

data/ext/psych/psych_yaml_tree.c

@@ -9,4 +9,3 @@ void Init_psych_yaml_tree(void)
     VALUE visitor   = rb_define_class_under(visitors, "Visitor", rb_cObject);
     cPsychVisitorsYamlTree = rb_define_class_under(visitors, "YAMLTree", visitor);
 }
-/* vim: set noet sws=4 sw=4: */

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,9 +2,9 @@
 
 module Psych
   # The version of Psych you are using
-  VERSION = '5.2.2'
+  VERSION = '5.2.4'
 
   if RUBY_ENGINE == 'jruby'
-    DEFAULT_SNAKEYAML_VERSION = '2.7'.freeze
+    DEFAULT_SNAKEYAML_VERSION = '2.9'.freeze
   end
 end

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,24 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: psych
 version: !ruby/object:Gem::Version
-  version: 5.2.2
+  version: 5.2.4
 platform: java
 authors:
 - Aaron Patterson
 - SHIBATA Hiroshi
 - Charles Oliver Nutter
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-18 00:00:00.000000000 Z
+date: 2025-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: jar-dependencies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.7
-  name: jar-dependencies
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,12 +26,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.7
 - !ruby/object:Gem::Dependency
+  name: date
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: date
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -117,7 +116,6 @@ licenses:
 metadata:
   msys2_mingw_dependencies: libyaml
   changelog_uri: https://github.com/ruby/psych/releases
-post_install_message:
 rdoc_options:
 - "--main"
 - README.md
@@ -134,9 +132,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- jar org.snakeyaml:snakeyaml-engine, 2.7
-rubygems_version: 3.3.26
-signing_key:
+- jar org.snakeyaml:snakeyaml-engine, 2.9
+rubygems_version: 3.6.3
 specification_version: 4
 summary: Psych is a YAML parser and emitter
 test_files: []