metanorma-ietf 3.5.7 → 3.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a7a8acefbf989aea665a8fbbb0e60447c921ee34527b9b1ba07526d281c35db
-  data.tar.gz: 5fdd90c1ad276336baf77616781b92bde24fa381752f6e8fc523f8d3a79d9c08
+  metadata.gz: fe59c2573e7cb80e26151e058ec1ddaec137ae0627f53aca32cea593f2a88a6e
+  data.tar.gz: 98f4553275189beb41e4d0f71daf1070163ec210f7050bdf4c8fda7b0f5a9bbf
 SHA512:
-  metadata.gz: 6e431686a4ed4fae904657b67f891c8dd1dc7f5ef1c33a1dbb04bc9d07b993801ab1b7d0423ff298d73ff4c2319393b9a0890d3d167177a70fcdee0289c80488
-  data.tar.gz: e9d77d069d55d1e36b98fa249e0e4ac8e0183a71c6fb53014626ccaa5a2a344d4b1952ef95c3f3bc4bad0160e6fe6bb10c602ef7f33b030e4b4701c11db8bcdf
+  metadata.gz: c56521d03c6c45c07e7cbfa977e7d87252825ccee610a7c4525398abe2f73ec3d64e4b3c28bf750c5058b0b4a6ae894a1c24238aad5328821265d4ebf0e1182b
+  data.tar.gz: 7d290b56d4ab6214181ff5c718e0eaafe8a199b9d5871a49cb17b260dd6ca02a7ed3b09d1aa110b8eba23154dfe6c9b4f1c237f81b75da3280c5367eb4a114db

data/lib/isodoc/ietf/front.rb

@@ -37,7 +37,7 @@ module IsoDoc
       end
 
       def seriesinfo(isoxml, front)
-        rfc_seriesinfo(isoxml, front) if @meta.get[:doctype] == "Rfc"
+        rfc_seriesinfo(isoxml, front) if @meta.get[:doctype] == "RFC"
         id_seriesinfo(isoxml, front) if @meta.get[:doctype] == "Internet Draft"
       end
 
@@ -55,8 +55,8 @@ module IsoDoc
         i = isoxml&.at(ns("//bibdata/series[@type = 'intended']")) and
           front.seriesInfo nil,
                            **attr_code(name: "",
-                                       status: i&.at(ns("./title"))&.text,
-                                       value: i&.at(ns("./number"))&.text || "")
+                                       status: i.at(ns("./title"))&.text,
+                                       value: i.at(ns("./number"))&.text || "")
       end
 
       def id_seriesinfo(isoxml, front)

data/lib/isodoc/ietf/metadata.rb

@@ -2,7 +2,7 @@ require "isodoc"
 
 module IsoDoc
   module Ietf
-    class  Metadata < IsoDoc::Metadata
+    class Metadata < IsoDoc::Metadata
       TITLE_RFC = "//bibdata//title[@type='main' and @language='en']".freeze
 
       def title(isoxml, _out)
@@ -47,7 +47,7 @@ module IsoDoc
 
       def doctype(isoxml, _out)
         super
-        set(:doctype, "Rfc") if get[:doctype].nil?
+        set(:doctype, "RFC") if get[:doctype].nil?
       end
     end
   end

data/lib/isodoc/ietf/rfc_convert.rb

@@ -34,6 +34,7 @@ module IsoDoc
         @isodoc.reqt_models = Metanorma::Requirements
           .new({ default: "default", lang: @lang, script: @script,
                  locale: @locale, labels: @i18n.get })
+        populate_id(docxml)
         info docxml, nil
         @xrefs.parse docxml
         @isodoc.xrefs = @xrefs
@@ -46,12 +47,25 @@ module IsoDoc
         @xrefs.parse docxml
       end
 
+      def populate_id(docxml)
+        docxml.xpath("//*[@id]").each do |x|
+          x["semx-id"] = x["id"]
+          x["anchor"] and x["id"] = to_ncname(x["anchor"])
+        end
+      end
+
+      # do not sanitise "#"
+      def to_ncname(ident)
+        ret = ident.split("#", 2)
+        ret.map { |x| Metanorma::Utils::to_ncname(x) }.join("#")
+      end
+
       def metadata_init(lang, script, locale, i18n)
         @meta = Metadata.new(lang, script, locale, i18n)
       end
 
-      def xref_init(lang, script, klass, i18n, options)
-        @xrefs = Xref.new(lang, script, klass, i18n, options)
+      def xref_init(lang, script, _klass, i18n, options)
+        @xrefs = Xref.new(lang, script, self, i18n, options)
       end
 
       def extract_delims(text)

data/lib/metanorma/ietf/cleanup.rb

@@ -10,6 +10,16 @@ module Metanorma
         xmldoc
       end
 
+        # simplified
+      def boilerplate_isodoc(xmldoc)
+        x = xmldoc.dup
+        x.root.add_namespace(nil, xml_namespace)
+        #xml = Nokogiri::XML(x.to_xml)
+        @isodoc ||= isodoc(@lang, @script, @locale)
+        # initialise @isodoc.xrefs, for @isodoc.xrefs.info
+        @isodoc
+      end
+
       def dt_cleanup(xmldoc)
         xmldoc.xpath("//dt").each do |dt|
           /:$/.match?(dt.text.strip) and next

data/lib/metanorma/ietf/converter.rb

@@ -25,7 +25,6 @@ module Metanorma
       end
 
       def makexml(node)
-        @draft = node.attributes.has_key?("draft")
         @workgroups = cache_workgroup(node)
         @bcp_bold = !node.attr?("no-rfc-bold-bcp14")
         @xinclude = node.attr?("use-xinclude")

data/lib/metanorma/ietf/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ietf
-    VERSION = "3.5.7".freeze
+    VERSION = "3.5.8".freeze
   end
 end

data/metanorma-ietf.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
   spec.add_dependency "metanorma-ietf-data"
-  spec.add_dependency "metanorma-standoc", "~> 3.0.0"
+  spec.add_dependency "metanorma-standoc", "~> 3.1.0"
   spec.add_dependency "relaton-render"
 
   spec.add_development_dependency "debug"
@@ -50,7 +50,6 @@ Gem::Specification.new do |spec|
 spec.add_development_dependency "rubocop-performance"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
-  spec.add_development_dependency "vcr", "~> 6.1.0"
   spec.add_development_dependency "webmock"
   spec.add_development_dependency "xml-c14n"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ietf
 version: !ruby/object:Gem::Version
-  version: 3.5.7
+  version: 3.5.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-06-09 00:00:00.000000000 Z
+date: 2025-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-ietf-data
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: relaton-render
   requirement: !ruby/object:Gem::Requirement
@@ -192,20 +192,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement