metanorma-ogc 2.5.1 → 2.5.3

data/lib/metanorma/ogc/front.rb

@@ -10,14 +10,20 @@ module Metanorma
         personal_author(node, xml)
       end
 
+      def safe_xml_string(node, key, value)
+        node.send key do |n|
+          n << value
+        end
+      end
+
       def corporate_author(node, xml)
         node.attr("submitting-organizations") or return
-        csv_split(HTMLEntities.new
-          .decode(node.attr("submitting-organizations")), ";")&.each do |org|
+        csv_split(@c.decode(node.attr("submitting-organizations")),
+                  ";")&.each do |org|
           xml.contributor do |c|
             c.role type: "author"
             c.organization do |a|
-              a.name org
+              safe_xml_string(a, "name", org)
             end
           end
         end
@@ -39,9 +45,7 @@ module Metanorma
         type = node.attr("role#{suffix}")&.downcase || "editor"
         if type == "contributor"
           contrib.role type: "author" do |r|
-            r.description do |d|
-              d << type
-            end
+            safe_xml_string(r, "description", type)
           end
         else contrib.role type: type
         end
@@ -64,23 +68,27 @@ module Metanorma
           personal_role(node, c, suffix)
           c.person do |p|
             p.name do |n|
-              if node.attr("fullname#{suffix}")
-                n.completename node.attr("fullname#{suffix}")
-              else
-                n.forename node.attr("givenname#{suffix}")
-                n.surname node.attr("surname#{suffix}")
-              end
+              personal_author_name(node, n, suffix)
             end
           end
         end
       end
 
+      def personal_author_name(node, xml, suffix)
+        if node.attr("fullname#{suffix}")
+          safe_xml_string(xml, "completename", node.attr("fullname#{suffix}"))
+        else
+          safe_xml_string(xml, "forename", node.attr("givenname#{suffix}"))
+          safe_xml_string(xml, "surname", node.attr("surname#{suffix}"))
+        end
+      end
+
       def default_publisher
         "OGC"
       end
 
-       def org_abbrev
-         { "Open Geospatial Consortium" => "OGC" }
+      def org_abbrev
+        { "Open Geospatial Consortium" => "OGC" }
       end
 
       def metadata_committee(node, xml)
@@ -108,7 +116,7 @@ module Metanorma
         a = node.attr("abbrev")
         d && a or return
         url = "http://www.opengis.net/doc/#{IsoDoc::Ogc::DOCTYPE_ABBR[d]}/#{a}"
-        v = (node.attr("edition") || node.attr("version")) and url += "/#{v}"
+        v = node.attr("edition") || node.attr("version") and url += "/#{v}"
         url
       end
 
@@ -119,7 +127,6 @@ module Metanorma
         docnumber = node.attr("docnumber") || node.attr("docreference")
         id = node.attr("docidentifier") || docnumber
         xml.docidentifier id, type: "ogc-internal"
-        docnumber and xml.docnumber docnumber
       end
 
       def externalurl(node)

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "2.5.1".freeze
+    VERSION = "2.5.3".freeze
   end
 end

data/metanorma-ogc.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.add_dependency "iso-639"
-  spec.add_dependency "metanorma-standoc", "~> 2.8.0"
+  spec.add_dependency "metanorma-standoc", "~> 2.8.4"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ogc
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.5.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-02-05 00:00:00.000000000 Z
+date: 2024-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso-639
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.8.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.8.4
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement