metanorma-ietf 3.3.2 → 3.3.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/ietf/section.rb +2 -2
  3. data/lib/metanorma/ietf/biblio.rng +28 -25
  4. data/lib/metanorma/ietf/validate.rb +1 -1
  5. data/lib/metanorma/ietf/version.rb +1 -1
  6. data/lib/relaton/render/fields.rb +1 -1
  7. data/metanorma-ietf.gemspec +1 -1
  8. metadata +4 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 14265a284f4144c71da7f1e427b520cc6d0e34fe888cb368d0f05423fbbf7958
4
- data.tar.gz: b4a6341006304c7bc49b73f12486dc54bf4e7bddee10a87ec16eff99832db7eb
3
+ metadata.gz: 31d8e42be51ec47f80027b7e16b93b2991d082250b7a4e4b26adea124cdb9007
4
+ data.tar.gz: 248e9076ba1a755f1439bac879035e6ef917c4ec0f414b612c0ee2bb2465dcc9
5
5
  SHA512:
6
- metadata.gz: 4f980c68587bf34737ffe6c3117ed76ba6fc4a0b0db662dd75bf93d36ab19b82d0b1599f0179970da8e20d55afc72ad793d3f0c768a90610a90c40682f4508af
7
- data.tar.gz: 88b4193027bbba65871acc89ea0bff8fbf06271fc6dc0888ce5f218fbebed3c74797a7edc8f65aa2c8b3d7ae63c40b3639dc17556b22ccbd486fa7dac969734c
6
+ metadata.gz: aee2b7a6f408086016b8d6da78587a9e70aeff99e31c07da722e064987b5d6346ef61de5c2196e2d9cb24a2d39382f0c07e8b227662f37e32c73e9b1dbb2ee0a
7
+ data.tar.gz: 6fe3c4365fad2521b94a94f0f851b67313e647114353451ac9d2c40950185a1184cbc2f1c8c0d363521a3a812e1b3de6b798b4461fd5d3107fb0b9a0d6c240b2
data/lib/isodoc/ietf/section.rb CHANGED
@@ -55,9 +55,9 @@ module IsoDoc
55
55
  def rfc_attributes(docxml)
56
56
  # t = Time.now.getutc
57
57
  obs = xpath_comma(docxml
58
- .xpath(ns("//bibdata/relation[@type = 'obsoletes']/bibitem/docidentifier")))
58
+ .xpath(ns("//bibdata/relation[@type = 'obsoletes']/bibitem/docidentifier[not(@scope)]")))
59
59
  upd = xpath_comma(docxml
60
- .xpath(ns("//bibdata/relation[@type = 'updates']/bibitem/docidentifier")))
60
+ .xpath(ns("//bibdata/relation[@type = 'updates']/bibitem/docidentifier[not(@scope)]")))
61
61
  {
62
62
  docName: @meta.get[:doctype] == "Internet Draft" ? @meta.get[:docnumber] : nil,
63
63
  number: @meta.get[:doctype].casecmp?("rfc") ? @meta.get[:docnumber] : nil,
data/lib/metanorma/ietf/biblio.rng CHANGED
@@ -338,29 +338,32 @@
338
338
  </define>
339
339
  <define name="organization">
340
340
  <element name="organization">
341
- <oneOrMore>
342
- <ref name="orgname"/>
343
- </oneOrMore>
344
- <zeroOrMore>
345
- <ref name="subdivision"/>
346
- </zeroOrMore>
347
- <optional>
348
- <ref name="abbreviation"/>
349
- </optional>
350
- <zeroOrMore>
351
- <ref name="uri"/>
352
- </zeroOrMore>
353
- <zeroOrMore>
354
- <ref name="org-identifier"/>
355
- </zeroOrMore>
356
- <zeroOrMore>
357
- <ref name="contact"/>
358
- </zeroOrMore>
359
- <optional>
360
- <ref name="logo"/>
361
- </optional>
341
+ <ref name="OrganizationType"/>
362
342
  </element>
363
343
  </define>
344
+ <define name="OrganizationType">
345
+ <oneOrMore>
346
+ <ref name="orgname"/>
347
+ </oneOrMore>
348
+ <zeroOrMore>
349
+ <ref name="subdivision"/>
350
+ </zeroOrMore>
351
+ <optional>
352
+ <ref name="abbreviation"/>
353
+ </optional>
354
+ <zeroOrMore>
355
+ <ref name="uri"/>
356
+ </zeroOrMore>
357
+ <zeroOrMore>
358
+ <ref name="org-identifier"/>
359
+ </zeroOrMore>
360
+ <zeroOrMore>
361
+ <ref name="contact"/>
362
+ </zeroOrMore>
363
+ <optional>
364
+ <ref name="logo"/>
365
+ </optional>
366
+ </define>
364
367
  <define name="orgname">
365
368
  <element name="name">
366
369
  <choice>
@@ -371,10 +374,10 @@
371
374
  </define>
372
375
  <define name="subdivision">
373
376
  <element name="subdivision">
374
- <choice>
375
- <ref name="LocalizedString"/>
376
- <ref name="NameWithVariants"/>
377
- </choice>
377
+ <optional>
378
+ <attribute name="type"/>
379
+ </optional>
380
+ <ref name="OrganizationType"/>
378
381
  </element>
379
382
  </define>
380
383
  <define name="logo">
data/lib/metanorma/ietf/validate.rb CHANGED
@@ -26,7 +26,7 @@ module Metanorma
26
26
  def image_validate(doc)
27
27
  doc.xpath("//image").each do |i|
28
28
  i["mimetype"] == "image/svg+xml" and next
29
- @log.add("MIME", i, "image #{i['src'][0, 40]} is not SVG!",
29
+ @log.add("Images", i, "image #{i['src'][0, 40]} is not SVG!",
30
30
  severity: 1)
31
31
  end
32
32
  end
data/lib/metanorma/ietf/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Ietf
3
- VERSION = "3.3.2".freeze
3
+ VERSION = "3.3.4".freeze
4
4
  end
5
5
  end
data/lib/relaton/render/fields.rb CHANGED
@@ -16,7 +16,7 @@ module Relaton
16
16
  end
17
17
 
18
18
  # do not format months
19
- def dateformat(date, _hash)
19
+ def dateformat(date, _hash, _type)
20
20
  date.nil? and return nil
21
21
  date_range(date)
22
22
  end
data/metanorma-ietf.gemspec CHANGED
@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
37
37
  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
38
38
 
39
39
  spec.add_dependency "metanorma-ietf-data"
40
- spec.add_dependency "metanorma-standoc", "~> 2.8.2"
40
+ spec.add_dependency "metanorma-standoc", "~> 2.8.4"
41
41
  spec.add_dependency "relaton-render"
42
42
 
43
43
  spec.add_development_dependency "debug"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-ietf
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.3.2
4
+ version: 3.3.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2024-02-19 00:00:00.000000000 Z
11
+ date: 2024-03-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-ietf-data
@@ -30,14 +30,14 @@ dependencies:
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 2.8.2
33
+ version: 2.8.4
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: 2.8.2
40
+ version: 2.8.4
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: relaton-render
43
43
  requirement: !ruby/object:Gem::Requirement