metanorma-utils 1.6.5 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3f777cb3ba87e217a3b56ee8caf1a2cd8f6948a8664e18900c6eb5494d162f9
-  data.tar.gz: 6a758b7d70a52f55c71d8db3562ea32a0f19de514948d17a48bee811850e0b16
+  metadata.gz: e00e0a899351896ba101b0522ec633f60959dd6a8ca8623c5f3b35445a9e8afb
+  data.tar.gz: 1b08d89297e4fc0dfff8dde93301389878cf2cb8a24789bab2876e77c059f62a
 SHA512:
-  metadata.gz: 2bf9b223b840ea02f05c3fe37cc6d12ab73044da84f5108c5f94323a096a567934deec55ddce269f616382b09e98f2be1bc8d835120b6127549ee3febd00bcaf
-  data.tar.gz: 5447a68582a1c245e1d8a1763573b956ae5999e7ed3a4b8f057e57b301cdc16d5cf2db99fa64bcdd6cb9f0047114fb75b812232fca7303c49ee9095a72387646
+  metadata.gz: a8fc3672c7ab49cc9e6f49405e47e8df92308b6685e1d0b87ad58afc0377f00ece6e5384552d42eafe866bd40ea87d8c7e2fa935c455006d5d9b49e618527860
+  data.tar.gz: 344fae6f2c4499b43dfc12e4da4928cea45a727cc879ed49f6aba4f9fd6edf568c2e4beef40c7779b00a18980aba45e796a60b9f1599658a0516cf7647137bda

data/Gemfile

@@ -4,12 +4,6 @@ Encoding.default_internal = Encoding::UTF_8
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}" }
 
-group :development, :test do
-  gem "rspec"
-end
-
-if File.exist? "Gemfile.devel"
-  eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
-end
-
 gemspec
+
+eval_gemfile("Gemfile.devel") rescue nil

data/lib/utils/image.rb

@@ -1,188 +1,7 @@
-require "tempfile"
-require "marcel"
-require "base64"
+require_relative "namespace"
 
 module Metanorma
+  # Image methods were moved to the Vectory gem
   module Utils
-    class << self
-      class Namespace
-        def initialize(xmldoc)
-          @namespace = xmldoc.root.namespace
-        end
-
-        def ns(path)
-          return path if @namespace.nil?
-
-          path.gsub(%r{/([a-zA-z])}, "/xmlns:\\1")
-            .gsub(%r{::([a-zA-z])}, "::xmlns:\\1")
-            .gsub(%r{\[([a-zA-z][a-z0-9A-Z@/]* ?=)}, "[xmlns:\\1")
-            .gsub(%r{\[([a-zA-z][a-z0-9A-Z@/]*\])}, "[xmlns:\\1")
-        end
-      end
-
-      def save_dataimage(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|
-          f.binmode
-          f.write(Base64.strict_decode64(imgdata))
-          f.path
-        end
-      end
-
-      SVG_NS = "http://www.w3.org/2000/svg".freeze
-
-      def svgmap_rewrite(xmldoc, localdirectory = "")
-        n = Namespace.new(xmldoc)
-        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, idx)
-        if (i = svgmap.at(namespace.ns(".//image"))) &&
-            (src = i["src"]) && !src.empty?
-          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, 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, idx))
-        else return false
-        end
-        true
-      end
-
-      def svgmap_rewrite0_path(src, localdirectory)
-        if /^data:/.match?(src)
-          save_dataimage(src)
-        else
-          File.file?(src) ? src : localdirectory + src
-        end
-      end
-
-      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
-      end
-
-      def svgmap_rewrite1_targets(svgmap, namespace)
-        svgmap.xpath(namespace.ns("./target"))
-          .each_with_object({}) do |t, m|
-          x = t.at(namespace.ns("./xref")) and
-            m[File.expand_path(t["href"])] = "##{x['target']}"
-          x = t.at(namespace.ns("./link")) and
-            m[File.expand_path(t["href"])] = x["target"]
-          t.remove if t.at(namespace.ns("./xref | ./link"))
-        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("#%<id>s_%<idx>09d", id: i, idx: idx))
-              .gsub(%r(\[id\s*=\s*['"]?#{i}['"]?\]),
-                    sprintf("[id='%<id>s_%<idx>09d']", id: i, idx: idx))
-          end
-          s.children = c
-        end
-      end
-
-      # sources/plantuml/plantuml20200524-90467-1iqek5i.png
-      # already includes localdir
-      # Check whether just the local path or the other specified relative path
-      # works.
-      def datauri(uri, local_dir = ".")
-        (datauri?(uri) || url?(uri)) and return uri
-        options = absolute_path?(uri) ? [uri] : [uri, File.join(local_dir, uri)]
-        path = options.detect do |p|
-          File.exist?(p) ? p : nil
-        end
-        path and return encode_datauri(path)
-        warn "Image specified at `#{uri}` does not exist."
-        uri # Return original provided location
-      end
-
-      def encode_datauri(path)
-        return nil unless File.exist?(path)
-
-        type = Marcel::MimeType.for(Pathname.new(path)) ||
-          'text/plain; charset="utf-8"'
-
-        bin = File.binread(path)
-        data = Base64.strict_encode64(bin)
-        "data:#{type};base64,#{data}"
-      rescue StandardError
-        warn "Data-URI encoding of `#{path}` failed."
-        nil
-      end
-
-      def datauri?(uri)
-        /^data:/.match?(uri)
-      end
-
-      def url?(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)
-        %r{^data:(?<mimetype>[^;]+);base64,(?<mimedata>.+)$} =~ uri
-        return nil unless mimetype && mimedata
-
-        data = Base64.strict_decode64(mimedata)
-        {
-          type_declared: mimetype,
-          type_detected: Marcel::MimeType.for(data, declared_type: mimetype),
-          data: data,
-        }
-      end
-
-      # FIXME: This method should ONLY return 1 type, remove Array wrapper
-      def datauri2mime(uri)
-        output = decode_datauri(uri)
-        return nil unless output && output[:type_detected]
-
-        [output[:type_detected]]
-      end
-    end
   end
 end

data/lib/utils/namespace.rb

@@ -0,0 +1,26 @@
+module Metanorma
+  module Utils
+    class << self
+      # NOTE: It was used in methods of an eigenclass of Metanorma::Utils.
+      #       Not sure if it's still used somewhere but could be.
+      class Namespace
+        def initialize(xmldoc)
+          @namespace = xmldoc.root.namespace
+        end
+
+        def ns(path)
+          return path if @namespace.nil?
+
+          path.gsub(%r{/([a-zA-Z])}, "/xmlns:\\1")
+            .gsub(%r{::([a-zA-Z])}, "::xmlns:\\1")
+            .gsub(%r{\[([a-zA-Z][a-z0-9A-Z@/]* ?=)}, "[xmlns:\\1")
+            .gsub(%r{\[([a-zA-Z][a-z0-9A-Z@/]*\])}, "[xmlns:\\1")
+        end
+      end
+
+      def create_namespace(xmldoc)
+        Namespace.new(xmldoc)
+      end
+    end
+  end
+end

data/lib/utils/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Utils
-    VERSION = "1.6.5".freeze
+    VERSION = "1.7.1".freeze
   end
 end

data/metanorma-utils.gemspec

@@ -30,8 +30,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "concurrent-ruby"
   spec.add_dependency "csv"
   spec.add_dependency "htmlentities", "~> 4.3.4"
-  spec.add_dependency "marcel", "~> 1.0.0"
-  spec.add_dependency "mime-types"
   spec.add_dependency "nokogiri", ">= 1.11"
   spec.add_dependency "sterile", "~> 1.0.14"
   spec.add_dependency "uuidtools"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-utils
 version: !ruby/object:Gem::Version
-  version: 1.6.5
+  version: 1.7.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-07 00:00:00.000000000 Z
+date: 2024-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -66,34 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.3.4
-- !ruby/object:Gem::Dependency
-  name: marcel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: mime-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -324,6 +296,7 @@ files:
 - lib/utils/image.rb
 - lib/utils/log.rb
 - lib/utils/main.rb
+- lib/utils/namespace.rb
 - lib/utils/version.rb
 - lib/utils/xml.rb
 - metanorma-utils.gemspec