yeptris 0.6.1.3 → 0.6.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 463374b3fdb577191db3ac0bafcc5a2fea0d5766328984118008836a05d6cb82
-  data.tar.gz: 781b4130bfe0e92d074bf9847847936106534a13a09e43f28c3db705b7700da7
+  metadata.gz: c7cbac43219b4ebaa9e50dd2e31f952e04e147f61a2b31da36607ecdd6ec6353
+  data.tar.gz: 1776b7da27e9e9a3686eadd95cc36d18b961ccb536a070a50ddb4f78e22e972a
 SHA512:
-  metadata.gz: 976b27c17df3ead867fdcf14935b745a6a37846718a277b3077895d6132a91c03ad062d52e3556805ff6496e0101d8311770318f6c0d207afdb1c40201a9f26e
-  data.tar.gz: '0195f2564404cd3b73712806af34794bbbf682f91ee026c0715d40b2d19a5165a496f5c058865900ca5ca8dbcb4c06f9bee7255cb636bde2d51633cf332b3494'
+  metadata.gz: 320f371c5a058d59954f78b71f1735fc4d0c085034a6685fc7b9f903694dc1528a6fb754fd98fa93ff5ae848fa9d91ad3c6272e115dc9d3c1390fe3efc517221
+  data.tar.gz: cdae458f8fa79763c28c30ec3c2d1479c57180147af0b5171fe20ff415fd2f723218ba984c016185781983de2c1a5e39421039a2127855c6a7ab54d8dd4e3f27

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
@@ -114,14 +120,18 @@ module Yeptris
           # strings route through the builder's plain-safety helper
           # (one quoting rule, DRY); other scalars are their own text
           text =
-            if obj.is_a?(::Date) || obj.is_a?(::Time)
-              obj.iso8601 # canonical timestamp form, not to_s
+            if obj.is_a?(::Time)
+              # psych-5's format_time (#300 family 1) — the FIRST cut
+              # put this branch after the Date||Time iso8601 one, dead
+              # code: Psych.dump of a Hash still emitted iso8601 (the
+              # neutral surface alone was pinned)
+              ::Yeptris::YAML::BulkBuilder.time_text(obj)
+            elsif obj.is_a?(::Date)
+              obj.iso8601 # canonical calendar form (DateTime rides here too)
             elsif obj.nil?
               "" # libyaml's null rendering rides bare (issue #290)
             elsif obj.is_a?(::Float)
               ::Yeptris::YAML::BulkBuilder.float_text(obj)
-            elsif obj.is_a?(::Time)
-              ::Yeptris::YAML::BulkBuilder.time_text(obj)
             else
               obj.to_s
             end
@@ -142,7 +152,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
 

data/lib/yeptris/psych.rb

@@ -184,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
@@ -420,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.3".freeze
+  VERSION = "0.6.2.2".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.3
+  version: 0.6.2.2
 platform: ruby
 authors:
 - Ribose Inc.