relaton-ietf 1.11.6 → 1.12.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/grammars/biblio.rng +172 -48
- data/grammars/isodoc.rng +77 -0
- data/lib/relaton_ietf/data_fetcher.rb +2 -2
- data/lib/relaton_ietf/hash_converter.rb +1 -1
- data/lib/relaton_ietf/rfc_index_entry.rb +12 -1
- data/lib/relaton_ietf/version.rb +1 -1
- data/relaton_ietf.gemspec +1 -2
- metadata +4 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 51a0a92632baaeef663f07d26c692121d027673a0ab55ac75be6d4b8d2ed7995
|
4
|
+
data.tar.gz: 0f89bdc4e3c3540a07d13c8a358c067951c662af3aa2dd44d78b229c204c9c24
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 7129d5d8825e51a9b4eb9340fe897bddd008e8017de20e6c358fe0d8cb6a1d753577f36bdbe9fcd8eb87b0f8438e84aa44c6e2426cacd176189e321a26d64bcc
|
7
|
+
data.tar.gz: 2064f8d3f4838ec4f976f6a3e5dc257badf87db2eb0e5051e66b9256fc906f179fdc63452873052cf3720b00b28f530de9f3aef4e1fefae9a605f89dd89c9e6b
|
data/grammars/biblio.rng
CHANGED
@@ -527,7 +527,7 @@
|
|
527
527
|
</define>
|
528
528
|
<define name="LocalityType">
|
529
529
|
<data type="string">
|
530
|
-
<param name="pattern">section|clause|part|paragraph|chapter|page|whole|table|annex|figure|note|list|example|volume|issue|time|anchor|locality:[a-zA-Z0-9_]+</param>
|
530
|
+
<param name="pattern">section|clause|part|paragraph|chapter|page|title|line|whole|table|annex|figure|note|list|example|volume|issue|time|anchor|locality:[a-zA-Z0-9_]+</param>
|
531
531
|
</data>
|
532
532
|
</define>
|
533
533
|
<define name="referenceFrom">
|
@@ -614,12 +614,103 @@
|
|
614
614
|
<optional>
|
615
615
|
<ref name="fetched"/>
|
616
616
|
</optional>
|
617
|
-
<
|
618
|
-
<oneOrMore>
|
619
|
-
<ref name="btitle"/>
|
620
|
-
</oneOrMore>
|
617
|
+
<optional>
|
621
618
|
<ref name="formattedref"/>
|
622
|
-
</
|
619
|
+
</optional>
|
620
|
+
<oneOrMore>
|
621
|
+
<ref name="btitle"/>
|
622
|
+
</oneOrMore>
|
623
|
+
<zeroOrMore>
|
624
|
+
<ref name="bsource"/>
|
625
|
+
</zeroOrMore>
|
626
|
+
<oneOrMore>
|
627
|
+
<ref name="docidentifier"/>
|
628
|
+
</oneOrMore>
|
629
|
+
<optional>
|
630
|
+
<ref name="docnumber"/>
|
631
|
+
</optional>
|
632
|
+
<zeroOrMore>
|
633
|
+
<ref name="bdate"/>
|
634
|
+
</zeroOrMore>
|
635
|
+
<zeroOrMore>
|
636
|
+
<ref name="contributor"/>
|
637
|
+
</zeroOrMore>
|
638
|
+
<optional>
|
639
|
+
<ref name="edition"/>
|
640
|
+
</optional>
|
641
|
+
<zeroOrMore>
|
642
|
+
<ref name="version"/>
|
643
|
+
</zeroOrMore>
|
644
|
+
<zeroOrMore>
|
645
|
+
<ref name="biblionote"/>
|
646
|
+
</zeroOrMore>
|
647
|
+
<zeroOrMore>
|
648
|
+
<ref name="language"/>
|
649
|
+
</zeroOrMore>
|
650
|
+
<zeroOrMore>
|
651
|
+
<ref name="script"/>
|
652
|
+
</zeroOrMore>
|
653
|
+
<zeroOrMore>
|
654
|
+
<ref name="bibabstract"/>
|
655
|
+
</zeroOrMore>
|
656
|
+
<optional>
|
657
|
+
<ref name="status"/>
|
658
|
+
</optional>
|
659
|
+
<zeroOrMore>
|
660
|
+
<ref name="copyright"/>
|
661
|
+
</zeroOrMore>
|
662
|
+
<zeroOrMore>
|
663
|
+
<ref name="docrelation"/>
|
664
|
+
</zeroOrMore>
|
665
|
+
<zeroOrMore>
|
666
|
+
<ref name="series"/>
|
667
|
+
</zeroOrMore>
|
668
|
+
<optional>
|
669
|
+
<ref name="medium"/>
|
670
|
+
</optional>
|
671
|
+
<zeroOrMore>
|
672
|
+
<ref name="bplace"/>
|
673
|
+
</zeroOrMore>
|
674
|
+
<zeroOrMore>
|
675
|
+
<ref name="bprice"/>
|
676
|
+
</zeroOrMore>
|
677
|
+
<zeroOrMore>
|
678
|
+
<ref name="extent"/>
|
679
|
+
</zeroOrMore>
|
680
|
+
<optional>
|
681
|
+
<ref name="bibliographic_size"/>
|
682
|
+
</optional>
|
683
|
+
<zeroOrMore>
|
684
|
+
<ref name="accesslocation"/>
|
685
|
+
</zeroOrMore>
|
686
|
+
<zeroOrMore>
|
687
|
+
<ref name="license"/>
|
688
|
+
</zeroOrMore>
|
689
|
+
<zeroOrMore>
|
690
|
+
<ref name="bclassification"/>
|
691
|
+
</zeroOrMore>
|
692
|
+
<zeroOrMore>
|
693
|
+
<ref name="bkeyword"/>
|
694
|
+
</zeroOrMore>
|
695
|
+
<optional>
|
696
|
+
<ref name="validity"/>
|
697
|
+
</optional>
|
698
|
+
</define>
|
699
|
+
<define name="ReducedBibliographicItem">
|
700
|
+
<optional>
|
701
|
+
<attribute name="type">
|
702
|
+
<ref name="BibItemType"/>
|
703
|
+
</attribute>
|
704
|
+
</optional>
|
705
|
+
<optional>
|
706
|
+
<ref name="fetched"/>
|
707
|
+
</optional>
|
708
|
+
<optional>
|
709
|
+
<ref name="formattedref"/>
|
710
|
+
</optional>
|
711
|
+
<zeroOrMore>
|
712
|
+
<ref name="btitle"/>
|
713
|
+
</zeroOrMore>
|
623
714
|
<zeroOrMore>
|
624
715
|
<ref name="bsource"/>
|
625
716
|
</zeroOrMore>
|
@@ -638,9 +729,9 @@
|
|
638
729
|
<optional>
|
639
730
|
<ref name="edition"/>
|
640
731
|
</optional>
|
641
|
-
<
|
732
|
+
<zeroOrMore>
|
642
733
|
<ref name="version"/>
|
643
|
-
</
|
734
|
+
</zeroOrMore>
|
644
735
|
<zeroOrMore>
|
645
736
|
<ref name="biblionote"/>
|
646
737
|
</zeroOrMore>
|
@@ -833,6 +924,12 @@
|
|
833
924
|
<data type="boolean"/>
|
834
925
|
</attribute>
|
835
926
|
</optional>
|
927
|
+
<optional>
|
928
|
+
<attribute name="language"/>
|
929
|
+
</optional>
|
930
|
+
<optional>
|
931
|
+
<attribute name="script"/>
|
932
|
+
</optional>
|
836
933
|
<text/>
|
837
934
|
</element>
|
838
935
|
</define>
|
@@ -851,17 +948,46 @@
|
|
851
948
|
</define>
|
852
949
|
<define name="bplace">
|
853
950
|
<element name="place">
|
854
|
-
<
|
855
|
-
<
|
856
|
-
|
857
|
-
|
858
|
-
|
859
|
-
|
860
|
-
|
861
|
-
|
951
|
+
<choice>
|
952
|
+
<text/>
|
953
|
+
<group>
|
954
|
+
<ref name="bibliocity"/>
|
955
|
+
<zeroOrMore>
|
956
|
+
<ref name="biblioregion"/>
|
957
|
+
</zeroOrMore>
|
958
|
+
<zeroOrMore>
|
959
|
+
<ref name="bibliocountry"/>
|
960
|
+
</zeroOrMore>
|
961
|
+
</group>
|
962
|
+
</choice>
|
963
|
+
</element>
|
964
|
+
</define>
|
965
|
+
<define name="bibliocity">
|
966
|
+
<element name="city">
|
862
967
|
<text/>
|
863
968
|
</element>
|
864
969
|
</define>
|
970
|
+
<define name="biblioregion">
|
971
|
+
<element name="region">
|
972
|
+
<ref name="RegionType"/>
|
973
|
+
</element>
|
974
|
+
</define>
|
975
|
+
<define name="bibliocountry">
|
976
|
+
<element name="country">
|
977
|
+
<ref name="RegionType"/>
|
978
|
+
</element>
|
979
|
+
</define>
|
980
|
+
<define name="RegionType">
|
981
|
+
<optional>
|
982
|
+
<attribute name="iso"/>
|
983
|
+
</optional>
|
984
|
+
<optional>
|
985
|
+
<attribute name="recommended">
|
986
|
+
<data type="boolean"/>
|
987
|
+
</attribute>
|
988
|
+
</optional>
|
989
|
+
<text/>
|
990
|
+
</define>
|
865
991
|
<define name="bprice">
|
866
992
|
<element name="price">
|
867
993
|
<attribute name="currency"/>
|
@@ -957,36 +1083,34 @@
|
|
957
1083
|
<ref name="SeriesType"/>
|
958
1084
|
</attribute>
|
959
1085
|
</optional>
|
960
|
-
<
|
1086
|
+
<optional>
|
961
1087
|
<ref name="formattedref"/>
|
962
|
-
|
963
|
-
|
964
|
-
|
965
|
-
|
966
|
-
|
967
|
-
|
968
|
-
|
969
|
-
|
970
|
-
|
971
|
-
|
972
|
-
|
973
|
-
|
974
|
-
|
975
|
-
|
976
|
-
|
977
|
-
|
978
|
-
|
979
|
-
|
980
|
-
|
981
|
-
|
982
|
-
|
983
|
-
|
984
|
-
|
985
|
-
|
986
|
-
|
987
|
-
|
988
|
-
</group>
|
989
|
-
</choice>
|
1088
|
+
</optional>
|
1089
|
+
<ref name="btitle"/>
|
1090
|
+
<optional>
|
1091
|
+
<ref name="bplace"/>
|
1092
|
+
</optional>
|
1093
|
+
<optional>
|
1094
|
+
<ref name="seriesorganization"/>
|
1095
|
+
</optional>
|
1096
|
+
<optional>
|
1097
|
+
<ref name="abbreviation"/>
|
1098
|
+
</optional>
|
1099
|
+
<optional>
|
1100
|
+
<ref name="seriesfrom"/>
|
1101
|
+
</optional>
|
1102
|
+
<optional>
|
1103
|
+
<ref name="seriesto"/>
|
1104
|
+
</optional>
|
1105
|
+
<optional>
|
1106
|
+
<ref name="seriesnumber"/>
|
1107
|
+
</optional>
|
1108
|
+
<optional>
|
1109
|
+
<ref name="seriespartnumber"/>
|
1110
|
+
</optional>
|
1111
|
+
<optional>
|
1112
|
+
<ref name="seriesrun"/>
|
1113
|
+
</optional>
|
990
1114
|
</element>
|
991
1115
|
</define>
|
992
1116
|
<define name="SeriesType">
|
@@ -1145,7 +1269,7 @@
|
|
1145
1269
|
</element>
|
1146
1270
|
</optional>
|
1147
1271
|
<element name="bibitem">
|
1148
|
-
<ref name="
|
1272
|
+
<ref name="ReducedBibliographicItem"/>
|
1149
1273
|
</element>
|
1150
1274
|
<choice>
|
1151
1275
|
<zeroOrMore>
|
@@ -1170,9 +1294,9 @@
|
|
1170
1294
|
<optional>
|
1171
1295
|
<ref name="revision-date"/>
|
1172
1296
|
</optional>
|
1173
|
-
<
|
1297
|
+
<optional>
|
1174
1298
|
<ref name="draft"/>
|
1175
|
-
</
|
1299
|
+
</optional>
|
1176
1300
|
</element>
|
1177
1301
|
</define>
|
1178
1302
|
<define name="vedition">
|
data/grammars/isodoc.rng
CHANGED
@@ -32,6 +32,43 @@
|
|
32
32
|
<ref name="DocumentType"/>
|
33
33
|
</element>
|
34
34
|
</define>
|
35
|
+
<define name="admonition">
|
36
|
+
<element name="admonition">
|
37
|
+
<attribute name="type">
|
38
|
+
<ref name="AdmonitionType"/>
|
39
|
+
</attribute>
|
40
|
+
<optional>
|
41
|
+
<attribute name="class"/>
|
42
|
+
</optional>
|
43
|
+
<attribute name="id">
|
44
|
+
<data type="ID"/>
|
45
|
+
</attribute>
|
46
|
+
<optional>
|
47
|
+
<attribute name="uri">
|
48
|
+
<data type="anyURI"/>
|
49
|
+
</attribute>
|
50
|
+
</optional>
|
51
|
+
<optional>
|
52
|
+
<attribute name="coverpage">
|
53
|
+
<data type="boolean"/>
|
54
|
+
</attribute>
|
55
|
+
</optional>
|
56
|
+
<optional>
|
57
|
+
<attribute name="notag">
|
58
|
+
<data type="boolean"/>
|
59
|
+
</attribute>
|
60
|
+
</optional>
|
61
|
+
<optional>
|
62
|
+
<ref name="tname"/>
|
63
|
+
</optional>
|
64
|
+
<zeroOrMore>
|
65
|
+
<ref name="paragraph-with-footnote"/>
|
66
|
+
</zeroOrMore>
|
67
|
+
<zeroOrMore>
|
68
|
+
<ref name="note"/>
|
69
|
+
</zeroOrMore>
|
70
|
+
</element>
|
71
|
+
</define>
|
35
72
|
<define name="index">
|
36
73
|
<element name="index">
|
37
74
|
<optional>
|
@@ -79,6 +116,11 @@
|
|
79
116
|
<data type="boolean"/>
|
80
117
|
</attribute>
|
81
118
|
</optional>
|
119
|
+
<optional>
|
120
|
+
<attribute name="suppress_identifier">
|
121
|
+
<data type="boolean"/>
|
122
|
+
</attribute>
|
123
|
+
</optional>
|
82
124
|
<ref name="BibliographicItem"/>
|
83
125
|
</element>
|
84
126
|
</define>
|
@@ -245,6 +287,9 @@
|
|
245
287
|
<ref name="MultilingualRenderingType"/>
|
246
288
|
</attribute>
|
247
289
|
</optional>
|
290
|
+
<optional>
|
291
|
+
<ref name="tname"/>
|
292
|
+
</optional>
|
248
293
|
<oneOrMore>
|
249
294
|
<ref name="ul_li"/>
|
250
295
|
</oneOrMore>
|
@@ -287,6 +332,9 @@
|
|
287
332
|
</choice>
|
288
333
|
</attribute>
|
289
334
|
</optional>
|
335
|
+
<optional>
|
336
|
+
<ref name="tname"/>
|
337
|
+
</optional>
|
290
338
|
<oneOrMore>
|
291
339
|
<ref name="li"/>
|
292
340
|
</oneOrMore>
|
@@ -323,6 +371,9 @@
|
|
323
371
|
<ref name="MultilingualRenderingType"/>
|
324
372
|
</attribute>
|
325
373
|
</optional>
|
374
|
+
<optional>
|
375
|
+
<ref name="tname"/>
|
376
|
+
</optional>
|
326
377
|
<oneOrMore>
|
327
378
|
<ref name="dt"/>
|
328
379
|
<ref name="dd"/>
|
@@ -657,6 +708,9 @@
|
|
657
708
|
<optional>
|
658
709
|
<attribute name="tag"/>
|
659
710
|
</optional>
|
711
|
+
<optional>
|
712
|
+
<attribute name="type"/>
|
713
|
+
</optional>
|
660
714
|
<optional>
|
661
715
|
<attribute name="multilingual-rendering">
|
662
716
|
<ref name="MultilingualRenderingType"/>
|
@@ -692,6 +746,9 @@
|
|
692
746
|
<optional>
|
693
747
|
<attribute name="tag"/>
|
694
748
|
</optional>
|
749
|
+
<optional>
|
750
|
+
<attribute name="type"/>
|
751
|
+
</optional>
|
695
752
|
<optional>
|
696
753
|
<attribute name="multilingual-rendering">
|
697
754
|
<ref name="MultilingualRenderingType"/>
|
@@ -851,6 +908,16 @@
|
|
851
908
|
<ref name="MultilingualRenderingType"/>
|
852
909
|
</attribute>
|
853
910
|
</optional>
|
911
|
+
<optional>
|
912
|
+
<attribute name="coverpage">
|
913
|
+
<data type="boolean"/>
|
914
|
+
</attribute>
|
915
|
+
</optional>
|
916
|
+
<optional>
|
917
|
+
<attribute name="notag">
|
918
|
+
<data type="boolean"/>
|
919
|
+
</attribute>
|
920
|
+
</optional>
|
854
921
|
<oneOrMore>
|
855
922
|
<choice>
|
856
923
|
<ref name="paragraph"/>
|
@@ -1178,6 +1245,7 @@
|
|
1178
1245
|
<ref name="concept"/>
|
1179
1246
|
<ref name="add"/>
|
1180
1247
|
<ref name="del"/>
|
1248
|
+
<ref name="span"/>
|
1181
1249
|
</choice>
|
1182
1250
|
</define>
|
1183
1251
|
<define name="add">
|
@@ -1204,6 +1272,14 @@
|
|
1204
1272
|
</choice>
|
1205
1273
|
</element>
|
1206
1274
|
</define>
|
1275
|
+
<define name="span">
|
1276
|
+
<element name="span">
|
1277
|
+
<attribute name="class"/>
|
1278
|
+
<oneOrMore>
|
1279
|
+
<ref name="TextElement"/>
|
1280
|
+
</oneOrMore>
|
1281
|
+
</element>
|
1282
|
+
</define>
|
1207
1283
|
<define name="concept">
|
1208
1284
|
<element name="concept">
|
1209
1285
|
<optional>
|
@@ -1994,6 +2070,7 @@
|
|
1994
2070
|
<value>compare</value>
|
1995
2071
|
<value>contrast</value>
|
1996
2072
|
<value>see</value>
|
2073
|
+
<value>seealso</value>
|
1997
2074
|
</choice>
|
1998
2075
|
</define>
|
1999
2076
|
<define name="deprecates">
|
@@ -72,8 +72,8 @@ module RelatonIetf
|
|
72
72
|
end
|
73
73
|
bib = BibXMLParser.parse(File.read(path, encoding: "UTF-8"))
|
74
74
|
if ver
|
75
|
-
version = RelatonBib::BibliographicItem::Version.new nil,
|
76
|
-
bib.instance_variable_set :@version, version
|
75
|
+
version = RelatonBib::BibliographicItem::Version.new nil, ver
|
76
|
+
bib.instance_variable_set :@version, [version]
|
77
77
|
end
|
78
78
|
save_doc bib
|
79
79
|
end
|
@@ -14,7 +14,7 @@ module RelatonIetf
|
|
14
14
|
def editorialgroup_hash_to_bib(ret)
|
15
15
|
return unless ret[:editorialgroup]
|
16
16
|
|
17
|
-
technical_committee = array(ret[:editorialgroup]).map do |wg|
|
17
|
+
technical_committee = RelatonBib.array(ret[:editorialgroup]).map do |wg|
|
18
18
|
Committee.new RelatonBib::WorkGroup.new(**wg)
|
19
19
|
end
|
20
20
|
ret[:editorialgroup] = RelatonBib::EditorialGroup.new technical_committee
|
@@ -35,8 +35,10 @@ module RelatonIetf
|
|
35
35
|
#
|
36
36
|
# @return [RelatonIetf::IetfBibliographicItem] bib item
|
37
37
|
#
|
38
|
-
def parse
|
38
|
+
def parse # rubocop:disable Metrics/MethodLength
|
39
39
|
IetfBibliographicItem.new(
|
40
|
+
fetched: Date.today.to_s,
|
41
|
+
title: make_title,
|
40
42
|
docnumber: docnumber,
|
41
43
|
type: "standard",
|
42
44
|
docid: parse_docid,
|
@@ -48,6 +50,15 @@ module RelatonIetf
|
|
48
50
|
)
|
49
51
|
end
|
50
52
|
|
53
|
+
def make_title
|
54
|
+
t = case @name
|
55
|
+
when "bcp" then "Best Current Practice #{@shortnum}"
|
56
|
+
when "fyi" then "For Your Information #{@shortnum}"
|
57
|
+
when "std" then "Internet Standard technical specification #{@shortnum}"
|
58
|
+
end
|
59
|
+
[RelatonBib::TypedTitleString.new(content: t, language: "en", script: "Latn")]
|
60
|
+
end
|
61
|
+
|
51
62
|
#
|
52
63
|
# Document number
|
53
64
|
#
|
data/lib/relaton_ietf/version.rb
CHANGED
data/relaton_ietf.gemspec
CHANGED
@@ -38,6 +38,5 @@ Gem::Specification.new do |spec|
|
|
38
38
|
spec.add_development_dependency "vcr"
|
39
39
|
spec.add_development_dependency "webmock"
|
40
40
|
|
41
|
-
spec.add_dependency "relaton-bib", "~> 1.
|
42
|
-
# spec.add_dependency "zlib", "~> 1.1.0"
|
41
|
+
spec.add_dependency "relaton-bib", "~> 1.12.0"
|
43
42
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: relaton-ietf
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.
|
4
|
+
version: 1.12.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ribose Inc.
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2022-06-
|
11
|
+
date: 2022-06-29 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: equivalent-xml
|
@@ -128,14 +128,14 @@ dependencies:
|
|
128
128
|
requirements:
|
129
129
|
- - "~>"
|
130
130
|
- !ruby/object:Gem::Version
|
131
|
-
version: 1.
|
131
|
+
version: 1.12.0
|
132
132
|
type: :runtime
|
133
133
|
prerelease: false
|
134
134
|
version_requirements: !ruby/object:Gem::Requirement
|
135
135
|
requirements:
|
136
136
|
- - "~>"
|
137
137
|
- !ruby/object:Gem::Version
|
138
|
-
version: 1.
|
138
|
+
version: 1.12.0
|
139
139
|
description: "RelatonIetf: retrieve IETF Standards for bibliographic use \nusing the
|
140
140
|
BibliographicItem model.\n\nFormerly known as rfcbib.\n"
|
141
141
|
email:
|