bolognese 1.6.2 → 1.6.7

Sign up to get free protection for your applications and to get access to all the features.
Files changed (57) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +18 -13
  3. data/bolognese.gemspec +4 -4
  4. data/lib/bolognese/datacite_utils.rb +9 -3
  5. data/lib/bolognese/metadata.rb +6 -8
  6. data/lib/bolognese/metadata_utils.rb +10 -3
  7. data/lib/bolognese/readers/bibtex_reader.rb +2 -1
  8. data/lib/bolognese/readers/citeproc_reader.rb +2 -2
  9. data/lib/bolognese/readers/codemeta_reader.rb +3 -3
  10. data/lib/bolognese/readers/crossref_reader.rb +2 -2
  11. data/lib/bolognese/readers/datacite_reader.rb +3 -3
  12. data/lib/bolognese/readers/npm_reader.rb +1 -1
  13. data/lib/bolognese/readers/schema_org_reader.rb +4 -5
  14. data/lib/bolognese/utils.rb +89 -9
  15. data/lib/bolognese/version.rb +1 -1
  16. data/lib/bolognese/writers/bibtex_writer.rb +2 -1
  17. data/lib/bolognese/writers/codemeta_writer.rb +3 -2
  18. data/lib/bolognese/writers/jats_writer.rb +2 -2
  19. data/lib/bolognese/writers/schema_org_writer.rb +1 -1
  20. data/resources/spdx/licenses.json +5297 -0
  21. data/spec/datacite_utils_spec.rb +5 -1
  22. data/spec/fixtures/datacite-example-affiliation.xml +1 -1
  23. data/spec/fixtures/vcr_cassettes/Bolognese_Metadata/normalize_cc_url/not_found.yml +44 -0
  24. data/spec/fixtures/vcr_cassettes/Bolognese_Metadata/normalize_cc_url/with_trailing_slash.yml +44 -0
  25. data/spec/fixtures/vcr_cassettes/Bolognese_Metadata/normalize_cc_url/with_trailing_slash_and_to_https.yml +44 -0
  26. data/spec/fixtures/vcr_cassettes/Bolognese_Metadata/normalize_url/to_https.yml +44 -0
  27. data/spec/fixtures/vcr_cassettes/Bolognese_Metadata/normalize_url/with_trailing_slash_and_to_https.yml +44 -0
  28. data/spec/fixtures/vcr_cassettes/Bolognese_Metadata/spdx/hsh_to_spdx_id.yml +44 -0
  29. data/spec/fixtures/vcr_cassettes/Bolognese_Metadata/spdx/hsh_to_spdx_not_found.yml +44 -0
  30. data/spec/fixtures/vcr_cassettes/Bolognese_Metadata/spdx/hsh_to_spdx_url.yml +44 -0
  31. data/spec/fixtures/vcr_cassettes/Bolognese_Metadata/spdx/name_to_spdx_exists.yml +44 -0
  32. data/spec/fixtures/vcr_cassettes/Bolognese_Metadata/spdx/name_to_spdx_id.yml +44 -0
  33. data/spec/fixtures/vcr_cassettes/Bolognese_Metadata/spdx/name_to_spdx_not_found.yml +44 -0
  34. data/spec/fixtures/vcr_cassettes/Bolognese_Metadata/url_to_https/http.yml +44 -0
  35. data/spec/fixtures/vcr_cassettes/Bolognese_Metadata/url_to_https/uri.yml +44 -0
  36. data/spec/fixtures/vcr_cassettes/Bolognese_Metadata/url_to_https/with_trailing_slash.yml +44 -0
  37. data/spec/fixtures/vcr_cassettes/Bolognese_Metadata/write_metadata_as_citation/software_w/version.yml +52 -0
  38. data/spec/fixtures/vcr_cassettes/Bolognese_Metadata/write_metadata_as_schema_org/Funding.yml +58 -10
  39. data/spec/fixtures/vcr_cassettes/Bolognese_Metadata/write_metadata_as_schema_org/Funding_OpenAIRE.yml +65 -28
  40. data/spec/fixtures/vcr_cassettes/Bolognese_Metadata/write_metadata_as_schema_org/Schema_org_JSON_Cyark.yml +98 -0
  41. data/spec/fixtures/vcr_cassettes/Bolognese_Metadata/write_metadata_as_schema_org/Schema_org_JSON_IsSupplementTo.yml +58 -10
  42. data/spec/readers/bibtex_reader_spec.rb +5 -1
  43. data/spec/readers/codemeta_reader_spec.rb +21 -1
  44. data/spec/readers/crossref_reader_spec.rb +21 -5
  45. data/spec/readers/datacite_json_reader_spec.rb +1 -1
  46. data/spec/readers/datacite_reader_spec.rb +51 -11
  47. data/spec/readers/npm_reader_spec.rb +3 -3
  48. data/spec/readers/schema_org_reader_spec.rb +2 -2
  49. data/spec/utils_spec.rb +58 -0
  50. data/spec/writers/bibtex_writer_spec.rb +6 -0
  51. data/spec/writers/citation_writer_spec.rb +8 -0
  52. data/spec/writers/citeproc_writer_spec.rb +12 -2
  53. data/spec/writers/crosscite_writer_spec.rb +5 -1
  54. data/spec/writers/datacite_json_writer_spec.rb +5 -1
  55. data/spec/writers/datacite_writer_spec.rb +22 -7
  56. data/spec/writers/schema_org_writer_spec.rb +29 -3
  57. metadata +31 -8
@@ -0,0 +1,98 @@
1
+ ---
2
+ http_interactions:
3
+ - request:
4
+ method: get
5
+ uri: https://doi.org/ra/10.26301
6
+ body:
7
+ encoding: US-ASCII
8
+ string: ''
9
+ headers:
10
+ User-Agent:
11
+ - Mozilla/5.0 (compatible; Maremma/4.7; mailto:info@datacite.org)
12
+ Accept:
13
+ - text/html,application/json,application/xml;q=0.9, text/plain;q=0.8,image/png,*/*;q=0.5
14
+ response:
15
+ status:
16
+ code: 200
17
+ message: ''
18
+ headers:
19
+ Date:
20
+ - Fri, 19 Jun 2020 11:53:16 GMT
21
+ Content-Type:
22
+ - application/json;charset=UTF-8
23
+ Connection:
24
+ - keep-alive
25
+ Set-Cookie:
26
+ - __cfduid=d026feabfb6d44e3a8e04eea7f4c19e621592567596; expires=Sun, 19-Jul-20
27
+ 11:53:16 GMT; path=/; domain=.doi.org; HttpOnly; SameSite=Lax; Secure
28
+ Cf-Cache-Status:
29
+ - DYNAMIC
30
+ Cf-Request-Id:
31
+ - 036e061ebd0000d721c099d200000001
32
+ Expect-Ct:
33
+ - max-age=604800, report-uri="https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct"
34
+ Strict-Transport-Security:
35
+ - max-age=31536000; includeSubDomains; preload
36
+ Server:
37
+ - cloudflare
38
+ Cf-Ray:
39
+ - 5a5d0c779d69d721-FRA
40
+ body:
41
+ encoding: ASCII-8BIT
42
+ string: |-
43
+ [
44
+ {
45
+ "DOI": "10.26301",
46
+ "RA": "DataCite"
47
+ }
48
+ ]
49
+ http_version:
50
+ recorded_at: Fri, 19 Jun 2020 11:53:16 GMT
51
+ - request:
52
+ method: get
53
+ uri: https://api.datacite.org/dois/10.26301/jgf3-jm06
54
+ body:
55
+ encoding: US-ASCII
56
+ string: ''
57
+ headers:
58
+ User-Agent:
59
+ - Mozilla/5.0 (compatible; Maremma/4.7; mailto:info@datacite.org)
60
+ Accept:
61
+ - text/html,application/json,application/xml;q=0.9, text/plain;q=0.8,image/png,*/*;q=0.5
62
+ response:
63
+ status:
64
+ code: 200
65
+ message: OK
66
+ headers:
67
+ Date:
68
+ - Fri, 19 Jun 2020 11:53:17 GMT
69
+ Content-Type:
70
+ - application/json; charset=utf-8
71
+ Connection:
72
+ - keep-alive
73
+ Status:
74
+ - 200 OK
75
+ X-Anonymous-Consumer:
76
+ - 'true'
77
+ Cache-Control:
78
+ - max-age=0, private, must-revalidate
79
+ Vary:
80
+ - Accept-Encoding, Origin
81
+ Etag:
82
+ - W/"486760ea0302b1535d436c1c05598ae3"
83
+ X-Runtime:
84
+ - '0.619532'
85
+ X-Request-Id:
86
+ - a6c829c4-ed51-49bc-937a-fefe4f60a573
87
+ X-Powered-By:
88
+ - Phusion Passenger 6.0.5
89
+ Server:
90
+ - nginx/1.14.0 + Phusion Passenger 6.0.5
91
+ body:
92
+ encoding: ASCII-8BIT
93
+ string: '{"data":{"id":"10.26301/jgf3-jm06","type":"dois","attributes":{"doi":"10.26301/jgf3-jm06","prefix":"10.26301","suffix":"jgf3-jm06","identifiers":[],"alternateIdentifiers":[],"creators":[{"name":"CyArk","nameType":"Organizational","givenName":null,"familyName":null,"affiliation":[],"nameIdentifiers":[]}],"titles":[{"lang":null,"title":"Chan
94
+ Chan - Rivero","titleType":null}],"publisher":"Open Heritage 3D","container":{},"publicationYear":2020,"subjects":[],"contributors":[],"dates":[],"language":null,"types":{"resourceType":"3D
95
+ Data","resourceTypeGeneral":"Dataset"},"relatedIdentifiers":[],"sizes":[],"formats":[],"version":null,"rightsList":[],"descriptions":[],"geoLocations":[],"fundingReferences":[],"xml":"PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHJlc291cmNlIHhtbG5zOnhzaT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEtaW5zdGFuY2UiIHhtbG5zPSJodHRwOi8vZGF0YWNpdGUub3JnL3NjaGVtYS9rZXJuZWwtNCIgeHNpOnNjaGVtYUxvY2F0aW9uPSJodHRwOi8vZGF0YWNpdGUub3JnL3NjaGVtYS9rZXJuZWwtNCBodHRwOi8vc2NoZW1hLmRhdGFjaXRlLm9yZy9tZXRhL2tlcm5lbC00L21ldGFkYXRhLnhzZCI+CiAgPGlkZW50aWZpZXIgaWRlbnRpZmllclR5cGU9IkRPSSI+MTAuMjYzMDEvSkdGMy1KTTA2PC9pZGVudGlmaWVyPgogIDxjcmVhdG9ycz4KICAgIDxjcmVhdG9yPgogICAgICA8Y3JlYXRvck5hbWUgbmFtZVR5cGU9Ik9yZ2FuaXphdGlvbmFsIj5DeUFyazwvY3JlYXRvck5hbWU+CiAgICA8L2NyZWF0b3I+CiAgPC9jcmVhdG9ycz4KICA8dGl0bGVzPgogICAgPHRpdGxlPkNoYW4gQ2hhbiAtIFJpdmVybzwvdGl0bGU+CiAgPC90aXRsZXM+CiAgPHB1Ymxpc2hlcj5PcGVuIEhlcml0YWdlIDNEPC9wdWJsaXNoZXI+CiAgPHB1YmxpY2F0aW9uWWVhcj4yMDIwPC9wdWJsaWNhdGlvblllYXI+CiAgPHJlc291cmNlVHlwZSByZXNvdXJjZVR5cGVHZW5lcmFsPSJEYXRhc2V0Ij4zRCBEYXRhPC9yZXNvdXJjZVR5cGU+CiAgPHZlcnNpb24vPgo8L3Jlc291cmNlPgo=","url":"https://openheritage3d.org/project.php?id=jgf3-jm06","contentUrl":null,"metadataVersion":0,"schemaVersion":"http://datacite.org/schema/kernel-4","source":"fabricaForm","isActive":true,"state":"findable","reason":null,"viewCount":0,"viewsOverTime":[],"downloadCount":0,"downloadsOverTime":[],"referenceCount":0,"citationCount":0,"citationsOverTime":[],"partCount":0,"partOfCount":0,"versionCount":0,"versionOfCount":0,"created":"2020-02-11T18:32:33.000Z","registered":"2020-02-11T18:32:33.000Z","published":"2020","updated":"2020-06-13T00:07:19.000Z"},"relationships":{"client":{"data":{"id":"cyark.oh","type":"clients"}},"media":{"data":{"id":"10.26301/jgf3-jm06","type":"media"}},"references":{"data":[]},"citations":{"data":[]},"parts":{"data":[]},"partOf":{"data":[]},"versions":{"data":[]},"versionOf":{"data":[]}}}}'
96
+ http_version:
97
+ recorded_at: Fri, 19 Jun 2020 11:53:17 GMT
98
+ recorded_with: VCR 3.0.3
@@ -1,5 +1,53 @@
1
1
  ---
2
2
  http_interactions:
3
+ - request:
4
+ method: get
5
+ uri: https://doi.org/ra/10.5517
6
+ body:
7
+ encoding: US-ASCII
8
+ string: ''
9
+ headers:
10
+ User-Agent:
11
+ - Mozilla/5.0 (compatible; Maremma/4.7; mailto:info@datacite.org)
12
+ Accept:
13
+ - text/html,application/json,application/xml;q=0.9, text/plain;q=0.8,image/png,*/*;q=0.5
14
+ response:
15
+ status:
16
+ code: 200
17
+ message: ''
18
+ headers:
19
+ Date:
20
+ - Fri, 19 Jun 2020 11:54:09 GMT
21
+ Content-Type:
22
+ - application/json;charset=UTF-8
23
+ Connection:
24
+ - keep-alive
25
+ Set-Cookie:
26
+ - __cfduid=d2721b2e66a989b796e9ce5c2a6a0579f1592567648; expires=Sun, 19-Jul-20
27
+ 11:54:08 GMT; path=/; domain=.doi.org; HttpOnly; SameSite=Lax; Secure
28
+ Cf-Cache-Status:
29
+ - DYNAMIC
30
+ Cf-Request-Id:
31
+ - 036e06eacf0000c27c4a188200000001
32
+ Expect-Ct:
33
+ - max-age=604800, report-uri="https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct"
34
+ Strict-Transport-Security:
35
+ - max-age=31536000; includeSubDomains; preload
36
+ Server:
37
+ - cloudflare
38
+ Cf-Ray:
39
+ - 5a5d0dbe1d96c27c-FRA
40
+ body:
41
+ encoding: ASCII-8BIT
42
+ string: |-
43
+ [
44
+ {
45
+ "DOI": "10.5517",
46
+ "RA": "DataCite"
47
+ }
48
+ ]
49
+ http_version:
50
+ recorded_at: Fri, 19 Jun 2020 11:54:09 GMT
3
51
  - request:
4
52
  method: get
5
53
  uri: https://api.datacite.org/dois/10.5517/cc8h01s
@@ -8,7 +56,7 @@ http_interactions:
8
56
  string: ''
9
57
  headers:
10
58
  User-Agent:
11
- - Mozilla/5.0 (compatible; Maremma/4.2.1; mailto:info@datacite.org)
59
+ - Mozilla/5.0 (compatible; Maremma/4.7; mailto:info@datacite.org)
12
60
  Accept:
13
61
  - text/html,application/json,application/xml;q=0.9, text/plain;q=0.8,image/png,*/*;q=0.5
14
62
  response:
@@ -17,7 +65,7 @@ http_interactions:
17
65
  message: OK
18
66
  headers:
19
67
  Date:
20
- - Wed, 03 Jul 2019 19:25:15 GMT
68
+ - Fri, 19 Jun 2020 11:54:09 GMT
21
69
  Content-Type:
22
70
  - application/json; charset=utf-8
23
71
  Connection:
@@ -30,20 +78,20 @@ http_interactions:
30
78
  - max-age=0, private, must-revalidate
31
79
  Vary:
32
80
  - Accept-Encoding, Origin
33
- X-Request-Id:
34
- - f7df7b8f-cc7e-483d-8461-80c50bb81c52
35
81
  Etag:
36
- - W/"058961737ac10259968291b254c8021f"
82
+ - W/"159e106ae0801c71dc525cf8770210e1"
37
83
  X-Runtime:
38
- - '0.024242'
84
+ - '0.275978'
85
+ X-Request-Id:
86
+ - 451ebe51-cf1f-423e-b533-a8311d0f0764
39
87
  X-Powered-By:
40
- - Phusion Passenger 6.0.2
88
+ - Phusion Passenger 6.0.5
41
89
  Server:
42
- - nginx/1.15.8 + Phusion Passenger 6.0.2
90
+ - nginx/1.14.0 + Phusion Passenger 6.0.5
43
91
  body:
44
92
  encoding: ASCII-8BIT
45
93
  string: !binary |-
46
- {"data":{"id":"10.5517/cc8h01s","type":"dois","attributes":{"doi":"10.5517/cc8h01s","prefix":"10.5517","suffix":"cc8h01s","identifiers":[{"identifier":"https://doi.org/10.5517/cc8h01s","identifierType":"DOI"},{"identifier":"252744","identifierType":"CCDC"}],"creators":[{"name":"Gao, Shan","nameType":"Personal","givenName":"Shan","familyName":"Gao"},{"name":"Lu, Zhen-Zhong","nameType":"Personal","givenName":"Zhen-Zhong","familyName":"Lu"},{"name":"Huo, Li-Hua","nameType":"Personal","givenName":"Li-Hua","familyName":"Huo"},{"name":"Zhang, Xian-Fa","nameType":"Personal","givenName":"Xian-Fa","familyName":"Zhang"},{"name":"Zhao, Hui","nameType":"Personal","givenName":"Hui","familyName":"Zhao"}],"titles":[{"title":"CCDC 252744: Experimental Crystal Structure Determination"}],"publisher":"Cambridge Crystallographic Data Centre","container":{},"publicationYear":2004,"subjects":[{"subject":"Crystal Structure"},{"subject":"Experimental 3D Coordinates"},{"subject":"Crystal System"},{"subject":"Space Group"},{"subject":"Cell Parameters"},{"subject":"Crystallography"},{"subject":"(Diacetato-O,O')-bis(3-hydroxypyridine)-copper(ii)"}],"contributors":[],"dates":[{"date":"2004","dateType":"Issued"}],"language":"eng","types":{"ris":"DATA","bibtex":"misc","citeproc":"dataset","schemaOrg":"Dataset","resourceTypeGeneral":"Dataset"},"relatedIdentifiers":[{"relationType":"IsSupplementTo","relatedIdentifier":"10.1107/s1600536804021154","relatedIdentifierType":"DOI"}],"sizes":[],"formats":["CIF"],"version":null,"rightsList":[],"descriptions":[{"description":"Related Article: Shan Gao, Zhen-Zhong Lu, Li-Hua Huo, Xian-Fa Zhang, Hui Zhao|2004|Acta Crystallogr.,Sect.E:Struct.Rep.Online|60|m1353|doi:10.1107/S1600536804021154","descriptionType":"Other"},{"description":"An entry from the Cambridge Structural Database, the world’s repository for small molecule crystal structures. The entry contains experimental data from a crystal diffraction study. The deposited dataset for this entry is freely available from the CCDC and typically includes 3D coordinates, cell parameters, space group, experimental conditions and quality measures.","descriptionType":"Abstract"}],"geoLocations":[],"fundingReferences":[],"xml":"PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjxyZXNvdXJjZSB4bWxuczp4c2Q9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hIiB4bWxuczp4c2k9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hLWluc3RhbmNlIiB4c2k6c2NoZW1hTG9jYXRpb249Imh0dHA6Ly9kYXRhY2l0ZS5vcmcvc2NoZW1hL2tlcm5lbC0zIGh0dHA6Ly9zY2hlbWEuZGF0YWNpdGUub3JnL21ldGEva2VybmVsLTMvbWV0YWRhdGEueHNkIiB4bWxucz0iaHR0cDovL2RhdGFjaXRlLm9yZy9zY2hlbWEva2VybmVsLTMiPg0KICA8aWRlbnRpZmllciBpZGVudGlmaWVyVHlwZT0iRE9JIj4xMC41NTE3L2NjOGgwMXM8L2lkZW50aWZpZXI+DQogIDxjcmVhdG9ycz4NCiAgICA8Y3JlYXRvcj4NCiAgICAgIDxjcmVhdG9yTmFtZT5HYW8sIFNoYW48L2NyZWF0b3JOYW1lPg0KICAgIDwvY3JlYXRvcj4NCiAgICA8Y3JlYXRvcj4NCiAgICAgIDxjcmVhdG9yTmFtZT5MdSwgWmhlbi1aaG9uZzwvY3JlYXRvck5hbWU+DQogICAgPC9jcmVhdG9yPg0KICAgIDxjcmVhdG9yPg0KICAgICAgPGNyZWF0b3JOYW1lPkh1bywgTGktSHVhPC9jcmVhdG9yTmFtZT4NCiAgICA8L2NyZWF0b3I+DQogICAgPGNyZWF0b3I+DQogICAgICA8Y3JlYXRvck5hbWU+WmhhbmcsIFhpYW4tRmE8L2NyZWF0b3JOYW1lPg0KICAgIDwvY3JlYXRvcj4NCiAgICA8Y3JlYXRvcj4NCiAgICAgIDxjcmVhdG9yTmFtZT5aaGFvLCBIdWk8L2NyZWF0b3JOYW1lPg0KICAgIDwvY3JlYXRvcj4NCiAgPC9jcmVhdG9ycz4NCiAgPHRpdGxlcz4NCiAgICA8dGl0bGU+Q0NEQyAyNTI3NDQ6IEV4cGVyaW1lbnRhbCBDcnlzdGFsIFN0cnVjdHVyZSBEZXRlcm1pbmF0aW9uPC90aXRsZT4NCiAgPC90aXRsZXM+DQogIDxwdWJsaXNoZXI+Q2FtYnJpZGdlIENyeXN0YWxsb2dyYXBoaWMgRGF0YSBDZW50cmU8L3B1Ymxpc2hlcj4NCiAgPHB1YmxpY2F0aW9uWWVhcj4yMDA0PC9wdWJsaWNhdGlvblllYXI+DQogIDxzdWJqZWN0cz4NCiAgICA8c3ViamVjdD5DcnlzdGFsIFN0cnVjdHVyZTwvc3ViamVjdD4NCiAgICA8c3ViamVjdD5FeHBlcmltZW50YWwgM0QgQ29vcmRpbmF0ZXM8L3N1YmplY3Q+DQogICAgPHN1YmplY3Q+Q3J5c3RhbCBTeXN0ZW08L3N1YmplY3Q+DQogICAgPHN1YmplY3Q+U3BhY2UgR3JvdXA8L3N1YmplY3Q+DQogICAgPHN1YmplY3Q+Q2VsbCBQYXJhbWV0ZXJzPC9zdWJqZWN0Pg0KICAgIDxzdWJqZWN0PkNyeXN0YWxsb2dyYXBoeTwvc3ViamVjdD4NCiAgICA8c3ViamVjdD4oRGlhY2V0YXRvLU8sTycpLWJpcygzLWh5ZHJveHlweXJpZGluZSktY29wcGVyKGlpKTwvc3ViamVjdD4NCiAgPC9zdWJqZWN0cz4NCiAgPGxhbmd1YWdlPmVuZzwvbGFuZ3VhZ2U+DQogIDxyZXNvdXJjZVR5cGUgcmVzb3VyY2VUeXBlR2VuZXJhbD0iRGF0YXNldCIgLz4NCiAgPGFsdGVybmF0ZUlkZW50aWZpZXJzPg0KICAgIDxhbHRlcm5hdGVJZGVudGlmaWVyIGFsdGVybmF0ZUlkZW50aWZpZXJUeXBlPSJDQ0RDIj4yNTI3NDQ8L2FsdGVybmF0ZUlkZW50aWZpZXI+DQogIDwvYWx0ZXJuYXRlSWRlbnRpZmllcnM+DQogIDxyZWxhdGVkSWRlbnRpZmllcnM+DQogICAgPHJlbGF0ZWRJZGVudGlmaWVyIHJlbGF0ZWRJZGVudGlmaWVyVHlwZT0iRE9JIiByZWxhdGlvblR5cGU9IklzU3VwcGxlbWVudFRvIj4xMC4xMTA3L1MxNjAwNTM2ODA0MDIxMTU0PC9yZWxhdGVkSWRlbnRpZmllcj4NCiAgPC9yZWxhdGVkSWRlbnRpZmllcnM+DQogIDxmb3JtYXRzPg0KICAgIDxmb3JtYXQ+Q0lGPC9mb3JtYXQ+DQogIDwvZm9ybWF0cz4NCiAgPGRlc2NyaXB0aW9ucz4NCiAgICA8ZGVzY3JpcHRpb24gZGVzY3JpcHRpb25UeXBlPSJPdGhlciI+UmVsYXRlZCBBcnRpY2xlOiBTaGFuIEdhbywgWmhlbi1aaG9uZyBMdSwgTGktSHVhIEh1bywgWGlhbi1GYSBaaGFuZywgSHVpIFpoYW98MjAwNHxBY3RhIENyeXN0YWxsb2dyLixTZWN0LkU6U3RydWN0LlJlcC5PbmxpbmV8NjB8bTEzNTN8ZG9pOjEwLjExMDcvUzE2MDA1MzY4MDQwMjExNTQ8L2Rlc2NyaXB0aW9uPg0KICAgIDxkZXNjcmlwdGlvbiBkZXNjcmlwdGlvblR5cGU9IkFic3RyYWN0Ij5BbiBlbnRyeSBmcm9tIHRoZSBDYW1icmlkZ2UgU3RydWN0dXJhbCBEYXRhYmFzZSwgdGhlIHdvcmxk4oCZcyByZXBvc2l0b3J5IGZvciBzbWFsbCBtb2xlY3VsZSBjcnlzdGFsIHN0cnVjdHVyZXMuIFRoZSBlbnRyeSBjb250YWlucyBleHBlcmltZW50YWwgZGF0YSBmcm9tIGEgY3J5c3RhbCBkaWZmcmFjdGlvbiBzdHVkeS4gVGhlIGRlcG9zaXRlZCBkYXRhc2V0IGZvciB0aGlzIGVudHJ5IGlzIGZyZWVseSBhdmFpbGFibGUgZnJvbSB0aGUgQ0NEQyBhbmQgdHlwaWNhbGx5IGluY2x1ZGVzIDNEIGNvb3JkaW5hdGVzLCBjZWxsIHBhcmFtZXRlcnMsIHNwYWNlIGdyb3VwLCBleHBlcmltZW50YWwgY29uZGl0aW9ucyBhbmQgcXVhbGl0eSBtZWFzdXJlcy48L2Rlc2NyaXB0aW9uPg0KICA8L2Rlc2NyaXB0aW9ucz4NCjwvcmVzb3VyY2U+","url":"http://www.ccdc.cam.ac.uk/services/structure_request?id=doi:10.5517/cc8h01s&sid=DataCite","contentUrl":null,"metadataVersion":2,"schemaVersion":"http://datacite.org/schema/kernel-3","source":null,"isActive":true,"state":"findable","reason":null,"created":"2014-03-18T19:21:49.000-04:00","registered":"2014-03-18T19:21:50.000-04:00","published":"2004","updated":"2019-03-29T12:47:54.000-04:00"},"relationships":{"client":{"data":{"id":"ccdc.csd","type":"clients"}},"media":{"data":[]}}},"included":[{"id":"ccdc.csd","type":"clients","attributes":{"name":"The Cambridge Structural Database","symbol":"CCDC.CSD","year":2019,"contactName":"Matt Lightfoot","contactEmail":"lightfoot@ccdc.cam.ac.uk","description":"Established in 1965, the Cambridge Structural Database (CSD) is the world’s repository for small-molecule organic and metal-organic crystal structures. Containing the results of a million x-ray and neutron diffraction analyses this unique database of accurate 3D structures has become an essential resource to scientists around the world. The CSD records bibliographic, chemical and crystallographic information for organic and metal-organic crystal structures whose 3D structures have been determined experimentally.\nThe CSD includes crystal structure data arising from publications in the open literature as well as data published directly though the CSD as CSD Communications.","domains":"*","url":"https://www.ccdc.cam.ac.uk/","created":"2019-03-26T06:28:08.000-04:00","updated":"2019-03-26T06:31:33.000-04:00","isActive":true,"hasPassword":true},"relationships":{"provider":{"data":{"id":"ccdc","type":"providers"}},"repository":{"data":{"id":"10.17616/R36011","type":"repositories"}},"prefixes":{"data":[{"id":"10.5517","type":"prefixes"},{"id":"10.25505","type":"prefixes"}]}}}]}
94
+ {"data":{"id":"10.5517/cc8h01s","type":"dois","attributes":{"doi":"10.5517/cc8h01s","prefix":"10.5517","suffix":"cc8h01s","identifiers":[{"identifier":"https://doi.org/10.5517/cc8h01s","identifierType":"DOI"},{"identifier":"252744","identifierType":"CCDC"}],"alternateIdentifiers":[{"alternateIdentifierType":"CCDC","alternateIdentifier":"252744"}],"creators":[{"name":"Gao, Shan","nameType":"Personal","givenName":"Shan","familyName":"Gao","affiliation":[]},{"name":"Lu, Zhen-Zhong","nameType":"Personal","givenName":"Zhen-Zhong","familyName":"Lu","affiliation":[]},{"name":"Huo, Li-Hua","nameType":"Personal","givenName":"Li-Hua","familyName":"Huo","affiliation":[]},{"name":"Zhang, Xian-Fa","nameType":"Personal","givenName":"Xian-Fa","familyName":"Zhang","affiliation":[]},{"name":"Zhao, Hui","nameType":"Personal","givenName":"Hui","familyName":"Zhao","affiliation":[]}],"titles":[{"title":"CCDC 252744: Experimental Crystal Structure Determination"}],"publisher":"Cambridge Crystallographic Data Centre","container":{},"publicationYear":2004,"subjects":[{"subject":"Crystal Structure"},{"subject":"Experimental 3D Coordinates"},{"subject":"Crystal System"},{"subject":"Space Group"},{"subject":"Cell Parameters"},{"subject":"Crystallography"},{"subject":"(Diacetato-O,O')-bis(3-hydroxypyridine)-copper(ii)"}],"contributors":[],"dates":[{"date":"2004","dateType":"Issued"}],"language":"eng","types":{"ris":"DATA","bibtex":"misc","citeproc":"dataset","schemaOrg":"Dataset","resourceTypeGeneral":"Dataset"},"relatedIdentifiers":[{"relationType":"IsSupplementTo","relatedIdentifier":"10.1107/s1600536804021154","relatedIdentifierType":"DOI"}],"sizes":[],"formats":["CIF"],"version":null,"rightsList":[],"descriptions":[{"description":"Related Article: Shan Gao, Zhen-Zhong Lu, Li-Hua Huo, Xian-Fa Zhang, Hui Zhao|2004|Acta Crystallogr.,Sect.E:Struct.Rep.Online|60|m1353|doi:10.1107/S1600536804021154","descriptionType":"Other"},{"description":"An entry from the Cambridge Structural Database, the world’s repository for small molecule crystal structures. The entry contains experimental data from a crystal diffraction study. The deposited dataset for this entry is freely available from the CCDC and typically includes 3D coordinates, cell parameters, space group, experimental conditions and quality measures.","descriptionType":"Abstract"}],"geoLocations":[],"fundingReferences":[],"xml":"PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjxyZXNvdXJjZSB4bWxuczp4c2Q9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hIiB4bWxuczp4c2k9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hLWluc3RhbmNlIiB4c2k6c2NoZW1hTG9jYXRpb249Imh0dHA6Ly9kYXRhY2l0ZS5vcmcvc2NoZW1hL2tlcm5lbC0zIGh0dHA6Ly9zY2hlbWEuZGF0YWNpdGUub3JnL21ldGEva2VybmVsLTMvbWV0YWRhdGEueHNkIiB4bWxucz0iaHR0cDovL2RhdGFjaXRlLm9yZy9zY2hlbWEva2VybmVsLTMiPg0KICA8aWRlbnRpZmllciBpZGVudGlmaWVyVHlwZT0iRE9JIj4xMC41NTE3L2NjOGgwMXM8L2lkZW50aWZpZXI+DQogIDxjcmVhdG9ycz4NCiAgICA8Y3JlYXRvcj4NCiAgICAgIDxjcmVhdG9yTmFtZT5HYW8sIFNoYW48L2NyZWF0b3JOYW1lPg0KICAgIDwvY3JlYXRvcj4NCiAgICA8Y3JlYXRvcj4NCiAgICAgIDxjcmVhdG9yTmFtZT5MdSwgWmhlbi1aaG9uZzwvY3JlYXRvck5hbWU+DQogICAgPC9jcmVhdG9yPg0KICAgIDxjcmVhdG9yPg0KICAgICAgPGNyZWF0b3JOYW1lPkh1bywgTGktSHVhPC9jcmVhdG9yTmFtZT4NCiAgICA8L2NyZWF0b3I+DQogICAgPGNyZWF0b3I+DQogICAgICA8Y3JlYXRvck5hbWU+WmhhbmcsIFhpYW4tRmE8L2NyZWF0b3JOYW1lPg0KICAgIDwvY3JlYXRvcj4NCiAgICA8Y3JlYXRvcj4NCiAgICAgIDxjcmVhdG9yTmFtZT5aaGFvLCBIdWk8L2NyZWF0b3JOYW1lPg0KICAgIDwvY3JlYXRvcj4NCiAgPC9jcmVhdG9ycz4NCiAgPHRpdGxlcz4NCiAgICA8dGl0bGU+Q0NEQyAyNTI3NDQ6IEV4cGVyaW1lbnRhbCBDcnlzdGFsIFN0cnVjdHVyZSBEZXRlcm1pbmF0aW9uPC90aXRsZT4NCiAgPC90aXRsZXM+DQogIDxwdWJsaXNoZXI+Q2FtYnJpZGdlIENyeXN0YWxsb2dyYXBoaWMgRGF0YSBDZW50cmU8L3B1Ymxpc2hlcj4NCiAgPHB1YmxpY2F0aW9uWWVhcj4yMDA0PC9wdWJsaWNhdGlvblllYXI+DQogIDxzdWJqZWN0cz4NCiAgICA8c3ViamVjdD5DcnlzdGFsIFN0cnVjdHVyZTwvc3ViamVjdD4NCiAgICA8c3ViamVjdD5FeHBlcmltZW50YWwgM0QgQ29vcmRpbmF0ZXM8L3N1YmplY3Q+DQogICAgPHN1YmplY3Q+Q3J5c3RhbCBTeXN0ZW08L3N1YmplY3Q+DQogICAgPHN1YmplY3Q+U3BhY2UgR3JvdXA8L3N1YmplY3Q+DQogICAgPHN1YmplY3Q+Q2VsbCBQYXJhbWV0ZXJzPC9zdWJqZWN0Pg0KICAgIDxzdWJqZWN0PkNyeXN0YWxsb2dyYXBoeTwvc3ViamVjdD4NCiAgICA8c3ViamVjdD4oRGlhY2V0YXRvLU8sTycpLWJpcygzLWh5ZHJveHlweXJpZGluZSktY29wcGVyKGlpKTwvc3ViamVjdD4NCiAgPC9zdWJqZWN0cz4NCiAgPGxhbmd1YWdlPmVuZzwvbGFuZ3VhZ2U+DQogIDxyZXNvdXJjZVR5cGUgcmVzb3VyY2VUeXBlR2VuZXJhbD0iRGF0YXNldCIgLz4NCiAgPGFsdGVybmF0ZUlkZW50aWZpZXJzPg0KICAgIDxhbHRlcm5hdGVJZGVudGlmaWVyIGFsdGVybmF0ZUlkZW50aWZpZXJUeXBlPSJDQ0RDIj4yNTI3NDQ8L2FsdGVybmF0ZUlkZW50aWZpZXI+DQogIDwvYWx0ZXJuYXRlSWRlbnRpZmllcnM+DQogIDxyZWxhdGVkSWRlbnRpZmllcnM+DQogICAgPHJlbGF0ZWRJZGVudGlmaWVyIHJlbGF0ZWRJZGVudGlmaWVyVHlwZT0iRE9JIiByZWxhdGlvblR5cGU9IklzU3VwcGxlbWVudFRvIj4xMC4xMTA3L1MxNjAwNTM2ODA0MDIxMTU0PC9yZWxhdGVkSWRlbnRpZmllcj4NCiAgPC9yZWxhdGVkSWRlbnRpZmllcnM+DQogIDxmb3JtYXRzPg0KICAgIDxmb3JtYXQ+Q0lGPC9mb3JtYXQ+DQogIDwvZm9ybWF0cz4NCiAgPGRlc2NyaXB0aW9ucz4NCiAgICA8ZGVzY3JpcHRpb24gZGVzY3JpcHRpb25UeXBlPSJPdGhlciI+UmVsYXRlZCBBcnRpY2xlOiBTaGFuIEdhbywgWmhlbi1aaG9uZyBMdSwgTGktSHVhIEh1bywgWGlhbi1GYSBaaGFuZywgSHVpIFpoYW98MjAwNHxBY3RhIENyeXN0YWxsb2dyLixTZWN0LkU6U3RydWN0LlJlcC5PbmxpbmV8NjB8bTEzNTN8ZG9pOjEwLjExMDcvUzE2MDA1MzY4MDQwMjExNTQ8L2Rlc2NyaXB0aW9uPg0KICAgIDxkZXNjcmlwdGlvbiBkZXNjcmlwdGlvblR5cGU9IkFic3RyYWN0Ij5BbiBlbnRyeSBmcm9tIHRoZSBDYW1icmlkZ2UgU3RydWN0dXJhbCBEYXRhYmFzZSwgdGhlIHdvcmxk4oCZcyByZXBvc2l0b3J5IGZvciBzbWFsbCBtb2xlY3VsZSBjcnlzdGFsIHN0cnVjdHVyZXMuIFRoZSBlbnRyeSBjb250YWlucyBleHBlcmltZW50YWwgZGF0YSBmcm9tIGEgY3J5c3RhbCBkaWZmcmFjdGlvbiBzdHVkeS4gVGhlIGRlcG9zaXRlZCBkYXRhc2V0IGZvciB0aGlzIGVudHJ5IGlzIGZyZWVseSBhdmFpbGFibGUgZnJvbSB0aGUgQ0NEQyBhbmQgdHlwaWNhbGx5IGluY2x1ZGVzIDNEIGNvb3JkaW5hdGVzLCBjZWxsIHBhcmFtZXRlcnMsIHNwYWNlIGdyb3VwLCBleHBlcmltZW50YWwgY29uZGl0aW9ucyBhbmQgcXVhbGl0eSBtZWFzdXJlcy48L2Rlc2NyaXB0aW9uPg0KICA8L2Rlc2NyaXB0aW9ucz4NCjwvcmVzb3VyY2U+","url":"http://www.ccdc.cam.ac.uk/services/structure_request?id=doi:10.5517/cc8h01s&sid=DataCite","contentUrl":null,"metadataVersion":2,"schemaVersion":"http://datacite.org/schema/kernel-3","source":null,"isActive":true,"state":"findable","reason":null,"viewCount":0,"viewsOverTime":[],"downloadCount":0,"downloadsOverTime":[],"referenceCount":0,"citationCount":0,"citationsOverTime":[],"partCount":0,"partOfCount":0,"versionCount":0,"versionOfCount":0,"created":"2014-03-18T23:21:49.000Z","registered":"2014-03-18T23:21:50.000Z","published":"2004","updated":"2019-08-02T03:23:17.000Z"},"relationships":{"client":{"data":{"id":"ccdc.csd","type":"clients"}},"media":{"data":{"id":"10.5517/cc8h01s","type":"media"}},"references":{"data":[]},"citations":{"data":[]},"parts":{"data":[]},"partOf":{"data":[]},"versions":{"data":[]},"versionOf":{"data":[]}}}}
47
95
  http_version:
48
- recorded_at: Wed, 03 Jul 2019 19:25:15 GMT
96
+ recorded_at: Fri, 19 Jun 2020 11:54:09 GMT
49
97
  recorded_with: VCR 3.0.3
@@ -35,7 +35,11 @@ describe Bolognese::Metadata, vcr: true do
35
35
  expect(subject.creators.first).to eq("familyName"=>"Sankar", "givenName"=>"Martial", "name"=>"Sankar, Martial", "nameType"=>"Personal")
36
36
  expect(subject.titles).to eq([{"title"=>"Automated quantitative histology reveals vascular morphodynamics during Arabidopsis hypocotyl secondary growth"}])
37
37
  expect(subject.descriptions.first["description"]).to start_with("Among various advantages, their small size makes model organisms preferred subjects of investigation.")
38
- expect(subject.rights_list.first["rightsUri"]).to eq("http://creativecommons.org/licenses/by/3.0/")
38
+ expect(subject.rights_list).to eq([{"rights"=>"Creative Commons Attribution 3.0 Unported",
39
+ "rightsIdentifier"=>"CC-BY-3.0",
40
+ "rightsIdentifierScheme"=>"SPDX",
41
+ "rightsUri"=>"https://creativecommons.org/licenses/by/3.0/legalcode",
42
+ "schemeUri"=>"https://spdx.org/licenses/"}])
39
43
  expect(subject.dates).to eq([{"date"=>"2014", "dateType"=>"Issued"}])
40
44
  expect(subject.publication_year).to eq("2014")
41
45
  expect(subject.related_identifiers).to eq([{"relatedIdentifier"=>"2050-084X", "relatedIdentifierType"=>"ISSN", "relationType"=>"IsPartOf", "title"=>"eLife", "type"=>"Periodical"}])
@@ -36,6 +36,11 @@ describe Bolognese::Metadata, vcr: true do
36
36
  expect(subject.dates).to eq([{"date"=>"2017-02-24", "dateType"=>"Issued"}, {"date"=>"2015-11-28", "dateType"=>"Created"}, {"date"=>"2017-02-24", "dateType"=>"Updated"}])
37
37
  expect(subject.publication_year).to eq("2017")
38
38
  expect(subject.publisher).to eq("DataCite")
39
+ expect(subject.rights_list).to eq([{"rights"=>"MIT License",
40
+ "rightsIdentifier"=>"MIT",
41
+ "rightsIdentifierScheme"=>"SPDX",
42
+ "rightsUri"=>"https://opensource.org/licenses/MIT",
43
+ "schemeUri"=>"https://spdx.org/licenses/"}])
39
44
  end
40
45
 
41
46
  it "rdataone" do
@@ -68,10 +73,15 @@ describe Bolognese::Metadata, vcr: true do
68
73
  expect(subject.titles).to eq([{"title"=>"R Interface to the DataONE REST API"}])
69
74
  expect(subject.descriptions.first["description"]).to start_with("Provides read and write access to data and metadata")
70
75
  expect(subject.subjects).to eq([{"subject"=>"data sharing"}, {"subject"=>"data repository"}, {"subject"=>"DataONE"}])
71
- expect(subject.version).to eq("2.0.0")
76
+ expect(subject.version_info).to eq("2.0.0")
72
77
  expect(subject.dates).to eq([{"date"=>"2016-05-27", "dateType"=>"Issued"}, {"date"=>"2016-05-27", "dateType"=>"Created"}, {"date"=>"2016-05-27", "dateType"=>"Updated"}])
73
78
  expect(subject.publication_year).to eq("2016")
74
79
  expect(subject.publisher).to eq("https://cran.r-project.org")
80
+ expect(subject.rights_list).to eq([{"rights"=>"Apache License 2.0",
81
+ "rightsIdentifier"=>"Apache-2.0",
82
+ "rightsIdentifierScheme"=>"SPDX",
83
+ "rightsUri"=>"http://www.apache.org/licenses/LICENSE-2.0",
84
+ "schemeUri"=>"https://spdx.org/licenses/"}])
75
85
  end
76
86
 
77
87
  it "maremma" do
@@ -96,6 +106,11 @@ describe Bolognese::Metadata, vcr: true do
96
106
  expect(subject.dates).to eq([{"date"=>"2017-02-24", "dateType"=>"Issued"}, {"date"=>"2015-11-28", "dateType"=>"Created"}, {"date"=>"2017-02-24", "dateType"=>"Updated"}])
97
107
  expect(subject.publication_year).to eq("2017")
98
108
  expect(subject.publisher).to eq("DataCite")
109
+ expect(subject.rights_list).to eq([{"rights"=>"MIT License",
110
+ "rightsIdentifier"=>"MIT",
111
+ "rightsIdentifierScheme"=>"SPDX",
112
+ "rightsUri"=>"https://opensource.org/licenses/MIT",
113
+ "schemeUri"=>"https://spdx.org/licenses/"}])
99
114
  end
100
115
 
101
116
  it "metadata_reports" do
@@ -113,6 +128,11 @@ describe Bolognese::Metadata, vcr: true do
113
128
  expect(subject.dates).to eq([{"date"=>"2018-05-17", "dateType"=>"Issued"}, {"date"=>"2018-03-09", "dateType"=>"Created"}, {"date"=>"2018-05-17", "dateType"=>"Updated"}])
114
129
  expect(subject.publication_year).to eq("2018")
115
130
  expect(subject.publisher).to eq("DataCite")
131
+ expect(subject.rights_list).to eq([{"rights"=>"MIT License",
132
+ "rightsIdentifier"=>"MIT",
133
+ "rightsIdentifierScheme"=>"SPDX",
134
+ "rightsUri"=>"https://opensource.org/licenses/MIT",
135
+ "schemeUri"=>"https://spdx.org/licenses/"}])
116
136
  end
117
137
  end
118
138
  end
@@ -23,7 +23,11 @@ describe Bolognese::Metadata, vcr: true do
23
23
  expect(subject.url).to eq("https://elifesciences.org/articles/01567")
24
24
  expect(subject.creators.length).to eq(5)
25
25
  expect(subject.creators.first).to eq("nameType"=>"Personal", "name"=>"Sankar, Martial", "givenName"=>"Martial", "familyName"=>"Sankar", "affiliation" => [{"name"=>"Department of Plant Molecular Biology, University of Lausanne, Lausanne, Switzerland"}])
26
- expect(subject.rights_list).to eq([{"rightsUri"=>"http://creativecommons.org/licenses/by/3.0"}])
26
+ expect(subject.rights_list).to eq([{"rights"=>"Creative Commons Attribution 3.0 Unported",
27
+ "rightsIdentifier"=>"CC-BY-3.0",
28
+ "rightsIdentifierScheme"=>"SPDX",
29
+ "rightsUri"=>"https://creativecommons.org/licenses/by/3.0/legalcode",
30
+ "schemeUri"=>"https://spdx.org/licenses/"}])
27
31
  expect(subject.titles).to eq([{"title"=>"Automated quantitative histology reveals vascular morphodynamics during Arabidopsis hypocotyl secondary growth"}])
28
32
  expect(subject.dates).to eq([{"date"=>"2014-02-11", "dateType"=>"Issued"}, {"date"=>"2018-08-23T13:41:49Z", "dateType"=>"Updated"}])
29
33
  expect(subject.publication_year).to eq("2014")
@@ -56,7 +60,11 @@ describe Bolognese::Metadata, vcr: true do
56
60
  expect(subject.creators.first).to eq("nameType"=>"Personal", "name"=>"Ralser, Markus", "givenName"=>"Markus", "familyName"=>"Ralser")
57
61
  expect(subject.contributors).to eq("contributorType"=>"Editor", "familyName"=>"Janbon", "givenName"=>"Guilhem", "name"=>"Janbon, Guilhem", "nameType"=>"Personal")
58
62
  expect(subject.titles).to eq([{"title"=>"Triose Phosphate Isomerase Deficiency Is Caused by Altered Dimerization–Not Catalytic Inactivity–of the Mutant Enzymes"}])
59
- expect(subject.rights_list).to eq([{"rightsUri"=>"http://creativecommons.org/licenses/by/4.0"}])
63
+ expect(subject.rights_list).to eq([{"rights"=>"Creative Commons Attribution 4.0 International",
64
+ "rightsIdentifier"=>"CC-BY-4.0",
65
+ "rightsIdentifierScheme"=>"SPDX",
66
+ "rightsUri"=>"https://creativecommons.org/licenses/by/4.0/legalcode",
67
+ "schemeUri"=>"https://spdx.org/licenses/"}])
60
68
  expect(subject.dates).to eq([{"date"=>"2006-12-20", "dateType"=>"Issued"}, {"date"=>"2019-04-23T08:33:24Z", "dateType"=>"Updated"}])
61
69
  expect(subject.publication_year).to eq("2006")
62
70
  expect(subject.publisher).to eq("Public Library of Science (PLoS)")
@@ -77,7 +85,11 @@ describe Bolognese::Metadata, vcr: true do
77
85
  expect(subject.creators.length).to eq(4)
78
86
  expect(subject.creators.first).to eq("familyName"=>"Fortes", "givenName"=>"Ana Margarida", "name"=>"Fortes, Ana Margarida", "nameType"=>"Personal")
79
87
  expect(subject.titles).to eq([{"title"=>"Transcriptional Modulation of Polyamine Metabolism in Fruit Species Under Abiotic and Biotic Stress"}])
80
- expect(subject.rights_list).to eq([{"rightsUri"=>"https://creativecommons.org/licenses/by/4.0"}])
88
+ expect(subject.rights_list).to eq([{"rights"=>"Creative Commons Attribution 4.0 International",
89
+ "rightsIdentifier"=>"CC-BY-4.0",
90
+ "rightsIdentifierScheme"=>"SPDX",
91
+ "rightsUri"=>"https://creativecommons.org/licenses/by/4.0/legalcode",
92
+ "schemeUri"=>"https://spdx.org/licenses/"}])
81
93
  expect(subject.dates).to eq([{"date"=>"2019-07-02", "dateType"=>"Issued"}, {"date"=>"2019-07-02T11:08:31Z", "dateType"=>"Updated"}])
82
94
  expect(subject.publication_year).to eq("2019")
83
95
  expect(subject.publisher).to eq("Frontiers Media SA")
@@ -192,7 +204,11 @@ describe Bolognese::Metadata, vcr: true do
192
204
  expect(subject.types).to eq("bibtex"=>"article", "citeproc"=>"article-journal", "resourceType"=>"JournalArticle", "resourceTypeGeneral"=>"Text", "ris"=>"JOUR", "schemaOrg"=>"ScholarlyArticle")
193
205
  expect(subject.creators.length).to eq(7)
194
206
  expect(subject.creators[2]).to eq("nameType"=>"Personal", "nameIdentifiers" => [{"nameIdentifier"=>"https://orcid.org/0000-0003-2043-4925", "nameIdentifierScheme"=>"ORCID", "schemeUri"=>"https://orcid.org"}], "name"=>"Hernandez, Beatriz", "givenName"=>"Beatriz", "familyName"=>"Hernandez", "affiliation" => [{"name"=>"War Related Illness and Injury Study Center (WRIISC) and Mental Illness Research Education and Clinical Center (MIRECC), Department of Veterans Affairs, Palo Alto, CA 94304, USA"}, {"name"=>"Department of Psychiatry and Behavioral Sciences, Stanford University School of Medicine, Stanford, CA 94304, USA"}])
195
- expect(subject.rights_list).to eq([{"rightsUri"=>"http://creativecommons.org/licenses/by/3.0"}])
207
+ expect(subject.rights_list).to eq([{"rights"=>"Creative Commons Attribution 3.0 Unported",
208
+ "rightsIdentifier"=>"CC-BY-3.0",
209
+ "rightsIdentifierScheme"=>"SPDX",
210
+ "rightsUri"=>"https://creativecommons.org/licenses/by/3.0/legalcode",
211
+ "schemeUri"=>"https://spdx.org/licenses/"}])
196
212
  expect(subject.titles).to eq([{"title"=>"Delineating a Retesting Zone Using Receiver Operating Characteristic Analysis on Serial QuantiFERON Tuberculosis Test Results in US Healthcare Workers"}])
197
213
  expect(subject.dates).to eq([{"date"=>"2012", "dateType"=>"Issued"}, {"date"=>"2016-08-02T18:42:41Z", "dateType"=>"Updated"}])
198
214
  expect(subject.publication_year).to eq("2012")
@@ -547,7 +563,7 @@ describe Bolognese::Metadata, vcr: true do
547
563
  expect(subject.creators.length).to eq(3)
548
564
  expect(subject.creators.first).to eq("nameType"=>"Personal", "nameIdentifiers" => [{"nameIdentifier"=>"https://orcid.org/0000-0002-4156-3761", "nameIdentifierScheme"=>"ORCID", "schemeUri"=>"https://orcid.org"}], "name"=>"Dissmeyer, Nico", "givenName"=>"Nico", "familyName"=>"Dissmeyer", "affiliation" => [{"name"=>"Independent Junior Research Group on Protein Recognition and Degradation; Leibniz Institute of Plant Biochemistry (IPB); Weinberg 3 Halle (Saale) D-06120 Germany"}, {"name"=>"ScienceCampus Halle - Plant-based Bioeconomy; Betty-Heimann-Strasse 3 Halle (Saale) D-06120 Germany"}])
549
565
  expect(subject.titles).to eq([{"title"=>"Life and death of proteins after protease cleavage: protein degradation by the N-end rule pathway"}])
550
- expect(subject.rights_list).to eq([{"rightsUri"=>"http://doi.wiley.com/10.1002/tdm_license_1.1"}, {"rightsUri"=>"http://onlinelibrary.wiley.com/termsAndConditions"}])
566
+ expect(subject.rights_list).to eq([{"rightsUri"=>"http://doi.wiley.com/10.1002/tdm_license_1.1"}, {"rightsUri"=>"http://onlinelibrary.wiley.com/termsAndConditions#vor"}])
551
567
  expect(subject.dates).to eq([{"date"=>"2018-05", "dateType"=>"Issued"}, {"date"=>"2018-08-07T05:52:14Z", "dateType"=>"Updated"}])
552
568
  expect(subject.publication_year).to eq("2018")
553
569
  expect(subject.publisher).to eq("Wiley")
@@ -69,7 +69,7 @@ describe Bolognese::Metadata, vcr: true do
69
69
  expect(subject.identifiers).to eq([{"identifier"=>"https://doi.org/10.5281/zenodo.28518", "identifierType"=>"DOI"}, {"identifier"=>"https://zenodo.org/record/28518", "identifierType"=>"URL"}])
70
70
  expect(subject.dates).to eq([{"date"=>"2015-08-19", "dateType"=>"Issued"}])
71
71
  expect(subject.publication_year).to eq("2015")
72
- expect(subject.version).to eq("v0.3.2")
72
+ expect(subject.version_info).to eq("v0.3.2")
73
73
  expect(subject.datacite).to include("<version>v0.3.2</version>")
74
74
  expect(subject.related_identifiers.length).to eq(2)
75
75
  expect(subject.related_identifiers.first).to eq("relatedIdentifier"=>"https://github.com/jakevdp/supersmoother/tree/v0.3.2", "relatedIdentifierType"=>"URL", "relationType"=>"IsSupplementTo")
@@ -31,7 +31,11 @@ describe Bolognese::Metadata, vcr: true do
31
31
  {"identifier"=>
32
32
  "Ollomo B, Durand P, Prugnolle F, Douzery EJP, Arnathau C, Nkoghe D, Leroy E, Renaud F (2009) A new malaria agent in African hominids. PLoS Pathogens 5(5): e1000446.",
33
33
  "identifierType"=>"citation"}])
34
- expect(subject.rights_list).to eq([{"rightsUri"=>"http://creativecommons.org/publicdomain/zero/1.0"}])
34
+ expect(subject.rights_list).to eq([{"rights"=>"Creative Commons Zero v1.0 Universal",
35
+ "rightsIdentifier"=>"CC0-1.0",
36
+ "rightsIdentifierScheme"=>"SPDX",
37
+ "rightsUri"=>"https://creativecommons.org/publicdomain/zero/1.0/legalcode",
38
+ "schemeUri"=>"https://spdx.org/licenses/"}])
35
39
  expect(subject.publication_year).to eq("2011")
36
40
  expect(subject.related_identifiers.length).to eq(6)
37
41
  expect(subject.related_identifiers.last).to eq("relatedIdentifier"=>"19478877", "relatedIdentifierType"=>"PMID", "relationType"=>"IsSupplementTo")
@@ -121,7 +125,7 @@ describe Bolognese::Metadata, vcr: true do
121
125
  {"identifier"=>
122
126
  "https://schema.datacite.org/meta/kernel-4.2/example/datacite-example-full-v4.2.xml",
123
127
  "identifierType"=>"URL"}])
124
- expect(subject.rights_list).to eq([{"lang"=>"en-US", "rightsUri"=>"http://creativecommons.org/publicdomain/zero/1.0"}])
128
+ expect(subject.rights_list).to eq([{"lang"=>"en-US", "rights"=>"Creative Commons Zero v1.0 Universal", "rightsIdentifier"=>"CC0-1.0", "rightsIdentifierScheme"=>"SPDX", "rightsUri"=>"https://creativecommons.org/publicdomain/zero/1.0/legalcode", "schemeUri"=>"https://spdx.org/licenses/"}])
125
129
  expect(subject.publication_year).to eq("2014")
126
130
  expect(subject.contributors).to eq([{"name"=>"Starr, Joan", "givenName"=>"Joan", "familyName"=>"Starr", "nameIdentifiers"=>[{"nameIdentifier"=>"https://orcid.org/0000-0002-7285-027X", "schemeUri"=>"https://orcid.org", "nameIdentifierScheme"=>"ORCID"}], "affiliation"=>
127
131
  [{"affiliationIdentifier"=>"https://ror.org/03yrm5c26",
@@ -193,7 +197,13 @@ describe Bolognese::Metadata, vcr: true do
193
197
  expect(subject.creators).to eq([{"nameType"=>"Personal", "name"=>"Garza, Kristian", "givenName"=>"Kristian", "familyName"=>"Garza", "nameIdentifiers" => [], "affiliation" => []}])
194
198
  expect(subject.titles).to eq([{"title"=>"Analysis Tools For Crossover Experiment Of Ui Using Choice Architecture"}])
195
199
  expect(subject.descriptions.first["description"]).to start_with("This tools are used to analyse the data produced by the Crosssover Experiment")
196
- expect(subject.rights_list).to eq([{"rights"=>"Creative Commons Attribution-NonCommercial-ShareAlike", "rightsUri"=>"https://creativecommons.org/licenses/by-nc-sa/4.0"},{"rights"=>"Open Access", "rightsUri"=>"info:eu-repo/semantics/openAccess"}])
200
+ expect(subject.rights_list).to eq([{"rights"=>
201
+ "Creative Commons Attribution Non Commercial Share Alike 4.0 International",
202
+ "rightsIdentifier"=>"CC-BY-NC-SA-4.0",
203
+ "rightsIdentifierScheme"=>"SPDX",
204
+ "rightsUri"=>"https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode",
205
+ "schemeUri"=>"https://spdx.org/licenses/"},
206
+ {"rights"=>"Open Access", "rightsUri"=>"info:eu-repo/semantics/openAccess"}])
197
207
  expect(subject.dates).to eq([{"date"=>"2016-03-27", "dateType"=>"Issued"}])
198
208
  expect(subject.publication_year).to eq("2016")
199
209
  expect(subject.related_identifiers.length).to eq(1)
@@ -218,7 +228,11 @@ describe Bolognese::Metadata, vcr: true do
218
228
  expect(subject.creators.first).to eq("nameType"=>"Personal", "nameIdentifiers" => [{"nameIdentifier"=>"https://orcid.org/0000-0002-2410-9671", "nameIdentifierScheme"=>"ORCID", "schemeUri"=>"https://orcid.org"}], "name"=>"Junge, Alexander", "givenName"=>"Alexander", "familyName"=>"Junge", "affiliation" => [])
219
229
  expect(subject.titles).to eq([{"title"=>"RAIN v1"}])
220
230
  expect(subject.descriptions.first["description"]).to start_with("<b>RAIN: RNA–protein Association and Interaction Networks")
221
- expect(subject.rights_list).to eq([{"rightsUri"=>"https://creativecommons.org/licenses/by/4.0", "rights"=>"CC-BY"}])
231
+ expect(subject.rights_list).to eq([{"rights"=>"Creative Commons Attribution 4.0 International",
232
+ "rightsIdentifier"=>"CC-BY-4.0",
233
+ "rightsIdentifierScheme"=>"SPDX",
234
+ "rightsUri"=>"https://creativecommons.org/licenses/by/4.0/legalcode",
235
+ "schemeUri"=>"https://spdx.org/licenses/"}])
222
236
  expect(subject.dates).to eq([{"date"=>"2016-11-16", "dateType"=>"Created"}, {"date"=>"2016-11-16", "dateType"=>"Updated"}, {"date"=>"2016", "dateType"=>"Issued"}])
223
237
  expect(subject.publication_year).to eq("2016")
224
238
  expect(subject.related_identifiers.length).to eq(1)
@@ -249,7 +263,11 @@ describe Bolognese::Metadata, vcr: true do
249
263
  "nameIdentifiers" => [{"nameIdentifier"=>"https://orcid.org/0000-0002-2874-287X", "nameIdentifierScheme"=>"ORCID", "schemeUri"=>"https://orcid.org"}], "affiliation" => [])
250
264
  expect(subject.titles).to eq([{"title"=>"Drosophila melanogaster African Wings"}])
251
265
  expect(subject.descriptions.first["description"]).to start_with("These are raw wing images from <i>Drosophila melanogaster</i>")
252
- expect(subject.rights_list).to eq([{"rights"=>"CC BY 4.0", "rightsUri"=>"https://creativecommons.org/licenses/by/4.0"}])
266
+ expect(subject.rights_list).to eq([{"rights"=>"Creative Commons Attribution 4.0 International",
267
+ "rightsIdentifier"=>"CC-BY-4.0",
268
+ "rightsIdentifierScheme"=>"SPDX",
269
+ "rightsUri"=>"https://creativecommons.org/licenses/by/4.0/legalcode",
270
+ "schemeUri"=>"https://spdx.org/licenses/"}])
253
271
  expect(subject.dates).to eq([{"date"=>"2015-06-14", "dateType"=>"Created"},
254
272
  {"date"=>"2018-03-17", "dateType"=>"Updated"},
255
273
  {"date"=>"2015", "dateType"=>"Issued"}])
@@ -684,7 +702,12 @@ describe Bolognese::Metadata, vcr: true do
684
702
  expect(subject.publication_year).to eq("2010")
685
703
  expect(subject.related_identifiers.length).to eq(1)
686
704
  expect(subject.related_identifiers.last).to eq("relatedIdentifier"=>"10.5272/oldertestpub", "relatedIdentifierType"=>"DOI", "relationType"=>"IsPartOf", "resourceTypeGeneral"=>"Text")
687
- expect(subject.rights_list).to eq([{"lang"=>"eng", "rightsUri"=>"http://creativecommons.org/licenses/by-nd/2.0", "rights"=>"Creative Commons Attribution-NoDerivs 2.0 Generic"}])
705
+ expect(subject.rights_list).to eq([{"lang"=>"eng",
706
+ "rights"=>"Creative Commons Attribution No Derivatives 2.0 Generic",
707
+ "rightsIdentifier"=>"CC-BY-ND-2.0",
708
+ "rightsIdentifierScheme"=>"SPDX",
709
+ "rightsUri"=>"https://creativecommons.org/licenses/by-nd/2.0/legalcode",
710
+ "schemeUri"=>"https://spdx.org/licenses/"}])
688
711
  expect(subject.publisher).to eq("Springer")
689
712
  expect(subject.agency).to eq("DataCite")
690
713
  expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4")
@@ -709,7 +732,11 @@ describe Bolognese::Metadata, vcr: true do
709
732
  expect(subject.publication_year).to eq("2010")
710
733
  expect(subject.related_identifiers.length).to eq(1)
711
734
  expect(subject.related_identifiers.last).to eq("relatedIdentifier"=>"10.5272/oldertestpub", "relatedIdentifierType"=>"DOI", "relationType"=>"IsPartOf")
712
- expect(subject.rights_list).to eq([{"rightsUri"=>"http://creativecommons.org/licenses/by-nd/2.0", "rights"=>"Creative Commons Attribution-NoDerivs 2.0 Generic"}])
735
+ expect(subject.rights_list).to eq([{"rights"=>"Creative Commons Attribution No Derivatives 2.0 Generic",
736
+ "rightsIdentifier"=>"CC-BY-ND-2.0",
737
+ "rightsIdentifierScheme"=>"SPDX",
738
+ "rightsUri"=>"https://creativecommons.org/licenses/by-nd/2.0/legalcode",
739
+ "schemeUri"=>"https://spdx.org/licenses/"}])
713
740
  expect(subject.publisher).to eq("Springer")
714
741
  expect(subject.agency).to eq("DataCite")
715
742
  expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-4.0")
@@ -734,7 +761,11 @@ describe Bolognese::Metadata, vcr: true do
734
761
  expect(subject.publication_year).to eq("2011")
735
762
  expect(subject.related_identifiers.length).to eq(4)
736
763
  expect(subject.related_identifiers.last).to eq("relatedIdentifier"=>"19478877", "relatedIdentifierType"=>"PMID", "relationType"=>"IsReferencedBy")
737
- expect(subject.rights_list).to eq([{"rightsUri"=>"http://creativecommons.org/publicdomain/zero/1.0"}])
764
+ expect(subject.rights_list).to eq([{"rights"=>"Creative Commons Zero v1.0 Universal",
765
+ "rightsIdentifier"=>"CC0-1.0",
766
+ "rightsIdentifierScheme"=>"SPDX",
767
+ "rightsUri"=>"https://creativecommons.org/publicdomain/zero/1.0/legalcode",
768
+ "schemeUri"=>"https://spdx.org/licenses/"}])
738
769
  expect(subject.publisher).to eq("Dryad Digital Repository")
739
770
  expect(subject.agency).to eq("DataCite")
740
771
  expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-3")
@@ -759,7 +790,11 @@ describe Bolognese::Metadata, vcr: true do
759
790
  expect(subject.publication_year).to eq("2010")
760
791
  expect(subject.related_identifiers.length).to eq(1)
761
792
  expect(subject.related_identifiers.last).to eq("relatedIdentifier"=>"10.5272/oldertestpub", "relatedIdentifierType"=>"DOI", "relationType"=>"IsPartOf")
762
- expect(subject.rights_list).to eq([{"rightsUri"=>"http://creativecommons.org/licenses/by-nd/2.0", "rights"=>"Creative Commons Attribution-NoDerivs 2.0 Generic"}])
793
+ expect(subject.rights_list).to eq([{"rights"=>"Creative Commons Attribution No Derivatives 2.0 Generic",
794
+ "rightsIdentifier"=>"CC-BY-ND-2.0",
795
+ "rightsIdentifierScheme"=>"SPDX",
796
+ "rightsUri"=>"https://creativecommons.org/licenses/by-nd/2.0/legalcode",
797
+ "schemeUri"=>"https://spdx.org/licenses/"}])
763
798
  expect(subject.publisher).to eq("Springer")
764
799
  expect(subject.agency).to eq("DataCite")
765
800
  expect(subject.schema_version).to eq("http://datacite.org/schema/kernel-3.0")
@@ -811,7 +846,12 @@ describe Bolognese::Metadata, vcr: true do
811
846
  expect(subject.publication_year).to eq("2010")
812
847
  expect(subject.related_identifiers.length).to eq(1)
813
848
  expect(subject.related_identifiers.last).to eq("relatedIdentifier"=>"10.5272/oldertestpub", "relatedIdentifierType"=>"DOI", "relationType"=>"IsPartOf", "resourceTypeGeneral"=>"Text")
814
- expect(subject.rights_list).to eq([{"lang"=>"eng", "rightsUri"=>"http://creativecommons.org/licenses/by-nd/2.0", "rights"=>"Creative Commons Attribution-NoDerivs 2.0 Generic"}])
849
+ expect(subject.rights_list).to eq([{"lang"=>"eng",
850
+ "rights"=>"Creative Commons Attribution No Derivatives 2.0 Generic",
851
+ "rightsIdentifier"=>"CC-BY-ND-2.0",
852
+ "rightsIdentifierScheme"=>"SPDX",
853
+ "rightsUri"=>"https://creativecommons.org/licenses/by-nd/2.0/legalcode",
854
+ "schemeUri"=>"https://spdx.org/licenses/"}])
815
855
  expect(subject.publisher).to eq("Springer")
816
856
  expect(subject.agency).to eq("DataCite")
817
857
  end
@@ -967,7 +1007,7 @@ describe Bolognese::Metadata, vcr: true do
967
1007
  "nameIdentifiers"=> [{"nameIdentifier"=>"https://orcid.org/0000-0002-8743-4455", "nameIdentifierScheme"=>"ORCID", "schemeUri"=>"https://orcid.org"}],
968
1008
  "affiliation"=>[{"name"=>"Royal Netherlands Meteorological Institute (KNMI)"}]}])
969
1009
  expect(subject.titles).to eq([{"title"=>"Multi-Sensor Reanalysis (MSR) of total ozone, version 2"}])
970
- expect(subject.version).to eq("2")
1010
+ expect(subject.version_info).to eq("2")
971
1011
  expect(subject.dates).to eq([{"date"=>"2014-04-25", "dateType"=>"Available"}, {"date"=>"2015", "dateType"=>"Issued"}])
972
1012
  expect(subject.publication_year).to eq("2015")
973
1013
  expect(subject.publisher).to eq("Royal Netherlands Meteorological Institute (KNMI)")