yeptris 0.6.5.4 → 0.6.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec5a8bfeb0851d4287965e0f7c162cf13b71c90bdbb1f423a2bb0a8f508d22e4
-  data.tar.gz: d757361d8e14a3f94f34419e71334c4c139dc60aaab7aaf638c9dd88239811c5
+  metadata.gz: 8192f177ce03a9524f7ec6bd078d1a5854bbcf533b53ed8c8d2d7982d07c1761
+  data.tar.gz: 470e8b180e8f1f632c2e616dc9e6b1762ec99b93fc642aa25a988ea3d1214722
 SHA512:
-  metadata.gz: 75c1451044793867918c6d9972ba7c452d79684c00e7b92a59a30f392bb741fe6c04b6e6571c3c7e6b956c14e7511bd48ba81ab79e552f54675d6726c2dd24d7
-  data.tar.gz: debf5f3377d19dfba238bb412145e7335480dbde4f5c3cff8b8d51aea7426f26038a8913caf1902a92e633684377c52994f10a342e39d2a67a68a5739468ba45
+  metadata.gz: acac433987243971017823d89f3ab5edefd89b3b3770d9a85555c71c0296ed50d144c543a7cc2fbbdb2c432b0c5482209db680e1dc8a89ba5e9b4b6a5dc97c9d
+  data.tar.gz: 5dbed07e836272d52b90c1e398ba0bdbb6e82b324498a66e053dd267a0cdba68c6f59f888eaab220270a2e1f05f2c298022899b9716030280396a88218cc6454

data/lib/yeptris/ffi.rb

@@ -28,17 +28,6 @@ module Yeptris
       MSG
     end
 
-    # :c_free (:free, line ~240) must resolve against the C runtime.
-    # Linux/macOS fall through to the process symbol table, but
-    # Windows has no such fallback — without LIBC attached the
-    # ffi.rb load DIED at that attach (leaving every later constant
-    # undefined: the mingw gem's missing NODE_* / #318).
-    begin
-      ffi_lib FFI::Library::LIBC
-    rescue StandardError
-      # no LIBC handle: the c_free attach below surfaces the failure
-      # exactly where it used to, on non-Windows platforms only
-    end
 
     typedef :pointer, :yeptris_document
     typedef :pointer, :yeptris_node
@@ -242,9 +231,17 @@ module Yeptris
     end
 
     # Owned char* results (serialize*): one reader, freed exactly once.
-    # The buffers are plain malloc'd C memory (the header contract says
-    # "caller frees"), so the release is libc free.
-    attach_function :c_free, :free, [:pointer], :void
+    # The release goes through yeptris_free (libyeptris's own
+    # allocator-matching free) because ffi's :free attach has no
+    # Windows process-symbol fallback — libyeptris.dll doesn't export
+    # libc free, so resolving :free against it fails on Windows.
+    begin
+      attach_function :yeptris_free, [:pointer], :void
+    rescue ::FFI::NotFoundError
+      # libyeptris < v0.6.6: POSIX resolves :free through the process
+      # symbol table, so the direct libc attach still works there.
+      attach_function :yeptris_free, :free, [:pointer], :void
+    end
 
     module Owned
       module_function
@@ -261,7 +258,7 @@ module Yeptris
             else
               ptr.read_string.force_encoding(Encoding::UTF_8)
             end
-        ::Yeptris::FFI.c_free(ptr)
+        ::Yeptris::FFI.yeptris_free(ptr)
         s
       end
     end

data/lib/yeptris/json.rb

@@ -71,7 +71,7 @@ module Yeptris
       return s unless s.include?("\\")
 
       b = s.b
-      out = +"".b
+      out = String.new(encoding: Encoding::BINARY)
       i = 0
       n = b.bytesize
       while i < n
@@ -154,7 +154,10 @@ module Yeptris
           stack.pop
           key_sets&.pop
         when T_STR
-          text = lens[i] == 0 ? +"".force_encoding(Encoding::UTF_8) : decode_span(src, offs[i], lens[i])
+          # empty-string literals are frozen+shared since Ruby 3.4
+          # (and `+""` binds after the method chain anyway), so the
+          # fresh copy must come from the encoding call itself
+          text = lens[i] == 0 ? String.new(encoding: Encoding::UTF_8) : decode_span(src, offs[i], lens[i])
           if pending_key.nil? && !stack.empty? && stack.last.is_a?(Hash)
             if key_sets && key_sets.last.key?(text)
               raise ParseError, %(duplicate key "#{text}" in JSON object)

data/lib/yeptris/psych.rb

@@ -4,6 +4,11 @@ require "date"
 require "time"
 require "set"
 
+# Self-sufficient (the #95 yaml.rb fix, same class): the standalone
+# require "yeptris/psych" must register the Document/FFI machinery —
+# consumers load this face directly under the drop-in.
+require "yeptris"
+
 # The Psych drop-in namespace (TODO.impl/15 phase C).
 #
 # `require "yeptris/psych"` loads this namespace WITHOUT touching the
@@ -130,7 +135,7 @@ module Yeptris
       # Psych 5: load is safe — plain data structures only. Tagged
       # nodes raise DisallowedClass unless their class is permitted
       # (Date/Time/Symbol are built in; they are plain data here).
-      def load(yaml, permitted_classes: [], aliases: false, **)
+      def load(yaml, permitted_classes: [::Date, ::Time], aliases: false, **)
         safe_load(yaml, permitted_classes: permitted_classes, aliases: aliases)
       end
 
@@ -144,10 +149,78 @@ module Yeptris
         Visitors::ToRuby.visit(tree.children.first)
       end
 
-      def safe_load(yaml, permitted_classes: [], aliases: false, **)
+      def safe_load(yaml, permitted_classes: [::Date, ::Time], aliases: false, **)
+        doc = Yeptris::Document.parse(yaml, schema: :compat_11)
+        begin
+          force_utf8_scalars(walk_safe(doc.root(0), permitted_classes, aliases))
+        ensure
+          doc.free
+        end
+      end
+
+      # A YAML stream is a Unicode character stream: stdlib psych tags
+      # non-ASCII scalars UTF-8 even when the input String is BINARY
+      # (#135). ASCII-only values keep their (binary) encoding — a
+      # re-tag would be observable there and stdlib does not either.
+      def force_utf8_scalars(obj)
+        case obj
+        when ::String
+          obj.force_encoding(::Encoding::UTF_8) if obj.encoding == ::Encoding::ASCII_8BIT && !obj.ascii_only?
+          obj
+        when ::Hash
+          obj.each { |k, v| force_utf8_scalars(k); force_utf8_scalars(v) }
+        when ::Array
+          obj.each { |v| force_utf8_scalars(v) }
+        else
+          obj
+        end
+      end
+
+      # stdlib's file-level faces (#135): BOM-tolerant UTF-8 reads with
+      # the fallback contract (load_file path, fallback: false default).
+      def load_file(path, fallback: false, **kwargs)
+        File.open(path, "r:bom|utf-8") { |f| load(f, **kwargs) }
+      rescue Errno::ENOENT
+        raise unless fallback
+
+        false
+      end
+
+      def safe_load_file(path, fallback: false, **kwargs)
+        File.open(path, "r:bom|utf-8") { |f| safe_load(f, **kwargs) }
+      rescue Errno::ENOENT
+        raise unless fallback
+
+        false
+      end
+
+      def unsafe_load_file(path, fallback: false, **kwargs)
+        File.open(path, "r:bom|utf-8") { |f| unsafe_load(f, **kwargs) }
+      rescue Errno::ENOENT
+        raise unless fallback
+
+        false
+      end
+
+      def parse_file(path, **kwargs)
+        File.open(path, "r:bom|utf-8") { |f| parse(f, **kwargs) }
+      end
+
+
+
+      # stdlib's deprecated safe/dump split — same output here (every
+      # value this loader produces is safe data)
+      def safe_dump(obj, io = nil, options = {})
+        ::Yeptris::Psych.dump(obj, io, options)
+      end
+
+      def load_stream(yaml, **kwargs)
+        # materialize each document's root directly — the stream
+        # children share one C document, so their handles would all
+        # resolve to the first document's tree
         doc = Yeptris::Document.parse(yaml, schema: :compat_11)
         begin
-          walk_safe(doc.root(0), permitted_classes, aliases)
+          (0...doc.document_count).map { |i| doc.root(i).to_ruby }
         ensure
           doc.free
         end

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.5.4".freeze
+  VERSION = "0.6.7.1".freeze
   # The error hierarchy lives in THIS file (the parent namespace's
   # own file): nested constants do not trigger a parent-constant
   # autoload, and the law forbids internal requires — defining the
@@ -44,14 +44,15 @@ module Yeptris
   autoload :ValueML, "yeptris/valueml"
   autoload :Psych, "yeptris/psych"
   autoload :Schema, "yeptris/schema"
-
-  # The safe_load error names, aliased at the top level so consumers
-  # writing rescues need no nesting knowledge (issue #73's naming
-  # note): Yeptris::DisallowedClass is Yeptris::Psych::DisallowedClass.
-  DisallowedClass = Psych::DisallowedClass
-  AliasesError = Psych::AliasesError
 end
 
+# NOTE (the #318 poisoned-process class): the Psych error-name aliases
+# live BELOW the ffi require — reading Psych here would trigger the
+# psych autoload BEFORE the native library resolves, and a mid-load
+# ffi failure under a drop-in rebind left ::Psych rebound against a
+# half-initialized FFI module (every to_yaml in the process died).
+# With this order an ffi failure is a clean, loud require failure.
+
 # Eager native-library resolution (leptris-ruby lesson): fail at
 # require time, not at first parse. The ffi require MUST come after
 # the autoload registrations — ffi.rb opens module Yeptris, and
@@ -67,6 +68,25 @@ rescue LoadError => e
   MSG
 end
 
+
+# The safe_load error names, aliased at the top level so consumers
+# writing rescues need no nesting knowledge (issue #73's naming
+# note): Yeptris::DisallowedClass is Yeptris::Psych::DisallowedClass.
+# LAZY (const_missing): a standalone require "yeptris/psych" loads
+# yeptris.rb MID-psych — an eager alias here would re-enter the
+# half-loaded psych.rb through the autoload and NameError. At first
+# touch psych is complete in every load order.
+module Yeptris
+  def self.const_missing(name)
+    case name
+    when :DisallowedClass, :AliasesError
+      const_set(name, Psych.const_get(name))
+    else
+      super
+    end
+  end
+end
+
 # Optional C-API materializer (TODO.restructure/22): fused visit →
 # Ruby objects via the Ruby C API. Feature-detected — LoadError leaves
 # the FFI ladder (Marshal → columns → records) as the sole path.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yeptris
 version: !ruby/object:Gem::Version
-  version: 0.6.5.4
+  version: 0.6.7.1
 platform: ruby
 authors:
 - Ribose Inc.