relaton-bipm 1.10.3 → 1.11.2

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 (10) hide show
  1. checksums.yaml +4 -4
  2. data/README.adoc +33 -8
  3. data/grammars/biblio.rng +62 -10
  4. data/grammars/bipm.rng +1 -1
  5. data/grammars/isodoc.rng +73 -3
  6. data/lib/relaton_bipm/bipm_bibliography.rb +2 -1
  7. data/lib/relaton_bipm/processor.rb +1 -1
  8. data/lib/relaton_bipm/version.rb +1 -1
  9. data/relaton_bipm.gemspec +1 -1
  10. metadata +4 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 82921528d18ccbfc6bbba60ae832fd711d92c9d338b887c19b500d81f911098b
4
- data.tar.gz: 21db3cbf7e095003a51224b8c7c8a11f0b46164d52f161f45c83acd5677b65ad
3
+ metadata.gz: ff32d2538d50008590df750214025152ebe40eef58b249eb940ca435ac33967f
4
+ data.tar.gz: abaaa5ff94b879d5d5c91a2f7dd4f2ce14116f361a5a21d379532a5db168cd2d
5
5
  SHA512:
6
- metadata.gz: 5df3c90e1dce934b765a738283b8cefc1de1516ffc869698bc5c161ca5a3ae290a30f799c00de19fe67513d589934ea469d3a9a4c5c3144e1afc6ca3174eea7b
7
- data.tar.gz: 5516be3766704271ef92b49621fdf4ee38e01520ba986917f8ff0a8fd4d34eabb3530dadb8fc500dbbedf762d0128115c3987476cb430930c21cbe516e248cab
6
+ metadata.gz: afa46e8f2ebf060da46d159f59155e4ae92d0d1a50fa73136be0c46a9065790606f83f9526e4365756e17d617e01770e1ecefa1d13d4b6305671368b0cf8a9e5
7
+ data.tar.gz: 4a804b81bec63e039320fa3e9deaf86d02542108def5c04528e30667d06b7855cf56793b6ea73c94d593098bc0d45364ecad0759063fa18d9692fdfa4f3ab22c
data/README.adoc CHANGED
@@ -53,17 +53,42 @@ bib = RelatonBipm::BipmBibliography.get "BIPM Metrologia 29 6 373"
53
53
  ...
54
54
 
55
55
  # get CGPM resolutions
56
- RelatonBipm::BipmBibliography.get "BIPM CR 01"
57
- [relaton-bipm] ("BIPM CR 01") fetching...
58
- [relaton-bipm] ("BIPM CR 01") found BIPM CR 01
56
+ RelatonBipm::BipmBibliography.get "CGPM Resolution 1"
57
+ [relaton-bipm] ("CGPM Resolution 1") fetching...
58
+ [relaton-bipm] ("CGPM Resolution 1") found CGPM Resolution 1
59
59
  => #<RelatonBipm::BipmBibliographicItem:0x00007fd4f7cba038
60
60
  ...
61
61
 
62
- # get CIPM resolutions
63
- RelatonBipm::BipmBibliography.get "BIPM PV 101(I)"
64
- [relaton-bipm] ("BIPM PV 101(I)") fetching...
65
- [relaton-bipm] ("BIPM PV 101(I)") found BIPM PV 101(I)
66
- => #<RelatonBipm::BipmBibliographicItem:0x00007fd5072301c0
62
+ # get CIPM decision
63
+ RelatonBipm::BipmBibliography.get "CIPM Decision 101-1"
64
+ [relaton-bipm] ("CIPM Decision 101-1") fetching...
65
+ [relaton-bipm] ("CIPM Decision 101-1") found CIPM Decision 101-1
66
+ => #<RelatonBipm::BipmBibliographicItem:0x00007fed16dfcfe0
67
+ ...
68
+
69
+ RelatonBipm::BipmBibliography.get "CIPM Decision 01 (2012)"
70
+ [relaton-bipm] ("CIPM Decision 01 (2012)") fetching...
71
+ [relaton-bipm] ("CIPM Decision 01 (2012)") found CIPM Decision 01 (2012)
72
+ => #<RelatonBipm::BipmBibliographicItem:0x00007fb6b9bbec08
73
+ ...
74
+
75
+ RelatonBipm::BipmBibliography.get "CIPM Decision 2012-01"
76
+ [relaton-bipm] ("CIPM Decision 2012-01") fetching...
77
+ [relaton-bipm] ("CIPM Decision 2012-01") found CIPM Decision 01 (2012)
78
+ => #<RelatonBipm::BipmBibliographicItem:0x00007fb6d98ddd98
79
+ ...
80
+
81
+ # get CIPM resolution
82
+ RelatonBipm::BipmBibliography.get "CIPM Resolution (1948)"
83
+ [relaton-bipm] ("CIPM Resolution (1948)") fetching...
84
+ [relaton-bipm] ("CIPM Resolution (1948)") found CIPM Resolution (1948)
85
+ => #<RelatonBipm::BipmBibliographicItem:0x00007fb6bb1c4a98
86
+ ...
87
+
88
+ RelatonBipm::BipmBibliography.get "CIPM Resolution 1948"
89
+ [relaton-bipm] ("CIPM Resolution 1948") fetching...
90
+ [relaton-bipm] ("CIPM Resolution 1948") found CIPM Resolution (1948)
91
+ => #<RelatonBipm::BipmBibliographicItem:0x00007fb6b9be5510
67
92
  ...
68
93
  ----
69
94
 
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">
@@ -677,6 +677,9 @@
677
677
  <zeroOrMore>
678
678
  <ref name="extent"/>
679
679
  </zeroOrMore>
680
+ <optional>
681
+ <ref name="bibliographic_size"/>
682
+ </optional>
680
683
  <zeroOrMore>
681
684
  <ref name="accesslocation"/>
682
685
  </zeroOrMore>
@@ -848,17 +851,46 @@
848
851
  </define>
849
852
  <define name="bplace">
850
853
  <element name="place">
851
- <optional>
852
- <attribute name="uri">
853
- <data type="anyURI"/>
854
- </attribute>
855
- </optional>
856
- <optional>
857
- <attribute name="region"/>
858
- </optional>
854
+ <choice>
855
+ <text/>
856
+ <group>
857
+ <ref name="bibliocity"/>
858
+ <zeroOrMore>
859
+ <ref name="biblioregion"/>
860
+ </zeroOrMore>
861
+ <zeroOrMore>
862
+ <ref name="bibliocountry"/>
863
+ </zeroOrMore>
864
+ </group>
865
+ </choice>
866
+ </element>
867
+ </define>
868
+ <define name="bibliocity">
869
+ <element name="city">
859
870
  <text/>
860
871
  </element>
861
872
  </define>
873
+ <define name="biblioregion">
874
+ <element name="region">
875
+ <ref name="RegionType"/>
876
+ </element>
877
+ </define>
878
+ <define name="bibliocountry">
879
+ <element name="country">
880
+ <ref name="RegionType"/>
881
+ </element>
882
+ </define>
883
+ <define name="RegionType">
884
+ <optional>
885
+ <attribute name="iso"/>
886
+ </optional>
887
+ <optional>
888
+ <attribute name="recommended">
889
+ <data type="boolean"/>
890
+ </attribute>
891
+ </optional>
892
+ <text/>
893
+ </define>
862
894
  <define name="bprice">
863
895
  <element name="price">
864
896
  <attribute name="currency"/>
@@ -922,9 +954,29 @@
922
954
  <text/>
923
955
  </element>
924
956
  </define>
957
+ <define name="sizevalue">
958
+ <element name="value">
959
+ <attribute name="type"/>
960
+ <text/>
961
+ </element>
962
+ </define>
963
+ <define name="bibliographic_size">
964
+ <element name="size">
965
+ <oneOrMore>
966
+ <ref name="sizevalue"/>
967
+ </oneOrMore>
968
+ </element>
969
+ </define>
925
970
  <define name="extent">
926
971
  <element name="extent">
927
- <ref name="BibItemLocality"/>
972
+ <choice>
973
+ <zeroOrMore>
974
+ <ref name="locality"/>
975
+ </zeroOrMore>
976
+ <zeroOrMore>
977
+ <ref name="localityStack"/>
978
+ </zeroOrMore>
979
+ </choice>
928
980
  </element>
929
981
  </define>
930
982
  <define name="series">
data/grammars/bipm.rng CHANGED
@@ -59,7 +59,7 @@
59
59
  <data type="boolean"/>
60
60
  </attribute>
61
61
  </optional>
62
- <text/>
62
+ <ref name="XrefBody"/>
63
63
  </element>
64
64
  </define>
65
65
  <define name="Clause-Section">
data/grammars/isodoc.rng CHANGED
@@ -152,9 +152,7 @@
152
152
  <data type="boolean"/>
153
153
  </attribute>
154
154
  </optional>
155
- <oneOrMore>
156
- <ref name="PureTextElement"/>
157
- </oneOrMore>
155
+ <ref name="XrefBody"/>
158
156
  </element>
159
157
  </define>
160
158
  <define name="erefType">
@@ -188,6 +186,42 @@
188
186
  <ref name="PureTextElement"/>
189
187
  </oneOrMore>
190
188
  </define>
189
+ <define name="localityStack">
190
+ <element name="localityStack">
191
+ <optional>
192
+ <attribute name="connective">
193
+ <choice>
194
+ <value>and</value>
195
+ <value>or</value>
196
+ <value>from</value>
197
+ <value>to</value>
198
+ <value/>
199
+ </choice>
200
+ </attribute>
201
+ </optional>
202
+ <zeroOrMore>
203
+ <ref name="locality"/>
204
+ </zeroOrMore>
205
+ </element>
206
+ </define>
207
+ <define name="sourceLocalityStack">
208
+ <element name="sourceLocalityStack">
209
+ <optional>
210
+ <attribute name="connective">
211
+ <choice>
212
+ <value>and</value>
213
+ <value>or</value>
214
+ <value>from</value>
215
+ <value>to</value>
216
+ <value/>
217
+ </choice>
218
+ </attribute>
219
+ </optional>
220
+ <zeroOrMore>
221
+ <ref name="sourceLocality"/>
222
+ </zeroOrMore>
223
+ </element>
224
+ </define>
191
225
  <define name="ul">
192
226
  <element name="ul">
193
227
  <attribute name="id">
@@ -1098,6 +1132,16 @@
1098
1132
  </define>
1099
1133
  </include>
1100
1134
  <!-- end overrides -->
1135
+ <define name="image" combine="choice">
1136
+ <element name="svg">
1137
+ <oneOrMore>
1138
+ <choice>
1139
+ <text/>
1140
+ <ref name="AnyElement"/>
1141
+ </choice>
1142
+ </oneOrMore>
1143
+ </element>
1144
+ </define>
1101
1145
  <define name="MultilingualRenderingType">
1102
1146
  <choice>
1103
1147
  <value>common</value>
@@ -2631,4 +2675,30 @@
2631
2675
  </zeroOrMore>
2632
2676
  </element>
2633
2677
  </define>
2678
+ <define name="XrefBody">
2679
+ <zeroOrMore>
2680
+ <ref name="XrefTarget"/>
2681
+ </zeroOrMore>
2682
+ <oneOrMore>
2683
+ <ref name="PureTextElement"/>
2684
+ </oneOrMore>
2685
+ </define>
2686
+ <define name="XrefTarget">
2687
+ <element name="location">
2688
+ <attribute name="target">
2689
+ <data type="string">
2690
+ <param name="pattern">\i\c*|\c+#\c+</param>
2691
+ </data>
2692
+ </attribute>
2693
+ <attribute name="connective">
2694
+ <choice>
2695
+ <value>and</value>
2696
+ <value>or</value>
2697
+ <value>from</value>
2698
+ <value>to</value>
2699
+ <value/>
2700
+ </choice>
2701
+ </attribute>
2702
+ </element>
2703
+ </define>
2634
2704
  </grammar>
data/lib/relaton_bipm/bipm_bibliography.rb CHANGED
@@ -40,7 +40,8 @@ module RelatonBipm
40
40
  # @param agent [Mechanize]
41
41
  # @return [RelatonBipm::BipmBibliographicItem]
42
42
  def get_bipm(ref, agent) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
43
- url = "#{GH_ENDPOINT}#{ref.upcase.split.join '-'}.yaml"
43
+ rf = ref.sub(/(\d{2})\s\((\d{4})\)/, "\\2-\\1").sub(/\((\d{4})\)/, "\\1")
44
+ url = "#{GH_ENDPOINT}#{rf.downcase.split.join '/'}.yaml"
44
45
  resp = agent.get url
45
46
  check_response resp
46
47
  return unless resp.code == "200"
data/lib/relaton_bipm/processor.rb CHANGED
@@ -7,7 +7,7 @@ module RelatonBipm
7
7
  def initialize
8
8
  @short = :relaton_bipm
9
9
  @prefix = "BIPM"
10
- @defaultprefix = %r{^BIPM\s}
10
+ @defaultprefix = %r{^(?:BIPM|CCTF|CGPM|CIPM)\s}
11
11
  @idtype = "BIPM"
12
12
  end
13
13
 
data/lib/relaton_bipm/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module RelatonBipm
2
- VERSION = "1.10.3".freeze
2
+ VERSION = "1.11.2".freeze
3
3
  end
data/relaton_bipm.gemspec CHANGED
@@ -44,6 +44,6 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
44
44
  spec.add_development_dependency "webmock"
45
45
 
46
46
  spec.add_dependency "mechanize", "~> 2.8.0"
47
- spec.add_dependency "relaton-bib", "~> 1.10.1"
47
+ spec.add_dependency "relaton-bib", "~> 1.11.0"
48
48
  spec.add_dependency "serrano", "~> 1.0"
49
49
  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.10.3
4
+ version: 1.11.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-03-22 00:00:00.000000000 Z
11
+ date: 2022-05-22 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: byebug
@@ -128,14 +128,14 @@ dependencies:
128
128
  requirements:
129
129
  - - "~>"
130
130
  - !ruby/object:Gem::Version
131
- version: 1.10.1
131
+ version: 1.11.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.10.1
138
+ version: 1.11.0
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: serrano
141
141
  requirement: !ruby/object:Gem::Requirement