yeptris 0.6.1.1 → 0.6.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9b0f5f6a0bcddd8467c3226cbe4438ad2ac119daecbc28395c125045a827825
-  data.tar.gz: 111a48659d2f3f8f23e3b04ae3dffc1d85fb632a4436887106f89edb583350f4
+  metadata.gz: 5d22f3bb3ecf5566fb8d89432ab482480256b3ccbcec5dbab77baef1bca72a69
+  data.tar.gz: 7e3fdb8f2faf9116395edbd55a0e2f859271ceee267fef2fda07a262812f16db
 SHA512:
-  metadata.gz: dc31a785a9e1bfb683ac4808a9cb58de25d75258d88e7871f8a57d8098e4e84667fb0810b0016eed80c2230260ca6e1a173b1befdbffc2c17d07fdaf07085c2a
-  data.tar.gz: ea6db1c0c50fe7d6fdd5ebd7bcfdd913e321fc15041deb4f024d03e6558438ff09511591462327279c7e1877b6beb298573c8e5f8067fb36544c08b05d5dc54b
+  metadata.gz: 0e9d2fcd8887331c5528afe7eafbddab1ae230621997ffbcf2e60d8a5f172af7cf00bcddd356ab60f6a9c847b269c3010b4b81b65aba7f567da2b4fc7beb1c2f
+  data.tar.gz: 8f53b540c0929a434fc131df7255d4462f76dd35d76c42575cf5bcabcbbd875a4c6a49453d9ba3c5e0ff2a3bd5e846e0036b0e73f40f4a23b0632eaed8a6e754

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
@@ -331,7 +334,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 +352,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,28 @@ 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
+    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.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.1
+  version: 0.6.1.2
 platform: ruby
 authors:
 - Ribose Inc.