leptris 1.9.186.0 → 1.9.186.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c702e5d445cbabe1892ea5aa261caf972a9ada194bb5abdb0a90afe5f249fa5
-  data.tar.gz: c9f55612f94575433e996905aeb06c5716b6fe2c7bb2fb1acde277f7f53e7746
+  metadata.gz: 5b96846659a7745d4cd915d4bb375f7081c7c5ba703bc4482fc44a3073c59961
+  data.tar.gz: dfed75d7ae1d31974ba748491de60e57bc4b6ecaf59902e7d53a88f6ff5ba0bb
 SHA512:
-  metadata.gz: 44009c3f0160ec11265c21fa17e3d54dfd89f4629ef8d8bae8934c5063e08e1579a4e20f1de42dc18dc0f94ca427c30e2c6785251ccfc9f5ff88e65ef088bc4e
-  data.tar.gz: cfe692871915a7dd8788ec8e2762c71b025e8e88df5eadf2bbe6c5b9203b875e91e28fd0ca53acf08cf61da6c3a8de8211c185e3a6d82a297effb77079096143
+  metadata.gz: 201cd532c264025a6a614e0f40fb576f63603175307b650a1dcd2d09dd53b74fff00bc9141e40c66246f4424643f8d4cba1439af8014d03aeb5bce0fcb12ac0c
+  data.tar.gz: 616ee2ad30c627196720c1be0301572cdb8e909f872f2ea78b7678eddf3b127ca43442a3e5b7ce053bce6967b45707b13ef1459b69a7341cd83c2bb220307323

data/CHANGELOG.md

@@ -5,6 +5,18 @@ All notable changes to Leptris will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.9.186.1] - 2026-09-17
+
+### Added
+
+- `RelaxNG::Schema#validate_errors(document)` — structured
+  `[{ line:, column:, message: }]` rows (Jing's exact attribution,
+  upstream #878 accumulation), for callers that need the fields
+  for log formatting instead of re-parsing the Jing-form strings
+  from `#validate`. `#validate` now renders its strings from the
+  same rows (one enumeration of the error surface; identical
+  output, including the back-compat zero-count fallback).
+
 ## [1.9.186.0] - 2026-09-17
 
 ### Changed — libleptris 1.9.181 → 1.9.186 (lockstep)

data/lib/leptris/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Leptris
-  VERSION = "1.9.186.0"
+  VERSION = "1.9.186.1"
 end

data/lib/leptris/xml/relaxng.rb

@@ -22,6 +22,7 @@ module Leptris::XML::RelaxNG
   #     rng = Leptris::XML::RelaxNG.parse(schema_xml)
   #     rng.valid?(doc)      # => true/false
   #     rng.validate(doc)    # => [] or ["1:0: error: element ..."]
+  #     rng.validate_errors(doc) # => [] or [{line:, column:, message:}]
   #
   class Schema
     # GC-managed compiled handle.
@@ -63,25 +64,45 @@ module Leptris::XML::RelaxNG
     # libleptris 1.9.179 (#878): errors accumulate — every failure
     # from the validate call is returned, not just the first.
     def validate(document)
+      structured = validate_errors(document)
+      unless structured.empty?
+        return structured.map do |e|
+          e[:line] > 0 ? "#{e[:line]}:#{e[:column]}: error: #{e[:message]}"
+                        : e[:message]
+        end
+      end
+      # Invalid verdict with nothing accumulated: the back-compat
+      # single-error accessor is the last resort (nil-safe).
+      return [] if valid?(document)
+      [Leptris::XML::FFI.leptris_rng_error(@handle)].compact
+    end
+
+    def valid?(document)
+      Leptris::XML::FFI.leptris_rng_validate(@handle,
+                                             document.c_ptr) != 0
+    end
+
+    # Structured errors: [{ line:, column:, message: }] — the fields
+    # callers need for log formatting, instead of re-parsing the
+    # Jing-form strings from #validate. Empty when valid. Message,
+    # line, and column carry Jing's exact attribution (libleptris
+    # >= 1.9.179, upstream #878). This is the single enumeration of
+    # the error-accumulation surface; #validate renders these rows.
+    def validate_errors(document)
       ok = Leptris::XML::FFI.leptris_rng_validate(@handle,
                                                   document.c_ptr)
       return [] if ok != 0
       count = Leptris::XML::FFI.leptris_rng_error_count(@handle)
-      return [Leptris::XML::FFI.leptris_rng_error(@handle)].compact if count.zero?
-      # Jing's rendering for every accumulated error, matching the
-      # single-error accessor's format ("line:col: error: msg").
+      return [] if count.zero?
       Array.new(count) do |i|
         msg = Leptris::XML::FFI.leptris_rng_error_message(@handle, i)
         next nil if msg.nil?
-        line = Leptris::XML::FFI.leptris_rng_error_line(@handle, i)
-        col = Leptris::XML::FFI.leptris_rng_error_column(@handle, i)
-        line > 0 ? "#{line}:#{col}: error: #{msg}" : msg
+        {
+          line: Leptris::XML::FFI.leptris_rng_error_line(@handle, i),
+          column: Leptris::XML::FFI.leptris_rng_error_column(@handle, i),
+          message: msg,
+        }
       end.compact
     end
-
-    def valid?(document)
-      Leptris::XML::FFI.leptris_rng_validate(@handle,
-                                             document.c_ptr) != 0
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: leptris
 version: !ruby/object:Gem::Version
-  version: 1.9.186.0
+  version: 1.9.186.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-09-16 00:00:00.000000000 Z
+date: 2026-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi