metanorma-utils 1.4.4.1 → 1.4.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57ecf7558228131c734f18189db5fe9579683f11c9f8269f5edf430412054cb2
-  data.tar.gz: 4762e8db65f0a9e03e6a0c958d3e40968b5194824f1018e5aea0f8aca1096a90
+  metadata.gz: 9e7d4b6d86dedc30058632c7ee8e4ac52f7da75d40ec9f8537410bb2d907ad84
+  data.tar.gz: e0f0cc16ad9d45ef019beb1bbdffa37c65d01dc5e4a7447b9a0ce919eda0a193
 SHA512:
-  metadata.gz: 644939cf2ef17f876d42224505ee084f57d1551ae44573f2792003c52392cd53fb3ae56cc872cba7f32680ca954738fefb1dda4c21d53395e74414c2140326ed
-  data.tar.gz: 1f159cdbd7c383816693d5e1b4303829f498ba7e47b6af583388c246f736bd80533d26d53e2e1a381f027c7a5340cbf320dc7300eb0ecd766b52482aa7dbfc52
+  metadata.gz: 98028f963be5cc7261afe75ce8ebbecc08df32b16c7783e8a94263453941b3139549367f6baa0576a187aafa2007b400fc76d7e6905a249216866aa9c075466b
+  data.tar.gz: f8e5cb9be34dc02eb56e24c6cd7c3b8e477f89eebdb356d130ad903ce5c12f63fdfcae934ebb859570d01f5ae8b3dda156c96b3e88b290a83540135ef6c1477d

data/lib/utils/image.rb

@@ -127,12 +127,14 @@ module Metanorma
       # Check whether just the local path or the other specified relative path
       # works.
       def datauri(uri, local_dir = ".")
-        return uri if datauri?(uri) || url?(uri) || absolute_path?(uri)
+        return uri if datauri?(uri) || url?(uri)
 
-        path = [uri, File.join(local_dir, uri)].detect do |p|
+options = absolute_path?(uri) ? [uri] : [uri, File.join(local_dir, uri)]
+        path = options.detect do |p|
           File.exist?(p) ? p : nil
         end
-        unless path && File.exist?(path)
+
+        unless path
           warn "Image specified at `#{uri}` does not exist."
           return uri # Return original provided location
         end

data/lib/utils/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Utils
-    VERSION = "1.4.4.1".freeze
+    VERSION = "1.4.4.2".freeze
   end
 end

data/spec/img_spec.rb

@@ -2,6 +2,39 @@ require "spec_helper"
 require "fileutils"
 
 RSpec.describe Metanorma::Utils do
+
+  context "recognises data uris" do
+    it "where the content is an existing file at a relative path" do
+      expect(Metanorma::Utils.datauri("spec/fixtures/rice_image1.png"))
+        .to eq Metanorma::Utils.encode_datauri('spec/fixtures/rice_image1.png')
+    end
+
+    it "where the content is an existing file at an absolute path" do
+      expect(Metanorma::Utils.datauri(File.expand_path("spec/fixtures/rice_image1.png")))
+        .to eq Metanorma::Utils.encode_datauri('spec/fixtures/rice_image1.png')
+    end
+
+    it "where the content is a relative file path pointing to a bogus file" do
+      expect(Metanorma::Utils.datauri("spec/fixtures/bogus.png"))
+        .to eq "spec/fixtures/bogus.png"
+    end
+
+    it "where the content is an absolute file path pointing to a bogus file" do
+      expect(Metanorma::Utils.datauri("D:/spec/fixtures/bogus.png"))
+        .to eq "D:/spec/fixtures/bogus.png"
+    end
+
+    it "where the content is a data/image URI" do
+      expect(Metanorma::Utils.datauri("data1:img/gif,base64,ABBC"))
+        .to eq "data1:img/gif,base64,ABBC"
+    end
+
+    it "where the content is an URL" do
+      expect(Metanorma::Utils.datauri("https://example.com/image.png"))
+        .to eq "https://example.com/image.png"
+    end
+  end
+
   it "recognises data uris" do
     expect(Metanorma::Utils.datauri?("data:img/gif,base64,ABBC"))
       .to eq true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-utils
 version: !ruby/object:Gem::Version
-  version: 1.4.4.1
+  version: 1.4.4.2
 platform: ruby
 authors:
 - Ribose Inc.