yeptris 0.6.26.2-powerpc64le-linux → 0.6.28.3-powerpc64le-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b51c13e27139834bba07dbbfdcf1020ab6042b31df7446ec923eaadaffac02d9
-  data.tar.gz: 4590cba30a53c1ecc147180915403b4797ff9990500c18854d00f349f29b8ed8
+  metadata.gz: 59a8ac563b8b1a5e4d9e97616e3b4c1c0721d9d53daf10d2cb03d42513207948
+  data.tar.gz: 6a4d565c878be41e836a80e720b71d52e5a94ca859d4ca0afaa476c3aa0ae6e2
 SHA512:
-  metadata.gz: c60beb467337b404f161020fc0e3009ac56cf211901627e0c35f528491c5e0cb504ef2c34448753de0220bfde21aef05ec483c50541b694558cceee343c3d324
-  data.tar.gz: b663d1a559515f8bfca7042e34321c8e47415e2bb82a64708902caff1d13a60f06e4dc127f779f4c1275f38e9a2a55e7954e2c4cfc77021637cba1f09e020cf0
+  metadata.gz: '05963ff7cae99604b9e7bff9cd3aeccb73a921f4d228a72e2f26d7058191a7f5809dd64d7bd4de8704f9a8e2935077187e96e07b5ed44503f602eac03f711f3a'
+  data.tar.gz: 50eb9480d3f33a3168cb527cd6ef4c63fdc83651ea43b457d160b99be0e25fcc3ed076a686f2fca444fc0739dd0810d0e7fe0ed0a5f3d45f01d61ee3575a481b

data/ext/yeptris_native/json_ruby.c

@@ -320,15 +320,32 @@ void yep_rb_set_gc_mode(int mode) {
 #include <time.h>
 
 
+/* portable monotonic seconds: clock_gettime macro-expands to Ruby's
+ * rb_w32_clock_gettime on mingw toolchains, which the windows-11-arm
+ * Ruby does not export (undefined symbol at link) */
+#ifdef _WIN32
+#include <windows.h>
+static double yep_now_s(void) {
+    LARGE_INTEGER c, f;
+    QueryPerformanceCounter(&c);
+    QueryPerformanceFrequency(&f);
+    return (double)c.QuadPart / (double)f.QuadPart;
+}
+#else
+static double yep_now_s(void) {
+    struct timespec t;
+    clock_gettime(CLOCK_MONOTONIC, &t);
+    return (double)t.tv_sec + (double)t.tv_nsec / 1e9;
+}
+#endif
+
 double yep_rb_scan_time(const char* p, size_t len, int n) {
     static const YeptrisVisitVTable none = {0};
-    struct timespec t0, t1;
-    clock_gettime(CLOCK_MONOTONIC, &t0);
+    double s0 = yep_now_s();
     for (int i = 0; i < n; i++) {
         (void)yeptris_visit_json(p, len, &none, NULL);
     }
-    clock_gettime(CLOCK_MONOTONIC, &t1);
-    return (double)(t1.tv_sec - t0.tv_sec) + (double)(t1.tv_nsec - t0.tv_nsec) / 1e9;
+    return yep_now_s() - s0;
 }
 
 VALUE yep_rb_parse_json(const char* p, size_t len, int strict_dup) {

data/lib/yeptris/psych.rb

@@ -182,12 +182,26 @@ module Yeptris
         Visitors::ToRuby.visit(tree.children.first)
       end
 
-      def safe_load(yaml, permitted_classes: [::Date, ::Time], aliases: false, **)
+      def deep_symbolize_keys(obj)
+        case obj
+        when Hash
+          obj.each_with_object({}) do |(k, v), out|
+            out[k.is_a?(String) ? k.to_sym : k] = deep_symbolize_keys(v)
+          end
+        when Array then obj.map { |v| deep_symbolize_keys(v) }
+        else obj
+        end
+      end
+
+      def safe_load(yaml, permitted_classes: [::Date, ::Time], aliases: false,
+                    symbolize_names: false, **)
         begin
           doc = Yeptris::Document.parse(yaml, schema: :compat_11)
           return nil if doc.nil? # the legal empty stream
 
-          force_utf8_scalars(walk_safe(doc.root(0), permitted_classes, aliases))
+          res = force_utf8_scalars(walk_safe(doc.root(0), permitted_classes, aliases))
+          res = deep_symbolize_keys(res) if symbolize_names
+          res
         rescue ::Yeptris::ParseError => e
           doc&.free unless doc&.freed?
           translate_parse_error(e)

data/lib/yeptris/valueml.rb

@@ -242,7 +242,13 @@ module Yeptris
           pending_key.pop
           pending_key_tag.pop
           target = merge_target.pop
-          Materializer.merge_into(target, closed) if target
+          if target
+            if closed.is_a?(Hash) || (closed.is_a?(Array) && closed.all? { |e| e.is_a?(Hash) })
+              Materializer.merge_into(target, closed)
+            else
+              target["<<"] = closed # Psych keeps non-mergeable merge values literally
+            end
+          end
         when DOC
           docs.push(nil)
         when ALIAS
@@ -402,7 +408,13 @@ module Yeptris
           pending_key.pop
           pending_key_tag.pop
           target = merge_target.pop
-          Materializer.merge_into(target, closed) if target
+          if target
+            if closed.is_a?(Hash) || (closed.is_a?(Array) && closed.all? { |e| e.is_a?(Hash) })
+              Materializer.merge_into(target, closed)
+            else
+              target["<<"] = closed # Psych keeps non-mergeable merge values literally
+            end
+          end
         when DOC
           docs.push(nil)
         when ALIAS
@@ -442,9 +454,12 @@ module Yeptris
       if key == "<<" && pending_key_tag[-1] == 9 # TAG_MERGE
         if (v.is_a?(Hash) || v.is_a?(Array)) && v.empty?
           parent # deferred: contents arrive after the open
-        else
+        elsif v.is_a?(Hash) || (v.is_a?(Array) && v.all? { |e| e.is_a?(Hash) })
           Materializer.merge_into(parent, v)
           nil
+        else
+          parent["<<"] = v # Psych keeps non-mergeable merge values literally
+          nil
         end
       else
         parent[key] = v

data/lib/yeptris.rb

@@ -3,7 +3,7 @@
 module Yeptris
   # The gem's version lives in the parent namespace's file — the last
   # internal require (yeptris/version) retired with it.
-  VERSION = "0.6.26.2".freeze
+  VERSION = "0.6.28.3".freeze
 
   # Informational notices are OPT-IN (yeptris-ruby#217): consumers
   # embed yeptris inside CLIs that assert clean stderr, and a

data/vendor/libyeptris/CMakeLists.txt

@@ -3,7 +3,7 @@
 cmake_minimum_required(VERSION 3.20)
 
 project(yeptris
-    VERSION 0.6.26
+    VERSION 0.6.28
     DESCRIPTION "Ultra-fast YAML 1.2 parser, emitter and streamer in C"
     LANGUAGES C CXX
 )