psych 5.2.6-java → 5.3.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b20d2cda7a787df2aa6da853737b94a752b7f6044d4a15e5b46909f66499251f
-  data.tar.gz: 58dc98568c83ea6a052268e0c96a6d9f232c65cb4bd40fa6eade231813f25b30
+  metadata.gz: 65eaefc2581960794ad4248d45b20e3b103f3c507778c38a70c1368d31e205c3
+  data.tar.gz: 01001d898d3407f8f1adc4b95ec6cfb1a19597750599864a105da9505ae4296f
 SHA512:
-  metadata.gz: 8f18f4be73e79863c96348e6a805762281a3275f2cc1726a8b0fec8316bac72d2740353b75b3e0588ae884e7cf9d2cfb6d3fb01ccda73b7b4dc211c8016ed33b
-  data.tar.gz: 414d593b1376c648e66bcf145da6faa0c97027bdc33d8f52bc6b2043a64266f9cb8c29f733f86578fe01d92150ecd923c54bff6b0cc5302cb12afdea85c9cd64
+  metadata.gz: 5a9b0231499d926d4d57c872e42e291a4ba79288d2bdaa7c82db389c3003b6ea14c18466e685a8da4ed096e4ac9de21d9a8489c7175d236c594afe4c18d5e037
+  data.tar.gz: be3b040be45154ffd386d8da11e27de35f517ec8f2caa3276a77168e9be5b524f1678d9c6d84662910ccdc30714c41178d55c233edcd1c61791616178f261f80

data/README.md

@@ -57,6 +57,16 @@ gem 'psych'
 
 JRuby ships with a pure Java implementation of Psych.
 
+## Release
+
+We used the trusted publisher and [rubygems/release-gem](https://github.com/rubygems/release-gem) workflow.
+
+We can release the new version with:
+
+```bash
+git tag vXXX && git push origin vXXX
+```
+
 ## License
 
 Copyright 2009 Aaron Patterson, et al.

data/ext/psych/extconf.rb

@@ -36,8 +36,11 @@ if yaml_source
   libyaml = "libyaml.#$LIBEXT"
   $cleanfiles << libyaml
   $LOCAL_LIBS.prepend("$(LIBYAML) ")
-else # default to pre-installed libyaml
-  pkg_config('yaml-0.1')
+
+  # default to pre-installed libyaml
+elsif pkg_config('yaml-0.1')
+  # found with pkg-config
+else
   dir_config('libyaml')
   find_header('yaml.h') or abort "yaml.h not found"
   find_library('yaml', 'yaml_get_version') or abort "libyaml not found"

data/ext/psych/psych_to_ruby.c

@@ -10,7 +10,11 @@ static VALUE build_exception(VALUE self, VALUE klass, VALUE mesg)
 {
     VALUE e = rb_obj_alloc(klass);
 
+#ifdef TRUFFLERUBY
+    rb_exc_set_message(e, mesg);
+#else
     rb_iv_set(e, "mesg", mesg);
+#endif
 
     return e;
 }
@@ -24,12 +28,9 @@ static VALUE path2class(VALUE self, VALUE path)
     return rb_path_to_class(path);
 }
 
-static VALUE init_struct(VALUE self, VALUE data, VALUE attrs)
+static VALUE init_data(VALUE self, VALUE data, VALUE values)
 {
-    VALUE args = rb_ary_new2(1);
-    rb_ary_push(args, attrs);
-    rb_struct_initialize(data, args);
-
+    rb_struct_initialize(data, values);
     return data;
 }
 
@@ -42,7 +43,7 @@ void Init_psych_to_ruby(void)
     VALUE visitor   = rb_define_class_under(visitors, "Visitor", rb_cObject);
     cPsychVisitorsToRuby = rb_define_class_under(visitors, "ToRuby", visitor);
 
-    rb_define_private_method(cPsychVisitorsToRuby, "init_struct", init_struct, 2);
+    rb_define_private_method(cPsychVisitorsToRuby, "init_data", init_data, 2);
     rb_define_private_method(cPsychVisitorsToRuby, "build_exception", build_exception, 2);
     rb_define_private_method(class_loader, "path2class", path2class, 1);
 }

data/lib/psych/core_ext.rb

@@ -14,13 +14,9 @@ class Object
   end
 end
 
-if defined?(::IRB)
-  require_relative 'y'
-end
-
 # Up to Ruby 3.4, Set was a regular object and was dumped as such
 # by Pysch.
-# Starting from Ruby 3.5 it's a core class written in C, so we have to implement
+# Starting from Ruby 4.0 it's a core class written in C, so we have to implement
 # #encode_with / #init_with to preserve backward compatibility.
 if defined?(::Set) && Set.new.instance_variables.empty?
   class Set

data/lib/psych/nodes/node.rb

@@ -45,8 +45,8 @@ module Psych
       # Convert this node to Ruby.
       #
       # See also Psych::Visitors::ToRuby
-      def to_ruby(symbolize_names: false, freeze: false, strict_integer: false)
-        Visitors::ToRuby.create(symbolize_names: symbolize_names, freeze: freeze, strict_integer: strict_integer).accept(self)
+      def to_ruby(symbolize_names: false, freeze: false, strict_integer: false, parse_symbols: true)
+        Visitors::ToRuby.create(symbolize_names: symbolize_names, freeze: freeze, strict_integer: strict_integer, parse_symbols: parse_symbols).accept(self)
       end
       alias :transform :to_ruby
 

data/lib/psych/scalar_scanner.rb

@@ -27,10 +27,11 @@ module Psych
     attr_reader :class_loader
 
     # Create a new scanner
-    def initialize class_loader, strict_integer: false
+    def initialize class_loader, strict_integer: false, parse_symbols: true
       @symbol_cache = {}
       @class_loader = class_loader
       @strict_integer = strict_integer
+      @parse_symbols = parse_symbols
     end
 
     # Tokenize +string+ returning the Ruby object
@@ -72,7 +73,7 @@ module Psych
         -Float::INFINITY
       elsif string.match?(/^\.nan$/i)
         Float::NAN
-      elsif string.match?(/^:./)
+      elsif @parse_symbols && string.match?(/^:./)
         if string =~ /^:(["'])(.*)\1/
           @symbol_cache[string] = class_loader.symbolize($2.sub(/^:/, ''))
         else

data/lib/psych/versions.rb

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

data/lib/psych/visitors/to_ruby.rb

@@ -12,9 +12,9 @@ module Psych
     ###
     # This class walks a YAML AST, converting each node to Ruby
     class ToRuby < Psych::Visitors::Visitor
-      def self.create(symbolize_names: false, freeze: false, strict_integer: false)
+      def self.create(symbolize_names: false, freeze: false, strict_integer: false, parse_symbols: true)
         class_loader = ClassLoader.new
-        scanner      = ScalarScanner.new class_loader, strict_integer: strict_integer
+        scanner      = ScalarScanner.new class_loader, strict_integer: strict_integer, parse_symbols: parse_symbols
         new(scanner, class_loader, symbolize_names: symbolize_names, freeze: freeze)
       end
 
@@ -219,7 +219,8 @@ module Psych
             revive_data_members(members, o)
           end
           data ||= allocate_anon_data(o, members)
-          init_struct(data, **members)
+          values = data.members.map { |m| members[m] }
+          init_data(data, values)
           data.freeze
           data
 

data/lib/psych.rb

@@ -269,10 +269,10 @@ module Psych
   # YAML documents that are supplied via user input.  Instead, please use the
   # load method or the safe_load method.
   #
-  def self.unsafe_load yaml, filename: nil, fallback: false, symbolize_names: false, freeze: false, strict_integer: false
+  def self.unsafe_load yaml, filename: nil, fallback: false, symbolize_names: false, freeze: false, strict_integer: false, parse_symbols: true
     result = parse(yaml, filename: filename)
     return fallback unless result
-    result.to_ruby(symbolize_names: symbolize_names, freeze: freeze, strict_integer: strict_integer)
+    result.to_ruby(symbolize_names: symbolize_names, freeze: freeze, strict_integer: strict_integer, parse_symbols: parse_symbols)
   end
 
   ###
@@ -320,13 +320,13 @@ module Psych
   #   Psych.safe_load("---\n foo: bar")                         # => {"foo"=>"bar"}
   #   Psych.safe_load("---\n foo: bar", symbolize_names: true)  # => {:foo=>"bar"}
   #
-  def self.safe_load yaml, permitted_classes: [], permitted_symbols: [], aliases: false, filename: nil, fallback: nil, symbolize_names: false, freeze: false, strict_integer: false
+  def self.safe_load yaml, permitted_classes: [], permitted_symbols: [], aliases: false, filename: nil, fallback: nil, symbolize_names: false, freeze: false, strict_integer: false, parse_symbols: true
     result = parse(yaml, filename: filename)
     return fallback unless result
 
     class_loader = ClassLoader::Restricted.new(permitted_classes.map(&:to_s),
                                                permitted_symbols.map(&:to_s))
-    scanner      = ScalarScanner.new class_loader, strict_integer: strict_integer
+    scanner      = ScalarScanner.new class_loader, strict_integer: strict_integer, parse_symbols: parse_symbols
     visitor = if aliases
                 Visitors::ToRuby.new scanner, class_loader, symbolize_names: symbolize_names, freeze: freeze
               else
@@ -366,7 +366,7 @@ module Psych
   # Raises a TypeError when `yaml` parameter is NilClass.  This method is
   # similar to `safe_load` except that `Symbol` objects are allowed by default.
   #
-  def self.load yaml, permitted_classes: [Symbol], permitted_symbols: [], aliases: false, filename: nil, fallback: nil, symbolize_names: false, freeze: false, strict_integer: false
+  def self.load yaml, permitted_classes: [Symbol], permitted_symbols: [], aliases: false, filename: nil, fallback: nil, symbolize_names: false, freeze: false, strict_integer: false, parse_symbols: true
     safe_load yaml, permitted_classes: permitted_classes,
                     permitted_symbols: permitted_symbols,
                     aliases: aliases,
@@ -374,7 +374,8 @@ module Psych
                     fallback: fallback,
                     symbolize_names: symbolize_names,
                     freeze: freeze,
-                    strict_integer: strict_integer
+                    strict_integer: strict_integer,
+                    parse_symbols: parse_symbols
   end
 
   ###

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psych
 version: !ruby/object:Gem::Version
-  version: 5.2.6
+  version: 5.3.0
 platform: java
 authors:
 - Aaron Patterson
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - jar org.snakeyaml:snakeyaml-engine, 2.9
-rubygems_version: 3.6.8
+rubygems_version: 4.0.1
 specification_version: 4
 summary: Psych is a YAML parser and emitter
 test_files: []