relaton-3gpp 1.11.0 → 1.13.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (10) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/rake.yml +1 -24
  3. data/.rubocop.yml +1 -1
  4. data/grammars/biblio.rng +180 -53
  5. data/grammars/isodoc.rng +103 -0
  6. data/lib/relaton_3gpp/hash_converter.rb +1 -1
  7. data/lib/relaton_3gpp/parser.rb +2 -1
  8. data/lib/relaton_3gpp/version.rb +1 -1
  9. data/relaton_3gpp.gemspec +2 -2
  10. metadata +5 -5
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: efd99624ed1dd3f25d4add9ee68720bfe1ea3d3f11fb801615e7a9ef112581dc
4
- data.tar.gz: 11c82eb476e8b1797f792fd756605ce4bd786e6ed99e11322edf52ad96017b36
3
+ metadata.gz: 7f5f0ab1062934b5d1df5ccc23fa70ba38ad63f39ccd368b7843643cf115f2f9
4
+ data.tar.gz: 1cf2b41cc082739fa8a91b68c870558ff3e3be935a4d0afa822c7b660493ea40
5
5
  SHA512:
6
- metadata.gz: 0b2bb54e7074e9448354584f03391e0d7182c51f39fc4fffb7779712d4c062abef226eedf6a19809578ec42ee6e215b45c4acb9908dc901f5a44a6bde56536e1
7
- data.tar.gz: 0a4ca6d78d6c222294330ec3e1e3d6b24d2b8ca99516e8940fae604484e0d5bfd69bf77caa751280dd79c6148e22a73d14b81f28e8743adc10543573a3b4b286
6
+ metadata.gz: 3902428c49a482f2cda63b4449d64575b1b43e98a0218591f8ec4a579016561cf7b6cb9a30ac0403913a4ebccd1cf36b918fcd0d9fa3558f3b87e082408d780e
7
+ data.tar.gz: a44403fca46651fd6d4e8479adae0dde3e05cbfd69d277572fda771de78d6605517ae7322b0c8c67aee3fa92f16b042db3b9068365d7f03dbaa947dd0b77eb0f
data/.github/workflows/rake.yml CHANGED
@@ -10,27 +10,4 @@ on:
10
10
 
11
11
  jobs:
12
12
  rake:
13
- name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
14
- runs-on: ${{ matrix.os }}
15
- continue-on-error: ${{ matrix.experimental }}
16
- strategy:
17
- fail-fast: false
18
- matrix:
19
- ruby: [ '3.0', '2.7', '2.6', '2.5' ]
20
- os: [ ubuntu-latest, windows-latest, macos-latest ]
21
- experimental: [ false ]
22
- steps:
23
- - uses: actions/checkout@v2
24
- with:
25
- submodules: true
26
-
27
- # https://github.com/ruby-debug/debase/issues/89#issuecomment-686827382
28
- - if: matrix.os == 'macos-latest' && matrix.ruby == '2.5'
29
- run: echo BUNDLE_BUILD__DEBASE="--with-cflags=\"-Wno-error=implicit-function-declaration\"" >> $GITHUB_ENV
30
-
31
- - uses: ruby/setup-ruby@v1
32
- with:
33
- ruby-version: ${{ matrix.ruby }}
34
- bundler-cache: true
35
-
36
- - run: bundle exec rake
13
+ uses: relaton/support/.github/workflows/rake.yml@master
data/.rubocop.yml CHANGED
@@ -7,6 +7,6 @@ require: rubocop-rails
7
7
  inherit_from:
8
8
  - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
9
9
  AllCops:
10
- TargetRubyVersion: 2.5
10
+ TargetRubyVersion: 2.6
11
11
  Rails:
12
12
  Enabled: false
data/grammars/biblio.rng CHANGED
@@ -225,9 +225,9 @@
225
225
  <zeroOrMore>
226
226
  <ref name="forename"/>
227
227
  </zeroOrMore>
228
- <zeroOrMore>
229
- <ref name="initial"/>
230
- </zeroOrMore>
228
+ <optional>
229
+ <ref name="formatted-initials"/>
230
+ </optional>
231
231
  <ref name="surname"/>
232
232
  <zeroOrMore>
233
233
  <ref name="addition"/>
@@ -247,8 +247,8 @@
247
247
  <ref name="LocalizedString"/>
248
248
  </element>
249
249
  </define>
250
- <define name="initial">
251
- <element name="initial">
250
+ <define name="formatted-initials">
251
+ <element name="formatted-initials">
252
252
  <ref name="LocalizedString"/>
253
253
  </element>
254
254
  </define>
@@ -264,6 +264,9 @@
264
264
  </define>
265
265
  <define name="forename">
266
266
  <element name="forename">
267
+ <optional>
268
+ <attribute name="initial"/>
269
+ </optional>
267
270
  <ref name="LocalizedString"/>
268
271
  </element>
269
272
  </define>
@@ -527,7 +530,7 @@
527
530
  </define>
528
531
  <define name="LocalityType">
529
532
  <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>
533
+ <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
534
  </data>
532
535
  </define>
533
536
  <define name="referenceFrom">
@@ -614,12 +617,103 @@
614
617
  <optional>
615
618
  <ref name="fetched"/>
616
619
  </optional>
617
- <choice>
618
- <oneOrMore>
619
- <ref name="btitle"/>
620
- </oneOrMore>
620
+ <optional>
621
621
  <ref name="formattedref"/>
622
- </choice>
622
+ </optional>
623
+ <oneOrMore>
624
+ <ref name="btitle"/>
625
+ </oneOrMore>
626
+ <zeroOrMore>
627
+ <ref name="bsource"/>
628
+ </zeroOrMore>
629
+ <oneOrMore>
630
+ <ref name="docidentifier"/>
631
+ </oneOrMore>
632
+ <optional>
633
+ <ref name="docnumber"/>
634
+ </optional>
635
+ <zeroOrMore>
636
+ <ref name="bdate"/>
637
+ </zeroOrMore>
638
+ <zeroOrMore>
639
+ <ref name="contributor"/>
640
+ </zeroOrMore>
641
+ <optional>
642
+ <ref name="edition"/>
643
+ </optional>
644
+ <zeroOrMore>
645
+ <ref name="version"/>
646
+ </zeroOrMore>
647
+ <zeroOrMore>
648
+ <ref name="biblionote"/>
649
+ </zeroOrMore>
650
+ <zeroOrMore>
651
+ <ref name="language"/>
652
+ </zeroOrMore>
653
+ <zeroOrMore>
654
+ <ref name="script"/>
655
+ </zeroOrMore>
656
+ <zeroOrMore>
657
+ <ref name="bibabstract"/>
658
+ </zeroOrMore>
659
+ <optional>
660
+ <ref name="status"/>
661
+ </optional>
662
+ <zeroOrMore>
663
+ <ref name="copyright"/>
664
+ </zeroOrMore>
665
+ <zeroOrMore>
666
+ <ref name="docrelation"/>
667
+ </zeroOrMore>
668
+ <zeroOrMore>
669
+ <ref name="series"/>
670
+ </zeroOrMore>
671
+ <optional>
672
+ <ref name="medium"/>
673
+ </optional>
674
+ <zeroOrMore>
675
+ <ref name="bplace"/>
676
+ </zeroOrMore>
677
+ <zeroOrMore>
678
+ <ref name="bprice"/>
679
+ </zeroOrMore>
680
+ <zeroOrMore>
681
+ <ref name="extent"/>
682
+ </zeroOrMore>
683
+ <optional>
684
+ <ref name="bibliographic_size"/>
685
+ </optional>
686
+ <zeroOrMore>
687
+ <ref name="accesslocation"/>
688
+ </zeroOrMore>
689
+ <zeroOrMore>
690
+ <ref name="license"/>
691
+ </zeroOrMore>
692
+ <zeroOrMore>
693
+ <ref name="bclassification"/>
694
+ </zeroOrMore>
695
+ <zeroOrMore>
696
+ <ref name="bkeyword"/>
697
+ </zeroOrMore>
698
+ <optional>
699
+ <ref name="validity"/>
700
+ </optional>
701
+ </define>
702
+ <define name="ReducedBibliographicItem">
703
+ <optional>
704
+ <attribute name="type">
705
+ <ref name="BibItemType"/>
706
+ </attribute>
707
+ </optional>
708
+ <optional>
709
+ <ref name="fetched"/>
710
+ </optional>
711
+ <optional>
712
+ <ref name="formattedref"/>
713
+ </optional>
714
+ <zeroOrMore>
715
+ <ref name="btitle"/>
716
+ </zeroOrMore>
623
717
  <zeroOrMore>
624
718
  <ref name="bsource"/>
625
719
  </zeroOrMore>
@@ -638,9 +732,9 @@
638
732
  <optional>
639
733
  <ref name="edition"/>
640
734
  </optional>
641
- <optional>
735
+ <zeroOrMore>
642
736
  <ref name="version"/>
643
- </optional>
737
+ </zeroOrMore>
644
738
  <zeroOrMore>
645
739
  <ref name="biblionote"/>
646
740
  </zeroOrMore>
@@ -833,6 +927,12 @@
833
927
  <data type="boolean"/>
834
928
  </attribute>
835
929
  </optional>
930
+ <optional>
931
+ <attribute name="language"/>
932
+ </optional>
933
+ <optional>
934
+ <attribute name="script"/>
935
+ </optional>
836
936
  <text/>
837
937
  </element>
838
938
  </define>
@@ -851,17 +951,46 @@
851
951
  </define>
852
952
  <define name="bplace">
853
953
  <element name="place">
854
- <optional>
855
- <attribute name="uri">
856
- <data type="anyURI"/>
857
- </attribute>
858
- </optional>
859
- <optional>
860
- <attribute name="region"/>
861
- </optional>
954
+ <choice>
955
+ <text/>
956
+ <group>
957
+ <ref name="bibliocity"/>
958
+ <zeroOrMore>
959
+ <ref name="biblioregion"/>
960
+ </zeroOrMore>
961
+ <zeroOrMore>
962
+ <ref name="bibliocountry"/>
963
+ </zeroOrMore>
964
+ </group>
965
+ </choice>
966
+ </element>
967
+ </define>
968
+ <define name="bibliocity">
969
+ <element name="city">
862
970
  <text/>
863
971
  </element>
864
972
  </define>
973
+ <define name="biblioregion">
974
+ <element name="region">
975
+ <ref name="RegionType"/>
976
+ </element>
977
+ </define>
978
+ <define name="bibliocountry">
979
+ <element name="country">
980
+ <ref name="RegionType"/>
981
+ </element>
982
+ </define>
983
+ <define name="RegionType">
984
+ <optional>
985
+ <attribute name="iso"/>
986
+ </optional>
987
+ <optional>
988
+ <attribute name="recommended">
989
+ <data type="boolean"/>
990
+ </attribute>
991
+ </optional>
992
+ <text/>
993
+ </define>
865
994
  <define name="bprice">
866
995
  <element name="price">
867
996
  <attribute name="currency"/>
@@ -957,36 +1086,34 @@
957
1086
  <ref name="SeriesType"/>
958
1087
  </attribute>
959
1088
  </optional>
960
- <choice>
1089
+ <optional>
961
1090
  <ref name="formattedref"/>
962
- <group>
963
- <ref name="btitle"/>
964
- <optional>
965
- <ref name="bplace"/>
966
- </optional>
967
- <optional>
968
- <ref name="seriesorganization"/>
969
- </optional>
970
- <optional>
971
- <ref name="abbreviation"/>
972
- </optional>
973
- <optional>
974
- <ref name="seriesfrom"/>
975
- </optional>
976
- <optional>
977
- <ref name="seriesto"/>
978
- </optional>
979
- <optional>
980
- <ref name="seriesnumber"/>
981
- </optional>
982
- <optional>
983
- <ref name="seriespartnumber"/>
984
- </optional>
985
- <optional>
986
- <ref name="seriesrun"/>
987
- </optional>
988
- </group>
989
- </choice>
1091
+ </optional>
1092
+ <ref name="btitle"/>
1093
+ <optional>
1094
+ <ref name="bplace"/>
1095
+ </optional>
1096
+ <optional>
1097
+ <ref name="seriesorganization"/>
1098
+ </optional>
1099
+ <optional>
1100
+ <ref name="abbreviation"/>
1101
+ </optional>
1102
+ <optional>
1103
+ <ref name="seriesfrom"/>
1104
+ </optional>
1105
+ <optional>
1106
+ <ref name="seriesto"/>
1107
+ </optional>
1108
+ <optional>
1109
+ <ref name="seriesnumber"/>
1110
+ </optional>
1111
+ <optional>
1112
+ <ref name="seriespartnumber"/>
1113
+ </optional>
1114
+ <optional>
1115
+ <ref name="seriesrun"/>
1116
+ </optional>
990
1117
  </element>
991
1118
  </define>
992
1119
  <define name="SeriesType">
@@ -1145,7 +1272,7 @@
1145
1272
  </element>
1146
1273
  </optional>
1147
1274
  <element name="bibitem">
1148
- <ref name="BibliographicItem"/>
1275
+ <ref name="ReducedBibliographicItem"/>
1149
1276
  </element>
1150
1277
  <choice>
1151
1278
  <zeroOrMore>
@@ -1170,9 +1297,9 @@
1170
1297
  <optional>
1171
1298
  <ref name="revision-date"/>
1172
1299
  </optional>
1173
- <zeroOrMore>
1300
+ <optional>
1174
1301
  <ref name="draft"/>
1175
- </zeroOrMore>
1302
+ </optional>
1176
1303
  </element>
1177
1304
  </define>
1178
1305
  <define name="vedition">
data/grammars/isodoc.rng CHANGED
@@ -32,6 +32,54 @@
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>
72
+ <define name="AdmonitionType">
73
+ <choice>
74
+ <value>warning</value>
75
+ <value>note</value>
76
+ <value>tip</value>
77
+ <value>important</value>
78
+ <value>caution</value>
79
+ <value>statement</value>
80
+ <value>editorial</value>
81
+ </choice>
82
+ </define>
35
83
  <define name="index">
36
84
  <element name="index">
37
85
  <optional>
@@ -79,6 +127,11 @@
79
127
  <data type="boolean"/>
80
128
  </attribute>
81
129
  </optional>
130
+ <optional>
131
+ <attribute name="suppress_identifier">
132
+ <data type="boolean"/>
133
+ </attribute>
134
+ </optional>
82
135
  <ref name="BibliographicItem"/>
83
136
  </element>
84
137
  </define>
@@ -245,6 +298,9 @@
245
298
  <ref name="MultilingualRenderingType"/>
246
299
  </attribute>
247
300
  </optional>
301
+ <optional>
302
+ <ref name="tname"/>
303
+ </optional>
248
304
  <oneOrMore>
249
305
  <ref name="ul_li"/>
250
306
  </oneOrMore>
@@ -287,6 +343,9 @@
287
343
  </choice>
288
344
  </attribute>
289
345
  </optional>
346
+ <optional>
347
+ <ref name="tname"/>
348
+ </optional>
290
349
  <oneOrMore>
291
350
  <ref name="li"/>
292
351
  </oneOrMore>
@@ -323,6 +382,9 @@
323
382
  <ref name="MultilingualRenderingType"/>
324
383
  </attribute>
325
384
  </optional>
385
+ <optional>
386
+ <ref name="tname"/>
387
+ </optional>
326
388
  <oneOrMore>
327
389
  <ref name="dt"/>
328
390
  <ref name="dd"/>
@@ -657,6 +719,9 @@
657
719
  <optional>
658
720
  <attribute name="tag"/>
659
721
  </optional>
722
+ <optional>
723
+ <attribute name="type"/>
724
+ </optional>
660
725
  <optional>
661
726
  <attribute name="multilingual-rendering">
662
727
  <ref name="MultilingualRenderingType"/>
@@ -692,6 +757,9 @@
692
757
  <optional>
693
758
  <attribute name="tag"/>
694
759
  </optional>
760
+ <optional>
761
+ <attribute name="type"/>
762
+ </optional>
695
763
  <optional>
696
764
  <attribute name="multilingual-rendering">
697
765
  <ref name="MultilingualRenderingType"/>
@@ -851,6 +919,16 @@
851
919
  <ref name="MultilingualRenderingType"/>
852
920
  </attribute>
853
921
  </optional>
922
+ <optional>
923
+ <attribute name="coverpage">
924
+ <data type="boolean"/>
925
+ </attribute>
926
+ </optional>
927
+ <optional>
928
+ <attribute name="notag">
929
+ <data type="boolean"/>
930
+ </attribute>
931
+ </optional>
854
932
  <oneOrMore>
855
933
  <choice>
856
934
  <ref name="paragraph"/>
@@ -1178,6 +1256,7 @@
1178
1256
  <ref name="concept"/>
1179
1257
  <ref name="add"/>
1180
1258
  <ref name="del"/>
1259
+ <ref name="span"/>
1181
1260
  </choice>
1182
1261
  </define>
1183
1262
  <define name="add">
@@ -1204,6 +1283,19 @@
1204
1283
  </choice>
1205
1284
  </element>
1206
1285
  </define>
1286
+ <define name="span">
1287
+ <element name="span">
1288
+ <optional>
1289
+ <attribute name="class"/>
1290
+ </optional>
1291
+ <optional>
1292
+ <attribute name="style"/>
1293
+ </optional>
1294
+ <oneOrMore>
1295
+ <ref name="TextElement"/>
1296
+ </oneOrMore>
1297
+ </element>
1298
+ </define>
1207
1299
  <define name="concept">
1208
1300
  <element name="concept">
1209
1301
  <optional>
@@ -1994,6 +2086,7 @@
1994
2086
  <value>compare</value>
1995
2087
  <value>contrast</value>
1996
2088
  <value>see</value>
2089
+ <value>seealso</value>
1997
2090
  </choice>
1998
2091
  </define>
1999
2092
  <define name="deprecates">
@@ -2416,6 +2509,16 @@
2416
2509
  <text/>
2417
2510
  </element>
2418
2511
  </optional>
2512
+ <optional>
2513
+ <element name="amendment">
2514
+ <text/>
2515
+ </element>
2516
+ </optional>
2517
+ <optional>
2518
+ <element name="corrigendum">
2519
+ <text/>
2520
+ </element>
2521
+ </optional>
2419
2522
  <optional>
2420
2523
  <element name="language">
2421
2524
  <text/>
data/lib/relaton_3gpp/hash_converter.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  module Relaton3gpp
2
2
  class HashConverter < RelatonBib::HashConverter
3
3
  class << self
4
- def hash_to_bib(args, nested = false)
4
+ def hash_to_bib(args)
5
5
  hash = super
6
6
  release_hash_to_bib(hash)
7
7
  hash
data/lib/relaton_3gpp/parser.rb CHANGED
@@ -250,7 +250,8 @@ module Relaton3gpp
250
250
  org = RelatonBib::Organization.new(
251
251
  name: "3rd Generation Partnership Project", abbreviation: "3GPP", contact: [address],
252
252
  )
253
- contribs = [RelatonBib::ContributionInfo.new(entity: org, role: [type: "author"])]
253
+ roles = [{ type: "author" }, { type: "publisher" }]
254
+ contribs = [RelatonBib::ContributionInfo.new(entity: org, role: roles)]
254
255
  return contribs unless @tstatus && @tstatus[:rapporteur]
255
256
 
256
257
  aff = []
data/lib/relaton_3gpp/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Relaton3gpp
4
- VERSION = "1.11.0"
4
+ VERSION = "1.13.0"
5
5
  end
data/relaton_3gpp.gemspec CHANGED
@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
12
12
  spec.description = "RelatonIana: Ruby XMLDOC impementation."
13
13
  spec.homepage = "https://github.com/relaton/relaton-iana"
14
14
  spec.license = "BSD-2-Clause"
15
- spec.required_ruby_version = ">= 2.5.0"
15
+ spec.required_ruby_version = ">= 2.6.0"
16
16
 
17
17
  # spec.metadata["allowed_push_host"] = "TODO: Set to 'https://mygemserver.com'"
18
18
 
@@ -46,6 +46,6 @@ Gem::Specification.new do |spec|
46
46
 
47
47
  spec.add_dependency "mdb", "~> 0.5.0"
48
48
  spec.add_dependency "net-ftp", "~> 0.1.0"
49
- spec.add_dependency "relaton-bib", "~> 1.11.0"
49
+ spec.add_dependency "relaton-bib", "~> 1.13.0"
50
50
  spec.add_dependency "rubyzip", "~> 2.3.0"
51
51
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: relaton-3gpp
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.11.0
4
+ version: 1.13.0
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-04-10 00:00:00.000000000 Z
11
+ date: 2022-08-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: equivalent-xml
@@ -156,14 +156,14 @@ dependencies:
156
156
  requirements:
157
157
  - - "~>"
158
158
  - !ruby/object:Gem::Version
159
- version: 1.11.0
159
+ version: 1.13.0
160
160
  type: :runtime
161
161
  prerelease: false
162
162
  version_requirements: !ruby/object:Gem::Requirement
163
163
  requirements:
164
164
  - - "~>"
165
165
  - !ruby/object:Gem::Version
166
- version: 1.11.0
166
+ version: 1.13.0
167
167
  - !ruby/object:Gem::Dependency
168
168
  name: rubyzip
169
169
  requirement: !ruby/object:Gem::Requirement
@@ -225,7 +225,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
225
225
  requirements:
226
226
  - - ">="
227
227
  - !ruby/object:Gem::Version
228
- version: 2.5.0
228
+ version: 2.6.0
229
229
  required_rubygems_version: !ruby/object:Gem::Requirement
230
230
  requirements:
231
231
  - - ">="