metanorma-utils 1.4.3 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38d5284e3547876d1ad2385d81d10dc9defa3e3669412c30b311fa2dd89857c4
-  data.tar.gz: e4bf71c720f096a107f2f22e075bb7391d2bdd844e020eb304ac4dc3c0323f29
+  metadata.gz: bdcbaef96c6a6ea0bbd2b04bb5266974aa6bec1567061c0e200c0e706b4388af
+  data.tar.gz: 361e87aa1151479e66c885d912f78a66749a697f2d93b4464d346e79f0fa193e
 SHA512:
-  metadata.gz: 0a992b7f1f3980ee4e57b74cd272b743acd197061e382089edd8fd948e629f5e182f0d66b38848a1efe7c2195c2da5d0dcd790ada393fc3a1bca31dc11fb2a61
-  data.tar.gz: d085748cc3ac46d3a85861c2533e9d361ece9b4cd4c7f2f18b860e9d19e09abb5c353e612bfadd7a897a59ac1690a77eb8fb611d286194f471b372df7952a53a
+  metadata.gz: 4ac44af9556e50ca2f7e7a1b197e3f9da3f80d27bf19545adc97e4ab77b7a082b033b06dc1d275bfcf06ea53dcacdc0d6422f36b732d48b46267f6ee0bc6a4f6
+  data.tar.gz: 8eeae386f6fbaba0ab910f389fa1122b7559bce68c01215fa7485f392044b9f8fb4c2d6ec11da09245b65a257744737b98a231f551c5b64ddd5f1a46e120fcae

data/lib/utils/image.rb

@@ -21,7 +21,7 @@ module Metanorma
       end
 
       def save_dataimage(uri)
-        %r{^data:(image|application)/(?<imgtype>[^;]+);(charset=[^;]+;)?base64,(?<imgdata>.+)$} =~ uri
+        %r{^data:(?:image|application)/(?<imgtype>[^;]+);(?:charset=[^;]+;)?base64,(?<imgdata>.+)$} =~ uri
         imgtype.sub!(/\+[a-z0-9]+$/, "") # svg+xml
         imgtype = "png" unless /^[a-z0-9]+$/.match? imgtype
         Tempfile.open(["image", ".#{imgtype}"]) do |f|
@@ -125,25 +125,20 @@ module Metanorma
       # sources/plantuml/plantuml20200524-90467-1iqek5i.png
       # already includes localdir
       def datauri(uri, local_dir = ".")
-        # Return the data URI if it already is a data URI
-        return uri if datauri?(uri)
-
-        # Return the URL if it is a URL
-        return uri if url?(uri)
-
-        local_path = uri
-        relative_path = File.join(local_dir, uri)
+        return uri if datauri?(uri) || url?(uri) || absolute_path?(uri)
 
         # Check whether just the local path or the other specified relative path
         # works.
-        path = [local_path, relative_path].detect do |p|
+        path = [uri, File.join(local_dir, uri)].detect do |p|
           File.exist?(p) ? p : nil
         end
+        datauri1(path)
+      end
 
+      def datauri1(path)
         unless path && File.exist?(path)
           warn "Image specified at `#{uri}` does not exist."
-          # Return original provided location
-          return uri
+          return uri # Return original provided location
         end
 
         encode_datauri(path)
@@ -171,6 +166,10 @@ module Metanorma
         %r{^[A-Z]{2,}://}i.match?(url)
       end
 
+      def absolute_path?(uri)
+        %r{^/}.match?(uri) || %r{^[A-Z]:/}.match?(uri)
+      end
+
       def decode_datauri(uri)
         %r{^data:(?<mimetype>[^;]+);base64,(?<mimedata>.+)$} =~ uri
         return nil unless mimetype && mimedata

data/lib/utils/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Utils
-    VERSION = "1.4.3".freeze
+    VERSION = "1.4.4".freeze
   end
 end

data/spec/img_spec.rb

@@ -20,6 +20,15 @@ RSpec.describe Metanorma::Utils do
       .to eq false
   end
 
+  it "recognises absolute file locations" do
+    expect(Metanorma::Utils.absolute_path?("D:/a.html"))
+      .to eq true
+    expect(Metanorma::Utils.absolute_path?("/a.html"))
+      .to eq true
+    expect(Metanorma::Utils.absolute_path?("a.html"))
+      .to eq false
+  end
+
   it "rewrites SVGs" do
     FileUtils.cp("spec/fixtures/action_schemaexpg1.svg",
                  "action_schemaexpg1.svg")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-utils
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-13 00:00:00.000000000 Z
+date: 2022-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor