yeptris 0.6.3.3 → 0.6.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d16340cd0d9b49195e34d5cad813470ef6d71a7b39ac902b0a1580999708cfc
-  data.tar.gz: 20f49034bd75ba72a1202c1b0bee77626aba0246719647ba3848d5849c54cd1b
+  metadata.gz: d45b2a3218406977adea5d7ae6d9184042864fce7bd2aeb9e69f3d87f0d11351
+  data.tar.gz: f2c61980fb7ca80b0d5686820718594c9cf8a0290975b555b2ce777d136bbfad
 SHA512:
-  metadata.gz: 4d77c4cfcb593eef407c9472b688f2ea527d45f4928a9a74a7dbbb90af16bdc681faf03db34276cf4f28ee963d0830af2796a365e94e229a506125a75db8301e
-  data.tar.gz: 37ff59642e868d3e9313067f424c0bfdd14f1b359052ff8c299636c14fd1c1453772f9df825134d5c07a60bf90581e2d3396b1fb9587e6658f046a65b68b9edb
+  metadata.gz: ef6d04e084a9bf84458396a560176ccd56eacd375bbc8bbf215e6ba810f2e07d149cd95727842fd5864f7eafc90306a09395becc154f16e68e4ec43fcc183322
+  data.tar.gz: da3bc2434c554b1d656e4f2749a1ee98acaaef71d37f5fad4372da679e22ff1c15b5be55545f18cb4e62e3984fc409f8763f563bd1b21d682c765b5f4af8b59b

data/lib/yeptris/ffi.rb

@@ -91,6 +91,17 @@ module Yeptris
     attach_function :yeptris_plan_result_str_lens, %i[pointer size_t], :pointer
     attach_function :yeptris_plan_result_nulls, %i[pointer size_t], :pointer
 
+    # the DOM (YAML) leg of the plan walk (#293 slice three): same
+    # compiled plan over a parsed document; str columns expose
+    # (ptr,len) views into the document's regions
+    attach_function :yeptris_document_plan_walk, %i[yeptris_document pointer pointer], :pointer
+    attach_function :yeptris_plan_result_strs, %i[pointer size_t], :pointer
+
+    # yeptris_plan_str (plan.h): one string view
+    class PlanStr < ::FFI::Struct
+      layout :p, :pointer, :len, :size_t
+    end
+
     attach_function :yeptris_document_free, [:yeptris_document], :void
     attach_function :yeptris_document_count, [:yeptris_document], :size_t
     attach_function :yeptris_document_root, [:yeptris_document, :size_t], :yeptris_node

data/lib/yeptris/json/descriptor.rb

@@ -50,9 +50,18 @@ class Yeptris::JSON::Descriptor
   end
 
   # +kind+: :seq (rows are the root array) or :map (rows live under
-  # +path:+'s value). +children+: the leaf columns; each row is a
-  # mapping, every child names one typed column.
+  # +path:+'s value). +path+: a String, or an Array of Strings for a
+  # segmented (nested) path. +children+: the leaf columns; each row
+  # is a mapping, every child names one typed column.
   def self.build(kind:, path: nil, children:)
+    handle, names = compile_handle(kind, path, children)
+    new(handle, names)
+  end
+
+  # The compile half of .build (shared with the YAML subclass's
+  # build — ONE owner of the spec grammar). Returns the owned handle
+  # and the leaf names.
+  def self.compile_handle(kind, path, children)
     unless ROOT_KINDS.include?(kind)
       raise ArgumentError, "kind must be one of #{ROOT_KINDS.inspect}, got #{kind.inspect}"
     end
@@ -74,8 +83,20 @@ class Yeptris::JSON::Descriptor
       { "name" => name, "kind" => LEAF_SPEC_NAMES[code] }
     end
 
+    case path
+    when nil then nil
+    when ::String then spec_path = path
+    when ::Array
+      unless path.all? { |seg| seg.is_a?(::String) && !seg.empty? }
+        raise ArgumentError, "path segments must be non-empty Strings"
+      end
+      spec_path = path
+    else
+      raise ArgumentError, "path must be a String or an Array of Strings"
+    end
+
     spec = { "kind" => kind == :map ? "map" : "seq", "children" => leaves }
-    spec["path"] = path if path
+    spec["path"] = spec_path unless spec_path.nil?
 
     # the spec is strict JSON (the C compiler parses it through the
     # strict JSON DOM); compile once, the engine owns the copy
@@ -86,8 +107,9 @@ class Yeptris::JSON::Descriptor
       raise Error, "plan compile failed (status=#{st.read_int}): #{spec_json}"
     end
 
-    new(Handle.new(raw), leaves.map { |leaf| leaf["name"] })
+    [Handle.new(raw), leaves.map { |leaf| leaf["name"] }]
   end
+  private_class_method :compile_handle
 
   attr_reader :names # the planned leaf names, in spec order
 
@@ -173,6 +195,30 @@ class Yeptris::JSON::Descriptor
     end
     private_class_method :read_column
 
+    # @api private — the DOM leg's read: typed lanes as above; str
+    # columns materialize from the (ptr,len) views into the document
+    def self.read_dom(raw, names)
+      rows = ::Yeptris::FFI.yeptris_plan_result_rows(raw)
+      columns = {}
+      names.each_with_index do |name, c|
+        kind = ::Yeptris::FFI.yeptris_plan_result_kind(raw, c)
+        if kind == 2
+          nulls = ::Yeptris::FFI.yeptris_plan_result_nulls(raw, c).read_bytes(rows).unpack("C*")
+          base = ::FFI::Pointer.new(::Yeptris::FFI.yeptris_plan_result_strs(raw, c))
+          stride = ::Yeptris::FFI::PlanStr.size
+          columns[name] = Array.new(rows) do |i|
+            next nil if nulls[i] == 1
+
+            v = ::Yeptris::FFI::PlanStr.new(base + i * stride)
+            v[:p].read_bytes(v[:len]).force_encoding(Encoding::UTF_8)
+          end
+        else
+          columns[name] = read_column(raw, c, kind, rows, nil)
+        end
+      end
+      new(rows, names, columns)
+    end
+
     def initialize(rows, names, columns)
       @rows = rows
       @names = names

data/lib/yeptris/yaml/descriptor.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+# The YAML leg of the Descriptor plan walk (yeptris#293 slice three,
+# over the C DOM plan walk of libyeptris v0.6.4): the same compiled
+# row shape as Yeptris::JSON::Descriptor, applied to a parsed YAML
+# document — block YAML hydrates to typed columns with no
+# intermediate Ruby tree.
+#
+#     descriptor = Yeptris::YAML::Descriptor.build(
+#       kind: :map, path: ["data", "items"], # segmented paths work
+#       children: [{ name: "id", kind: :int }, { name: "name", kind: :str }])
+#     descriptor.walk(yaml).column("id") # => [1, 2, ...]
+#
+# Typed extraction rides the parse-time tag ids (schema: selects the
+# resolver — :compat_11 keeps the Psych/libyaml implicit typing
+# YAML.load uses); string columns are materialized from the
+# document's regions before the result returns (nothing borrowed).
+class Yeptris::YAML::Descriptor < ::Yeptris::JSON::Descriptor
+  # schema: :core_12 (YAML 1.2) or :compat_11 (the Psych-compatible
+  # implicit typing Yeptris::YAML.load uses).
+  def initialize(handle, names, schema)
+    super(handle, names)
+    @schema = schema
+  end
+
+  # @api private — the compile rides the JSON Descriptor's grammar
+  # (inherited private class method); schema selects the resolver
+  def self.build(kind:, path: nil, children:, schema: :compat_11)
+    handle, names = compile_handle(kind, path, children)
+    new(handle, names, schema)
+  end
+
+  def walk(yaml)
+    src = ::Yeptris.read_input(yaml).to_s
+    doc = ::Yeptris::Document.parse(src, schema: @schema)
+    begin
+      st = ::FFI::MemoryPointer.new(:int)
+      raw = ::Yeptris::FFI.yeptris_document_plan_walk(doc.c_ptr, @handle, st)
+      if raw.null?
+        raise ::Yeptris::JSON::Descriptor::Error,
+              "plan walk failed (status=#{st.read_int}) — the document shape " \
+              "disagrees with the plan"
+      end
+
+      begin
+        ::Yeptris::JSON::Descriptor::PlanResult.read_dom(raw, @names)
+      ensure
+        ::Yeptris::FFI.yeptris_plan_result_free(raw)
+      end
+    ensure
+      doc.free
+    end
+  end
+end

data/lib/yeptris/yaml.rb

@@ -9,6 +9,8 @@ module Yeptris
   # the recorder-driven Visitors in phase B; this is the yeptris-native
   # face users target first).
   module YAML
+    autoload :Descriptor, "yeptris/yaml/descriptor"
+
     module_function
 
     # Loads the FIRST document of a YAML stream as native Ruby objects.

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.3.3".freeze
+  VERSION = "0.6.4.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.3.3
+  version: 0.6.4.1
 platform: ruby
 authors:
 - Ribose Inc.
@@ -55,6 +55,7 @@ files:
 - lib/yeptris/schema.rb
 - lib/yeptris/valueml.rb
 - lib/yeptris/yaml.rb
+- lib/yeptris/yaml/descriptor.rb
 homepage: https://github.com/leptris/yeptris
 licenses:
 - MIT