vectory 0.12.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a9abbde7cd6a7876ad8a2f8077786e870dcf860b3206bef30f061f997145d31
-  data.tar.gz: 05c8f3c7a6ab01aa09e3facc83d145ba17a6a8ea7dde5e2bba02ab1405d49999
+  metadata.gz: 5f48a547c1520b19d88d77ad41c2e2967da41896163f49ef39492f6f6e73b1af
+  data.tar.gz: cb36e0382b283f7ad50816a5ce5ff5b6a80736a44f8a062db57dd8ce836385f2
 SHA512:
-  metadata.gz: a9651cbe852b2ba5dbdbdb07db31105aa33bf9a41bcc7bd0cb4f621c679ba41f4343f85ae0d4f3722a34cfaab2cb4cb80210e2aa383b71d7df34256b36a781ac
-  data.tar.gz: c03d30678dfa73b41dac5b987cd70905fc0edc2dcd5621a7bdfb2d61bf8be11769f1d4135602c93aa7b51b243e05b915d0c7b0e55f5002badc50d45365863e3a
+  metadata.gz: 11759d94c1a88218d39f5e4561a661c1c0bee4f371d9c369571d95c34e141dadfb308646c890fc08ddef5a5484fe381e5303b07fc153985b0989fd249e85d8c8
+  data.tar.gz: 1a0151957b311956558f7935e548e92d2678d283238eb66445ec7203916b3fba3753f93140affb5145b732df6f8cd3b75746a2985f9801875a2bf4688f021ad3

data/.github/workflows/release.yml

@@ -1,5 +1,7 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
+# Trusted publishing (OIDC) release — matches lutaml-model/.github/workflows/release.yml.
+# metanorma/ci switches to OIDC when the rubygems-api-key secret is omitted;
+# each gem must be registered for trusted publishing on rubygems.org
+# (owner=claricle, workflow=release.yml).
 name: release
 
 on:
@@ -10,19 +12,21 @@ on:
           Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
         required: true
         default: 'skip'
-  push:
-    tags: [ v* ]
+  repository_dispatch:
+    types: [ do-release ]
 
+# Least-privilege ceiling for the called rubygems-release.yml: its release job
+# needs contents:write (git tag push) and id-token:write (OIDC Trusted Publishing).
 permissions:
   contents: write
-  packages: write
   id-token: write
 
+concurrency:
+  group: release
+  cancel-in-progress: false
+
 jobs:
   release:
     uses: metanorma/ci/.github/workflows/rubygems-release.yml@main
     with:
       next_version: ${{ github.event.inputs.next_version }}
-    secrets:
-      rubygems-api-key: ${{ secrets.CLARICLE_CI_RUBYGEMS_API_KEY }}
-      pat_token: ${{ secrets.CLARICLE_CI_PAT_TOKEN }}

data/Gemfile

@@ -9,6 +9,7 @@ gem "canon", "~> 0.1.7"
 gem "connection_pool", "~> 2.0"
 gem "openssl", "~> 3.0"
 gem "rake"
+gem "nokogiri" # dev-only: exercises SvgMapping's duck-typed document-object input (metanorma passes Nokogiri docs)
 gem "rspec"
 gem "rubocop"
 gem "rubocop-performance"

data/lib/vectory/svg.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "nokogiri"
+require "leptris"
 require "postsvg"
 
 module Vectory
@@ -55,7 +55,7 @@ module Vectory
     private
 
     def svg_root
-      doc = Nokogiri::XML(content)
+      doc = Leptris::XML.parse(content)
       doc.at_xpath("//svg:svg", "svg" => SVG_NS) || doc.at_xpath("//svg")
     end
 
@@ -77,7 +77,11 @@ module Vectory
     def content=(content)
       # non-root node inserts the xml tag which breaks markup when placed in
       # another xml document
-      document = Nokogiri::XML(content).root
+      document = begin
+        Leptris::XML.parse(content).root
+      rescue Leptris::XML::ParseError
+        nil
+      end
       unless document
         raise ParsingError, "Could not parse '#{content&.slice(0, 30)}'"
       end

data/lib/vectory/svg_document.rb

@@ -1,4 +1,4 @@
-require "nokogiri"
+require "leptris"
 
 module Vectory
   # Represents and processes an SVG document within XML.
@@ -21,7 +21,7 @@ module Vectory
     class << self
       # Updates ID references in CSS style statements within a document.
       #
-      # @param document [Nokogiri::XML::Document] The SVG document
+      # @param document [Leptris::XML::Document] The SVG document
       # @param ids [Array<String>] IDs to update
       # @param suffix [Integer, String] The suffix to apply (integers are zero-padded)
       # @return [void]
@@ -56,7 +56,7 @@ module Vectory
 
       # Updates ID attributes in SVG elements.
       #
-      # @param document [Nokogiri::XML::Document] The SVG document
+      # @param document [Leptris::XML::Document] The SVG document
       # @param ids [Array<String>] IDs to update
       # @param suffix [Integer, String] The suffix to apply (integers are zero-padded)
       # @return [void]
@@ -76,7 +76,7 @@ module Vectory
     #
     # @param content [String] SVG XML content
     def initialize(content)
-      @document = Nokogiri::XML(content)
+      @document = Leptris::XML.parse(content)
     end
 
     # Returns the processed SVG content as XML string.

data/lib/vectory/svg_mapping.rb

@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
+require "leptris"
+
 module Vectory
   # Processes SVG mapping in XML documents.
   #
@@ -7,6 +11,11 @@ module Vectory
   # - Applying ID suffixes for uniqueness in multi-document scenarios
   # - Simplifying svgmap structure for final output
   #
+  # The document is processed on a leptris tree: pass XML content, or any
+  # document object responding to #to_xml (serialized once on entry).
+  # #call returns the processed Leptris document; callers working on
+  # their own DOM (e.g. Nokogiri) re-serialize and graft the result back.
+  #
   # == ID Suffixing
   #
   # SVG IDs are suffixed in two stages to ensure uniqueness:
@@ -30,7 +39,7 @@ module Vectory
   class SvgMapping
     # Namespace helper for XML namespace handling
     class Namespace
-      # @param xmldoc [Nokogiri::XML::Document] The XML document
+      # @param xmldoc [Leptris::XML::Document] The XML document
       def initialize(xmldoc)
         @namespace = xmldoc.root.namespace
       end
@@ -61,7 +70,7 @@ module Vectory
     # @param path [String] Path to the XML file
     # @return [Vectory::SvgMapping] New mapping instance
     def self.from_path(path)
-      new(Nokogiri::XML(File.read(path)))
+      new(File.read(path))
     end
 
     # Creates an SvgMapping from an XML string.
@@ -69,25 +78,27 @@ module Vectory
     # @param xml [String] XML content
     # @return [Vectory::SvgMapping] New mapping instance
     def self.from_xml(xml)
-      new(Nokogiri::XML(xml))
+      new(xml)
     end
 
     # Initializes a new SvgMapping processor.
     #
-    # @param doc [Nokogiri::XML::Document] The document containing svgmap elements
+    # @param doc [String, #to_xml] XML content, or a document object
+    #   (serialized once on entry)
     # @param local_directory [String] Directory for resolving relative file paths
     # @param id_suffix [String, nil] Optional suffix derived from document/container
     #   identity. Applied before the index suffix to provide cross-document
     #   uniqueness. Example: "_ISO_17301-1_2016"
     def initialize(doc, local_directory = "", id_suffix: nil)
-      @doc = doc
+      xml = doc.respond_to?(:to_xml) ? doc.to_xml : doc
+      @doc = Leptris::XML.parse(xml)
       @local_directory = local_directory
       @id_suffix = id_suffix
     end
 
     # Processes all svgmap elements in the document.
     #
-    # @return [Nokogiri::XML::Document] The processed document
+    # @return [Leptris::XML::Document] The processed document
     def call
       @namespace = Namespace.new(@doc)
 
@@ -109,7 +120,7 @@ module Vectory
 
     # Processes a single svgmap element.
     #
-    # @param svgmap [Nokogiri::XML::Element] The svgmap element to process
+    # @param svgmap [Leptris::XML::Element] The svgmap element to process
     # @param index [Integer] Position of this svgmap in the document (0-indexed)
     def process_svgmap(svgmap, index)
       image = extract_image_tag(svgmap)
@@ -125,19 +136,19 @@ module Vectory
 
     # Extracts the image element (SVG inline or image with src) from svgmap.
     #
-    # @param svgmap [Nokogiri::XML::Element] The svgmap element
-    # @return [Nokogiri::XML::Element, nil] The image/svg element or nil
+    # @param svgmap [Leptris::XML::Element] The svgmap element
+    # @return [Leptris::XML::Element, nil] The image/svg element or nil
     def extract_image_tag(svgmap)
-      image = svgmap.at(@namespace.ns(".//image"))
+      image = svgmap.at_xpath(@namespace.ns(".//image"))
       return image if image && image["src"] && !image["src"].empty?
 
-      svgmap.at(".//m:svg", "m" => SVG_NS)
+      svgmap.at_xpath(".//m:svg", "m" => SVG_NS)
     end
 
     # Generates processed SVG content for an svgmap.
     #
-    # @param image [Nokogiri::XML::Element] The image/svg element
-    # @param svgmap [Nokogiri::XML::Element] The parent svgmap element
+    # @param image [Leptris::XML::Element] The image/svg element
+    # @param svgmap [Leptris::XML::Element] The parent svgmap element
     # @param index [Integer] Index suffix to apply
     # @return [String, nil] Processed SVG content or nil if invalid
     def generate_content(image, svgmap, index)
@@ -153,7 +164,7 @@ module Vectory
 
     # Builds an SvgDocument from an image element.
     #
-    # @param image [Nokogiri::XML::Element] The image element
+    # @param image [Leptris::XML::Element] The image element
     # @return [Vectory::SvgDocument, nil] The SVG document or nil if invalid
     def build_svg_document(image)
       vector = build_vector(image)
@@ -164,7 +175,7 @@ module Vectory
 
     # Builds a Vector from an image element.
     #
-    # @param image [Nokogiri::XML::Element] The image element
+    # @param image [Leptris::XML::Element] The image element
     # @return [Vectory::Vector, nil] The vector or nil if invalid
     def build_vector(image)
       return Vectory::Svg.from_content(image.to_xml) if image.name == "svg"
@@ -182,7 +193,7 @@ module Vectory
 
     # Builds a mapping from target hrefs to their link targets.
     #
-    # @param svgmap [Nokogiri::XML::Element] The svgmap element
+    # @param svgmap [Leptris::XML::Element] The svgmap element
     # @return [Hash{String => String}] Mapping of href to target
     def from_targets_to_links_map(svgmap)
       targets = svgmap.xpath(@namespace.ns("./target"))
@@ -199,13 +210,13 @@ module Vectory
 
     # Extracts link target from a target element.
     #
-    # @param target_tag [Nokogiri::XML::Element] The target element
+    # @param target_tag [Leptris::XML::Element] The target element
     # @return [String, nil] The link target or nil
     def link_target(target_tag)
-      xref = target_tag.at(@namespace.ns("./xref"))
+      xref = target_tag.at_xpath(@namespace.ns("./xref"))
       return "##{xref['target']}" if xref
 
-      link = target_tag.at(@namespace.ns("./link"))
+      link = target_tag.at_xpath(@namespace.ns("./link"))
       return unless link
 
       link["target"]
@@ -214,11 +225,11 @@ module Vectory
     # Simplifies svgmap after processing.
     # Removes svgmap wrapper if no more target elements with eref.
     #
-    # @param svgmap [Nokogiri::XML::Element] The svgmap element
+    # @param svgmap [Leptris::XML::Element] The svgmap element
     def simplify_svgmap(svgmap)
-      return if svgmap.at(@namespace.ns("./target/eref"))
+      return if svgmap.at_xpath(@namespace.ns("./target/eref"))
 
-      svgmap.replace(svgmap.at(@namespace.ns("./figure")))
+      svgmap.replace(svgmap.at_xpath(@namespace.ns("./figure")))
     end
   end
 end

data/lib/vectory/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Vectory
-  VERSION = "0.12.0"
+  VERSION = "0.13.1"
 end

data/vectory.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "emfsvg", "~> 0.1", ">= 0.1.2"
   spec.add_dependency "image_size", ">= 3.2.0"
   spec.add_dependency "marcel", "~> 1.0"
-  spec.add_dependency "nokogiri", "~> 1.14"
+  spec.add_dependency "leptris", ">= 1.9.361.1"
   spec.add_dependency "postsvg", "~> 0.3"
   spec.add_dependency "thor", "~> 1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vectory
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-07-27 00:00:00.000000000 Z
+date: 2026-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -73,19 +73,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: leptris
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: 1.9.361.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: 1.9.361.1
 - !ruby/object:Gem::Dependency
   name: postsvg
   requirement: !ruby/object:Gem::Requirement