metanorma-utils 1.4.2 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd1e58ea4dadd1ad26ad1b254805c2c831914a1177b0e75ea166117a3c1a4e99
-  data.tar.gz: 1479bd090933fc9e861f3b9aba780fa18fe863ddfa923ddcee7caa148956f754
+  metadata.gz: bdcbaef96c6a6ea0bbd2b04bb5266974aa6bec1567061c0e200c0e706b4388af
+  data.tar.gz: 361e87aa1151479e66c885d912f78a66749a697f2d93b4464d346e79f0fa193e
 SHA512:
-  metadata.gz: c4578a2d2450368c92cec783b297ab5c5ba921e3644dc6078b6df66af58b0a74f56e6e800d2d01322f8af6b95ebf3c2834076528308845aaca612ed851108990
-  data.tar.gz: 343f2b25137e40335e56ce82f00297294f6f33a956d7bec3ccb76ad012d31a8594d78a31143919060d05fe6edfa2a3a39f06183548e2b9a671cb3f97a310d6c8
+  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)
@@ -168,7 +163,11 @@ module Metanorma
       end
 
       def url?(url)
-        %r{^([A-Z]:)?/}.match?(url)
+        %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)

data/lib/utils/version.rb

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

data/spec/img_spec.rb

@@ -2,6 +2,33 @@ require "spec_helper"
 require "fileutils"
 
 RSpec.describe Metanorma::Utils do
+  it "recognises data uris" do
+    expect(Metanorma::Utils.datauri?("data:img/gif,base64,ABBC"))
+      .to eq true
+    expect(Metanorma::Utils.datauri?("data1:img/gif,base64,ABBC"))
+      .to eq false
+  end
+
+  it "recognises uris" do
+    expect(Metanorma::Utils.url?("mailto://ABC"))
+      .to eq true
+    expect(Metanorma::Utils.url?("http://ABC"))
+      .to eq true
+    expect(Metanorma::Utils.url?("D:/ABC"))
+      .to eq false
+    expect(Metanorma::Utils.url?("/ABC"))
+      .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.2
+  version: 1.4.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-07 00:00:00.000000000 Z
+date: 2022-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor