psych 3.3.2-java → 3.3.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f502010ef57ab680b8a273b17cb0c7bcf38cd9e3c9f4885323c8817933bbf7b
-  data.tar.gz: 2be8f458c94bf961bb3c9681ced9ea2e00e67095e9ce0f4e062111a0b1e6bbaa
+  metadata.gz: 7e314c5613e0b86ac2a12afd58de21b4b2253bbce98c9f5059f193b07abbbe47
+  data.tar.gz: 53031659a8f278e7003f36b3732401a4c63e7ec3d05f7a5302bb3610f7d0b18c
 SHA512:
-  metadata.gz: 4af84db27ecb5c12a92c8f80b6078a639e75f11ce0284b68e57e4906e62893ffd7cfe77780e6729374d760e136b61c70709050c8aebce345b373ea3fbfd00f77
-  data.tar.gz: afcf7ee1fac4892db0789448761d325d951904423d914e579a1b51740ae3bdb0c5de9b20590b11ed88aa56c03fff25bb16623b7771c45e9957dc8e07b716d81a
+  metadata.gz: 64ffd8d7ccacad0f5c934e0756343a131b07d245972e5e0d58526c8ea3e7b19d2259f89b19b8eeb123d0746da61e8373e91ecc3f7db73f9db25eba46e5a90310
+  data.tar.gz: 949dccd16148d62ac4c7b3fc61ea16739470ad213c06070b9f93f71d5d595696e4e6d7e4b50755cdf6d04b31a580c07ea5283136a33d228ae8bc1fe466a86176

data/lib/psych/scalar_scanner.rb

@@ -34,7 +34,7 @@ module Psych
 
       # Check for a String type, being careful not to get caught by hash keys, hex values, and
       # special floats (e.g., -.inf).
-      if string.match?(/^[^\d\.:-]?[A-Za-z_\s!@#\$%\^&\*\(\)\{\}\<\>\|\/\\~;=]+/) || string.match?(/\n/)
+      if string.match?(%r{^[^\d.:-]?[[:alpha:]_\s!@#$%\^&*(){}<>|/\\~;=]+}) || string.match?(/\n/)
         return string if string.length > 5
 
         if string.match?(/^[^ytonf~]/i)
@@ -57,7 +57,7 @@ module Psych
       elsif string.match?(/^\d{4}-(?:1[012]|0\d|\d)-(?:[12]\d|3[01]|0\d|\d)$/)
         require 'date'
         begin
-          class_loader.date.strptime(string, '%Y-%m-%d')
+          class_loader.date.strptime(string, '%F', Date::GREGORIAN)
         rescue ArgumentError
           string
         end

data/lib/psych/versions.rb

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

data/lib/psych/visitors/to_ruby.rb

@@ -80,7 +80,9 @@ module Psych
         when "!ruby/object:DateTime"
           class_loader.date_time
           require 'date' unless defined? DateTime
-          @ss.parse_time(o.value).to_datetime
+          t = @ss.parse_time(o.value)
+          DateTime.civil(*t.to_a[0, 6].reverse, Rational(t.utc_offset, 86400)) +
+            (t.subsec/86400)
         when '!ruby/encoding'
           ::Encoding.find o.value
         when "!ruby/object:Complex"

data/lib/psych/visitors/yaml_tree.rb

@@ -192,12 +192,13 @@ module Psych
         register o, @emitter.scalar(o.inspect, nil, '!ruby/regexp', false, false, Nodes::Scalar::ANY)
       end
 
+      def visit_Date o
+        register o, visit_Integer(o.gregorian)
+      end
+
       def visit_DateTime o
-        formatted = if o.offset.zero?
-                      o.strftime("%Y-%m-%d %H:%M:%S.%9N Z".freeze)
-                    else
-                      o.strftime("%Y-%m-%d %H:%M:%S.%9N %:z".freeze)
-                    end
+        t = o.italy
+        formatted = format_time t, t.offset.zero?
         tag = '!ruby/object:DateTime'
         register o, @emitter.scalar(formatted, nil, tag, false, false, Nodes::Scalar::ANY)
       end
@@ -235,7 +236,6 @@ module Psych
       end
       alias :visit_TrueClass :visit_Integer
       alias :visit_FalseClass :visit_Integer
-      alias :visit_Date :visit_Integer
 
       def visit_Float o
         if o.nan?
@@ -480,8 +480,8 @@ module Psych
         @emitter.end_mapping
       end
 
-      def format_time time
-        if time.utc?
+      def format_time time, utc = time.utc?
+        if utc
           time.strftime("%Y-%m-%d %H:%M:%S.%9N Z")
         else
           time.strftime("%Y-%m-%d %H:%M:%S.%9N %:z")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psych
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.3.4
 platform: java
 authors:
 - Aaron Patterson
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-13 00:00:00.000000000 Z
+date: 2022-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -19,8 +19,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.7
   name: jar-dependencies
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,8 +137,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- jar org.yaml:snakeyaml, 1.28
-rubygems_version: 3.0.6
+- jar org.yaml:snakeyaml, 1.33
+rubygems_version: 3.2.29
 signing_key:
 specification_version: 4
 summary: Psych is a YAML parser and emitter