yeptris 0.6.1.1-aarch64-linux → 0.6.1.3-aarch64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0aaf24aca5a062a617a4a370bc558bdd357fc21cda729592e97676f8d73e2820
-  data.tar.gz: 20985a79263de7c34623537e735749a493036a47a331866b8bb86f0bb27f4afc
+  metadata.gz: 3e5b8193f2815d4e3d52870b429abcb0e8253aa8f0d9309f31927e72f77d4a5d
+  data.tar.gz: f6e011eb746bc702ab53044c288dcfc28642b55d523394a957ff6e90e01cdb20
 SHA512:
-  metadata.gz: c56b1a465bde0b9dd01120dc7da7a26bfd3d466c84c426a1dfeb29ce64a51f52dc3bc2b6336fc338d725abe20b361e8853203bc47575c207faef512e384e23fb
-  data.tar.gz: c5d6b69c0a72c207475ef7a64fb1dc5b639590bbc75a04a247cab315b514391ef7e358dee0b6bd3ed9449ecf346549941f5bd39bd272dc5e5821ed24eaffcd76
+  metadata.gz: 06eb30461b0a3a5bbf2024425c47e6fd9d313d073a62fe73d69dfa08cd97e5934e0f528bbd02df7ee0eba6af6359715ec67b9e378d8a4ad31f9b9342f613e3f0
+  data.tar.gz: 625b12f9093edf683420ba81788c81e4e52a73ec5805184264c00aaafbee52461c16baba982871290e0f3d128c3e8f7cd1daeb67a3e6ac406cf791e65f6dbb4a

data/lib/yeptris/psych/visitors.rb

@@ -120,6 +120,8 @@ module Yeptris
               "" # 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
@@ -204,7 +206,8 @@ module Yeptris
           end
           m = @tree.new_mapping
           m.set_anchor(name) if name
-          m.set_tag("!ruby/object:#{obj.class.name}")
+          custom = ::Yeptris::Psych.dump_tags[obj.class]
+          m.set_tag(custom || "!ruby/object:#{obj.class.name}")
           m.map_add("__init__", init)
           remember(obj, m)
           m
@@ -242,15 +245,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
@@ -331,7 +356,13 @@ module Yeptris
             klass = resolve_class(Regexp.last_match(1).to_s)
             revive_object(klass, node)
           else
-            hash_into({}, node)
+            # Psych.load_tags first (the class registry, #95 bug 4);
+            # anything else stays the plain mapping
+            if (klass = ::Yeptris::Psych.load_tags[tag])
+              revive_tagged(klass, node)
+            else
+              hash_into({}, node)
+            end
           end
         end
 
@@ -343,6 +374,23 @@ module Yeptris
           h
         end
 
+        # A load_tags-registered class revives from the mapping's own
+        # top-level pairs (Psych's coder semantics — no __init__
+        # wrapper, which is OUR encoder's internal convention)
+        def revive_tagged(klass, node)
+          raise ::Yeptris::DumpError,
+                "#{klass} is not Yeptris::Psych::Encodable: implement init_with(coder)" unless klass <= ::Yeptris::Psych::Encodable
+
+          obj = klass.allocate
+          anchors[node.anchor] = obj if node.anchor
+          coder = ::Yeptris::Psych::CoderShim.new
+          node.children.each_slice(2) do |k, v|
+            coder[k.to_ruby.to_s] = visit(v)
+          end
+          obj.init_with(coder)
+          obj
+        end
+
         def revive_object(klass, node)
           # bare !ruby/object (no class): Psych.dump(Object.new)'s form.
           # An Object has no declared state — allocation is the whole

data/lib/yeptris/psych.rb

@@ -17,6 +17,60 @@ require "set"
 # document without materializing.
 module Yeptris
   module Psych
+    # The tag registries (Psych's class-level API, #95 bug 4):
+    # load_tags maps a serialized tag to the Class that revives it;
+    # dump_tags overrides the emitted tag for a Class. Consulted by
+    # the revival visitor (custom tags) and the dumper's tag choice.
+    class << self
+      def load_tags
+        @load_tags ||= {}
+      end
+
+      def load_tags=(tags)
+        @load_tags = tags
+      end
+
+      def dump_tags
+        @dump_tags ||= {}
+      end
+
+      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
     # namespace's file (never internal requires).
     autoload :Handler, "yeptris/psych/handler"

data/lib/yeptris/yaml.rb

@@ -105,6 +105,12 @@ module Yeptris
 
       module_function
 
+      # Psych's exact timestamp spelling (format_time, #300): space
+      # separated, nanosecond width, Z for UTC — iso8601 diverged
+      def time_text(t)
+        t.utc? ? t.strftime("%Y-%m-%d %H:%M:%S.%9N Z") : t.strftime("%Y-%m-%d %H:%M:%S.%9N %:z")
+      end
+
       # Psych's float spelling (#290): Infinity/NAN ride the YAML words,
       # not Ruby's to_s (which prints "Infinity"/"NaN" — a STRING on
       # reload)
@@ -182,7 +188,8 @@ module Yeptris
         when Float then scalar(float_text(obj), STYLE_PLAIN, emit, blob, off)
         when true, false then scalar(obj.to_s, STYLE_PLAIN, emit, blob, off)
         when nil then scalar("", STYLE_PLAIN, emit, blob, off)
-        when Date, Time then scalar(obj.iso8601, STYLE_PLAIN, emit, blob, off)
+        when Time then scalar(time_text(obj), STYLE_PLAIN, emit, blob, off)
+        when Date then scalar(obj.iso8601, STYLE_PLAIN, emit, blob, off)
         else
           raise DumpError,
                 "cannot dump #{obj.class}: unsupported object " \
@@ -297,7 +304,8 @@ module Yeptris
         when Float then new_scalar(doc, BulkBuilder.float_text(obj))
         when true, false then new_scalar(doc, obj.to_s)
         when nil then new_scalar(doc, "")
-        when Date, Time then new_scalar(doc, obj.iso8601)
+        when Time then new_scalar(doc, BulkBuilder.time_text(obj))
+        when Date then new_scalar(doc, obj.iso8601)
         else
           raise DumpError,
                 "cannot dump #{obj.class}: unsupported object " \

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.1".freeze
+  VERSION = "0.6.1.3".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.1
+  version: 0.6.1.3
 platform: aarch64-linux
 authors:
 - Ribose Inc.