lib/metanorma/ogc/front.rb in metanorma-ogc-2.3.3 vs lib/metanorma/ogc/front.rb in metanorma-ogc-2.3.4

@@ -14,11 +14,11 @@
         return unless node.attr("submitting-organizations")
 
         csv_split(HTMLEntities.new
           .decode(node.attr("submitting-organizations")), ";")&.each do |org|
           xml.contributor do |c|
-            c.role **{ type: "author" }
+            c.role type: "author"
             c.organization do |a|
               a.name org
             end
           end
         end
@@ -37,24 +37,24 @@
       end
 
       def personal_role(node, contrib, suffix)
         type = node.attr("role#{suffix}")&.downcase || "editor"
         if type == "contributor"
-          contrib.role **{ type: "author" } do |r|
+          contrib.role type: "author" do |r|
             r.description do |d|
               d << type
             end
           end
-        else contrib.role **{ type: type }
+        else contrib.role type: type
         end
       end
 
       def ogc_editor(node, xml)
         return unless node.attr("editor")
 
         xml.contributor do |c|
-          c.role **{ type: "editor" }
+          c.role type: "editor"
           c.person do |p|
             p.name do |n|
               n.completename node.attr("editor")
             end
           end
@@ -112,18 +112,17 @@
         v = (node.attr("edition") || node.attr("version")) and url += "/#{v}"
         url
       end
 
       def metadata_id(node, xml)
-        e = externalid(node) and xml.docidentifier e, **{ type: "ogc-external" }
+        e = externalid(node) and xml.docidentifier e, type: "ogc-external"
         node.attr("referenceurlid") and
-          xml.docidentifier externalurl(node), **{ type: "ogc-external" }
+          xml.docidentifier externalurl(node), type: "ogc-external"
         docnumber = node.attr("docnumber") || node.attr("docreference")
-        if docnumber
-          xml.docidentifier docnumber, **{ type: "ogc-internal" }
-          xml.docnumber docnumber
-        end
+        id = node.attr("docidentifier") || docnumber
+        xml.docidentifier id, type: "ogc-internal"
+        docnumber and xml.docnumber docnumber
       end
 
       def externalurl(node)
         if doctype(node) == "engineering-report"
           "http://www.opengis.net/doc/PER/t14-#{node.attr('referenceurlid')}"
@@ -151,10 +150,10 @@
         ogc_date(node, xml, "approvaldate", "issued")
       end
 
       def ogc_date(node, xml, ogcname, metanormaname)
         if node.attr(ogcname)
-          xml.date **{ type: metanormaname } do |d|
+          xml.date type: metanormaname do |d|
             d.on node.attr(ogcname)
           end
         end
       end