vectory 0.13.0 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66b15c386fa1dcdd0fc02473b9062f3eca19ed5b1bc40f2facec9577a4495fd4
-  data.tar.gz: d5bc9be14ab660ddbbba77548a205a472eb4215bb848c57d5e3d980205159da4
+  metadata.gz: f57a3fbf7c5b0f3c7660e32dbd1f6361d149ee27a9eef68418ced42ab0d4416b
+  data.tar.gz: 0e6dcda6b904e457b75ee3091ee27f91c6790da056f289003f289f585a66148b
 SHA512:
-  metadata.gz: 9e802267d5860c496738492218e4fd8260ff9c84546d63c11254d170f14ee1c8c9bebd24a943b24e8bcd5c7013db8a3d55844aba286d06f5959a717fe289da34
-  data.tar.gz: 53747660f38c403952debd623ad81dbce990e51fa8098d63480762c3de40531cc2602b903c943c91e01f9678433b6340b77529345ad487f53b4fb2c04ca4bfe6
+  metadata.gz: bdd45abe6b12a83b16d04a63fca16fa3052552909ac1a16de73623706d0b2ee8dd84a958baec8e60e14c6d4b4037c6832ec55abddda3acb94b971cd5bbbbe206
+  data.tar.gz: 9761d2d5b4169f87fbbc46555ac74ab8d3d43ad80260aadd07bc6a77aa7d0c6ea564854bef42f70b02a383a1647610a1770af8d200a43881a91001386bec2f3d

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/lib/vectory/svg_id_disambiguator.rb

@@ -0,0 +1,138 @@
+require "leptris"
+
+module Vectory
+  # Disambiguates element ids across multiple SVG documents embedded in one
+  # output (the multi-svg collision problem): ids that appear in more than
+  # one SVG get a per-document suffix, and every reference form is rewritten
+  # to match — `url(#id)` in presentation attributes and `<style>` blocks,
+  # `href`/`xlink:href` fragment references, and the `id` attributes
+  # themselves.
+  #
+  # This is the string-in/string-out counterpart of SvgMapping's document
+  # processing: content in, processed content out, same as SvgMapping's
+  # "serialize on entry" contract. Ported from metanorma-standoc's
+  # svg_uniqueids cleanup (lib/metanorma/cleanup/image.rb), where it was
+  # written against Nokogiri inline.
+  #
+  # Usage — N embedded SVGs, disambiguate by position:
+  #
+  #   dupes = Vectory::SvgIdDisambiguator.duplicate_ids(svgs)
+  #   svgs.map.with_index { |svg, i| Vectory::SvgIdDisambiguator.rewrite(svg, "_inject_#{i}", dupes) }
+  #
+  class SvgIdDisambiguator
+    # SVG elements whose ids are referenced through presentation attributes
+    # and CSS rather than href: the tag maps to the attributes that carry
+    # the reference (nil = the tag name itself is the CSS property).
+    IRI_TAG_PROPERTIES_MAP = {
+      "clipPath" => ["clip-path"],
+      "color-profile" => nil,
+      "cursor" => nil,
+      "filter" => nil,
+      "linearGradient" => ["fill", "stroke"],
+      "marker" => ["marker", "marker-end", "marker-mid", "marker-start"],
+      "mask" => nil,
+      "pattern" => ["fill", "stroke"],
+      "radialGradient" => ["fill", "stroke"],
+    }.freeze
+
+    URL_RE = %r{url\("?#([a-zA-Z][\w:.-]*)"?\)}.freeze
+    private_constant :URL_RE
+
+    class << self
+      # Ids that appear more than once across the given SVG contents.
+      #
+      # @param contents [Array<String>] SVG document contents
+      # @return [Hash{String => Integer}] id => occurrence count (count >= 2)
+      def duplicate_ids(contents)
+        contents.flat_map { |c| id_values(Leptris::XML.parse(c)) }
+          .group_by(&:itself).transform_values(&:count)
+          .delete_if { |_, v| v < 2 }
+      end
+
+      # Suffix every id in +duplicate_ids+ with +suffix+ inside +content+,
+      # rewriting all reference forms to match. Ids absent from the map are
+      # left untouched.
+      #
+      # @param content [String] SVG document content
+      # @param suffix [String] the full disambiguator, separator included
+      #   (e.g. "_inject_0")
+      # @param duplicate_ids [Hash{String => Integer}] from .duplicate_ids
+      # @return [String] the rewritten content
+      def rewrite(content, suffix, duplicate_ids)
+        doc = Leptris::XML.parse(content)
+        svg_roots(doc).each { |svg| rewrite_svg(svg, suffix, duplicate_ids) }
+        doc.to_xml
+      end
+
+      private
+
+      def svg_roots(doc)
+        root = doc.root
+        if root&.name == "svg"
+          [root]
+        else
+          # SVGs embedded in a host document
+          doc.xpath("//*[local-name()='svg']")
+        end
+      end
+
+      def id_values(doc)
+        doc.xpath("//*").filter_map { |e| e["id"] if e["id"] }
+      end
+
+      def rewrite_svg(svg, suffix, ids)
+        id_elems = svg.xpath(".//*[@id]")
+        id_elems = [svg] + id_elems if svg["id"]
+        iri_properties = iri_properties(id_elems)
+        ([svg] + svg.xpath("//*")).each { |e| rewrite_element(e, iri_properties, suffix, ids) }
+      end
+
+      def rewrite_element(elem, iri_properties, suffix, ids)
+        if elem.name == "style"
+          elem.children = rewrite_urls(elem.text, suffix, ids)
+          return
+        end
+
+        # All attribute reads AND writes go through attribute_nodes: mixing
+        # in the elem[...] accessors after an id write desyncs the native
+        # attribute layer (leptris-ruby#526).
+        nodes = elem.attribute_nodes || []
+        return if nodes.empty?
+
+        iri_properties.each do |p|
+          node = nodes.find { |a| a.name == p } or next
+          node.value = rewrite_urls(node.value, suffix, ids)
+        end
+        nodes.each do |a|
+          case a.name
+          when "id"
+            a.value = "#{a.value}#{suffix}" if ids[a.value]
+          when "xlink:href", "href"
+            v = a.value.to_s.strip
+            a.value = "#{a.value}#{suffix}" if v.start_with?("#") && ids[v.sub(/\A#/, "")]
+          end
+        end
+      end
+
+      # The CSS-referenceable properties present among the id-bearing
+      # elements, plus "style" when any exist (standoc svg_iri_properties).
+      def iri_properties(id_elems)
+        iri_tag_names = id_elems.filter_map do |e|
+          e.name if IRI_TAG_PROPERTIES_MAP.key?(e.name)
+        end.uniq
+        iri_properties = iri_tag_names.flat_map do |t|
+          IRI_TAG_PROPERTIES_MAP[t] || [t]
+        end.uniq
+        return [] if iri_properties.empty?
+
+        iri_properties + ["style"]
+      end
+
+      def rewrite_urls(text, suffix, ids)
+        text.gsub(URL_RE) do |x|
+          ids[$1] ? "url(##{$1}#{suffix})" : x
+        end
+      end
+    end
+  end
+end

data/lib/vectory/version.rb

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

data/lib/vectory.rb

@@ -37,6 +37,7 @@ module Vectory
   autoload :Svg, "vectory/svg"
   autoload :SvgMapping, "vectory/svg_mapping"
   autoload :SvgDocument, "vectory/svg_document"
+  autoload :SvgIdDisambiguator, "vectory/svg_id_disambiguator"
   autoload :FileMagic, "vectory/file_magic"
 end
 

data/vectory.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = ["vectory"]
   spec.require_paths = ["lib"]
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(bin|spec)/})
+    f.match(%r{^(bin|spec|TODO\.[^/]+)/})
   end
   spec.test_files = `git ls-files -- {spec}/*`.split("\n")
   spec.required_ruby_version = ">= 3.1.0"
@@ -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 "leptris", "~> 1.9.361.1"
+  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.13.0
+  version: 0.13.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-10-16 00:00:00.000000000 Z
+date: 2026-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -76,14 +76,14 @@ dependencies:
   name: leptris
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.361.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.361.1
 - !ruby/object:Gem::Dependency
@@ -168,6 +168,7 @@ files:
 - lib/vectory/ps.rb
 - lib/vectory/svg.rb
 - lib/vectory/svg_document.rb
+- lib/vectory/svg_id_disambiguator.rb
 - lib/vectory/svg_mapping.rb
 - lib/vectory/utils.rb
 - lib/vectory/vector.rb