lib/isodoc/function/utils.rb in isodoc-2.6.5 vs lib/isodoc/function/utils.rb in isodoc-2.6.6

@@ -1,10 +1,13 @@
 require "metanorma-utils"
 
 module IsoDoc
   module Function
     module Utils
+      Hash.include Metanorma::Utils::Hash
+      Array.include Metanorma::Utils::Array
+
       def to_xml(node)
         self.class.to_xml(node)
       end
 
       def date_range(date)
@@ -164,11 +167,11 @@
         meta = @meta
           .get
           .merge(@labels ? { labels: @labels } : {})
           .merge(@meta.labels ? { labels: @meta.labels } : {})
           .merge(fonts_options || {})
-        template = liquid(docxml)
-        template.render(meta.map { |k, v| [k.to_s, empty2nil(v)] }.to_h)
+        liquid(docxml).render(meta.stringify_all_keys
+          .transform_values { |v| empty2nil(v) })
           .gsub("<", "<").gsub(">", ">").gsub("&", "&")
       end
 
       def save_dataimage(uri, _relative_dir = true)
         %r{^data:(?<imgclass>image|application)/(?<imgtype>[^;]+);(?:charset=[^;]+;)?base64,(?<imgdata>.+)$} =~ uri