RubyGems - metanorma-utils - Versions diffs - 1.2.1 → 1.2.2 - Mend

metanorma-utils 1.2.1 → 1.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

checksums.yaml +4 -4
data/lib/utils/image.rb +41 -8
data/lib/utils/version.rb +1 -1
data/spec/fixtures/action_schemaexpg1.svg +3 -1
data/spec/utils_spec.rb +19 -13
metadata +2 -2

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e32e0167b7ef50067c61aca6c6d270c239d6095f428b2d94cae193ef0ff97643
-  data.tar.gz: 4d374d23469c0ba74cae811f155a430fb6a7c0865558fd5e332555ed4cd646b3
+  metadata.gz: 52b94adefc23d35f664e35438604432f951f29d15ccb5622f64447a79eaa14d0
+  data.tar.gz: 5e68045ce2aaf9c6a34ec8793d8f75b1e3bb065fe4a733db84101f4bee31cf2d
 SHA512:
-  metadata.gz: 9e560c04556fc4439ac3af71692e7f552048737c71148cbed4448e97fc12be5bcea60c467c03bb1ade45e53b2e482a6ca5781f81561a17a570e77a9f127ce959
-  data.tar.gz: 3befc32a1486a098183b21f341741cf857161c93c56ad51261c6d2035c9d117f6d12638693ace505701e228dcc1034fcfc4a3264746e52e34dcb58c97e0dbab5
+  metadata.gz: b5e47154cf50378f9960ddd1f782d3ec35c4c92395d3e74a0f734ad7f77c510c401ad26e46fa4aae96b30784e0263e407e93b6d58daf97070b9f2628a72b57ff
+  data.tar.gz: adec26a807cb648a9b6ad5d6cc3e6251f0b79eba52e1901f99cf102ef61db425bb6ea3e1676e51af1a5d9ab9a0b5aeda1e0c6f071ff48238e2fa103fae0b7d48

data/lib/utils/image.rb CHANGED Viewed

@@ -37,23 +37,23 @@ module Metanorma
       def svgmap_rewrite(xmldoc, localdirectory = "")
         n = Namespace.new(xmldoc)
-        xmldoc.xpath(n.ns("//svgmap")).each do |s|
-          next unless svgmap_rewrite0(s, n, localdirectory)
+        xmldoc.xpath(n.ns("//svgmap")).each_with_index do |s, i|
+          next unless svgmap_rewrite0(s, n, localdirectory, i)
           next if s.at(n.ns("./target/eref"))
           s.replace(s.at(n.ns("./figure")))
         end
       end
-      def svgmap_rewrite0(svgmap, namespace, localdirectory)
+      def svgmap_rewrite0(svgmap, namespace, localdirectory, idx)
         if (i = svgmap.at(namespace.ns(".//image"))) && (src = i["src"])
           path = svgmap_rewrite0_path(src, localdirectory)
           File.file?(path) or return false
           svg = Nokogiri::XML(File.read(path, encoding: "utf-8"))
-          i.replace(svgmap_rewrite1(svgmap, svg.root, namespace))
+          i.replace(svgmap_rewrite1(svgmap, svg.root, namespace, idx))
           /^data:/.match(src) and i["src"] = datauri(path)
         elsif i = svgmap.at(".//m:svg", "m" => SVG_NS)
-          i.replace(svgmap_rewrite1(svgmap, i, namespace))
+          i.replace(svgmap_rewrite1(svgmap, i, namespace, idx))
         else
           return false
         end
@@ -68,15 +68,20 @@ module Metanorma
         end
       end
-      def svgmap_rewrite1(svgmap, svg, namespace)
+      def svgmap_rewrite1(svgmap, svg, namespace, idx)
+        svg_update_href(svgmap, svg, namespace)
+        svg_update_ids(svg, idx)
+        svg.xpath("processing-instruction()|.//processing-instruction()").remove
+        svg.to_xml
+      end
+      def svg_update_href(svgmap, svg, namespace)
         targ = svgmap_rewrite1_targets(svgmap, namespace)
         svg.xpath(".//m:a", "m" => SVG_NS).each do |a|
           ["xlink:href", "href"].each do |p|
             a[p] and x = targ[File.expand_path(a[p])] and a[p] = x
           end
         end
-        svg.xpath("processing-instruction()|.//processing-instruction()").remove
-        svg.to_xml
       end
       def svgmap_rewrite1_targets(svgmap, namespace)
@@ -90,6 +95,34 @@ module Metanorma
         end
       end
+      def svg_update_ids(svg, idx)
+        ids = svg.xpath("./@id | .//@id")
+          .each_with_object([]) { |i, m| m << i.value }
+        return if ids.empty?
+        svg_update_ids_attrs(svg, ids, idx)
+        svg_update_ids_css(svg, ids, idx)
+      end
+      def svg_update_ids_attrs(svg, ids, idx)
+        svg.xpath(". | .//*[@*]").each do |a|
+          a.attribute_nodes.each do |x|
+            ids.include?(x.value) and x.value += sprintf("_%09d", idx)
+          end
+        end
+      end
+      def svg_update_ids_css(svg, ids, idx)
+        svg.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("#%s_%09d", i, idx))
+              .gsub(%r(\[id\s*=\s*['"]?#{i}['"]?\]), sprintf("[id='%s_%09d']", i, idx))
+          end
+          s.children = c
+        end
+      end
       # sources/plantuml/plantuml20200524-90467-1iqek5i.png
       # already includes localdir
       def datauri(uri, localdirectory = ".")

data/lib/utils/version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 module Metanorma
   module Utils
-    VERSION = "1.2.1".freeze
+    VERSION = "1.2.2".freeze
   end
 end

data/spec/fixtures/action_schemaexpg1.svg CHANGED Viewed

@@ -3,6 +3,8 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 595.28 841.89" style="enable-background:new 0 0 595.28 841.89;" xml:space="preserve">
 <style type="text/css">
+        #Layer_1 { fill:none }
+        svg[id = 'Layer_1'] { fill:none }
 	.st0{fill:none;stroke:#000000;stroke-miterlimit:10;}
 </style>
 <image style="overflow:visible;" width="368" height="315" xlink:href="data:image/gif;base64,R0lGODlhcAE7Aff/AAAAAAAAMwAAZgAAmQAAzAAA/wAzAAAzMwAzZgAzmQAzzAAz/wBmAABmMwBm
@@ -110,7 +112,7 @@ vsuOvuXr7OfLveML7c0u7c9u7dEevt+77cwuvteu7d2uvuzb2ORe7u97ZvV7v8UevBLGv/4LwHi+
 ZARswAgc77C27vqba/guwMe27x997/Z+av6O3QC/5co28BQs8AFfaAgv0gWf3Apv8P2+8GfW8CJ8
 8BS/ZBYP2fqe8TK28Xmdaydj7iRfFvIpo8qEnfIqv/Is3/Iu//IwH/OhERAAOw==" transform="matrix(1 0 0 1 114 263.8898)">
 </image>
-<a xlink:href="mn://action_schema" >
+<a xlink:href="mn://action_schema" xlink:dummy="Layer_1">
 	<rect x="123.28" y="273.93" class="st0" width="88.05" height="41.84"/>
 </a>
 <a xlink:href="mn://basic_attribute_schema" >

data/spec/utils_spec.rb CHANGED Viewed

@@ -158,10 +158,10 @@ RSpec.describe Metanorma::Utils do
              </target>
            </svgmap>
            <figure>
-<svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' version='1.1' id='Layer_1' x='0px' y='0px' viewBox='0 0 595.28 841.89' style='enable-background:new 0 0 595.28 841.89;' xml:space='preserve'>
+            <svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' version='1.1' id='Layer_1_000000001' x='0px' y='0px' viewBox='0 0 595.28 841.89' style='enable-background:new 0 0 595.28 841.89;' xml:space='preserve'>
                <style/>
                <image/>
-               <a xlink:href='#ref1'>
+               <a xlink:href='#ref1' xlink:dummy='Layer_1_000000001'>
                  <rect x='123.28' y='273.93' class='st0' width='88.05' height='41.84'/>
                </a>
                <a xlink:href='mn://basic_attribute_schema'>
@@ -174,10 +174,10 @@ RSpec.describe Metanorma::Utils do
            </figure>
            <svgmap id='_60dadf08-48d4-4164-845c-b4e293e00abd'>
              <figure>
-             <svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' version='1.1' id='Layer_1' x='0px' y='0px' viewBox='0 0 595.28 841.89' style='enable-background:new 0 0 595.28 841.89;' xml:space='preserve'>
+             <svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' version='1.1' id='Layer_1_000000002' x='0px' y='0px' viewBox='0 0 595.28 841.89' style='enable-background:new 0 0 595.28 841.89;' xml:space='preserve'>
                  <style/>
                  <image/>
-                 <a xlink:href='mn://action_schema'>
+                 <a xlink:href='mn://action_schema'  xlink:dummy='Layer_1_000000002'>
                    <rect x='123.28' y='273.93' class='st0' width='88.05' height='41.84'/>
                  </a>
                  <a xlink:href='http://www.example.com'>
@@ -200,7 +200,7 @@ RSpec.describe Metanorma::Utils do
              </target>
            </svgmap>
            <figure>
-           <svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' version='1.1' id='Layer_1' x='0px' y='0px' viewBox='0 0 595.28 841.89' style='enable-background:new 0 0 595.28 841.89;' xml:space='preserve'>
+           <svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' version='1.1' id='Layer_1_000000003' x='0px' y='0px' viewBox='0 0 595.28 841.89' style='enable-background:new 0 0 595.28 841.89;' xml:space='preserve'>
                <a href='#ref1'>
                  <rect x='123.28' y='273.93' class='st0' width='88.05' height='41.84'/>
                </a>
@@ -214,7 +214,7 @@ RSpec.describe Metanorma::Utils do
            </figure>
            <svgmap id='_60dadf08-48d4-4164-845c-b4e293e00abd'>
              <figure>
-             <svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' version='1.1' id='Layer_1' x='0px' y='0px' viewBox='0 0 595.28 841.89' style='enable-background:new 0 0 595.28 841.89;' xml:space='preserve'>
+             <svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' version='1.1' id='Layer_1_000000004' x='0px' y='0px' viewBox='0 0 595.28 841.89' style='enable-background:new 0 0 595.28 841.89;' xml:space='preserve'>
                  <style/>
                  <image/>
                  <a xlink:href='mn://action_schema'>
@@ -280,7 +280,7 @@ RSpec.describe Metanorma::Utils do
       </standard-document>
     INPUT
     Metanorma::Utils.svgmap_rewrite(xmldoc)
-    expect(xmlpp(xmldoc.to_xml.gsub(%r{<image.*?</image>}m, "<image/>").gsub(%r{<style.*?</style>}m, "<style/>"))).to be_equivalent_to xmlpp(<<~OUTPUT)
+    expect(xmlpp(xmldoc.to_xml.gsub(%r{<image.*?</image>}m, "<image/>"))).to be_equivalent_to xmlpp(<<~OUTPUT)
         <?xml version='1.0'?>
          <standard-document type="semantic" version="1.8.2" xmlns="http://www.example.com">
              <bibdata type="standard">
@@ -302,10 +302,13 @@ RSpec.describe Metanorma::Utils do
              </bibdata>
              <sections><svgmap id="_d5b5049a-dd53-4ea0-bc6f-e8773bd59052"><target href="mn://action_schema"><xref target="ref1">Computer</xref></target></svgmap>
              <figure>
-             <svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' version='1.1' id='Layer_1' x='0px' y='0px' viewBox='0 0 595.28 841.89' style='enable-background:new 0 0 595.28 841.89;' xml:space='preserve'>
-               <style/>
+             <svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' version='1.1' id='Layer_1_000000001' x='0px' y='0px' viewBox='0 0 595.28 841.89' style='enable-background:new 0 0 595.28 841.89;' xml:space='preserve'>
+             <style type='text/css'>
+   #Layer_1_000000001 { fill:none } svg[id='Layer_1_000000001'] {
+  fill:none } .st0{fill:none;stroke:#000000;stroke-miterlimit:10;}
+</style>
                <image/>
-               <a xlink:href='#ref1'>
+               <a xlink:href='#ref1' xlink:dummy='Layer_1_000000001'>
                  <rect x='123.28' y='273.93' class='st0' width='88.05' height='41.84'/>
                </a>
                <a xlink:href='mn://basic_attribute_schema'>
@@ -318,10 +321,13 @@ RSpec.describe Metanorma::Utils do
       </figure>
       <svgmap id='_60dadf08-48d4-4164-845c-b4e293e00abd'>
         <figure>
-        <svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' version='1.1' id='Layer_1' x='0px' y='0px' viewBox='0 0 595.28 841.89' style='enable-background:new 0 0 595.28 841.89;' xml:space='preserve'>
-                 <style/>
+        <svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' version='1.1' id='Layer_1_000000002' x='0px' y='0px' viewBox='0 0 595.28 841.89' style='enable-background:new 0 0 595.28 841.89;' xml:space='preserve'>
+        <style type='text/css'>
+   #Layer_1_000000002 { fill:none } svg[id='Layer_1_000000002'] {
+  fill:none } .st0{fill:none;stroke:#000000;stroke-miterlimit:10;}
+</style>
                  <image/>
-                 <a xlink:href='mn://action_schema'>
+                 <a xlink:href='mn://action_schema' xlink:dummy='Layer_1_000000002'>
                    <rect x='123.28' y='273.93' class='st0' width='88.05' height='41.84'/>
                  </a>
                  <a xlink:href='http://www.example.com'>

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-utils
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-12 00:00:00.000000000 Z
+date: 2021-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sterile