Skip to content

Commit 630c740

Browse files
svogt0511svogt0511
authored
Merge pull request #78 from datacite/pb88-geolocation
Testing poodle for geoLocation support
2 parents dabedd1 + d078d7f commit 630c740

10 files changed

Lines changed: 537 additions & 19 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ on:
66
required: true
77
MDS_PASSWORD:
88
required: true
9-
CC_TEST_REPORTER_ID:
10-
required: true
119
jobs:
1210
test:
1311
runs-on: ubuntu-latest
@@ -46,7 +44,3 @@ jobs:
4644
# bundle exec rubocop
4745
bundle exec rspec
4846
echo $?
49-
- name: Publish code coverage
50-
uses: paambaati/codeclimate-action@v3.1.1
51-
env:
52-
CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}

‎Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ gem "oj_mimic_json", "~> 1.0", ">= 1.0.1"
99
gem "equivalent-xml", "~> 0.6.0"
1010
gem "nokogiri", ">= 1.10.4"
1111
gem "iso8601", "~> 0.9.0"
12-
gem "bolognese", "~> 2.3.2"
12+
gem "bolognese", "~> 2.3.9"
1313
gem "maremma", ">= 4.9.8"
1414
gem "faraday", ">= 2.0", "< 3.0.0"
1515
gem "base32-url", "~> 0.5"

‎Gemfile.lock‎

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ GEM
8989
bigdecimal (3.1.8)
9090
binding_of_caller (1.0.0)
9191
debug_inspector (>= 0.0.1)
92-
bolognese (2.3.2)
92+
bolognese (2.3.9)
9393
activesupport (>= 4.2.5)
9494
benchmark_methods (~> 0.7)
9595
bibtex-ruby (>= 5.1.0)
@@ -126,8 +126,13 @@ GEM
126126
rack-test (>= 0.6.3)
127127
regexp_parser (>= 1.5, < 3.0)
128128
xpath (~> 3.2)
129-
citeproc (1.0.10)
129+
citeproc (1.1.0)
130+
date
131+
forwardable
132+
json
130133
namae (~> 1.0)
134+
observer (< 1.0)
135+
open-uri (< 1.0)
131136
citeproc-ruby (1.1.14)
132137
citeproc (~> 1.0, >= 1.0.9)
133138
csl (~> 1.6)
@@ -152,14 +157,15 @@ GEM
152157
docile (1.1.5)
153158
dotenv (2.7.6)
154159
drb (2.2.1)
155-
ebnf (2.5.0)
160+
ebnf (2.6.0)
161+
base64 (~> 0.2)
156162
htmlentities (~> 4.3)
157163
rdf (~> 3.3)
158164
scanf (~> 1.0)
159165
sxp (~> 2.0)
160166
unicode-types (~> 1.8)
161-
edtf (3.1.1)
162-
activesupport (>= 3.0, < 8.0)
167+
edtf (3.2.0)
168+
activesupport (>= 3.0, < 9.0)
163169
equivalent-xml (0.6.0)
164170
nokogiri (>= 1.4.3)
165171
erubi (1.13.0)
@@ -184,6 +190,7 @@ GEM
184190
net-http
185191
ffi (1.17.0-arm64-darwin)
186192
ffi (1.17.0-x86_64-linux-gnu)
193+
forwardable (1.3.3)
187194
gender_detector (0.1.2)
188195
unicode_utils (>= 1.3.0)
189196
git (1.8.1)
@@ -209,7 +216,7 @@ GEM
209216
rack (>= 2.2, < 4)
210217
rdf (~> 3.3)
211218
rexml (~> 3.2)
212-
json-ld-preloaded (3.3.1)
219+
json-ld-preloaded (3.3.2)
213220
json-ld (~> 3.3)
214221
rdf (~> 3.3)
215222
jsonlint (0.3.0)
@@ -253,11 +260,11 @@ GEM
253260
nokogiri (~> 1.16, >= 1.16.2)
254261
oj (>= 2.8.3)
255262
oj_mimic_json (~> 1.0, >= 1.0.1)
256-
matrix (0.4.2)
263+
matrix (0.4.3)
257264
mini_mime (1.0.3)
258265
minitest (5.14.4)
259266
msgpack (1.4.5)
260-
multi_json (1.15.0)
267+
multi_json (1.17.0)
261268
multipart-post (2.4.1)
262269
namae (1.2.0)
263270
racc (~> 1.7)
@@ -279,9 +286,15 @@ GEM
279286
racc (~> 1.4)
280287
nokogiri (1.16.7-x86_64-linux)
281288
racc (~> 1.4)
289+
observer (0.1.2)
282290
oj (3.11.8)
283291
oj_mimic_json (1.0.1)
284-
optimist (3.2.0)
292+
open-uri (0.5.0)
293+
stringio
294+
time
295+
uri
296+
optimist (3.2.1)
297+
ostruct (0.6.3)
285298
parallel (1.20.1)
286299
parser (3.0.3.2)
287300
ast (~> 2.4.1)
@@ -340,10 +353,13 @@ GEM
340353
rb-inotify (0.11.1)
341354
ffi (~> 1.0)
342355
rchardet (1.8.0)
343-
rdf (3.3.2)
356+
rdf (3.3.4)
344357
bcp47_spec (~> 0.2)
345358
bigdecimal (~> 3.1, >= 3.1.5)
346359
link_header (~> 0.0, >= 0.0.8)
360+
logger (~> 1.5)
361+
ostruct (~> 0.6)
362+
readline (~> 0.0)
347363
rdf-rdfxml (3.3.0)
348364
builder (~> 3.2, >= 3.2.4)
349365
htmlentities (~> 4.3)
@@ -359,6 +375,8 @@ GEM
359375
rexml (~> 3.2)
360376
rdoc (6.7.0)
361377
psych (>= 4.0.0)
378+
readline (0.0.4)
379+
reline
362380
regexp_parser (2.1.1)
363381
reline (0.5.10)
364382
io-console (~> 0.5)
@@ -417,13 +435,15 @@ GEM
417435
matrix (~> 0.4)
418436
rdf (~> 3.3)
419437
thor (1.3.2)
438+
time (0.4.1)
439+
date
420440
timeout (0.4.1)
421441
tzinfo (2.0.6)
422442
concurrent-ruby (~> 1.0)
423443
tzinfo-data (1.2021.5)
424444
tzinfo (>= 1.0.0)
425445
unicode-display_width (1.6.1)
426-
unicode-types (1.10.0)
446+
unicode-types (1.11.0)
427447
unicode_utils (1.4.0)
428448
uri (0.13.1)
429449
useragent (0.16.10)
@@ -450,7 +470,7 @@ DEPENDENCIES
450470
base64 (~> 0.2.0)
451471
better_errors
452472
binding_of_caller
453-
bolognese (~> 2.3.2)
473+
bolognese (~> 2.3.9)
454474
bootsnap (>= 1.1.0)
455475
byebug
456476
cancancan (~> 2.0)

‎spec/fixtures/files/datacite-geolocation.xml‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://datacite.org/schema/kernel-4" xsi:schemaLocation="http://datacite.org/schema/kernel-4 http://schema.datacite.org/meta/kernel-4/metadata.xsd">
3+
<identifier identifierType="DOI">10.14454/ey2x-5w17</identifier>
4+
<creators>
5+
<creator>
6+
<creatorName>Fenner, Martin</creatorName>
7+
<givenName>Martin</givenName>
8+
<familyName>Fenner</familyName>
9+
<nameIdentifier schemeURI="http://orcid.org/" nameIdentifierScheme="ORCID">0000-0003-1419-2405</nameIdentifier>
10+
</creator>
11+
</creators>
12+
<titles>
13+
<title>Eating your own Dog Food</title>
14+
</titles>
15+
<publisher>DataCite</publisher>
16+
<publicationYear>2016</publicationYear>
17+
<resourceType resourceTypeGeneral="Text">BlogPosting</resourceType>
18+
<alternateIdentifiers>
19+
<alternateIdentifier alternateIdentifierType="Local accession number">MS-49-3632-5083</alternateIdentifier>
20+
</alternateIdentifiers>
21+
<subjects>
22+
<subject>datacite</subject>
23+
<subject>doi</subject>
24+
<subject>metadata</subject>
25+
</subjects>
26+
<dates>
27+
<date dateType="Created">2016-12-20</date>
28+
<date dateType="Issued">2016-12-20</date>
29+
<date dateType="Updated">2016-12-20</date>
30+
</dates>
31+
<relatedIdentifiers>
32+
<relatedIdentifier relatedIdentifierType="DOI" relationType="References">10.5438/0012</relatedIdentifier>
33+
<relatedIdentifier relatedIdentifierType="DOI" relationType="References">10.5438/55E5-T5C0</relatedIdentifier>
34+
<relatedIdentifier relatedIdentifierType="DOI" relationType="IsPartOf">10.5438/0000-00SS</relatedIdentifier>
35+
</relatedIdentifiers>
36+
<version>1.0</version>
37+
<descriptions>
38+
<description descriptionType="Abstract">Eating your own dog food is a slang term to describe that an organization should itself use the products and services it provides. For DataCite this means that we should use DOIs with appropriate metadata and strategies for long-term preservation for...</description>
39+
</descriptions>
40+
<geoLocations>
41+
<geoLocation>
42+
<geoLocationPlace>New York, NY</geoLocationPlace>
43+
<geoLocationPoint>
44+
<pointLatitude>31.233</pointLatitude>
45+
<pointLongitude>-67.302</pointLongitude>
46+
</geoLocationPoint>
47+
<geoLocationBox>
48+
<westBoundLongitude>-123.0</westBoundLongitude>
49+
<eastBoundLongitude>+123.</eastBoundLongitude>
50+
<southBoundLatitude>-40</southBoundLatitude>
51+
<northBoundLatitude>60.2312</northBoundLatitude>
52+
</geoLocationBox>
53+
<geoLocationPolygon>
54+
<polygonPoint>
55+
<pointLatitude>42.4935265</pointLatitude>
56+
<pointLongitude>-87.812664</pointLongitude>
57+
</polygonPoint>
58+
<polygonPoint>
59+
<pointLatitude>42.4975767</pointLatitude>
60+
<pointLongitude>-88.5872001</pointLongitude>
61+
</polygonPoint>
62+
<polygonPoint>
63+
<pointLatitude>41.5550023</pointLatitude>
64+
<pointLongitude>-88.6915703</pointLongitude>
65+
</polygonPoint>
66+
<polygonPoint>
67+
<pointLatitude>41.4624467</pointLatitude>
68+
<pointLongitude>-87.5270195</pointLongitude>
69+
</polygonPoint>
70+
<polygonPoint>
71+
<pointLatitude>41.46244679</pointLatitude>
72+
<pointLongitude>-87.51054</pointLongitude>
73+
</polygonPoint>
74+
<polygonPoint>
75+
<pointLatitude>42.2012176</pointLatitude>
76+
<pointLongitude>-87.812664</pointLongitude>
77+
</polygonPoint>
78+
<inPolygonPoint>
79+
<pointLatitude>42.2195267</pointLatitude>
80+
<pointLongitude>-88.2960624</pointLongitude>
81+
</inPolygonPoint>
82+
</geoLocationPolygon>
83+
</geoLocation>
84+
</geoLocations>
85+
</resource>

‎spec/fixtures/vcr_cassettes/metadata/metadata_geolocation/delete_doi.yml‎

Lines changed: 64 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎spec/fixtures/vcr_cassettes/metadata/metadata_geolocation/delete_metadata_for_doi.yml‎

Lines changed: 75 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)