relaton-bib 1.17.2 → 1.18.1
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/README.adoc +1 -1
- data/docs/hash.adoc +123 -91
- data/grammars/basicdoc.rng +117 -25
- data/grammars/biblio-standoc.rng +44 -1
- data/grammars/biblio.rng +11 -0
- data/grammars/versions.json +5 -5
- data/lib/relaton_bib/contributor.rb +16 -7
- data/lib/relaton_bib/document_type.rb +1 -1
- data/lib/relaton_bib/full_name.rb +12 -14
- data/lib/relaton_bib/hash_converter.rb +24 -16
- data/lib/relaton_bib/image.rb +90 -0
- data/lib/relaton_bib/organization.rb +10 -2
- data/lib/relaton_bib/person.rb +17 -11
- data/lib/relaton_bib/renderer/bibxml.rb +12 -6
- data/lib/relaton_bib/version.rb +1 -1
- data/lib/relaton_bib/xml_parser.rb +32 -23
- data/lib/relaton_bib.rb +1 -0
- metadata +3 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 553a5db6c205eb58d6eb143ccb607b740a6e2a64520b8f1d46fb403294bbbadd
|
4
|
+
data.tar.gz: ce2a0d00f513a565c39f760c60cdf452bc3521b033f233a7c16b7e0beda9debe
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f550ee510f6f7b7e854c3c1045397de858fe20451d6d1adee25fc8f0d63734303516ee8c6be2f34c994d400e192752e4f44d4abc28e820982b483157c48f6968
|
7
|
+
data.tar.gz: f0b2f2ee6dff9714c4310fe5318c0a5d42077b51112a8dc00a5c1dd6a654f13290341981e1a6abeb9e08cffe0cedffa90f6da3fe0901396c07faa3b87a3528fb
|
data/.github/workflows/rake.yml
CHANGED
data/README.adoc
CHANGED
@@ -6,7 +6,7 @@ image:https://codeclimate.com/github/relaton/relaton-bib/badges/gpa.svg["Code Cl
|
|
6
6
|
image:https://img.shields.io/github/issues-pr-raw/relaton/relaton-bib.svg["Pull Requests", link="https://github.com/relaton/relaton-bib/pulls"]
|
7
7
|
image:https://img.shields.io/github/commits-since/relaton/relaton-bib/latest.svg["Commits since latest",link="https://github.com/relaton/relaton-bib/releases"]
|
8
8
|
|
9
|
-
|
9
|
+
RelatonBib is a Ruby gem that implements the https://github.com/metanorma/relaton-models#bibliography-uml-models[BibliographicItem model].
|
10
10
|
|
11
11
|
== Installation
|
12
12
|
|
data/docs/hash.adoc
CHANGED
@@ -88,9 +88,12 @@ biblionote:
|
|
88
88
|
home run record in 1998.
|
89
89
|
# document status has stage, and optional substage and iteration
|
90
90
|
docstatus:
|
91
|
-
stage:
|
92
|
-
|
93
|
-
|
91
|
+
stage:
|
92
|
+
value: '30'
|
93
|
+
abbreviation: CD
|
94
|
+
substage:
|
95
|
+
value: '00'
|
96
|
+
iteration: final
|
94
97
|
# date is an array, with mandatory type, and either an "on" value or a "from" and optional "to" value
|
95
98
|
date:
|
96
99
|
- type: issued
|
@@ -112,27 +115,35 @@ abstract:
|
|
112
115
|
# contributors are an array of entity/role pairs, where entity is either person or organization.
|
113
116
|
# The role is an array of type and description; it can be a an array of just string, which are treated
|
114
117
|
# as the type.
|
115
|
-
# Organisations have attributes name, url, abbreviation, subdivision, contacts, identifiers
|
118
|
+
# Organisations have attributes name, url, abbreviation, subdivision, contacts, identifiers, logo.
|
116
119
|
# Persons have attributes name, affiliation, contacts
|
117
|
-
# Person names have attributes
|
118
|
-
# Given has formatted_initials or forename.
|
120
|
+
# Person names have attributes abbreviation, surname, completename, initials, forename, additions, prefixes.
|
119
121
|
# Initials, forename, additions, prefixes are arrays.
|
120
122
|
# Name field values are either strings, or hashes, with content and language and script attributes.
|
121
123
|
# The language and script attribute can also be given on the name.
|
122
124
|
# Contacts are an array, containing either addresses, or other fields.
|
123
125
|
# Addresses are identified as hashes containing a city attribute; they can also contain a street
|
124
126
|
# (which is an array), a postcode, a state, and a country. The other contact fields
|
125
|
-
# are phones, emails, uris; they contain a type
|
127
|
+
# are phones, emails, uris; they can contain a type.
|
126
128
|
# Affiliations are an array, and they contains an organization, and an optional description.
|
127
129
|
# The affiliation description can be a single string, or a hash of content, language, script, and format.
|
128
130
|
contributor:
|
129
131
|
- organization:
|
130
|
-
name:
|
131
|
-
content: International Organization for Standardization
|
132
|
+
name: International Organization for Standardization
|
132
133
|
url: www.iso.org
|
133
|
-
abbreviation:
|
134
|
-
content: ISO
|
134
|
+
abbreviation: ISO
|
135
135
|
subdivision: division
|
136
|
+
logo:
|
137
|
+
image:
|
138
|
+
id: logo1
|
139
|
+
src: logo1.png
|
140
|
+
mimetype: image/png
|
141
|
+
filename: logo1.png
|
142
|
+
height: "100%"
|
143
|
+
width: "200"
|
144
|
+
alt: Logo 1
|
145
|
+
title: "Logo #1"
|
146
|
+
longdesc: Logo number 1
|
136
147
|
role:
|
137
148
|
type: publisher
|
138
149
|
description: Publisher role
|
@@ -143,10 +154,8 @@ contributor:
|
|
143
154
|
language: en
|
144
155
|
affiliation:
|
145
156
|
- organization:
|
146
|
-
name:
|
147
|
-
|
148
|
-
abbreviation:
|
149
|
-
content: IETF
|
157
|
+
name: IETF
|
158
|
+
abbreviation: IETF
|
150
159
|
identifier:
|
151
160
|
- type: uri
|
152
161
|
id: www.ietf.org
|
@@ -160,12 +169,11 @@ contributor:
|
|
160
169
|
country: Country
|
161
170
|
state: State
|
162
171
|
- phone: '223322'
|
172
|
+
type: mobile
|
163
173
|
role: author
|
164
174
|
- organization:
|
165
|
-
name:
|
166
|
-
|
167
|
-
abbreviation:
|
168
|
-
content: IETF
|
175
|
+
name: IETF
|
176
|
+
abbreviation: IETF
|
169
177
|
identifier:
|
170
178
|
- type: uri
|
171
179
|
id: www.ietf.org
|
@@ -173,24 +181,19 @@ contributor:
|
|
173
181
|
publisher
|
174
182
|
- person:
|
175
183
|
name:
|
176
|
-
|
177
|
-
|
178
|
-
|
179
|
-
|
180
|
-
|
181
|
-
content: A.
|
182
|
-
surname:
|
183
|
-
content: Bierman
|
184
|
+
abbreviation: AB
|
185
|
+
language: en
|
186
|
+
initial:
|
187
|
+
- A.
|
188
|
+
surname: Bierman
|
184
189
|
affiliation:
|
185
|
-
-
|
186
|
-
|
187
|
-
|
188
|
-
|
189
|
-
|
190
|
-
|
191
|
-
|
192
|
-
language: en
|
193
|
-
script: Latn
|
190
|
+
- organization:
|
191
|
+
name: IETF
|
192
|
+
abbreviation: IETF
|
193
|
+
description:
|
194
|
+
content: Affiliation description
|
195
|
+
language: en
|
196
|
+
script: Latn
|
194
197
|
identifier:
|
195
198
|
- type: uri
|
196
199
|
id: www.person.com
|
@@ -200,10 +203,8 @@ contributor:
|
|
200
203
|
# a "from" date, and an optional "to" date
|
201
204
|
copyright:
|
202
205
|
owner:
|
203
|
-
name:
|
204
|
-
|
205
|
-
abbreviation:
|
206
|
-
content: ISO
|
206
|
+
name: International Organization for Standardization
|
207
|
+
abbreviation: ISO
|
207
208
|
url: www.iso.org
|
208
209
|
from: '2014'
|
209
210
|
to: '2020'
|
@@ -215,26 +216,45 @@ link:
|
|
215
216
|
content: https://www.iso.org/obp/ui/#!iso:std:53798:en
|
216
217
|
- type: rss
|
217
218
|
content: https://www.iso.org/contents/data/standard/05/37/53798.detail.rss
|
218
|
-
# relations are an array of type, bibitem, and
|
219
|
+
# relations are an array of type, bibitem, locality, source_locality, and description.
|
219
220
|
# bibitem contains any of the attributes of a bibliographic item.
|
220
|
-
#
|
221
|
+
# locality is an array of locality_stack which is an array of hash of type,
|
222
|
+
# reference_from, and optionally reference_to
|
223
|
+
# source_locality is an array of source_locality_stack which is similar to locality_stack
|
224
|
+
# description is optional and contains content and optional format, language, ans script.
|
221
225
|
relation:
|
222
226
|
- type: updates
|
223
227
|
bibitem:
|
224
|
-
formattedref:
|
225
|
-
|
226
|
-
|
227
|
-
|
228
|
-
|
229
|
-
|
228
|
+
formattedref: ISO 19115:2003
|
229
|
+
locality:
|
230
|
+
locality_stack:
|
231
|
+
type: page
|
232
|
+
reference_from: '7'
|
233
|
+
reference_to: '10'
|
234
|
+
source_locality:
|
235
|
+
source_locality_stack:
|
236
|
+
- type: volume
|
237
|
+
reference_from: '1'
|
238
|
+
- type: chapter
|
239
|
+
reference_from: '2'
|
230
240
|
- type: updates
|
231
241
|
bibitem:
|
232
242
|
type: standard
|
233
243
|
formattedref:
|
234
244
|
content: ISO 19115:2003/Cor 1:2006
|
235
|
-
|
236
|
-
|
237
|
-
|
245
|
+
format: text/plain
|
246
|
+
description:
|
247
|
+
content: supersedes
|
248
|
+
format: text/plain
|
249
|
+
- type: partOf
|
250
|
+
bibitem:
|
251
|
+
title:
|
252
|
+
type: main
|
253
|
+
content: Book title
|
254
|
+
format: text/plain
|
255
|
+
# series are an array, containing a title, a type, a formattedref, a place,
|
256
|
+
# an organization (string), an abbreviation, a from, a to, a number, and a partnumber.
|
257
|
+
# The title is mandatory, and all other fields are optional.
|
238
258
|
# The series title, like the titles of bibliographic items, contains a type,
|
239
259
|
# content, and optional language, script, and format attributes.
|
240
260
|
# The abbreviation and formattedref are either a string,
|
@@ -257,22 +277,37 @@ series:
|
|
257
277
|
to: '2010-12-20'
|
258
278
|
number: serie1234
|
259
279
|
partnumber: part5678
|
260
|
-
-
|
261
|
-
|
262
|
-
|
263
|
-
|
264
|
-
|
280
|
+
- title:
|
281
|
+
- content: Series
|
282
|
+
language: en
|
283
|
+
script: Latn
|
284
|
+
- content: Séries
|
285
|
+
language: fr
|
286
|
+
script: Latn
|
287
|
+
format: text/plain
|
265
288
|
# medium contains a form, a size, and a scale
|
266
289
|
medium:
|
267
290
|
form: medium form
|
268
291
|
size: medium size
|
269
292
|
scale: medium scale
|
270
|
-
# place is an array of strings
|
271
|
-
|
272
|
-
#
|
293
|
+
# place is an array of strings or hashes. Can have name or city, region and country.
|
294
|
+
# Name or city is mandatory, region and country are optional.
|
295
|
+
# String and hash with name are equivalent.
|
296
|
+
place:
|
297
|
+
- bib place
|
298
|
+
- city: Geneva
|
299
|
+
region:
|
300
|
+
- name: Region
|
301
|
+
country:
|
302
|
+
- iso: CH
|
303
|
+
name: Switzelznd
|
304
|
+
recommended: true
|
305
|
+
# extent is an array, localities are an array of locality_stack
|
273
306
|
extent:
|
274
|
-
|
275
|
-
|
307
|
+
locality:
|
308
|
+
type: section
|
309
|
+
reference_from: '7'
|
310
|
+
reference_to: '10'
|
276
311
|
# accesslocation is an array of strings
|
277
312
|
accesslocation:
|
278
313
|
- accesslocation1
|
@@ -286,6 +321,12 @@ validity:
|
|
286
321
|
begins: '2010-10-10 12:21'
|
287
322
|
ends: '2011-02-03 18:30'
|
288
323
|
revision: '2011-03-04 09:00'
|
324
|
+
# keyword is an array of strings or hashes of content, language, script, and format
|
325
|
+
keyword:
|
326
|
+
- Keyword
|
327
|
+
- Key Word
|
328
|
+
# license is a string
|
329
|
+
license: License
|
289
330
|
----
|
290
331
|
|
291
332
|
== Metanorma structure (AsciiBib): nested definition list
|
@@ -545,8 +586,9 @@ medium::
|
|
545
586
|
scale::: medium scale
|
546
587
|
place:: bib place
|
547
588
|
extent::
|
548
|
-
|
549
|
-
|
589
|
+
locality:::
|
590
|
+
type::: section
|
591
|
+
reference_from::: 7
|
550
592
|
accesslocation::
|
551
593
|
. accesslocation1
|
552
594
|
. accesslocation2
|
@@ -588,7 +630,7 @@ type::: uri
|
|
588
630
|
id::: www.ietf.org
|
589
631
|
--
|
590
632
|
description:::: Affiliation description
|
591
|
-
|
633
|
+
address:::
|
592
634
|
street::::
|
593
635
|
. 8 Street St
|
594
636
|
city:::: City
|
@@ -596,8 +638,8 @@ id::: www.ietf.org
|
|
596
638
|
country:::: Country
|
597
639
|
state:::: State
|
598
640
|
contact:::
|
599
|
-
|
600
|
-
|
641
|
+
mobile:::: 223322
|
642
|
+
phone:::: mobile
|
601
643
|
role:: author
|
602
644
|
|
603
645
|
==== Contributor
|
@@ -716,7 +758,6 @@ docid::
|
|
716
758
|
docid::
|
717
759
|
type::: ABC
|
718
760
|
id::: 32784
|
719
|
-
type:: standard
|
720
761
|
----
|
721
762
|
|
722
763
|
can instead be represented as:
|
@@ -743,15 +784,11 @@ Embedded elements can also repeat:
|
|
743
784
|
==== Contributor
|
744
785
|
person::
|
745
786
|
contact:::
|
746
|
-
|
747
|
-
|
748
|
-
city:::: City
|
749
|
-
postcode:::: 123456
|
750
|
-
country:::: Country
|
751
|
-
state:::: State
|
787
|
+
phone:::: 223322
|
788
|
+
type:::: mobile
|
752
789
|
contact:::
|
753
|
-
|
754
|
-
|
790
|
+
phone:::: 332233
|
791
|
+
type:::: work
|
755
792
|
----
|
756
793
|
|
757
794
|
can instead be represented as:
|
@@ -761,14 +798,11 @@ can instead be represented as:
|
|
761
798
|
[%bibitem]
|
762
799
|
...
|
763
800
|
contributor.person.contact::
|
764
|
-
contributor.person.contact.
|
765
|
-
contributor.person.contact.
|
766
|
-
contributor.person.contact.postcode:: 123456
|
767
|
-
contributor.person.contact.country:: Country
|
768
|
-
contributor.person.contact.state:: State
|
801
|
+
contributor.person.contact.phone:: 223322
|
802
|
+
contributor.person.contact.type:: mobile
|
769
803
|
contributor.person.contact::
|
770
|
-
contributor.person.contact.
|
771
|
-
contributor.person.contact.
|
804
|
+
contributor.person.contact.phone:: 332233
|
805
|
+
contributor.person.contact.type:: work
|
772
806
|
----
|
773
807
|
|
774
808
|
The following is Metanorma AsciiDoc markup corresponding to the YAML
|
@@ -873,15 +907,13 @@ contributor.person.affiliation.organization.abbreviation:: IETF
|
|
873
907
|
contributor.person.affiliation.organization.identifier.type:: uri
|
874
908
|
contributor.person.affiliation.organization.identifier.id:: www.ietf.org
|
875
909
|
contributor.person.affiliation.description:: Affiliation description
|
876
|
-
contributor.person.
|
877
|
-
contributor.person.
|
878
|
-
contributor.person.
|
879
|
-
contributor.person.
|
880
|
-
contributor.person.
|
881
|
-
contributor.person.contact.
|
882
|
-
contributor.person.contact::
|
883
|
-
contributor.person.contact.type:: phone
|
884
|
-
contributor.person.contact.value:: 223322
|
910
|
+
contributor.person.address.street:: 8 Street St
|
911
|
+
contributor.person.address.city:: City
|
912
|
+
contributor.person.address.postcode:: 123456
|
913
|
+
contributor.person.address.country:: Country
|
914
|
+
contributor.person.address.state:: State
|
915
|
+
contributor.person.contact.phone:: 223322
|
916
|
+
contributor.person.contact.type:: mobile
|
885
917
|
contributor.role:: author
|
886
918
|
contributor::
|
887
919
|
contributor.organization.name:: IETF
|
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">
|
@@ -930,18 +1020,12 @@
|
|
930
1020
|
</optional>
|
931
1021
|
<optional>
|
932
1022
|
<attribute name="width">
|
933
|
-
<
|
934
|
-
<data type="int"/>
|
935
|
-
<value>auto</value>
|
936
|
-
</choice>
|
1023
|
+
<ref name="ImageSize"/>
|
937
1024
|
</attribute>
|
938
1025
|
</optional>
|
939
1026
|
<optional>
|
940
1027
|
<attribute name="height">
|
941
|
-
<
|
942
|
-
<data type="int"/>
|
943
|
-
<value>auto</value>
|
944
|
-
</choice>
|
1028
|
+
<ref name="ImageSize"/>
|
945
1029
|
</attribute>
|
946
1030
|
</optional>
|
947
1031
|
<optional>
|
@@ -956,6 +1040,14 @@
|
|
956
1040
|
</attribute>
|
957
1041
|
</optional>
|
958
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>
|
1050
|
+
</define>
|
959
1051
|
<define name="video">
|
960
1052
|
<element name="video">
|
961
1053
|
<attribute name="id">
|
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"/>
|
@@ -870,6 +878,9 @@
|
|
870
878
|
<optional>
|
871
879
|
<ref name="validity"/>
|
872
880
|
</optional>
|
881
|
+
<optional>
|
882
|
+
<ref name="depiction"/>
|
883
|
+
</optional>
|
873
884
|
</define>
|
874
885
|
<define name="btitle">
|
875
886
|
<element name="title">
|
data/grammars/versions.json
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
{
|
2
|
-
"relaton-models": "v1.2.
|
3
|
-
"basicdoc-models": "v1.
|
4
|
-
"metanorma-requirements-models": "v1.0.
|
2
|
+
"relaton-models": "v1.2.8",
|
3
|
+
"basicdoc-models": "v1.1.2",
|
4
|
+
"metanorma-requirements-models": "v1.0.1",
|
5
5
|
"relaton-model-ieee": "v1.0.1",
|
6
6
|
"relaton-model-iso": "v1.0.0",
|
7
7
|
"relaton-model-iec": "v1.0.0",
|
@@ -29,6 +29,6 @@
|
|
29
29
|
"relaton-model-oasis": "v1.0.1",
|
30
30
|
"relaton-model-jis": "v0.0.1",
|
31
31
|
"relaton-model-etsi": "v0.0.3",
|
32
|
-
"metanorma-model": "v1.2.
|
33
|
-
"date": "
|
32
|
+
"metanorma-model": "v1.2.11",
|
33
|
+
"date": "2024-01-04T03:55:06Z"
|
34
34
|
}
|
@@ -84,24 +84,33 @@ module RelatonBib
|
|
84
84
|
# @return [String] allowed "phone", "email" or "uri"
|
85
85
|
attr_reader :type
|
86
86
|
|
87
|
+
# @return [String, nil]
|
88
|
+
attr_reader :subtype
|
89
|
+
|
87
90
|
# @return [String]
|
88
91
|
attr_reader :value
|
89
92
|
|
90
93
|
# @param type [String] allowed "phone", "email" or "uri"
|
94
|
+
# @param subtype [String, nil] i.e. "fax", "mobile", "landline" for "phone"
|
95
|
+
# or "work", "personal" for "uri" type
|
91
96
|
# @param value [String]
|
92
|
-
def initialize(type:, value:)
|
93
|
-
@type
|
94
|
-
@
|
97
|
+
def initialize(type:, value:, subtype: nil)
|
98
|
+
@type = type
|
99
|
+
@subtype = subtype
|
100
|
+
@value = value
|
95
101
|
end
|
96
102
|
|
97
103
|
# @param builder [Nokogiri::XML::Document]
|
98
|
-
def to_xml(
|
99
|
-
|
104
|
+
def to_xml(builder)
|
105
|
+
node = builder.send type, value
|
106
|
+
node["type"] = subtype if subtype
|
100
107
|
end
|
101
108
|
|
102
109
|
# @return [Hash]
|
103
110
|
def to_hash
|
104
|
-
{ type => value }
|
111
|
+
hash = { type => value }
|
112
|
+
hash["type"] = subtype if subtype
|
113
|
+
hash
|
105
114
|
end
|
106
115
|
|
107
116
|
# @param prefix [String]
|
@@ -110,8 +119,8 @@ module RelatonBib
|
|
110
119
|
def to_asciibib(prefix = "", count = 1)
|
111
120
|
pref = prefix.empty? ? prefix : "#{prefix}."
|
112
121
|
out = count > 1 ? "#{pref}contact::\n" : ""
|
113
|
-
# out += "#{pref}contact.type:: #{type}\n"
|
114
122
|
out += "#{pref}contact.#{type}:: #{value}\n"
|
123
|
+
out += "#{pref}contact.type:: #{subtype}\n" if subtype
|
115
124
|
out
|
116
125
|
end
|
117
126
|
end
|
@@ -42,7 +42,7 @@ module RelatonBib
|
|
42
42
|
# @return [String] AsciiBib representation
|
43
43
|
#
|
44
44
|
def to_asciibib(prefix = "")
|
45
|
-
pref = prefix.empty? ? prefix : prefix
|
45
|
+
pref = prefix.empty? ? prefix : "#{prefix}."
|
46
46
|
pref += "doctype."
|
47
47
|
out = "#{pref}type:: #{@type}\n"
|
48
48
|
out += "#{pref}abbreviation:: #{@abbreviation}\n" if @abbreviation
|
@@ -7,35 +7,29 @@ module RelatonBib
|
|
7
7
|
attr_accessor :forename
|
8
8
|
|
9
9
|
# @return [Array<RelatonBib::LocalizedString>]
|
10
|
-
attr_accessor :initials
|
10
|
+
attr_accessor :initials, :addition, :prefix
|
11
11
|
|
12
12
|
# @return [RelatonBib::LocalizedString, nil]
|
13
|
-
attr_accessor :surname, :completename
|
14
|
-
|
15
|
-
# @return [Array<RelatonBib::LocalizedString>]
|
16
|
-
attr_accessor :addition
|
17
|
-
|
18
|
-
# @return [Array<RelatonBib::LocalizedString>]
|
19
|
-
attr_accessor :prefix
|
13
|
+
attr_accessor :surname, :abbreviation, :completename
|
20
14
|
|
21
15
|
#
|
22
16
|
# Initialize FullName instance
|
23
17
|
#
|
24
|
-
# @param surname [RelatonBib::LocalizedString, nil] surname or completename
|
25
|
-
#
|
18
|
+
# @param surname [RelatonBib::LocalizedString, nil] surname or completename should be present
|
19
|
+
# @param abbreviation [RelatonBib::LocalizedString, nil] abbreviation
|
26
20
|
# @param forename [Array<RelatonBib::Forename>] forename
|
27
21
|
# @param initials [RelatonBib::LocalizedString, String, nil] string of initials
|
28
22
|
# @param addition [Array<RelatonBib::LocalizedString>] array of additions
|
29
23
|
# @param prefix [Array<RelatonBib::LocalizedString>] array of prefixes
|
30
|
-
# @param completename [RelatonBib::LocalizedString, nil] completename or
|
31
|
-
# surname should be present
|
24
|
+
# @param completename [RelatonBib::LocalizedString, nil] completename or surname should be present
|
32
25
|
#
|
33
|
-
def initialize(**args)
|
26
|
+
def initialize(**args) # rubocop:disable Metrics/AbcSize
|
34
27
|
unless args[:surname] || args[:completename]
|
35
28
|
raise ArgumentError, "Should be given :surname or :completename"
|
36
29
|
end
|
37
30
|
|
38
31
|
@surname = args[:surname]
|
32
|
+
@abbreviation = args[:abbreviation]
|
39
33
|
@forename = args.fetch :forename, []
|
40
34
|
@initials = args[:initials].is_a?(String) ? LocalizedString.new(args[:initials]) : args[:initials]
|
41
35
|
@addition = args.fetch :addition, []
|
@@ -48,6 +42,7 @@ module RelatonBib
|
|
48
42
|
# @option opts [String] :lang language
|
49
43
|
def to_xml(**opts) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
|
50
44
|
opts[:builder].name do |builder|
|
45
|
+
builder.abbreviation { abbreviation.to_xml builder } if abbreviation
|
51
46
|
if completename
|
52
47
|
builder.completename { completename.to_xml builder }
|
53
48
|
else
|
@@ -69,6 +64,7 @@ module RelatonBib
|
|
69
64
|
# @return [Hash]
|
70
65
|
def to_hash # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity,Metrics/MethodLength
|
71
66
|
hash = {}
|
67
|
+
hash["abbreviation"] = abbreviation.to_hash if abbreviation
|
72
68
|
if forename.any? || initials
|
73
69
|
hash["given"] = {}
|
74
70
|
hash["given"]["forename"] = single_element_array(forename) if forename&.any?
|
@@ -86,8 +82,10 @@ module RelatonBib
|
|
86
82
|
def to_asciibib(pref) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
|
87
83
|
prf = pref.empty? ? pref : "#{pref}."
|
88
84
|
prf += "name"
|
85
|
+
out = ""
|
86
|
+
out += abbreviation.to_asciibib "#{prf}.abbreviation" if abbreviation
|
89
87
|
given = "#{pref}.given"
|
90
|
-
out
|
88
|
+
out += forename.map do |fn|
|
91
89
|
fn.to_asciibib given, forename.size
|
92
90
|
end.join
|
93
91
|
out += initials.to_asciibib "#{given}.formatted-initials" if initials
|
@@ -232,12 +232,14 @@ module RelatonBib
|
|
232
232
|
LocalizedString.new sd
|
233
233
|
end
|
234
234
|
org[:contact] = contacts_hash_to_bib(org)
|
235
|
+
org[:logo] = Image.new(**org[:logo][:image]) if org[:logo]
|
235
236
|
org
|
236
237
|
end
|
237
238
|
|
238
239
|
def person_hash_to_bib(person)
|
239
240
|
Person.new(
|
240
241
|
name: fullname_hash_to_bib(person),
|
242
|
+
credential: RelatonBib.array(person[:credential]),
|
241
243
|
affiliation: affiliation_hash_to_bib(person),
|
242
244
|
contact: contacts_hash_to_bib(person),
|
243
245
|
identifier: person_identifiers_hash_to_bib(person),
|
@@ -248,6 +250,7 @@ module RelatonBib
|
|
248
250
|
n = person[:name]
|
249
251
|
fname, inits = given_hash_to_bib n[:given] || n # `n` is for backward compatibility
|
250
252
|
FullName.new(
|
253
|
+
abbreviation: localizedstring(n[:abbreviation]),
|
251
254
|
forename: fname, initials: inits,
|
252
255
|
addition: RelatonBib.array(n[:addition])&.map { |f| localizedstring(f) },
|
253
256
|
prefix: RelatonBib.array(n[:prefix])&.map { |f| localizedstring(f) },
|
@@ -289,35 +292,40 @@ module RelatonBib
|
|
289
292
|
end
|
290
293
|
FormattedString.new(**cnt)
|
291
294
|
end
|
292
|
-
name = LocalizedString.new(a[:name][:content], a[:name][:language], a[:name][:script]) if a[:name]
|
293
295
|
Affiliation.new(
|
294
296
|
organization: Organization.new(**org_hash_to_bib(a[:organization])),
|
295
|
-
description: a[:description], name: name
|
297
|
+
description: a[:description], name: localizedstring(a[:name])
|
296
298
|
)
|
297
299
|
end
|
298
300
|
end
|
299
301
|
|
300
|
-
def contacts_hash_to_bib(entity) # rubocop:disable Metrics/AbcSize,
|
302
|
+
def contacts_hash_to_bib(entity) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength,Metrics/CyclomaticComplexity
|
301
303
|
return [] unless entity[:contact]
|
302
304
|
|
303
305
|
RelatonBib.array(entity[:contact]).map do |a|
|
304
|
-
|
305
|
-
|
306
|
-
|
307
|
-
|
308
|
-
)
|
309
|
-
|
310
|
-
|
311
|
-
|
312
|
-
|
313
|
-
|
314
|
-
else
|
315
|
-
type, value = a.flatten
|
316
|
-
RelatonBib::Contact.new(type: type.to_s, value: value)
|
306
|
+
type, value = a.reject { |k, _| k == :type }.flatten
|
307
|
+
case type
|
308
|
+
when :street, :city, :state, :country, :postcode # it's for old version compatibility, should be removed in the future
|
309
|
+
a[:street] = RelatonBib.array(a[:street])
|
310
|
+
Address.new(**a)
|
311
|
+
when :address then create_address(a[:address])
|
312
|
+
when :phone, :email, :uri
|
313
|
+
Contact.new(type: type.to_s, value: value, subtype: a[:type])
|
314
|
+
else # it's for old version compatibility, should be removed in the future
|
315
|
+
Contact.new(**a)
|
317
316
|
end
|
318
317
|
end
|
319
318
|
end
|
320
319
|
|
320
|
+
def create_address(adr)
|
321
|
+
if adr.is_a?(Hash)
|
322
|
+
adr[:street] = RelatonBib.array(adr[:street])
|
323
|
+
Address.new(**adr)
|
324
|
+
else
|
325
|
+
Address.new(formatted_address: adr)
|
326
|
+
end
|
327
|
+
end
|
328
|
+
|
321
329
|
# @param ret [Hash]
|
322
330
|
def copyright_hash_to_bib(ret)
|
323
331
|
return unless ret[:copyright]
|
@@ -0,0 +1,90 @@
|
|
1
|
+
module RelatonBib
|
2
|
+
class Image
|
3
|
+
# @return [String]
|
4
|
+
attr_reader :id, :src, :mimetype, :filename, :width, :height, :alt, :title, :longdesc
|
5
|
+
|
6
|
+
#
|
7
|
+
# Initializes a new Image object.
|
8
|
+
#
|
9
|
+
# @param id [String] the ID of the image
|
10
|
+
# @param src [String] the source URL of the image
|
11
|
+
# @param mimetype [String] the MIME type of the image
|
12
|
+
# @param args [Hash] additional arguments
|
13
|
+
# @option args [String] :filename the filename of the image
|
14
|
+
# @option args [String] :width the width of the image
|
15
|
+
# @option args [String] :height the height of the image
|
16
|
+
# @option args [String] :alt the alternative text for the image
|
17
|
+
# @option args [String] :title the title of the image
|
18
|
+
# @option args [String] :longdesc the long description of the image
|
19
|
+
#
|
20
|
+
def initialize(id:, src:, mimetype:, **args)
|
21
|
+
@id = id
|
22
|
+
@src = src
|
23
|
+
@mimetype = mimetype
|
24
|
+
@filename = args[:filename]
|
25
|
+
@width = args[:width]
|
26
|
+
@height = args[:height]
|
27
|
+
@alt = args[:alt]
|
28
|
+
@title = args[:title]
|
29
|
+
@longdesc = args[:longdesc]
|
30
|
+
end
|
31
|
+
|
32
|
+
#
|
33
|
+
# Converts the image object to XML format.
|
34
|
+
#
|
35
|
+
# @param [Nokogiri::XML::Builder] builder The XML builder object.
|
36
|
+
#
|
37
|
+
# @return [void]
|
38
|
+
#
|
39
|
+
def to_xml(builder) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength
|
40
|
+
builder.image do
|
41
|
+
builder.parent[:id] = id
|
42
|
+
builder.parent[:src] = src
|
43
|
+
builder.parent[:mimetype] = mimetype
|
44
|
+
builder.parent[:filename] = filename if filename
|
45
|
+
builder.parent[:width] = width if width
|
46
|
+
builder.parent[:height] = height if height
|
47
|
+
builder.parent[:alt] = alt if alt
|
48
|
+
builder.parent[:title] = title if title
|
49
|
+
builder.parent[:longdesc] = longdesc if longdesc
|
50
|
+
end
|
51
|
+
end
|
52
|
+
|
53
|
+
#
|
54
|
+
# Converts the Image object to a hash representation.
|
55
|
+
#
|
56
|
+
# @return [Hash] The hash representation of the Image object.
|
57
|
+
#
|
58
|
+
def to_hash # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity
|
59
|
+
hash = { "image" => { "id" => id, "src" => src, "mimetype" => mimetype } }
|
60
|
+
hash["image"]["filename"] = filename if filename
|
61
|
+
hash["image"]["width"] = width if width
|
62
|
+
hash["image"]["height"] = height if height
|
63
|
+
hash["image"]["alt"] = alt if alt
|
64
|
+
hash["image"]["title"] = title if title
|
65
|
+
hash["image"]["longdesc"] = longdesc if longdesc
|
66
|
+
hash
|
67
|
+
end
|
68
|
+
|
69
|
+
#
|
70
|
+
# Converts the image object to AsciiBib format.
|
71
|
+
#
|
72
|
+
# @param prefix [String] The prefix to be added to the AsciiBib output.
|
73
|
+
#
|
74
|
+
# @return [String] The image object converted to AsciiBib format.
|
75
|
+
#
|
76
|
+
def to_asciibib(prefix = "") # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity,Metrics/MethodLength
|
77
|
+
pref = prefix.empty? ? "image." : "#{prefix}.image."
|
78
|
+
out = "#{pref}id:: #{id}\n"
|
79
|
+
out += "#{pref}src:: #{src}\n"
|
80
|
+
out += "#{pref}mimetype:: #{mimetype}\n"
|
81
|
+
out += "#{pref}filename:: #{filename}\n" if filename
|
82
|
+
out += "#{pref}width:: #{width}\n" if width
|
83
|
+
out += "#{pref}height:: #{height}\n" if height
|
84
|
+
out += "#{pref}alt:: #{alt}\n" if alt
|
85
|
+
out += "#{pref}title:: #{title}\n" if title
|
86
|
+
out += "#{pref}longdesc:: #{longdesc}\n" if longdesc
|
87
|
+
out
|
88
|
+
end
|
89
|
+
end
|
90
|
+
end
|
@@ -61,12 +61,16 @@ module RelatonBib
|
|
61
61
|
# @return [Array<RelatonBib::OrgIdentifier>]
|
62
62
|
attr_reader :identifier
|
63
63
|
|
64
|
+
# @return [RelatonBib::Image, nil]
|
65
|
+
attr_reader :logo
|
66
|
+
|
64
67
|
# @param name [String, Hash, Array<String, Hash>]
|
65
68
|
# @param abbreviation [RelatoBib::LocalizedString, String]
|
66
69
|
# @param subdivision [Array<RelatoBib::LocalizedString>]
|
67
70
|
# @param url [String]
|
68
71
|
# @param identifier [Array<RelatonBib::OrgIdentifier>]
|
69
72
|
# @param contact [Array<RelatonBib::Address, RelatonBib::Contact>]
|
73
|
+
# @param logo [RelatonBib::Image, nil]
|
70
74
|
def initialize(**args) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
|
71
75
|
raise ArgumentError, "missing keyword: name" unless args[:name]
|
72
76
|
|
@@ -83,6 +87,7 @@ module RelatonBib
|
|
83
87
|
localized_string sd
|
84
88
|
end
|
85
89
|
@identifier = args.fetch(:identifier, [])
|
90
|
+
@logo = args[:logo]
|
86
91
|
end
|
87
92
|
|
88
93
|
# @param opts [Hash]
|
@@ -100,24 +105,26 @@ module RelatonBib
|
|
100
105
|
builder.uri url if uri
|
101
106
|
identifier.each { |identifier| identifier.to_xml builder }
|
102
107
|
super builder
|
108
|
+
builder.logo { |b| logo.to_xml b } if logo
|
103
109
|
end
|
104
110
|
end
|
105
111
|
|
106
112
|
# @return [Hash]
|
107
|
-
def to_hash # rubocop:disable Metrics/AbcSize
|
113
|
+
def to_hash # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity
|
108
114
|
hash = { "name" => single_element_array(name) }
|
109
115
|
hash["abbreviation"] = abbreviation.to_hash if abbreviation
|
110
116
|
hash["identifier"] = single_element_array(identifier) if identifier&.any?
|
111
117
|
if subdivision&.any?
|
112
118
|
hash["subdivision"] = single_element_array(subdivision)
|
113
119
|
end
|
120
|
+
hash["logo"] = logo.to_hash if logo
|
114
121
|
{ "organization" => hash.merge(super) }
|
115
122
|
end
|
116
123
|
|
117
124
|
# @param prefix [String]
|
118
125
|
# @param count [Integer]
|
119
126
|
# @return [String]
|
120
|
-
def to_asciibib(prefix = "", count = 1) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength
|
127
|
+
def to_asciibib(prefix = "", count = 1) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
|
121
128
|
pref = prefix.sub(/\*$/, "organization")
|
122
129
|
out = count > 1 ? "#{pref}::\n" : ""
|
123
130
|
name.each { |n| out += n.to_asciibib "#{pref}.name", name.size }
|
@@ -128,6 +135,7 @@ module RelatonBib
|
|
128
135
|
end
|
129
136
|
identifier.each { |n| out += n.to_asciibib pref, identifier.size }
|
130
137
|
out += super pref
|
138
|
+
out += logo.to_asciibib "#{pref}.logo" if logo
|
131
139
|
out
|
132
140
|
end
|
133
141
|
|
data/lib/relaton_bib/person.rb
CHANGED
@@ -66,6 +66,9 @@ module RelatonBib
|
|
66
66
|
# @return [RelatonBib::FullName]
|
67
67
|
attr_accessor :name
|
68
68
|
|
69
|
+
# @return [Array<String>]
|
70
|
+
attr_reader :credential
|
71
|
+
|
69
72
|
# @return [Array<RelatonBib::Affiliation>]
|
70
73
|
attr_accessor :affiliation
|
71
74
|
|
@@ -73,24 +76,27 @@ module RelatonBib
|
|
73
76
|
attr_accessor :identifier
|
74
77
|
|
75
78
|
# @param name [RelatonBib::FullName]
|
79
|
+
# @param credential [Array<String>]
|
76
80
|
# @param affiliation [Array<RelatonBib::Affiliation>]
|
77
81
|
# @param contact [Array<RelatonBib::Address, RelatonBib::Contact>]
|
78
82
|
# @param identifier [Array<RelatonBib::PersonIdentifier>]
|
79
83
|
# @param url [String, nil]
|
80
|
-
def initialize(name:,
|
81
|
-
|
82
|
-
super(contact: contact, url: url)
|
84
|
+
def initialize(name:, **args)
|
85
|
+
contact = args[:contact] || []
|
86
|
+
super(contact: contact, url: args[:url])
|
83
87
|
@name = name
|
84
|
-
@
|
85
|
-
@
|
88
|
+
@credential = args[:credential] || []
|
89
|
+
@affiliation = args[:affiliation] || []
|
90
|
+
@identifier = args[:identifier] || []
|
86
91
|
end
|
87
92
|
|
88
93
|
# @param opts [Hash]
|
89
94
|
# @option opts [Nokogiri::XML::Builder] :builder XML builder
|
90
95
|
# @option opts [String, Symbol] :lang language
|
91
|
-
def to_xml(**opts)
|
96
|
+
def to_xml(**opts) # rubocop:disable Metrics/AbcSize
|
92
97
|
opts[:builder].person do |builder|
|
93
98
|
name.to_xml(**opts)
|
99
|
+
credential.each { |c| builder.credential c }
|
94
100
|
affiliation.each { |a| a.to_xml(**opts) }
|
95
101
|
identifier.each { |id| id.to_xml builder }
|
96
102
|
contact.each { |contact| contact.to_xml builder }
|
@@ -98,12 +104,11 @@ module RelatonBib
|
|
98
104
|
end
|
99
105
|
|
100
106
|
# @return [Hash]
|
101
|
-
def to_hash
|
107
|
+
def to_hash # rubocop:disable Metrics/AbcSize
|
102
108
|
hash = { "name" => name.to_hash }
|
103
|
-
if
|
104
|
-
|
105
|
-
|
106
|
-
hash["identifier"] = single_element_array(identifier) if identifier&.any?
|
109
|
+
hash["credential"] = credential if credential.any?
|
110
|
+
hash["affiliation"] = affiliation.map &:to_hash if affiliation.any?
|
111
|
+
hash["identifier"] = identifier.map &:to_hash if identifier.any?
|
107
112
|
{ "person" => hash.merge(super) }
|
108
113
|
end
|
109
114
|
|
@@ -114,6 +119,7 @@ module RelatonBib
|
|
114
119
|
pref = prefix.sub(/\*$/, "person")
|
115
120
|
out = count > 1 ? "#{pref}::\n" : ""
|
116
121
|
out += name.to_asciibib pref
|
122
|
+
credential.each { |c| out += "#{pref}.credential:: #{c}\n" }
|
117
123
|
affiliation.each { |af| out += af.to_asciibib pref, affiliation.size }
|
118
124
|
identifier.each { |id| out += id.to_asciibib pref, identifier.size }
|
119
125
|
out += super pref
|
@@ -124,12 +124,10 @@ module RelatonBib
|
|
124
124
|
# @param [RelatonBib::ContributionInfo] contrib contributor
|
125
125
|
#
|
126
126
|
def render_address(builder, contrib) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
|
127
|
-
|
128
|
-
|
129
|
-
# end
|
130
|
-
if contrib.entity.contact.any?
|
127
|
+
address, contact = address_contact contrib.entity.contact
|
128
|
+
if address || contact.any?
|
131
129
|
builder.address do |xml|
|
132
|
-
address = contrib.entity.contact.detect { |cn| cn.is_a? Address }
|
130
|
+
# address = contrib.entity.contact.detect { |cn| cn.is_a? Address }
|
133
131
|
if address
|
134
132
|
xml.postal do
|
135
133
|
xml.city address.city if address.city
|
@@ -139,11 +137,19 @@ module RelatonBib
|
|
139
137
|
xml.street address.street[0] if address.street.any?
|
140
138
|
end
|
141
139
|
end
|
142
|
-
render_contact xml,
|
140
|
+
render_contact xml, contact
|
143
141
|
end
|
144
142
|
end
|
145
143
|
end
|
146
144
|
|
145
|
+
def address_contact(contact) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
|
146
|
+
addr = contact.detect do |c|
|
147
|
+
c.is_a?(Address) && (c.city || c.postcode || c.country || c.state || c.street.any?)
|
148
|
+
end
|
149
|
+
cont = contact.select { |c| c.is_a?(Contact) }
|
150
|
+
[addr, cont]
|
151
|
+
end
|
152
|
+
|
147
153
|
#
|
148
154
|
# Render contact
|
149
155
|
#
|
data/lib/relaton_bib/version.rb
CHANGED
@@ -379,13 +379,20 @@ module RelatonBib
|
|
379
379
|
end
|
380
380
|
subdiv = org.xpath("subdivision").map &:text
|
381
381
|
contact = parse_contact org
|
382
|
+
logo = fetch_image org.at("./logo/image")
|
382
383
|
Organization.new(
|
383
384
|
name: names, abbreviation: org.at("abbreviation")&.text,
|
384
385
|
subdivision: subdiv, # url: org.at("uri")&.text,
|
385
|
-
identifier: identifier, contact: contact
|
386
|
+
identifier: identifier, contact: contact, logo: logo
|
386
387
|
)
|
387
388
|
end
|
388
389
|
|
390
|
+
def fetch_image(elm)
|
391
|
+
return unless elm
|
392
|
+
|
393
|
+
Image.new(**elm.to_h.transform_keys(&:to_sym))
|
394
|
+
end
|
395
|
+
|
389
396
|
#
|
390
397
|
# Parse person from XML
|
391
398
|
#
|
@@ -403,25 +410,27 @@ module RelatonBib
|
|
403
410
|
PersonIdentifier.new pi[:type], pi.text
|
404
411
|
end
|
405
412
|
|
406
|
-
cname = localized_string person.at("./name/completename")
|
407
|
-
sname = localized_string person.at("./name/surname")
|
408
|
-
|
409
|
-
name = FullName.new(
|
410
|
-
completename: cname, surname: sname,
|
411
|
-
initials: parse_initials(person),
|
412
|
-
forename: parse_forename(person),
|
413
|
-
addition: name_part(person, "addition"),
|
414
|
-
prefix: name_part(person, "prefix")
|
415
|
-
)
|
416
|
-
|
417
413
|
Person.new(
|
418
|
-
name: name,
|
414
|
+
name: full_name(person.at("./name")),
|
415
|
+
credential: person.xpath("./credential").map(&:text),
|
419
416
|
affiliation: affiliations,
|
420
417
|
contact: contact,
|
421
418
|
identifier: identifier,
|
422
419
|
)
|
423
420
|
end
|
424
421
|
|
422
|
+
def full_name(name)
|
423
|
+
cname = localized_string name.at("./completename")
|
424
|
+
sname = localized_string name.at("./surname")
|
425
|
+
abbreviation = localized_string name.at("./abbreviation")
|
426
|
+
|
427
|
+
FullName.new(
|
428
|
+
completename: cname, surname: sname, abbreviation: abbreviation,
|
429
|
+
initials: parse_initials(name), forename: parse_forename(name),
|
430
|
+
addition: name_part(name, "addition"), prefix: name_part(name, "prefix")
|
431
|
+
)
|
432
|
+
end
|
433
|
+
|
425
434
|
def fetch_affiliation(elm)
|
426
435
|
org = get_org elm.at("./organization")
|
427
436
|
desc = elm.xpath("./description").map do |e|
|
@@ -447,7 +456,7 @@ module RelatonBib
|
|
447
456
|
#
|
448
457
|
def parse_contact(contrib)
|
449
458
|
contrib.xpath("./address|./phone|./email|./uri").map do |c|
|
450
|
-
parse_address(c) || Contact.new(type: c.name, value: c.text)
|
459
|
+
parse_address(c) || Contact.new(type: c.name, value: c.text, subtype: c[:type])
|
451
460
|
end
|
452
461
|
end
|
453
462
|
|
@@ -474,23 +483,23 @@ module RelatonBib
|
|
474
483
|
#
|
475
484
|
# Parse initials
|
476
485
|
#
|
477
|
-
# @param [Nokogiri::XML::Element]
|
486
|
+
# @param [Nokogiri::XML::Element] name person name element
|
478
487
|
#
|
479
488
|
# @return [RelatonBib::LocalizedString, nil] initials
|
480
489
|
#
|
481
|
-
def parse_initials(
|
482
|
-
localized_string
|
490
|
+
def parse_initials(name)
|
491
|
+
localized_string name.at("./formatted-initials")
|
483
492
|
end
|
484
493
|
|
485
494
|
#
|
486
495
|
# Parse forename
|
487
496
|
#
|
488
|
-
# @param [Nokogiri::XML::Element]
|
497
|
+
# @param [Nokogiri::XML::Element] name person name element
|
489
498
|
#
|
490
499
|
# @return [Array<RelatonBib::Forename>] forenames
|
491
500
|
#
|
492
|
-
def parse_forename(
|
493
|
-
|
501
|
+
def parse_forename(name)
|
502
|
+
name.xpath("./forename").map do |np|
|
494
503
|
args = np.attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v.to_s }
|
495
504
|
args[:content] = np.text
|
496
505
|
Forename.new(**args)
|
@@ -500,13 +509,13 @@ module RelatonBib
|
|
500
509
|
#
|
501
510
|
# Parse name part
|
502
511
|
#
|
503
|
-
# @param [Nokogiri::XML::Element]
|
512
|
+
# @param [Nokogiri::XML::Element] name person name element
|
504
513
|
# @param [String] part name part
|
505
514
|
#
|
506
515
|
# @return [Array<RelatonBib::LocalizedString>] name parts
|
507
516
|
#
|
508
|
-
def name_part(
|
509
|
-
|
517
|
+
def name_part(name, part)
|
518
|
+
name.xpath("./#{part}").map { |np| localized_string np }
|
510
519
|
end
|
511
520
|
|
512
521
|
# @param item [Nokogiri::XML::Element]
|
data/lib/relaton_bib.rb
CHANGED
@@ -10,6 +10,7 @@ require "relaton_bib/forename"
|
|
10
10
|
require "relaton_bib/full_name"
|
11
11
|
require "relaton_bib/contributor"
|
12
12
|
require "relaton_bib/document_type"
|
13
|
+
require "relaton_bib/image"
|
13
14
|
require "relaton_bib/bibliographic_item"
|
14
15
|
require "relaton_bib/hit_collection"
|
15
16
|
require "relaton_bib/hit"
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: relaton-bib
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.
|
4
|
+
version: 1.18.1
|
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-12 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: addressable
|
@@ -138,6 +138,7 @@ files:
|
|
138
138
|
- lib/relaton_bib/hit.rb
|
139
139
|
- lib/relaton_bib/hit_collection.rb
|
140
140
|
- lib/relaton_bib/ics.rb
|
141
|
+
- lib/relaton_bib/image.rb
|
141
142
|
- lib/relaton_bib/localized_string.rb
|
142
143
|
- lib/relaton_bib/medium.rb
|
143
144
|
- lib/relaton_bib/organization.rb
|