yeptris 0.1.32.1 → 0.2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 715a303c3798b0e446f0511093790dcc23958039cee970672772bf34d724614e
-  data.tar.gz: fba78db515f493833a9c43c6931386c7cd4958582eda1f98b1e4ffef6dbfb950
+  metadata.gz: 1173c7a995c80564dbb7685e5b3a8e01ffce35233f5736367affa9b4cfc47fbf
+  data.tar.gz: 36facc6eda9fd872c00149122f7edadcf88909702317e5f34ff20cd4e202359d
 SHA512:
-  metadata.gz: 3024caec31b6a0e1535e2dfcbe53c61aa790fca013a14a4138f266c12acc6016cd6ab53c83a0c1bb70f39ecddc717ed0eff83baf78613440fc150aed29e0ec54
-  data.tar.gz: ce5a508e4efcd1485f4d18121025a203579c53d9b990246b2961991009e5c4367140eb993bdfe28ca380776dd95be4922d3fea0fa89146b439fbf5922c14cee3
+  metadata.gz: 720c5a7a2b1ebca34757c05b8fbaff07669797b0abf2758e37330beb86156c3d0a302848412d792912726f7b62dda9a56d0fb0fec57c2657d19c8ba10bfbf014
+  data.tar.gz: fc0e98a14c2c5ee6d88cbba2bce4ff097427f01be955ca138a16adf730ed37cb0b2279e12565707518dfd895ae9245c55add02128f59e31141fd8924154c30a3

data/README.adoc

@@ -116,11 +116,26 @@ without compiling).
   (`Node#to_ruby` becomes bulk). Alias identity preserved through
   object links; merge keys and timestamps return UNSUPPORTED for the
   record-walk fallback.
-* `Yeptris::Psych` — the drop-in namespace with the ported Psych
-  suite (143 specs), `.tml` corpora conformance, and the Encodable
-  object protocol (`include Yeptris::Psych::Encodable` +
+* `Yeptris::Psych` — the Psych-compatible namespace with the ported
+  Psych suite (143 specs), `.tml` corpora conformance, and the
+  Encodable object protocol (`include Yeptris::Psych::Encodable` +
   `encode_with`/`init_with` — no `respond_to?`, no ivar reflection;
   the library never reaches into an object's internals).
+** CO-EXISTENCE (issue #69): `require "yeptris/psych"` loads the
+   namespace WITHOUT touching the top-level `Psych` constant — it
+   coexists with stdlib psych in ANY load order. The process-
+   exclusive drop-in rebind (`::Psych = Yeptris::Psych`) is now
+   OPT-IN: `require "yeptris/psych/drop_in"`. Once the drop-in runs,
+   stdlib psych must NOT be loaded afterwards (its require re-opens
+   the rebound module and clobbers constants). Bundles that cannot
+   control the load order (activesupport et al.) should use
+   `Yeptris::Psych` / `Yeptris::YAML` directly.
+** `Yeptris::YAML.safe_load(yaml, permitted_classes: [], aliases:
+   false)` — Psych's safe_load semantics on the native surface:
+   plain data by default; a leaf that would materialize to a
+   non-permitted class (a compat_11 date) raises
+   `Yeptris::Psych::DisallowedClass`; alias use without `aliases:
+   true` raises `Yeptris::Psych::AliasesError`.
 * Lockstep versioning with the C library
   (`{c-semver}.{gem-patch}`); releases published from the C repo's
   workflow through the RubyGems trusted publisher.

data/lib/yeptris/psych/drop_in.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+# The process-exclusive drop-in (issue #69): rebinds the top-level
+# Psych constant to Yeptris::Psych. Once this runs, stdlib psych must
+# NOT be loaded afterwards — its require would re-open THIS module and
+# clobber constants ("already initialized" warnings, then
+# NameError/NoMethodError at call time). Bundles that cannot
+# guarantee the load order (activesupport et al.) should require
+# "yeptris/psych" only and reference Yeptris::Psych directly.
+require "yeptris" # the autoload declarations (Document, Node, ...) live here
+require "yeptris/psych"
+
+# ( Psych-stdlib, if already loaded, stays reachable as
+# ::Psych::ORIGINAL.)
+if defined?(::Psych) && !::Psych.equal?(Yeptris::Psych) &&
+   !Yeptris::Psych.const_defined?(:ORIGINAL, false)
+  Yeptris::Psych.const_set(:ORIGINAL, ::Psych)
+end
+# class_eval reaches Module-private methods WITHOUT send (the law: no
+# send to private methods); remove_const has no public form, and the
+# rebind is this file's whole purpose
+Object.class_eval { remove_const(:Psych) } if defined?(::Psych) && !::Psych.equal?(Yeptris::Psych)
+::Psych = Yeptris::Psych

data/lib/yeptris/psych.rb

@@ -6,8 +6,10 @@ require "set"
 
 # The Psych drop-in namespace (TODO.impl/15 phase C).
 #
-# `require "yeptris/psych"` rebinds the top-level Psych constant to
-# this module (the original, if any, stays reachable as
+# `require "yeptris/psych"` loads this namespace WITHOUT touching the
+# top-level Psych constant (co-existence, issue #69); the process-
+# exclusive drop-in rebind is `require "yeptris/psych/drop_in"` (the
+# original stdlib, if loaded first, stays reachable as
 # ::Psych::ORIGINAL). Semantics follow the Psych suite: load is
 # SAFE by default (Psych 5 behavior — plain data only; anything
 # tagged raises), unsafe_load materializes everything the yeptris
@@ -65,7 +67,10 @@ module Yeptris
         @name = name
       end
     end
-    class AliasNotEnabled < Error; end
+    # Psych spells it Psych::AliasesError; the older name stays as an
+    # alias for existing rescues.
+    class AliasesError < Error; end
+    AliasNotEnabled = AliasesError
 
     class << self
       # Psych 5: load is safe — plain data structures only. Tagged
@@ -146,19 +151,24 @@ module Yeptris
       private
 
       # yeptris materializes plain data only — there is nothing
-      # unsafe it COULD load. The safety walk enforces what Psych
-      # enforces on such documents: aliases need opt-in, and explicit
-      # non-core tags raise DisallowedClass (the only "classes" the
-      # loader can produce are core-schema types, all permitted).
+      # unsafe it COULD load. The safety walk enforces Psych's
+      # contract: aliases need opt-in, explicit non-core tags raise
+      # DisallowedClass, and a scalar whose IMPLICIT typing yields a
+      # class outside the permitted set raises too (issue #69: a
+      # compat_11 date must not become a Date unless Date is
+      # permitted — Psych::DisallowedClass semantics).
       def walk_safe(root, permitted, aliases_enabled)
-        check(root, aliases_enabled) if root
+        check(root, permitted, aliases_enabled) if root
         root.to_ruby
       end
 
-      def check(node, aliases_enabled)
+      PERMITTED_BY_DEFAULT = [TrueClass, FalseClass, NilClass, Integer, Float,
+                              String, Array, Hash].freeze
+
+      def check(node, permitted, aliases_enabled)
         case node.kind
         when :alias
-          raise AliasNotEnabled, "Unknown alias" unless aliases_enabled
+          raise AliasesError, "Unknown alias" unless aliases_enabled
         when :scalar, :mapping, :sequence
           tag = node.tag
           unless tag.nil?
@@ -168,14 +178,18 @@ module Yeptris
               raise DisallowedClass, name
             end
           end
+          if node.kind == :scalar && node.tag_id == :timestamp &&
+             !permitted.include?(Date) && !permitted.include?(Time)
+            raise DisallowedClass, "Date"
+          end
           case node.kind
           when :mapping
             node.each_pair do |k, v|
-              check(k, aliases_enabled)
-              check(v, aliases_enabled)
+              check(k, permitted, aliases_enabled)
+              check(v, permitted, aliases_enabled)
             end
           when :sequence
-            node.each { |e| check(e, aliases_enabled) }
+            node.each { |e| check(e, permitted, aliases_enabled) }
           end
         end
       end
@@ -346,14 +360,9 @@ module Yeptris
   end
 end
 
-# The drop-in: rebind the top-level constant ( Psych-stdlib, if
-# already loaded, stays reachable as Yeptris::Psych::ORIGINAL).
-if defined?(::Psych) && !::Psych.equal?(Yeptris::Psych) &&
-   !Yeptris::Psych.const_defined?(:ORIGINAL, false)
-  Yeptris::Psych.const_set(:ORIGINAL, ::Psych)
-end
-# class_eval reaches Module-private methods WITHOUT send (the law:
-# no send to private methods); remove_const has no public form, and
-        # the rebind is this namespace's whole purpose
-        Object.class_eval { remove_const(:Psych) } if defined?(::Psych)
-::Psych = Yeptris::Psych
+# The drop-in is OPT-IN (issue #69): `require "yeptris/psych"` loads
+# the namespace only and coexists with stdlib psych in ANY load
+# order (this file never touches ::Psych). The rebind lives in
+# yeptris/psych/drop_in — process-exclusive by nature, since the
+# stdlib cannot be prevented from re-opening whatever ::Psych points
+# at once IT loads.

data/lib/yeptris/yaml.rb

@@ -22,6 +22,17 @@ module Yeptris
       docs.empty? ? nil : docs.first
     end
 
+    # Psych-semantics safe_load on the native surface (issue #69 —
+    # the entry frameworks actually want): plain data only; a leaf
+    # whose class is not permitted raises Yeptris::Psych::
+    # DisallowedClass; aliases: false raises Yeptris::Psych::
+    # AliasesError on alias use. Delegates to the compat namespace's
+    # tree walk (correctness first; the fused drain comes later).
+    def safe_load(yaml, permitted_classes: [], aliases: false, schema: :compat_11)
+      yaml = Yeptris.read_input(yaml)
+      Psych.safe_load(yaml.to_s, permitted_classes: permitted_classes, aliases: aliases)
+    end
+
     # Every document in the stream, in order.
     def load_stream(yaml, schema: :compat_11)
       yaml = Yeptris.read_input(yaml)

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.1.32.1".freeze
+  VERSION = "0.2.0.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.1.32.1
+  version: 0.2.0.1
 platform: ruby
 authors:
 - Ribose Inc.
@@ -45,6 +45,7 @@ files:
 - lib/yeptris/node.rb
 - lib/yeptris/psych.rb
 - lib/yeptris/psych/coder_shim.rb
+- lib/yeptris/psych/drop_in.rb
 - lib/yeptris/psych/encodable.rb
 - lib/yeptris/psych/handler.rb
 - lib/yeptris/psych/parser.rb