relaton-gb 0.12.0 → 1.2.0

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 (19) hide show
  1. checksums.yaml +4 -4
  2. data/grammars/basicdoc.rng +12 -55
  3. data/grammars/biblio.rng +145 -50
  4. data/grammars/gbstandard.rng +4 -1
  5. data/grammars/isodoc.rng +1045 -55
  6. data/grammars/isostandard.rng +148 -472
  7. data/lib/relaton_gb.rb +1 -1
  8. data/lib/relaton_gb/gb_bibliographic_item.rb +2 -26
  9. data/lib/relaton_gb/gb_scrapper.rb +1 -1
  10. data/lib/relaton_gb/hash_converter.rb +9 -0
  11. data/lib/relaton_gb/hit.rb +1 -1
  12. data/lib/relaton_gb/hit_collection.rb +3 -2
  13. data/lib/relaton_gb/scrapper.rb +23 -24
  14. data/lib/relaton_gb/sec_scrapper.rb +5 -3
  15. data/lib/relaton_gb/t_scrapper.rb +7 -10
  16. data/lib/relaton_gb/version.rb +1 -1
  17. data/lib/relaton_gb/xml_parser.rb +7 -15
  18. data/relaton_gb.gemspec +1 -1
  19. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 852074eca70e37185fece3ea6d720f0b23af4144ba7d4f28c8c4a04a3516abee
4
- data.tar.gz: e22768cb97a2b566cc89845be62064a77ea7626bf928aee4a2b93304f9a7ebb9
3
+ metadata.gz: 6a2def68ed449438b4718929f3eac94284baa6be65232dc0f16564dc6f192f9a
4
+ data.tar.gz: 31deeb1c5d825866c432c67863ba55d4e55630ad3867df8e7adb2f5ae8045fbc
5
5
  SHA512:
6
- metadata.gz: 12790bcbf1c3837ba7d01647fb2fbc6e5cc70a372841c1f444ef6aa6c8d387f146190c03279578c73f652ce9875c73441453136ff1e12d717ef7863ffd5be63d
7
- data.tar.gz: 61b70387d0f4d67984726d6696b055dc2b6ea35a1095ae9749dc7c5207bad34b9207108f842a665a2b478e686eb3fc1d8fe3bd72fdc7f507db0e3001a4abe2ac
6
+ metadata.gz: 6b120c1edf6fcc8658a3dacca1806d26913c96399b2ef22e0cdc3c24079d38af7b9be633860f6e421f734d29851578675f29bd4cc69e7f97c7a2c7ce0a94bf9f
7
+ data.tar.gz: f546268018b661693313f3821e0a9dd86cec929b85ee1d60e3bb93ced58e95ebab9ba172474699a8fcafeb6804487071551a465c76c0741f69a4933bcad3c997
data/grammars/basicdoc.rng CHANGED
@@ -1,9 +1,9 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
3
+ <include href="biblio.rng"/>
3
4
  <start>
4
5
  <ref name="document"/>
5
6
  </start>
6
- <include href="biblio.rng" />
7
7
  <define name="document">
8
8
  <element name="document">
9
9
  <optional>
@@ -42,12 +42,6 @@
42
42
  <data type="ID"/>
43
43
  </attribute>
44
44
  </optional>
45
- <optional>
46
- <attribute name="language"/>
47
- </optional>
48
- <optional>
49
- <attribute name="script"/>
50
- </optional>
51
45
  <optional>
52
46
  <ref name="section-title"/>
53
47
  </optional>
@@ -194,14 +188,6 @@
194
188
  <data type="boolean"/>
195
189
  </attribute>
196
190
  </optional>
197
- <optional>
198
- <attribute name="subsequence"/>
199
- </optional>
200
- <optional>
201
- <attribute name="inequality">
202
- <data type="boolean"/>
203
- </attribute>
204
- </optional>
205
191
  <ref name="stem"/>
206
192
  <optional>
207
193
  <ref name="dl"/>
@@ -255,9 +241,6 @@
255
241
  <data type="boolean"/>
256
242
  </attribute>
257
243
  </optional>
258
- <optional>
259
- <attribute name="subsequence"/>
260
- </optional>
261
244
  <optional>
262
245
  <attribute name="lang"/>
263
246
  </optional>
@@ -302,15 +285,9 @@
302
285
  <data type="boolean"/>
303
286
  </attribute>
304
287
  </optional>
305
- <optional>
306
- <attribute name="subsequence"/>
307
- </optional>
308
288
  <optional>
309
289
  <attribute name="alt"/>
310
290
  </optional>
311
- <optional>
312
- <attribute name="summary"/>
313
- </optional>
314
291
  <optional>
315
292
  <attribute name="uri">
316
293
  <data type="anyURI"/>
@@ -336,9 +313,12 @@
336
313
  </define>
337
314
  <define name="tname">
338
315
  <element name="name">
339
- <oneOrMore>
340
- <ref name="PureTextElement"/>
341
- </oneOrMore>
316
+ <text/>
317
+ </element>
318
+ </define>
319
+ <define name="tclass">
320
+ <element name="name">
321
+ <text/>
342
322
  </element>
343
323
  </define>
344
324
  <define name="thead">
@@ -437,12 +417,6 @@
437
417
  <data type="boolean"/>
438
418
  </attribute>
439
419
  </optional>
440
- <optional>
441
- <attribute name="subsequence"/>
442
- </optional>
443
- <optional>
444
- <ref name="tname"/>
445
- </optional>
446
420
  <oneOrMore>
447
421
  <choice>
448
422
  <ref name="formula"/>
@@ -506,26 +480,18 @@
506
480
  <data type="boolean"/>
507
481
  </attribute>
508
482
  </optional>
509
- <optional>
510
- <attribute name="subsequence"/>
511
- </optional>
512
- <optional>
513
- <attribute name="class"/>
514
- </optional>
515
483
  <optional>
516
484
  <ref name="source"/>
517
485
  </optional>
518
486
  <optional>
519
487
  <ref name="tname"/>
520
488
  </optional>
489
+ <optional>
490
+ <ref name="tclass"/>
491
+ </optional>
521
492
  <choice>
522
493
  <ref name="image"/>
523
- <ref name="video"/>
524
- <ref name="audio"/>
525
494
  <ref name="pre"/>
526
- <oneOrMore>
527
- <ref name="paragraph-with-footnote"/>
528
- </oneOrMore>
529
495
  <zeroOrMore>
530
496
  <ref name="figure"/>
531
497
  </zeroOrMore>
@@ -812,9 +778,6 @@
812
778
  <optional>
813
779
  <attribute name="alt"/>
814
780
  </optional>
815
- <optional>
816
- <attribute name="title"/>
817
- </optional>
818
781
  <optional>
819
782
  <attribute name="longdesc">
820
783
  <data type="anyURI"/>
@@ -823,7 +786,7 @@
823
786
  </element>
824
787
  </define>
825
788
  <define name="video">
826
- <element name="video">
789
+ <element name="image">
827
790
  <attribute name="id">
828
791
  <data type="ID"/>
829
792
  </attribute>
@@ -853,9 +816,6 @@
853
816
  <optional>
854
817
  <attribute name="alt"/>
855
818
  </optional>
856
- <optional>
857
- <attribute name="title"/>
858
- </optional>
859
819
  <optional>
860
820
  <attribute name="longdesc">
861
821
  <data type="anyURI"/>
@@ -867,7 +827,7 @@
867
827
  </element>
868
828
  </define>
869
829
  <define name="audio">
870
- <element name="audio">
830
+ <element name="image">
871
831
  <attribute name="id">
872
832
  <data type="ID"/>
873
833
  </attribute>
@@ -881,9 +841,6 @@
881
841
  <optional>
882
842
  <attribute name="alt"/>
883
843
  </optional>
884
- <optional>
885
- <attribute name="title"/>
886
- </optional>
887
844
  <optional>
888
845
  <attribute name="longdesc">
889
846
  <data type="anyURI"/>
data/grammars/biblio.rng CHANGED
@@ -49,11 +49,17 @@
49
49
  </define>
50
50
  <define name="stage">
51
51
  <element name="stage">
52
+ <optional>
53
+ <attribute name="abbreviation"/>
54
+ </optional>
52
55
  <text/>
53
56
  </element>
54
57
  </define>
55
58
  <define name="substage">
56
59
  <element name="substage">
60
+ <optional>
61
+ <attribute name="abbreviation"/>
62
+ </optional>
57
63
  <text/>
58
64
  </element>
59
65
  </define>
@@ -82,7 +88,7 @@
82
88
  <text/>
83
89
  </element>
84
90
  </define>
85
- <define name="LocalizedString">
91
+ <define name="LocalizedString1">
86
92
  <optional>
87
93
  <!-- multiple languages and scripts possible: comma delimit them if so -->
88
94
  <attribute name="language"/>
@@ -92,6 +98,16 @@
92
98
  </optional>
93
99
  <text/>
94
100
  </define>
101
+ <define name="LocalizedString">
102
+ <choice>
103
+ <ref name="LocalizedString1"/>
104
+ <oneOrMore>
105
+ <element name="variant">
106
+ <ref name="LocalizedString1"/>
107
+ </element>
108
+ </oneOrMore>
109
+ </choice>
110
+ </define>
95
111
  <!--
96
112
  Unlike UML, change type to format: type is overloaded
97
113
  Would be need if plain were default value and could omit the attribute
@@ -115,7 +131,7 @@
115
131
  </optional>
116
132
  <ref name="LocalizedStringOrXsAny"/>
117
133
  </define>
118
- <define name="LocalizedStringOrXsAny">
134
+ <define name="LocalizedStringOrXsAny1">
119
135
  <optional>
120
136
  <!-- multiple languages and scripts possible: comma delimit them if so -->
121
137
  <attribute name="language"/>
@@ -130,6 +146,16 @@
130
146
  </choice>
131
147
  </oneOrMore>
132
148
  </define>
149
+ <define name="LocalizedStringOrXsAny">
150
+ <choice>
151
+ <ref name="LocalizedStringOrXsAny1"/>
152
+ <oneOrMore>
153
+ <element name="variant">
154
+ <ref name="LocalizedStringOrXsAny1"/>
155
+ </element>
156
+ </oneOrMore>
157
+ </choice>
158
+ </define>
133
159
  <define name="contributor">
134
160
  <element name="contributor">
135
161
  <zeroOrMore>
@@ -452,9 +478,14 @@
452
478
  <attribute name="bibitemid">
453
479
  <data type="IDREF"/>
454
480
  </attribute>
455
- <zeroOrMore>
456
- <ref name="locality"/>
457
- </zeroOrMore>
481
+ <choice>
482
+ <zeroOrMore>
483
+ <ref name="locality"/>
484
+ </zeroOrMore>
485
+ <zeroOrMore>
486
+ <ref name="localityStack"/>
487
+ </zeroOrMore>
488
+ </choice>
458
489
  <optional>
459
490
  <ref name="date"/>
460
491
  </optional>
@@ -469,6 +500,25 @@
469
500
  <ref name="BibItemLocality"/>
470
501
  </element>
471
502
  </define>
503
+ <define name="localityStack">
504
+ <element name="localityStack">
505
+ <zeroOrMore>
506
+ <ref name="locality"/>
507
+ </zeroOrMore>
508
+ </element>
509
+ </define>
510
+ <define name="sourceLocality">
511
+ <element name="sourceLocality">
512
+ <ref name="BibItemLocality"/>
513
+ </element>
514
+ </define>
515
+ <define name="sourceLocalityStack">
516
+ <element name="sourceLocalityStack">
517
+ <zeroOrMore>
518
+ <ref name="sourceLocality"/>
519
+ </zeroOrMore>
520
+ </element>
521
+ </define>
472
522
  <define name="BibItemLocality">
473
523
  <attribute name="type">
474
524
  <ref name="LocalityType"/>
@@ -482,7 +532,7 @@
482
532
  </define>
483
533
  <define name="LocalityType">
484
534
  <data type="string">
485
- <param name="pattern">section|clause|part|paragraph|chapter|page|whole|table|annex|figure|note|list|example|volume|issue|time|locality:[a-zA-Z0-9_]+</param>
535
+ <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>
486
536
  </data>
487
537
  </define>
488
538
  <define name="referenceFrom">
@@ -611,9 +661,9 @@
611
661
  <optional>
612
662
  <ref name="status"/>
613
663
  </optional>
614
- <optional>
664
+ <zeroOrMore>
615
665
  <ref name="copyright"/>
616
- </optional>
666
+ </zeroOrMore>
617
667
  <zeroOrMore>
618
668
  <ref name="docrelation"/>
619
669
  </zeroOrMore>
@@ -703,21 +753,11 @@
703
753
  </define>
704
754
  <define name="TypedTitleString">
705
755
  <optional>
706
- <attribute name="type">
707
- <ref name="TitleType"/>
708
- </attribute>
756
+ <attribute name="type"/>
709
757
  </optional>
710
758
  <ref name="FormattedString"/>
711
759
  </define>
712
- <define name="TitleType">
713
- <choice>
714
- <value>alternative</value>
715
- <value>original</value>
716
- <value>unofficial</value>
717
- <value>subtitle</value>
718
- <value>main</value>
719
- </choice>
720
- </define>
760
+ <!-- TitleType = ( "alternative" | "original" | "unofficial" | "subtitle" | "main" ) -->
721
761
  <define name="TypedUri">
722
762
  <optional>
723
763
  <attribute name="type"/>
@@ -747,6 +787,8 @@
747
787
  <value>unchanged</value>
748
788
  <value>circulated</value>
749
789
  <value>adapted</value>
790
+ <value>vote-started</value>
791
+ <value>vote-ended</value>
750
792
  </choice>
751
793
  </define>
752
794
  <define name="bdate">
@@ -979,7 +1021,17 @@
979
1021
  <optional>
980
1022
  <ref name="to"/>
981
1023
  </optional>
982
- <ref name="owner"/>
1024
+ <oneOrMore>
1025
+ <ref name="owner"/>
1026
+ </oneOrMore>
1027
+ <optional>
1028
+ <ref name="copyright_scope"/>
1029
+ </optional>
1030
+ </element>
1031
+ </define>
1032
+ <define name="copyright_scope">
1033
+ <element name="scope">
1034
+ <text/>
983
1035
  </element>
984
1036
  </define>
985
1037
  <define name="from">
@@ -999,38 +1051,63 @@
999
1051
  </define>
1000
1052
  <define name="DocRelationType">
1001
1053
  <choice>
1002
- <value>obsoletes</value>
1003
- <value>obsoletedBy</value>
1004
- <value>supersedes</value>
1005
- <value>supersededBy</value>
1006
- <value>updates</value>
1007
- <value>updatedBy</value>
1008
- <value>complements</value>
1009
- <value>derivedFrom</value>
1010
- <value>translatedFrom</value>
1011
- <value>hasTranslation</value>
1012
- <value>adoptedFrom</value>
1013
- <value>equivalent</value>
1014
- <value>identical</value>
1015
- <value>nonequivalent</value>
1016
- <value>includedIn</value>
1017
1054
  <value>includes</value>
1018
- <value>instance</value>
1019
- <value>instanceOf</value>
1020
- <value>partOf</value>
1055
+ <value>includedIn</value>
1021
1056
  <value>hasPart</value>
1022
- <value>hasDraft</value>
1023
- <value>draftOf</value>
1057
+ <value>partOf</value>
1024
1058
  <value>merges</value>
1059
+ <value>mergedInto</value>
1025
1060
  <value>splits</value>
1026
- <value>amends</value>
1027
- <value>amendedBy</value>
1028
- <value>corrects</value>
1029
- <value>correctedBy</value>
1030
- <value>revises</value>
1031
- <value>revisedBy</value>
1061
+ <value>splitInto</value>
1062
+ <value>instance</value>
1063
+ <value>hasInstance</value>
1064
+ <value>exemplarOf</value>
1065
+ <value>hasExemplar</value>
1066
+ <value>manifestationOf</value>
1067
+ <value>hasManifestation</value>
1068
+ <value>reproductionOf</value>
1069
+ <value>hasReproduction</value>
1070
+ <value>reprintOf</value>
1071
+ <value>hasReprint</value>
1072
+ <value>expressionOf</value>
1073
+ <value>hasExpression</value>
1074
+ <value>translatedFrom</value>
1075
+ <value>hasTranslation</value>
1076
+ <value>arrangementOf</value>
1077
+ <value>hasArrangement</value>
1078
+ <value>abridgementOf</value>
1079
+ <value>hasAbridgement</value>
1080
+ <value>annotationOf</value>
1081
+ <value>hasAnnotation</value>
1082
+ <value>draftOf</value>
1083
+ <value>hasDraft</value>
1084
+ <value>editionOf</value>
1085
+ <value>hasEdition</value>
1086
+ <value>updates</value>
1087
+ <value>updatedBy</value>
1088
+ <value>derivedFrom</value>
1089
+ <value>derives</value>
1032
1090
  <value>describes</value>
1033
1091
  <value>describedBy</value>
1092
+ <value>catalogues</value>
1093
+ <value>cataloguedBy</value>
1094
+ <value>hasSuccessor</value>
1095
+ <value>successorOf</value>
1096
+ <value>adaptedFrom</value>
1097
+ <value>hasAdaptation</value>
1098
+ <value>adoptedFrom</value>
1099
+ <value>adoptedAs</value>
1100
+ <value>reviewOf</value>
1101
+ <value>hasReview</value>
1102
+ <value>commentaryOf</value>
1103
+ <value>hasCommentary</value>
1104
+ <value>related</value>
1105
+ <value>complements</value>
1106
+ <value>complementOf</value>
1107
+ <value>obsoletes</value>
1108
+ <value>obsoletedBy</value>
1109
+ <value>cited</value>
1110
+ <value>isCitedIn</value>
1034
1111
  </choice>
1035
1112
  </define>
1036
1113
  <define name="docrelation">
@@ -1038,12 +1115,30 @@
1038
1115
  <attribute name="type">
1039
1116
  <ref name="DocRelationType"/>
1040
1117
  </attribute>
1118
+ <optional>
1119
+ <element name="description">
1120
+ <ref name="FormattedString"/>
1121
+ </element>
1122
+ </optional>
1041
1123
  <element name="bibitem">
1042
1124
  <ref name="BibliographicItem"/>
1043
1125
  </element>
1044
- <zeroOrMore>
1045
- <ref name="locality"/>
1046
- </zeroOrMore>
1126
+ <choice>
1127
+ <zeroOrMore>
1128
+ <ref name="locality"/>
1129
+ </zeroOrMore>
1130
+ <zeroOrMore>
1131
+ <ref name="localityStack"/>
1132
+ </zeroOrMore>
1133
+ </choice>
1134
+ <choice>
1135
+ <zeroOrMore>
1136
+ <ref name="sourceLocality"/>
1137
+ </zeroOrMore>
1138
+ <zeroOrMore>
1139
+ <ref name="sourceLocalityStack"/>
1140
+ </zeroOrMore>
1141
+ </choice>
1047
1142
  </element>
1048
1143
  </define>
1049
1144
  <define name="version">