vectory 0.7.3 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7e5cf52ef253c6c347b08de4933cec1766c28c018bfc7db7cec90389d136f84
-  data.tar.gz: 88874bb762defd6629019da70230e1bcad31a8421bd5687d90b6bae5f456ffc6
+  metadata.gz: 0a6c18ba7c79e9fe87d1a9ccdd8456e250b85d91e4955c9d84487a1b0d13d30e
+  data.tar.gz: 710be6d71399fc7cfc0dcd18b016edb6f4fa4ab5587b5af9dec0c011e7cdc31b
 SHA512:
-  metadata.gz: e25ab6e9f1e7ff9f61f4f525e4116b31d1f5a7649579abcd304efff9dd1e6b31afcd57d1b317ef8bec884359d201ea3f99b8aa6157707c6586e46729a80dc94f
-  data.tar.gz: ed47e2375f1f01140b88a014b1ec03f73571cf461f957793b35d6d34b52d4dd4cc82701186e016482e27fd5d2807e36893354d8a7c81e97d1763fab8a6b87fed
+  metadata.gz: 0b78ec2bbaaeff9a1de40cb3b259b6dec8530b867c25bda9a9c2f593649f6ce1e8d825a9b3d9e534ba68b5a6188d4b99dfa7a8997b81e5815c547b950a60531d
+  data.tar.gz: 7d3d896903020a026a6d2da467e8a23f996a69b0fc5033ca7a6c6741a41ebb19330702b1d68c896deca84f44db69f37fc38ce7cd4e8d6aa27297e412aa3b3fdb

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/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,20 @@ 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)
+      return unless vector
 
-      vector.content
+      SvgDocument.new(vector.content)
     end
 
     def build_vector(image)

data/lib/vectory/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Vectory
-  VERSION = "0.7.3"
+  VERSION = "0.7.5"
 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.3
+  version: 0.7.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-03-27 00:00:00.000000000 Z
+date: 2024-04-23 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
@@ -138,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.3.27
 signing_key: 
 specification_version: 4
 summary: Pairwise vector image conversions.