metanorma-ogc 2.5.2 → 2.5.4

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,17 +68,21 @@ 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

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "2.5.2".freeze
+    VERSION = "2.5.4".freeze
   end
 end

data/lib/relaton/render/date.rb

@@ -1,8 +1,11 @@
 module Relaton
   module Render
-    class Date
-      def render
-        @date&.sub(/-.*$/, "")
+    module Ogc
+      class Date < ::Relaton::Render::Date
+        def render
+          @type == "accessed" or @date&.sub(/-.*$/, "")
+          @date
+        end
       end
     end
   end

data/lib/relaton/render/fields.rb

@@ -1,5 +1,3 @@
-require_relative "date"
-
 module Relaton
   module Render
     module Ogc

data/lib/relaton/render/general.rb

@@ -1,6 +1,7 @@
 require "relaton-render"
 require_relative "parse"
 require_relative "fields"
+require_relative "date"
 
 module Relaton
   module Render
@@ -11,12 +12,9 @@ module Relaton
         end
 
         def klass_initialize(_options)
-          @nametemplateklass = Relaton::Render::Template::Name
-          @seriestemplateklass = Relaton::Render::Template::Series
-          @extenttemplateklass = Relaton::Render::Template::Extent
-          @sizetemplateklass = Relaton::Render::Template::Size
-          @generaltemplateklass = Relaton::Render::Template::General
+          super
           @fieldsklass = Relaton::Render::Ogc::Fields
+          @dateklass = Relaton::Render::Ogc::Date
           @parseklass = Relaton::Render::Ogc::Parse
         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.2"
+  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.2
+  version: 2.5.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-02-19 00:00:00.000000000 Z
+date: 2024-03-10 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.2
+        version: 2.8.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.2
+        version: 2.8.4
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement