metanorma-iso 2.4.6 → 2.4.8

data/lib/metanorma/iso/front.rb

@@ -12,12 +12,18 @@ module Metanorma
       def metadata_ext(node, xml)
         super
         structured_id(node, xml)
+        metadata_stage(node, xml)
+        @amd && a = node.attr("updates-document-type") and
+          xml.updates_document_type a
+      end
+
+      def metadata_stage(node, xml)
         id = iso_id_default(iso_id_params(node))
         id.stage and
           xml.stagename metadata_stagename(id)&.strip,
                         **attr_code(abbreviation: id.typed_stage_abbrev&.strip)
-        @amd && a = node.attr("updates-document-type") and
-          xml.updates_document_type a
+      rescue Pubid::Core::Errors::HarmonizedStageCodeInvalidError,
+             Pubid::Core::Errors::TypeStageParseError
       end
 
       def metadata_stagename(id)
@@ -92,8 +98,17 @@ module Metanorma
         xml.status do |s|
           s.stage stage, **attr_code(abbreviation: abbrev)
           s.substage substage
-          node.attr("iteration") && (s.iteration node.attr("iteration"))
+          i = node.attr("iteration") and s.iteration i
         end
+      rescue Pubid::Core::Errors::HarmonizedStageCodeInvalidError,
+             Pubid::Core::Errors::TypeStageParseError
+        report_illegal_stage(stage, substage)
+      end
+
+      def report_illegal_stage(stage, substage)
+        err = "Illegal document stage: #{stage}.#{substage}"
+        @log.add("Document Attributes", nil, err)
+        warn err
       end
 
       def metadata_committee(node, xml)

data/lib/metanorma/iso/front_id.rb

@@ -10,41 +10,6 @@ require "pubid-iso"
 module Metanorma
   module ISO
     class Converter < Standoc::Converter
-      STAGE_ABBRS = {
-        "00": "PWI",
-        "10": "NP",
-        "20": "WD",
-        "30": "CD",
-        "40": "DIS",
-        "50": "FDIS",
-        "60": "IS",
-        "90": "(Review)",
-        "95": "(Withdrawal)",
-      }.freeze
-
-      STAGE_NAMES = {
-        "00": "Preliminary work item",
-        "10": "New work item proposal",
-        "20": "Working draft",
-        "30": "Committee draft",
-        "40": "Draft",
-        "50": "Final draft",
-        "60": "International standard",
-        "90": "Review",
-        "95": "Withdrawal",
-      }.freeze
-
-      def stage_abbr(stage, substage, _doctype)
-        return nil if stage.to_i > 60
-
-        ret = STAGE_ABBRS[stage.to_sym]
-        ret = "PRF" if stage == "60" && substage == "00"
-        ret = nil if stage == "60" && substage != "00"
-        ret = "AWI" if stage == "10" && substage == "99"
-        ret = "AWI" if stage == "20" && substage == "00"
-        ret
-      end
-
       def metadata_id(node, xml)
         if id = node.attr("docidentifier")
           xml.docidentifier id, **attr_code(type: "ISO")
@@ -103,23 +68,19 @@ module Metanorma
 
       def iso_id_params_add(node)
         stage = iso_id_stage(node)
-
         ret = { number: node.attr("amendment-number") ||
           node.attr("corrigendum-number"),
                 year: iso_id_year(node),
                 iteration: node.attr("iteration") }.compact
-        stage and ret[:stage] = stage
-        ret[:stage] == "60.00" and ret[:stage] = :PRF
+        if stage
+          ret[:stage] = stage
+          ret[:stage] == "60.00" and ret[:stage] = :PRF
+        end
         ret
       end
 
       def iso_id_stage(node)
-        stage = stage_abbr(get_stage(node), get_substage(node),
-                           doctype(node))
-        harmonised = "#{get_stage(node)}.#{get_substage(node)}"
-        harmonised = nil unless /^\d\d\.\d\d/.match?(harmonised)
-        { abbr: stage&.to_sym, harmonized_code: harmonised }
-        harmonised || stage&.to_sym
+        "#{get_stage(node)}.#{get_substage(node)}"
       end
 
       def iso_id_year(node)
@@ -195,7 +156,7 @@ module Metanorma
       def structured_id(node, xml)
         return unless node.attr("docnumber")
 
-        part, subpart = node&.attr("partnumber")&.split(/-/)
+        part, subpart = node&.attr("partnumber")&.split("-")
         xml.structuredidentifier do |i|
           i.project_number(node.attr("docnumber"), **attr_code(
             part: part, subpart: subpart,

data/lib/metanorma/iso/validate.rb

@@ -132,20 +132,6 @@ module Metanorma
                    "#{script} is not a recognised script")
       end
 
-      def stage_validate(xmldoc)
-        stage = xmldoc&.at("//bibdata/status/stage")&.text
-        %w(00 10 20 30 40 50 60 90 95).include? stage or
-          @log.add("Document Attributes", nil,
-                   "#{stage} is not a recognised stage")
-      end
-
-      def substage_validate(xmldoc)
-        substage = xmldoc&.at("//bibdata/status/substage")&.text or return
-        %w(00 20 60 90 92 93 98 99).include? substage or
-          @log.add("Document Attributes", nil,
-                   "#{substage} is not a recognised substage")
-      end
-
       def iteration_validate(xmldoc)
         iteration = xmldoc&.at("//bibdata/status/iteration")&.text or return
         /^\d+/.match(iteration) or
@@ -156,8 +142,6 @@ module Metanorma
       def bibdata_validate(doc)
         doctype_validate(doc)
         script_validate(doc)
-        stage_validate(doc)
-        substage_validate(doc)
         iteration_validate(doc)
       end
 

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "2.4.6".freeze
+    VERSION = "2.4.8".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 2.4.6
+  version: 2.4.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-19 00:00:00.000000000 Z
+date: 2023-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc