vectory 0.7.2 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55fbd240e8b8c5e4409e73d720e752c502a1d0700617aa8889c7dca337be989b
-  data.tar.gz: 51a18f30f14a783c9f249a1b8664bf5767f10eb8f7a85aed3d87ca06d4d8d00e
+  metadata.gz: aef4319c091897a2bc5971c65ef3d87332655aa1d76516ffbcd66fc9541465da
+  data.tar.gz: ca405f2071d56b523ec6203b6dcf98c390fa420c2c9a58102fdb766a179d9577
 SHA512:
-  metadata.gz: 239f4a3ef419cc72978ee7300867b66978e86f5154918b0a537397ef0ac2a3b1726ac91132c2673c637335c871fb4acecf88a26ff952f26fcd32177208dcb8b8
-  data.tar.gz: 79c93b9aea448ca971a9d4f531a3de7377601f771ee7e8830258cea8a27b5bccd3b9271a743550e84a4e0682fb77ce84e969129a5c6ff4a17faee3c53a087a17
+  metadata.gz: 101b0bbf1881240b6a84516450e8e73670c726339d16d1bb7b15e3efd806422f237a95dcc5b1e7145c951df4326cbda679d7f89c0523909822e0d3a28ecf2c73
+  data.tar.gz: 4a5b4495f7a8335e8514c2dd76fc332ce6f46afe070132f9aee427317aaeedcbfd4922c23fb7efff8c429f89a2cff74077cfdb5d3e4134279867556b9e38a614

data/README.adoc

@@ -27,7 +27,7 @@ Vectory relies on the following software to be installed:
 * https://inkscape.org[Inkscape]
 * https://www.ghostscript.com/[Ghostscript]
 
-NOTE: Inkscape 1.3.1 does not work properly with EPS/PS on Windows. To avoid
+NOTE: Inkscape 1.3.1+ does not work properly with EPS/PS on Windows. To avoid
 this issue, the 1.3.0 version of Inkscape can be used.
 
 

data/lib/vectory/emf.rb

@@ -29,7 +29,7 @@ module Vectory
 
     def to_svg
       with_file("emf") do |input_path|
-        content = Emf2svg.from_file(input_path).sub(/<\?[^>]+>/, "")
+        content = Emf2svg.from_file(input_path)
 
         Svg.from_content(content)
       end

data/lib/vectory/image_resize.rb

@@ -2,10 +2,12 @@ require "image_size"
 
 module Vectory
   class ImageResize
+    BORDER_WIDTH = 2
+
     def call(img, path, maxheight, maxwidth)
       s, realsize = get_image_size(img, path)
       img.name == "svg" && !img["viewBox"] && s[0] && s[1] and
-        img["viewBox"] = "0 0 #{s[0]} #{s[1]}"
+        img["viewBox"] = viewbox(s)
       s, skip = image_dont_resize(s, realsize)
       skip and return s
       s = image_size_fillin(s, realsize)
@@ -20,6 +22,13 @@ module Vectory
 
     private
 
+    def viewbox(dimensions)
+      width = dimensions[0] + BORDER_WIDTH
+      height = dimensions[1] + BORDER_WIDTH
+
+      "0 0 #{width} #{height}"
+    end
+
     def image_dont_resize(dim, realsize)
       dim.nil? and return [[nil, nil], true]
       realsize.nil? and return [dim, true]

data/lib/vectory/svg.rb

@@ -25,8 +25,10 @@ module Vectory
       from_path(uri)
     end
 
-    def content
-      @document&.to_xml || @content
+    def initialize(content = nil, initial_path = nil)
+      super
+
+      self.content = content
     end
 
     def to_emf
@@ -41,81 +43,17 @@ module Vectory
       convert_with_inkscape("--export-type=ps", Ps)
     end
 
-    def namespace(suffix, links, xpath_to_remove)
-      remap_links(links)
-      suffix_ids(suffix)
-      remove_xpath(xpath_to_remove)
-    end
-
-    def remap_links(map)
-      document.xpath(".//m:a", "m" => SVG_NS).each do |a|
-        href_attrs = ["xlink:href", "href"]
-        href_attrs.each do |p|
-          a[p] and x = map[File.expand_path(a[p])] and a[p] = x
-        end
-      end
-
-      self
-    end
-
-    def suffix_ids(suffix)
-      ids = collect_ids
-      return if ids.empty?
-
-      update_ids_attrs(ids, suffix)
-      update_ids_css(ids, suffix)
-
-      self
-    end
-
-    def remove_xpath(xpath)
-      document.xpath(xpath).remove
-
-      self
-    end
-
     private
 
     def content=(content)
-      if @document
-        @document = Nokogiri::XML(content)
-      else
-        @content = content
-      end
-    end
-
-    def document
-      @document ||= begin
-        doc = Nokogiri::XML(@content)
-        @content = nil
-        doc
-      end
-    end
-
-    def collect_ids
-      document.xpath("./@id | .//@id").map(&:value)
-    end
-
-    def update_ids_attrs(ids, suffix)
-      document.xpath(". | .//*[@*]").each do |a|
-        a.attribute_nodes.each do |x|
-          ids.include?(x.value) and x.value += sprintf("_%09d", suffix)
-        end
+      # non-root node inserts the xml tag which breaks markup when placed in
+      # another xml document
+      document = Nokogiri::XML(content).root
+      unless document
+        raise ParsingError, "Could not parse '#{content&.slice(0, 30)}'"
       end
-    end
-
-    def update_ids_css(ids, suffix)
-      document.xpath("//m:style", "m" => SVG_NS).each do |s|
-        c = s.children.to_xml
-        ids.each do |i|
-          c = c.gsub(%r[##{i}\b],
-                     sprintf("#%<id>s_%<suffix>09d", id: i, suffix: suffix))
-            .gsub(%r(\[id\s*=\s*['"]?#{i}['"]?\]),
-                  sprintf("[id='%<id>s_%<suffix>09d']", id: i, suffix: suffix))
-        end
 
-        s.children = c
-      end
+      @content = document.to_xml
     end
   end
 end

data/lib/vectory/svg_document.rb

@@ -0,0 +1,76 @@
+require "nokogiri"
+
+module Vectory
+  class SvgDocument
+    SVG_NS = "http://www.w3.org/2000/svg".freeze
+
+    def initialize(content)
+      @document = Nokogiri::XML(content)
+    end
+
+    def content
+      @document.root.to_xml
+    end
+
+    def namespace(suffix, links, xpath_to_remove)
+      remap_links(links)
+      suffix_ids(suffix)
+      remove_xpath(xpath_to_remove)
+    end
+
+    def remap_links(map)
+      @document.xpath(".//m:a", "m" => SVG_NS).each do |a|
+        href_attrs = ["xlink:href", "href"]
+        href_attrs.each do |p|
+          a[p] and x = map[File.expand_path(a[p])] and a[p] = x
+        end
+      end
+
+      self
+    end
+
+    def suffix_ids(suffix)
+      ids = collect_ids
+      return if ids.empty?
+
+      update_ids_attrs(ids, suffix)
+      update_ids_css(ids, suffix)
+
+      self
+    end
+
+    def remove_xpath(xpath)
+      @document.xpath(xpath).remove
+
+      self
+    end
+
+    private
+
+    def collect_ids
+      @document.xpath("./@id | .//@id").map(&:value)
+    end
+
+    def update_ids_attrs(ids, suffix)
+      @document.xpath(". | .//*[@*]").each do |a|
+        a.attribute_nodes.each do |x|
+          ids.include?(x.value) and x.value += sprintf("_%09d", suffix)
+        end
+      end
+    end
+
+    def update_ids_css(ids, suffix)
+      @document.xpath("//m:style", "m" => SVG_NS).each do |s|
+        c = s.children.to_xml
+        ids.each do |i|
+          c = c.gsub(%r[##{i}\b],
+                     sprintf("#%<id>s_%<suffix>09d", id: i, suffix: suffix))
+            .gsub(%r(\[id\s*=\s*['"]?#{i}['"]?\]),
+                  sprintf("[id='%<id>s_%<suffix>09d']", id: i, suffix: suffix))
+        end
+
+        s.children = c
+      end
+    end
+  end
+end

data/lib/vectory/svg_mapping.rb

@@ -1,4 +1,5 @@
 require_relative "svg"
+require_relative "svg_document"
 
 module Vectory
   class SvgMapping
@@ -70,13 +71,19 @@ module Vectory
     end
 
     def generate_content(image, svgmap, suffix)
-      vector = build_vector(image)
-      return unless vector
+      document = build_svg_document(image)
+      return unless document
 
       links_map = from_targets_to_links_map(svgmap)
-      vector.namespace(suffix, links_map, PROCESSING_XPATH)
+      document.namespace(suffix, links_map, PROCESSING_XPATH)
+
+      document.content
+    end
+
+    def build_svg_document(image)
+      vector = build_vector(image)
 
-      vector.content
+      SvgDocument.new(vector.content)
     end
 
     def build_vector(image)

data/lib/vectory/system_call.rb

@@ -33,6 +33,7 @@ module Vectory
     def execute(cmd)
       result = Capture.with_timeout(cmd,
                                     timeout: @timeout,
+                                    signal: :KILL, # only KILL works on Windows
                                     kill_after: @timeout)
       @stdout = result[:stdout]
       @stderr = result[:stderr]

data/lib/vectory/version.rb

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

data/lib/vectory.rb

@@ -28,6 +28,8 @@ module Vectory
 
   class NotWrittenToDiskError < Error; end
 
+  class ParsingError < Error; end
+
   def self.ui
     @ui ||= Logger.new(STDOUT).tap do |logger|
       logger.level = ENV['VECTORY_LOG'] || Logger::WARN

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vectory
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-02-15 00:00:00.000000000 Z
+date: 2024-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: emf2svg
@@ -112,6 +112,7 @@ files:
 - lib/vectory/inkscape_converter.rb
 - lib/vectory/ps.rb
 - lib/vectory/svg.rb
+- lib/vectory/svg_document.rb
 - lib/vectory/svg_mapping.rb
 - lib/vectory/system_call.rb
 - lib/vectory/utils.rb