yeptris 0.6.1.2 → 0.6.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d22f3bb3ecf5566fb8d89432ab482480256b3ccbcec5dbab77baef1bca72a69
-  data.tar.gz: 7e3fdb8f2faf9116395edbd55a0e2f859271ceee267fef2fda07a262812f16db
+  metadata.gz: 965e8f62705fce2b6b3566e5f64e4719c504cb08ae995a9a58de071c13543481
+  data.tar.gz: 4f06fa6f1ecddc993a58c54ae4f3e6fb160bc39d3629ff8c2293d9de59fda11f
 SHA512:
-  metadata.gz: 0e9d2fcd8887331c5528afe7eafbddab1ae230621997ffbcf2e60d8a5f172af7cf00bcddd356ab60f6a9c847b269c3010b4b81b65aba7f567da2b4fc7beb1c2f
-  data.tar.gz: 8f53b540c0929a434fc131df7255d4462f76dd35d76c42575cf5bcabcbbd875a4c6a49453d9ba3c5e0ff2a3bd5e846e0036b0e73f40f4a23b0632eaed8a6e754
+  metadata.gz: 6126e07fdbf24026edc357d5748d659e2c4a7fa534cdf4dbdfa2ccadabc00fa41548917f563fedbe09ea56324a7fb28d28417559136b2648a2c9631c72d07a87
+  data.tar.gz: 5222f3d5c13e87a0b119d5505077f6288e53711319d901a30de3f33ba5232e9ffc56bf6d4560ee6332dbcb129b8c6eb818a24b4211abdd7b1848bd66e2a0b4f3

data/lib/yeptris/ffi.rb

@@ -89,6 +89,8 @@ module Yeptris
                     %i[yeptris_document pointer size_t int], :yeptris_node
     attach_function :yeptris_node_map_add,
                     %i[yeptris_node pointer size_t yeptris_node], :int
+    attach_function :yeptris_node_map_add_node,
+                    %i[yeptris_node yeptris_node yeptris_node], :int
     attach_function :yeptris_node_map_set,
                     %i[yeptris_node pointer size_t yeptris_node], :int
     attach_function :yeptris_node_map_del, %i[yeptris_node pointer size_t], :int
@@ -176,6 +178,7 @@ module Yeptris
     BUILD_SEQ = 2
     BUILD_MAP = 3
     BUILD_END = 4
+    BUILD_TAG = 5
 
     # the ABI-pinned shape; the bulk builder packs these bytes
     # directly (12 per entry)

data/lib/yeptris/node.rb

@@ -201,6 +201,17 @@ class Yeptris::Node
     self
   end
 
+  # A pre-built key NODE ( Psych parity: nil keys ride the explicit
+  # `!` tag on an empty single-quoted scalar, which the byte-key form
+  # cannot carry)
+  def map_add_node(key_node, node)
+    rc = alive do
+      Yeptris::FFI.yeptris_node_map_add_node(@c_ptr, key_node.c_ptr, node.c_ptr)
+    end
+    Yeptris::FFI.check_status(rc, "yeptris_node_map_add_node")
+    self
+  end
+
   def map_set(key, node)
     key = key.to_s
     rc = alive { Yeptris::FFI.yeptris_node_map_set(@c_ptr, key, key.bytesize, node.c_ptr) }

data/lib/yeptris/psych/visitors.rb

@@ -12,6 +12,12 @@ module Yeptris
       # objects, aliases for repeats, the Encodable protocol, and the
       # !ruby/... tags Psych's own emitter produces.
       class YAMLTree
+        # stdlib's factory (relaton's db cache calls it): the options
+        # ride our visitor defaults
+        def self.create(options = {}, emitter = nil)
+          new
+        end
+
         def initialize
           @tree = ::Yeptris::Document.create
           @names = {}  # object_id -> anchor name
@@ -142,7 +148,17 @@ module Yeptris
           m = @tree.new_mapping
           remember(hash, m)
           m.set_anchor(name) if name
-          hash.each { |k, v| m.map_add(key_text(k), visit(v)) }
+          hash.each do |k, v|
+            if k.nil?
+              # Psych's nil-key form: `! ''` — the explicit tag on an
+              # empty single-quoted key (#300 family 2)
+              key_node = @tree.new_scalar("", :single_quoted)
+              key_node.set_tag("!")
+              m.map_add_node(key_node, visit(v))
+            else
+              m.map_add(key_text(k), visit(v))
+            end
+          end
           m
         end
 
@@ -245,15 +261,37 @@ module Yeptris
           new.visit(node)
         end
 
+        # stdlib ToRuby#accept's domain post-pass: normalize the tag
+        # (strip leading !//, ensure tag: unless x-private) and run the
+        # registered block over the revived result (#95 thread)
+        def apply_domain_type(result, node)
+          return result if node.tag.nil? || node.tag.empty?
+
+          key = node.tag.sub(/\A[!\/]*/, "").sub(/(,\d+)\//, '\1:')
+          key = "tag:#{key}" unless key.match?(/\A(?:tag:|x-private)/)
+          entry = ::Yeptris::Psych.domain_types[key]
+          return result unless entry
+
+          _value, block = entry
+          block.call(key, result)
+        end
+
         def visit(node)
           @root ||= node
-          case node
-          when ::Yeptris::Psych::Nodes::Alias then visit_alias(node)
-          when ::Yeptris::Psych::Nodes::Scalar then visit_scalar(node)
-          when ::Yeptris::Psych::Nodes::Sequence then visit_sequence(node)
-          when ::Yeptris::Psych::Nodes::Mapping then visit_mapping(node)
-          else node&.to_ruby
+          result =
+            case node
+            when ::Yeptris::Psych::Nodes::Alias then visit_alias(node)
+            when ::Yeptris::Psych::Nodes::Scalar then visit_scalar(node)
+            when ::Yeptris::Psych::Nodes::Sequence then visit_sequence(node)
+            when ::Yeptris::Psych::Nodes::Mapping then visit_mapping(node)
+            else node&.to_ruby
+            end
+          # the domain-types post-pass (stdlib ToRuby#accept's tail):
+          # registered blocks transform the revived result per node
+          if node && !::Yeptris::Psych.domain_types.empty?
+            result = apply_domain_type(result, node)
           end
+          result
         end
 
         private

data/lib/yeptris/psych.rb

@@ -37,6 +37,38 @@ module Yeptris
       def dump_tags=(tags)
         @dump_tags = tags
       end
+
+      # The third registry (stdlib psych carries all three; the rebind
+      # broke relaton/lutaml callers that wrote it — the 26x
+      # undefined-method report). Keys are normalized tag strings
+      # ("tag:DOMAIN:TYPE"), values are [key, block] post-processors.
+      def domain_types
+        @domain_types ||= {}
+      end
+
+      def domain_types=(types)
+        @domain_types = types
+      end
+
+      def add_domain_type(domain, type_tag, &block)
+        key = ["tag", domain, type_tag].join(":")
+        domain_types[key] = [key, block]
+        domain_types["tag:#{type_tag}"] = [key, block]
+      end
+
+      def add_builtin_type(type_tag, &block)
+        key = ["tag", "yaml.org,2002", type_tag].join(":")
+        domain_types[key] = [key, block]
+      end
+
+      def remove_type(type_tag)
+        domain_types.delete type_tag
+      end
+
+      def add_tag(tag, klass)
+        load_tags[tag] = klass.name
+        dump_tags[klass] = tag
+      end
     end
 
     # Children load via autoload declared HERE — the immediate parent
@@ -152,7 +184,15 @@ module Yeptris
 
       # Arbitrary object graphs through the YAMLTree visitor
       # (anchors, !ruby/ tags); plain data rides the fast builder.
-      def dump(obj, io = nil)
+      def dump(obj, io = nil, options = {})
+        # stdlib's Object#to_yaml calls Psych.dump(self, options) —
+        # the options hash lands in the io slot positionally; treat a
+        # Hash there as options (the options themselves ride the
+        # visitor's defaults, #95 thread)
+        if io.is_a?(::Hash)
+          options = io
+          io = nil
+        end
         # scalars take the fast builder; EVERYTHING else (including
         # plain containers — they may nest custom objects) goes
         # through the visitor, which builds the same DOM for plain
@@ -388,6 +428,20 @@ end
 # yeptris/psych/drop_in — process-exclusive by nature, since the
 # stdlib cannot be prevented from re-opening whatever ::Psych points
 # at once IT loads.
+# The core extension (stdlib psych/core_ext parity): Object#to_yaml
+# and Object.yaml_tag exist whether the consumer came through stdlib
+# psych first or pure drop-in. Both definitions are compatible —
+# whoever loads last wins, and both call the rebound Psych.dump.
+class Object
+  def self.yaml_tag(url)
+    ::Yeptris::Psych.add_tag(url, self)
+  end
+
+  def to_yaml(options = {})
+    ::Yeptris::Psych.dump(self, options)
+  end
+end
+
 # 0.4-contract migration signal (issue #95): this require used to
 # rebind ::Psych. It does not anymore, and re-binding it here would
 # regress #69 (any stdlib psych loaded afterwards would explode with

data/lib/yeptris/yaml.rb

@@ -102,6 +102,7 @@ module Yeptris
       STYLE_SQ = 2
       STYLE_DQ = 3
       STYLE_LIT = 4
+      BUILD_TAG = Yeptris::FFI::BUILD_TAG
 
       module_function
 
@@ -164,8 +165,15 @@ module Yeptris
               # reader resolves them back to Symbols; Integer/Float/
               # bool keys ride plain like their values (Psych emits
               # 1: unquoted — #290 family 5); string keys ride the
-              # visit_String rules like any other scalar
-              if k.is_a?(Symbol)
+              # visit_String rules like any other scalar; NIL keys
+              # ride Psych's explicit-`!` empty-scalar form
+              # (#300 family 2)
+              if k.nil?
+                scalar("", STYLE_SQ, emit, blob, off)
+                emit.call(BUILD_TAG, 0, off[0], 1)
+                blob << "!"
+                off[0] += 1
+              elsif k.is_a?(Symbol)
                 scalar(":#{k}", STYLE_PLAIN, emit, blob, off)
               elsif k.is_a?(String)
                 place(k, emit, blob, off, seen)
@@ -316,7 +324,15 @@ module Yeptris
       def build_map(doc, h, seen)
         cycle_guard(h, seen) do
           m = doc.new_mapping
-          h.each { |k, v| m.map_add(key_text(k), build(doc, v, seen)) }
+          h.each do |k, v|
+            if k.nil?
+              key_node = doc.new_scalar("", :single_quoted)
+              key_node.set_tag("!")
+              m.map_add_node(key_node, build(doc, v, seen))
+            else
+              m.map_add(key_text(k), build(doc, v, seen))
+            end
+          end
           m
         end
       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.1.2".freeze
+  VERSION = "0.6.2.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

metadata

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