relaton-bipm 1.17.0 → 1.18.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/rake.yml +1 -1
- data/.github/workflows/release.yml +1 -1
- data/grammars/basicdoc.rng +147 -52
- data/grammars/biblio-standoc.rng +44 -1
- data/grammars/biblio.rng +32 -0
- data/lib/relaton_bipm/bipm_bibliography.rb +2 -1
- data/lib/relaton_bipm/id_parser.rb +3 -3
- data/lib/relaton_bipm/version.rb +1 -1
- data/lib/relaton_bipm.rb +1 -1
- data/relaton_bipm.gemspec +1 -1
- 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: d51b6507b240f142eca33e8276587dc32d0e5e7a3a794d1ab7eaa2b6e2af09ac
|
|
4
|
+
data.tar.gz: 491c23ff3ef47f435ec18d605b0bc35806eb872755e338c1d06ce609284bab34
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: b362e8a613b038c7890987beb9ebd84f42162a94f8f42149bb763426c2f8bf8536a815006f9a9587b12f1a89e714aaa832f619d22214a88e0549fb9eee11ca06
|
|
7
|
+
data.tar.gz: a71ec348afeeb1383bc1f3ea2c5ae11f9c1a34014f0f81462d5bc1cf248566ced81c2043991ff67bd0c40e42b9480a5472abf9d46ed2da1d0b6a3ec9a08a433e
|
data/.github/workflows/rake.yml
CHANGED
data/grammars/basicdoc.rng
CHANGED
|
@@ -95,8 +95,89 @@
|
|
|
95
95
|
<ref name="pagebreak"/>
|
|
96
96
|
<ref name="hr"/>
|
|
97
97
|
<ref name="bookmark"/>
|
|
98
|
+
<ref name="amend"/>
|
|
98
99
|
</choice>
|
|
99
100
|
</define>
|
|
101
|
+
<define name="amend">
|
|
102
|
+
<element name="amend">
|
|
103
|
+
<ref name="AmendType"/>
|
|
104
|
+
</element>
|
|
105
|
+
</define>
|
|
106
|
+
<define name="AmendType">
|
|
107
|
+
<optional>
|
|
108
|
+
<attribute name="id">
|
|
109
|
+
<data type="ID"/>
|
|
110
|
+
</attribute>
|
|
111
|
+
</optional>
|
|
112
|
+
<attribute name="change">
|
|
113
|
+
<choice>
|
|
114
|
+
<value>add</value>
|
|
115
|
+
<value>modify</value>
|
|
116
|
+
<value>delete</value>
|
|
117
|
+
<value>replace</value>
|
|
118
|
+
</choice>
|
|
119
|
+
</attribute>
|
|
120
|
+
<optional>
|
|
121
|
+
<attribute name="path"/>
|
|
122
|
+
</optional>
|
|
123
|
+
<optional>
|
|
124
|
+
<attribute name="path_end"/>
|
|
125
|
+
</optional>
|
|
126
|
+
<optional>
|
|
127
|
+
<attribute name="title"/>
|
|
128
|
+
</optional>
|
|
129
|
+
<optional>
|
|
130
|
+
<element name="location">
|
|
131
|
+
<zeroOrMore>
|
|
132
|
+
<choice>
|
|
133
|
+
<ref name="locality"/>
|
|
134
|
+
<ref name="localityStack"/>
|
|
135
|
+
</choice>
|
|
136
|
+
</zeroOrMore>
|
|
137
|
+
</element>
|
|
138
|
+
</optional>
|
|
139
|
+
<optional>
|
|
140
|
+
<element name="description">
|
|
141
|
+
<zeroOrMore>
|
|
142
|
+
<ref name="BasicBlock"/>
|
|
143
|
+
</zeroOrMore>
|
|
144
|
+
</element>
|
|
145
|
+
</optional>
|
|
146
|
+
<optional>
|
|
147
|
+
<element name="newcontent">
|
|
148
|
+
<optional>
|
|
149
|
+
<attribute name="id">
|
|
150
|
+
<data type="ID"/>
|
|
151
|
+
</attribute>
|
|
152
|
+
</optional>
|
|
153
|
+
<zeroOrMore>
|
|
154
|
+
<ref name="BasicBlock"/>
|
|
155
|
+
</zeroOrMore>
|
|
156
|
+
</element>
|
|
157
|
+
</optional>
|
|
158
|
+
<zeroOrMore>
|
|
159
|
+
<ref name="classification"/>
|
|
160
|
+
</zeroOrMore>
|
|
161
|
+
<zeroOrMore>
|
|
162
|
+
<ref name="contributor"/>
|
|
163
|
+
</zeroOrMore>
|
|
164
|
+
</define>
|
|
165
|
+
<define name="classification">
|
|
166
|
+
<element name="classification">
|
|
167
|
+
<ref name="classification_tag"/>
|
|
168
|
+
<ref name="classification_value"/>
|
|
169
|
+
</element>
|
|
170
|
+
</define>
|
|
171
|
+
<define name="classification_tag">
|
|
172
|
+
<element name="tag">
|
|
173
|
+
<text/>
|
|
174
|
+
</element>
|
|
175
|
+
</define>
|
|
176
|
+
<define name="classification_value">
|
|
177
|
+
<element name="value">
|
|
178
|
+
<text/>
|
|
179
|
+
</element>
|
|
180
|
+
</define>
|
|
100
181
|
<define name="paragraph">
|
|
101
182
|
<element name="p">
|
|
102
183
|
<ref name="ParagraphType"/>
|
|
@@ -715,27 +796,36 @@
|
|
|
715
796
|
</define>
|
|
716
797
|
<define name="ruby">
|
|
717
798
|
<element name="ruby">
|
|
718
|
-
<
|
|
719
|
-
<
|
|
720
|
-
|
|
721
|
-
|
|
722
|
-
|
|
723
|
-
|
|
724
|
-
|
|
799
|
+
<choice>
|
|
800
|
+
<ref name="ruby_pronunciation"/>
|
|
801
|
+
<ref name="ruby_annotation"/>
|
|
802
|
+
</choice>
|
|
803
|
+
<choice>
|
|
804
|
+
<text/>
|
|
805
|
+
<ref name="ruby"/>
|
|
806
|
+
</choice>
|
|
725
807
|
</element>
|
|
726
808
|
</define>
|
|
727
|
-
<define name="
|
|
728
|
-
<element name="
|
|
729
|
-
<
|
|
730
|
-
|
|
731
|
-
|
|
809
|
+
<define name="ruby_pronunciation">
|
|
810
|
+
<element name="pronunciation">
|
|
811
|
+
<attribute name="value"/>
|
|
812
|
+
<optional>
|
|
813
|
+
<attribute name="script"/>
|
|
814
|
+
</optional>
|
|
815
|
+
<optional>
|
|
816
|
+
<attribute name="lang"/>
|
|
817
|
+
</optional>
|
|
732
818
|
</element>
|
|
733
819
|
</define>
|
|
734
|
-
<define name="
|
|
735
|
-
<element name="
|
|
736
|
-
<
|
|
737
|
-
|
|
738
|
-
|
|
820
|
+
<define name="ruby_annotation">
|
|
821
|
+
<element name="annotation">
|
|
822
|
+
<attribute name="value"/>
|
|
823
|
+
<optional>
|
|
824
|
+
<attribute name="script"/>
|
|
825
|
+
</optional>
|
|
826
|
+
<optional>
|
|
827
|
+
<attribute name="lang"/>
|
|
828
|
+
</optional>
|
|
739
829
|
</element>
|
|
740
830
|
</define>
|
|
741
831
|
<define name="br">
|
|
@@ -914,44 +1004,49 @@
|
|
|
914
1004
|
-->
|
|
915
1005
|
<define name="image">
|
|
916
1006
|
<element name="image">
|
|
917
|
-
<
|
|
918
|
-
|
|
1007
|
+
<ref name="Image"/>
|
|
1008
|
+
</element>
|
|
1009
|
+
</define>
|
|
1010
|
+
<define name="Image">
|
|
1011
|
+
<attribute name="id">
|
|
1012
|
+
<data type="ID"/>
|
|
1013
|
+
</attribute>
|
|
1014
|
+
<attribute name="src">
|
|
1015
|
+
<data type="anyURI"/>
|
|
1016
|
+
</attribute>
|
|
1017
|
+
<attribute name="mimetype"/>
|
|
1018
|
+
<optional>
|
|
1019
|
+
<attribute name="filename"/>
|
|
1020
|
+
</optional>
|
|
1021
|
+
<optional>
|
|
1022
|
+
<attribute name="width">
|
|
1023
|
+
<ref name="ImageSize"/>
|
|
919
1024
|
</attribute>
|
|
920
|
-
|
|
1025
|
+
</optional>
|
|
1026
|
+
<optional>
|
|
1027
|
+
<attribute name="height">
|
|
1028
|
+
<ref name="ImageSize"/>
|
|
1029
|
+
</attribute>
|
|
1030
|
+
</optional>
|
|
1031
|
+
<optional>
|
|
1032
|
+
<attribute name="alt"/>
|
|
1033
|
+
</optional>
|
|
1034
|
+
<optional>
|
|
1035
|
+
<attribute name="title"/>
|
|
1036
|
+
</optional>
|
|
1037
|
+
<optional>
|
|
1038
|
+
<attribute name="longdesc">
|
|
921
1039
|
<data type="anyURI"/>
|
|
922
1040
|
</attribute>
|
|
923
|
-
|
|
924
|
-
|
|
925
|
-
|
|
926
|
-
|
|
927
|
-
<
|
|
928
|
-
<
|
|
929
|
-
|
|
930
|
-
|
|
931
|
-
|
|
932
|
-
</choice>
|
|
933
|
-
</attribute>
|
|
934
|
-
</optional>
|
|
935
|
-
<optional>
|
|
936
|
-
<attribute name="height">
|
|
937
|
-
<choice>
|
|
938
|
-
<data type="int"/>
|
|
939
|
-
<value>auto</value>
|
|
940
|
-
</choice>
|
|
941
|
-
</attribute>
|
|
942
|
-
</optional>
|
|
943
|
-
<optional>
|
|
944
|
-
<attribute name="alt"/>
|
|
945
|
-
</optional>
|
|
946
|
-
<optional>
|
|
947
|
-
<attribute name="title"/>
|
|
948
|
-
</optional>
|
|
949
|
-
<optional>
|
|
950
|
-
<attribute name="longdesc">
|
|
951
|
-
<data type="anyURI"/>
|
|
952
|
-
</attribute>
|
|
953
|
-
</optional>
|
|
954
|
-
</element>
|
|
1041
|
+
</optional>
|
|
1042
|
+
</define>
|
|
1043
|
+
<define name="ImageSize">
|
|
1044
|
+
<choice>
|
|
1045
|
+
<data type="string">
|
|
1046
|
+
<param name="pattern">\d+([.]\d+)?(%?)</param>
|
|
1047
|
+
</data>
|
|
1048
|
+
<value>auto</value>
|
|
1049
|
+
</choice>
|
|
955
1050
|
</define>
|
|
956
1051
|
<define name="video">
|
|
957
1052
|
<element name="video">
|
data/grammars/biblio-standoc.rng
CHANGED
|
@@ -9,11 +9,42 @@
|
|
|
9
9
|
-->
|
|
10
10
|
<include href="biblio.rng">
|
|
11
11
|
<define name="BibData">
|
|
12
|
-
<ref name="
|
|
12
|
+
<ref name="StandardBibliographicItem"/>
|
|
13
13
|
<optional>
|
|
14
14
|
<ref name="ext"/>
|
|
15
15
|
</optional>
|
|
16
16
|
</define>
|
|
17
|
+
<define name="docrelation">
|
|
18
|
+
<element name="relation">
|
|
19
|
+
<attribute name="type">
|
|
20
|
+
<ref name="DocRelationType"/>
|
|
21
|
+
</attribute>
|
|
22
|
+
<optional>
|
|
23
|
+
<element name="description">
|
|
24
|
+
<ref name="FormattedString"/>
|
|
25
|
+
</element>
|
|
26
|
+
</optional>
|
|
27
|
+
<element name="bibitem">
|
|
28
|
+
<ref name="StandardReducedBibliographicItem"/>
|
|
29
|
+
</element>
|
|
30
|
+
<choice>
|
|
31
|
+
<zeroOrMore>
|
|
32
|
+
<ref name="locality"/>
|
|
33
|
+
</zeroOrMore>
|
|
34
|
+
<zeroOrMore>
|
|
35
|
+
<ref name="localityStack"/>
|
|
36
|
+
</zeroOrMore>
|
|
37
|
+
</choice>
|
|
38
|
+
<choice>
|
|
39
|
+
<zeroOrMore>
|
|
40
|
+
<ref name="sourceLocality"/>
|
|
41
|
+
</zeroOrMore>
|
|
42
|
+
<zeroOrMore>
|
|
43
|
+
<ref name="sourceLocalityStack"/>
|
|
44
|
+
</zeroOrMore>
|
|
45
|
+
</choice>
|
|
46
|
+
</element>
|
|
47
|
+
</define>
|
|
17
48
|
</include>
|
|
18
49
|
<define name="ext">
|
|
19
50
|
<element name="ext">
|
|
@@ -161,4 +192,16 @@
|
|
|
161
192
|
</optional>
|
|
162
193
|
</element>
|
|
163
194
|
</define>
|
|
195
|
+
<define name="StandardBibliographicItem">
|
|
196
|
+
<ref name="BibliographicItem"/>
|
|
197
|
+
<zeroOrMore>
|
|
198
|
+
<ref name="amend"/>
|
|
199
|
+
</zeroOrMore>
|
|
200
|
+
</define>
|
|
201
|
+
<define name="StandardReducedBibliographicItem">
|
|
202
|
+
<ref name="ReducedBibliographicItem"/>
|
|
203
|
+
<zeroOrMore>
|
|
204
|
+
<ref name="amend"/>
|
|
205
|
+
</zeroOrMore>
|
|
206
|
+
</define>
|
|
164
207
|
</grammar>
|
data/grammars/biblio.rng
CHANGED
|
@@ -241,6 +241,9 @@
|
|
|
241
241
|
</element>
|
|
242
242
|
</define>
|
|
243
243
|
<define name="FullNameType">
|
|
244
|
+
<optional>
|
|
245
|
+
<ref name="name_abbreviation"/>
|
|
246
|
+
</optional>
|
|
244
247
|
<choice>
|
|
245
248
|
<group>
|
|
246
249
|
<zeroOrMore>
|
|
@@ -266,6 +269,11 @@
|
|
|
266
269
|
<ref name="variantname"/>
|
|
267
270
|
</zeroOrMore>
|
|
268
271
|
</define>
|
|
272
|
+
<define name="name_abbreviation">
|
|
273
|
+
<element name="abbreviation">
|
|
274
|
+
<ref name="LocalizedString"/>
|
|
275
|
+
</element>
|
|
276
|
+
</define>
|
|
269
277
|
<define name="prefix">
|
|
270
278
|
<element name="prefix">
|
|
271
279
|
<ref name="LocalizedString"/>
|
|
@@ -348,6 +356,9 @@
|
|
|
348
356
|
<zeroOrMore>
|
|
349
357
|
<ref name="contact"/>
|
|
350
358
|
</zeroOrMore>
|
|
359
|
+
<optional>
|
|
360
|
+
<ref name="logo"/>
|
|
361
|
+
</optional>
|
|
351
362
|
</element>
|
|
352
363
|
</define>
|
|
353
364
|
<define name="orgname">
|
|
@@ -366,6 +377,21 @@
|
|
|
366
377
|
</choice>
|
|
367
378
|
</element>
|
|
368
379
|
</define>
|
|
380
|
+
<define name="logo">
|
|
381
|
+
<element name="logo">
|
|
382
|
+
<ref name="image"/>
|
|
383
|
+
</element>
|
|
384
|
+
</define>
|
|
385
|
+
<define name="depiction">
|
|
386
|
+
<element name="depiction">
|
|
387
|
+
<optional>
|
|
388
|
+
<attribute name="scope"/>
|
|
389
|
+
</optional>
|
|
390
|
+
<zeroOrMore>
|
|
391
|
+
<ref name="image"/>
|
|
392
|
+
</zeroOrMore>
|
|
393
|
+
</element>
|
|
394
|
+
</define>
|
|
369
395
|
<define name="NameWithVariants">
|
|
370
396
|
<element name="primary">
|
|
371
397
|
<ref name="LocalizedString"/>
|
|
@@ -752,6 +778,9 @@
|
|
|
752
778
|
<optional>
|
|
753
779
|
<ref name="validity"/>
|
|
754
780
|
</optional>
|
|
781
|
+
<optional>
|
|
782
|
+
<ref name="depiction"/>
|
|
783
|
+
</optional>
|
|
755
784
|
</define>
|
|
756
785
|
<define name="ReducedBibliographicItem">
|
|
757
786
|
<optional>
|
|
@@ -849,6 +878,9 @@
|
|
|
849
878
|
<optional>
|
|
850
879
|
<ref name="validity"/>
|
|
851
880
|
</optional>
|
|
881
|
+
<optional>
|
|
882
|
+
<ref name="depiction"/>
|
|
883
|
+
</optional>
|
|
852
884
|
</define>
|
|
853
885
|
<define name="btitle">
|
|
854
886
|
<element name="title">
|
|
@@ -50,7 +50,8 @@ module RelatonBipm
|
|
|
50
50
|
rows = index.search { |r| ref_id == r[:id] }
|
|
51
51
|
return unless rows.any?
|
|
52
52
|
|
|
53
|
-
|
|
53
|
+
row = rows.sort_by { |r| r[:id][:year] }.last
|
|
54
|
+
url = "#{GH_ENDPOINT}#{row[:file]}"
|
|
54
55
|
resp = Mechanize.new.get url
|
|
55
56
|
return unless resp.code == "200"
|
|
56
57
|
|
|
@@ -94,9 +94,9 @@ module RelatonBipm
|
|
|
94
94
|
#
|
|
95
95
|
def ==(other) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity,Metrics/AbcSize
|
|
96
96
|
other_hash = other.is_a?(Id) ? other.to_hash : normalize_hash(other)
|
|
97
|
-
hash = to_hash
|
|
98
|
-
hash.delete(:number) if other_hash[:number].nil? && hash[:number] == "1"
|
|
99
|
-
other_hash.delete(:number) if hash[:number].nil? && other_hash[:number] == "1"
|
|
97
|
+
hash = to_hash.dup
|
|
98
|
+
hash.delete(:number) if other_hash[:number].nil? && hash[:number] == "1" && hash[:year]
|
|
99
|
+
other_hash.delete(:number) if hash[:number].nil? && other_hash[:number] == "1" && other_hash[:year]
|
|
100
100
|
# hash.delete(:year) unless other_hash[:year]
|
|
101
101
|
other_hash.delete(:year) unless hash[:year]
|
|
102
102
|
hash.delete(:lang) unless other_hash[:lang]
|
data/lib/relaton_bipm/version.rb
CHANGED
data/lib/relaton_bipm.rb
CHANGED
|
@@ -28,7 +28,7 @@ require "relaton_bipm/rawdata_bipm_metrologia/article_parser"
|
|
|
28
28
|
module RelatonBipm
|
|
29
29
|
class Error < StandardError; end
|
|
30
30
|
|
|
31
|
-
# Returns hash of
|
|
31
|
+
# Returns hash of gems versions used to generate the data model.
|
|
32
32
|
# @return [String]
|
|
33
33
|
def grammar_hash
|
|
34
34
|
# gem_path = File.expand_path "..", __dir__
|
data/relaton_bipm.gemspec
CHANGED
|
@@ -35,7 +35,7 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
|
|
|
35
35
|
spec.add_dependency "faraday", "~> 2.7.0"
|
|
36
36
|
spec.add_dependency "mechanize", "~> 2.8.0"
|
|
37
37
|
spec.add_dependency "parslet", "~> 2.0.0"
|
|
38
|
-
spec.add_dependency "relaton-bib", "~> 1.
|
|
38
|
+
spec.add_dependency "relaton-bib", "~> 1.18.0"
|
|
39
39
|
spec.add_dependency "relaton-index", "~> 0.2.2"
|
|
40
40
|
spec.add_dependency "rubyzip", "~> 2.3.0"
|
|
41
41
|
end
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: relaton-bipm
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.
|
|
4
|
+
version: 1.18.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:
|
|
11
|
+
date: 2024-01-06 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: faraday
|
|
@@ -58,14 +58,14 @@ dependencies:
|
|
|
58
58
|
requirements:
|
|
59
59
|
- - "~>"
|
|
60
60
|
- !ruby/object:Gem::Version
|
|
61
|
-
version: 1.
|
|
61
|
+
version: 1.18.0
|
|
62
62
|
type: :runtime
|
|
63
63
|
prerelease: false
|
|
64
64
|
version_requirements: !ruby/object:Gem::Requirement
|
|
65
65
|
requirements:
|
|
66
66
|
- - "~>"
|
|
67
67
|
- !ruby/object:Gem::Version
|
|
68
|
-
version: 1.
|
|
68
|
+
version: 1.18.0
|
|
69
69
|
- !ruby/object:Gem::Dependency
|
|
70
70
|
name: relaton-index
|
|
71
71
|
requirement: !ruby/object:Gem::Requirement
|