bolognese 1.9.12 → 1.9.17

Sign up to get free protection for your applications and to get access to all the features.
Files changed (12) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/pull-request.yml +21 -0
  3. data/.gitignore +1 -0
  4. data/CHANGELOG.md +47 -5
  5. data/Gemfile.lock +76 -77
  6. data/bolognese.gemspec +1 -1
  7. data/lib/bolognese/readers/schema_org_reader.rb +3 -4
  8. data/lib/bolognese/version.rb +1 -1
  9. data/resources/oecd/dfg-mappings.json +1866 -0
  10. data/spec/metadata_spec.rb +1 -1
  11. data/spec/readers/datacite_json_reader_spec.rb +1 -1
  12. metadata +14 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 809d529a1ec99aa9653b7532586134862f896e46338e33fd97ea54da86dd0ed1
4
- data.tar.gz: 85532735a718977631655c991d2c545a9974e091e5d656ab389b953b6d608165
3
+ metadata.gz: dd97b1d21783c57768cd25908cbd6be7d676c1f6993a0c242d5c3f254ad22b93
4
+ data.tar.gz: 10a5d72f8291eb95773b0f65b3ebc161072c98ff62fd7ac7c90263fa1be63578
5
5
  SHA512:
6
- metadata.gz: 013f57c1d908072881e9736c29e2e623cc0b311789450a20abeb0930f2dd754a9c09cf5b69cca8647b5561ace43dec33ffe6623424f5c1e79eb5f59defc74edc
7
- data.tar.gz: 22e534387e3a579ded5f1d4da6fa46193e44169c5df2c6eb2a8a7f7fd3ba1218ecd59f74e540be67125a1dc6ab49cbf817dbaca430d26c3d3c06e2507fe127e1
6
+ metadata.gz: 6d05090c57b150bf61a9111a57aab3432d7fceaf60b75949476571344b61838b25140a816d2b2bd3b052f071428193f3dc9bcfdc6a452552cf7af1212c97060b
7
+ data.tar.gz: ebf7a1b66b48cfe38ab3cdd308c9c936638fffb64fd3b756ec0d5b51c89545bdb07c23e0443d9536c18d2761c16a9133e860c703e102e1b66b01ed2c40b153ad
data/.github/workflows/pull-request.yml ADDED
@@ -0,0 +1,21 @@
1
+ name: Pull Request - Run Tests
2
+
3
+ on:
4
+ pull_request:
5
+ branches:
6
+ - master
7
+ jobs:
8
+ build:
9
+ runs-on: ubuntu-latest
10
+ steps:
11
+ - uses: actions/checkout@v2
12
+ - name: Set up Ruby 2.6
13
+ uses: actions/setup-ruby@v1
14
+ with:
15
+ ruby-version: 2.6.x
16
+
17
+ - name: Install and test
18
+ run: |
19
+ gem install bundler
20
+ bundle install
21
+ bundle exec rspec
data/.gitignore CHANGED
@@ -57,3 +57,4 @@ coverage/
57
57
  !.env.travis
58
58
 
59
59
  .vscode
60
+ .ruby-version
data/CHANGELOG.md CHANGED
@@ -1,5 +1,47 @@
1
1
  # Changelog
2
2
 
3
+ ## [1.9.16](https://github.com/datacite/bolognese/tree/1.9.16) (2022-07-04)
4
+
5
+ [Full Changelog](https://github.com/datacite/bolognese/compare/1.9.15...1.9.16)
6
+
7
+ ## [1.9.15](https://github.com/datacite/bolognese/tree/1.9.15) (2022-07-04)
8
+
9
+ [Full Changelog](https://github.com/datacite/bolognese/compare/1.9.14...1.9.15)
10
+
11
+ **Merged pull requests:**
12
+
13
+ - Fix issue Bracco 521 [\#138](https://github.com/datacite/bolognese/pull/138) ([richardhallett](https://github.com/richardhallett))
14
+
15
+ ## [1.9.14](https://github.com/datacite/bolognese/tree/1.9.14) (2022-05-25)
16
+
17
+ [Full Changelog](https://github.com/datacite/bolognese/compare/1.9.13...1.9.14)
18
+
19
+ **Merged pull requests:**
20
+
21
+ - Update critical dependencies [\#134](https://github.com/datacite/bolognese/pull/134) ([jrhoads](https://github.com/jrhoads))
22
+
23
+ ## [1.9.13](https://github.com/datacite/bolognese/tree/1.9.13) (2022-01-06)
24
+
25
+ [Full Changelog](https://github.com/datacite/bolognese/compare/1.9.12...1.9.13)
26
+
27
+ **Fixed bugs:**
28
+
29
+ - Schema 4 RelatedItems does not allow relatedItem without relatedItemIdentifier [\#118](https://github.com/datacite/bolognese/issues/118)
30
+
31
+ **Closed issues:**
32
+
33
+ - How to use "bolognese help \[COMMAND\]"? [\#129](https://github.com/datacite/bolognese/issues/129)
34
+ - Move nokogiri dependency up to dependency \>= 1.12.5 [\#127](https://github.com/datacite/bolognese/issues/127)
35
+
36
+ **Merged pull requests:**
37
+
38
+ - update nokogiri to latest, including updating maremma [\#130](https://github.com/datacite/bolognese/pull/130) ([orangewolf](https://github.com/orangewolf))
39
+ - mapping for DFG-to-OECD [\#125](https://github.com/datacite/bolognese/pull/125) ([kjgarza](https://github.com/kjgarza))
40
+
41
+ ## [1.9.12](https://github.com/datacite/bolognese/tree/1.9.12) (2021-08-19)
42
+
43
+ [Full Changelog](https://github.com/datacite/bolognese/compare/1.9.11...1.9.12)
44
+
3
45
  ## [1.9.11](https://github.com/datacite/bolognese/tree/1.9.11) (2021-08-17)
4
46
 
5
47
  [Full Changelog](https://github.com/datacite/bolognese/compare/1.9.10...1.9.11)
@@ -1318,15 +1360,15 @@
1318
1360
 
1319
1361
  ## [v.0.9.70](https://github.com/datacite/bolognese/tree/v.0.9.70) (2018-01-12)
1320
1362
 
1321
- [Full Changelog](https://github.com/datacite/bolognese/compare/v.0.9.69...v.0.9.70)
1363
+ [Full Changelog](https://github.com/datacite/bolognese/compare/v.0.6.69...v.0.9.70)
1322
1364
 
1323
- ## [v.0.9.69](https://github.com/datacite/bolognese/tree/v.0.9.69) (2018-01-11)
1365
+ ## [v.0.6.69](https://github.com/datacite/bolognese/tree/v.0.6.69) (2018-01-11)
1324
1366
 
1325
- [Full Changelog](https://github.com/datacite/bolognese/compare/v.0.6.69...v.0.9.69)
1367
+ [Full Changelog](https://github.com/datacite/bolognese/compare/v.0.9.69...v.0.6.69)
1326
1368
 
1327
- ## [v.0.6.69](https://github.com/datacite/bolognese/tree/v.0.6.69) (2018-01-11)
1369
+ ## [v.0.9.69](https://github.com/datacite/bolognese/tree/v.0.9.69) (2018-01-11)
1328
1370
 
1329
- [Full Changelog](https://github.com/datacite/bolognese/compare/v.0.9.68...v.0.6.69)
1371
+ [Full Changelog](https://github.com/datacite/bolognese/compare/v.0.9.68...v.0.9.69)
1330
1372
 
1331
1373
  ## [v.0.9.68](https://github.com/datacite/bolognese/tree/v.0.9.68) (2018-01-11)
1332
1374
 
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- bolognese (1.9.12)
4
+ bolognese (1.9.17)
5
5
  activesupport (>= 4.2.5)
6
6
  benchmark_methods (~> 0.7)
7
7
  bibtex-ruby (>= 5.1.0)
@@ -19,7 +19,7 @@ PATH
19
19
  loofah (~> 2.0, >= 2.0.3)
20
20
  maremma (>= 4.9.4, < 5)
21
21
  namae (~> 1.0)
22
- nokogiri (~> 1.11.2)
22
+ nokogiri (>= 1.13.2, < 1.14)
23
23
  oj (~> 3.10)
24
24
  oj_mimic_json (~> 1.0, >= 1.0.1)
25
25
  postrank-uri (~> 1.0, >= 1.0.18)
@@ -30,7 +30,7 @@ PATH
30
30
  GEM
31
31
  remote: https://rubygems.org/
32
32
  specs:
33
- activesupport (6.1.4)
33
+ activesupport (6.1.6)
34
34
  concurrent-ruby (~> 1.0, >= 1.0.2)
35
35
  i18n (>= 1.6, < 2)
36
36
  minitest (>= 5.1)
@@ -38,7 +38,7 @@ GEM
38
38
  zeitwerk (~> 2.3)
39
39
  addressable (2.8.0)
40
40
  public_suffix (>= 2.0.2, < 5.0)
41
- amazing_print (1.3.0)
41
+ amazing_print (1.4.0)
42
42
  benchmark_methods (0.7)
43
43
  bibtex-ruby (6.0.0)
44
44
  latex-decode (~> 0.0)
@@ -49,7 +49,7 @@ GEM
49
49
  citeproc (~> 1.0, >= 1.0.9)
50
50
  csl (~> 1.6)
51
51
  colorize (0.8.1)
52
- concurrent-ruby (1.1.9)
52
+ concurrent-ruby (1.1.10)
53
53
  crack (0.4.5)
54
54
  rexml
55
55
  crass (1.0.6)
@@ -58,19 +58,19 @@ GEM
58
58
  rexml
59
59
  csl-styles (1.0.1.11)
60
60
  csl (~> 1.0)
61
- diff-lcs (1.4.4)
61
+ diff-lcs (1.5.0)
62
62
  docile (1.4.0)
63
- ebnf (2.1.3)
64
- amazing_print (~> 1.2)
63
+ ebnf (2.3.1)
64
+ amazing_print (~> 1.4)
65
65
  htmlentities (~> 4.3)
66
- rdf (~> 3.1)
66
+ rdf (~> 3.2)
67
67
  scanf (~> 1.0)
68
- sxp (~> 1.1)
69
- unicode-types (~> 1.6)
70
- edtf (3.0.6)
71
- activesupport (>= 3.0, < 7.0)
68
+ sxp (~> 1.2)
69
+ unicode-types (~> 1.7)
70
+ edtf (3.0.8)
71
+ activesupport (>= 3.0, < 8.0)
72
72
  excon (0.71.1)
73
- faraday (0.17.4)
73
+ faraday (0.17.5)
74
74
  multipart-post (>= 1.2, < 3)
75
75
  faraday-encoding (0.0.5)
76
76
  faraday
@@ -81,34 +81,32 @@ GEM
81
81
  haml (5.2.2)
82
82
  temple (>= 0.8.0)
83
83
  tilt
84
- hamster (3.0.0)
85
- concurrent-ruby (~> 1.0)
86
84
  hashdiff (1.0.1)
87
85
  htmlentities (4.3.4)
88
- i18n (1.8.10)
86
+ i18n (1.10.0)
89
87
  concurrent-ruby (~> 1.0)
90
88
  iso8601 (0.9.1)
91
- json (2.5.1)
92
- json-canonicalization (0.2.1)
93
- json-ld (3.1.9)
89
+ json (2.6.2)
90
+ json-canonicalization (0.3.0)
91
+ json-ld (3.2.1)
94
92
  htmlentities (~> 4.3)
95
- json-canonicalization (~> 0.2)
93
+ json-canonicalization (~> 0.3)
96
94
  link_header (~> 0.0, >= 0.0.8)
97
- multi_json (~> 1.14)
98
- rack (~> 2.0)
99
- rdf (~> 3.1)
100
- json-ld-preloaded (3.1.6)
101
- json-ld (~> 3.1)
102
- rdf (~> 3.1)
95
+ multi_json (~> 1.15)
96
+ rack (~> 2.2)
97
+ rdf (~> 3.2)
98
+ json-ld-preloaded (3.2.0)
99
+ json-ld (~> 3.2)
100
+ rdf (~> 3.2)
103
101
  jsonlint (0.3.0)
104
102
  oj (~> 3)
105
103
  optimist (~> 3)
106
104
  latex-decode (0.3.2)
107
105
  link_header (0.0.8)
108
- loofah (2.12.0)
106
+ loofah (2.18.0)
109
107
  crass (~> 1.0.2)
110
108
  nokogiri (>= 1.5.9)
111
- maremma (4.9.5)
109
+ maremma (4.9.8)
112
110
  activesupport (>= 4.2.5)
113
111
  addressable (>= 2.3.6)
114
112
  builder (~> 3.2, >= 3.2.2)
@@ -116,18 +114,19 @@ GEM
116
114
  faraday (~> 0.17.3)
117
115
  faraday-encoding (~> 0.0.4)
118
116
  faraday_middleware (~> 0.14.0)
119
- nokogiri (~> 1.11.2)
117
+ nokogiri (>= 1.11.2, < 1.14.0)
120
118
  oj (>= 2.8.3)
121
119
  oj_mimic_json (~> 1.0, >= 1.0.1)
122
- mini_portile2 (2.5.3)
123
- minitest (5.14.4)
120
+ matrix (0.4.2)
121
+ mini_portile2 (2.8.0)
122
+ minitest (5.16.2)
124
123
  multi_json (1.15.0)
125
- multipart-post (2.1.1)
124
+ multipart-post (2.2.3)
126
125
  namae (1.1.1)
127
- nokogiri (1.11.7)
128
- mini_portile2 (~> 2.5.0)
126
+ nokogiri (1.13.6)
127
+ mini_portile2 (~> 2.8.0)
129
128
  racc (~> 1.4)
130
- oj (3.13.2)
129
+ oj (3.13.15)
131
130
  oj_mimic_json (1.0.1)
132
131
  optimist (3.0.1)
133
132
  postrank-uri (1.0.24)
@@ -135,50 +134,49 @@ GEM
135
134
  nokogiri (>= 1.8.0)
136
135
  public_suffix (>= 2.0.0, < 2.1)
137
136
  public_suffix (2.0.5)
138
- racc (1.5.2)
139
- rack (2.2.3)
137
+ racc (1.6.0)
138
+ rack (2.2.3.1)
140
139
  rack-test (0.8.3)
141
140
  rack (>= 1.0, < 3)
142
141
  rake (12.3.3)
143
- rdf (3.1.15)
144
- hamster (~> 3.0)
142
+ rdf (3.2.8)
145
143
  link_header (~> 0.0, >= 0.0.8)
146
- rdf-aggregate-repo (3.1.0)
147
- rdf (~> 3.1)
148
- rdf-rdfa (3.1.3)
144
+ rdf-aggregate-repo (3.2.1)
145
+ rdf (~> 3.2)
146
+ rdf-rdfa (3.2.0)
149
147
  haml (~> 5.2)
150
148
  htmlentities (~> 4.3)
151
- rdf (~> 3.1, >= 3.1.13)
152
- rdf-aggregate-repo (~> 3.1)
153
- rdf-vocab (~> 3.1, >= 3.1.11)
154
- rdf-xsd (~> 3.1)
155
- rdf-rdfxml (3.1.1)
149
+ rdf (~> 3.2)
150
+ rdf-aggregate-repo (~> 3.2)
151
+ rdf-vocab (~> 3.2)
152
+ rdf-xsd (~> 3.2)
153
+ rdf-rdfxml (3.2.0)
156
154
  htmlentities (~> 4.3)
157
- rdf (~> 3.1)
158
- rdf-rdfa (~> 3.1)
159
- rdf-xsd (~> 3.1)
160
- rdf-turtle (3.1.3)
161
- ebnf (~> 2.1)
162
- rdf (~> 3.1, >= 3.1.8)
163
- rdf-vocab (3.1.14)
164
- rdf (~> 3.1, >= 3.1.12)
165
- rdf-xsd (3.1.1)
166
- rdf (~> 3.1)
155
+ rdf (~> 3.2)
156
+ rdf-rdfa (~> 3.2)
157
+ rdf-xsd (~> 3.2)
158
+ rdf-turtle (3.2.1)
159
+ ebnf (~> 2.3)
160
+ rdf (~> 3.2)
161
+ rdf-vocab (3.2.1)
162
+ rdf (~> 3.2, >= 3.2.4)
163
+ rdf-xsd (3.2.1)
164
+ rdf (~> 3.2)
167
165
  rexml (~> 3.2)
168
166
  rexml (3.2.5)
169
- rspec (3.10.0)
170
- rspec-core (~> 3.10.0)
171
- rspec-expectations (~> 3.10.0)
172
- rspec-mocks (~> 3.10.0)
173
- rspec-core (3.10.1)
174
- rspec-support (~> 3.10.0)
175
- rspec-expectations (3.10.1)
167
+ rspec (3.11.0)
168
+ rspec-core (~> 3.11.0)
169
+ rspec-expectations (~> 3.11.0)
170
+ rspec-mocks (~> 3.11.0)
171
+ rspec-core (3.11.0)
172
+ rspec-support (~> 3.11.0)
173
+ rspec-expectations (3.11.0)
176
174
  diff-lcs (>= 1.2.0, < 2.0)
177
- rspec-support (~> 3.10.0)
178
- rspec-mocks (3.10.2)
175
+ rspec-support (~> 3.11.0)
176
+ rspec-mocks (3.11.1)
179
177
  diff-lcs (>= 1.2.0, < 2.0)
180
- rspec-support (~> 3.10.0)
181
- rspec-support (3.10.2)
178
+ rspec-support (~> 3.11.0)
179
+ rspec-support (3.11.0)
182
180
  rspec-xsd (0.1.0)
183
181
  nokogiri (~> 1.6)
184
182
  rspec (~> 3)
@@ -188,21 +186,22 @@ GEM
188
186
  json (>= 1.8, < 3)
189
187
  simplecov-html (~> 0.10.0)
190
188
  simplecov-html (0.10.2)
191
- sxp (1.1.0)
192
- rdf (~> 3.1)
189
+ sxp (1.2.2)
190
+ matrix
191
+ rdf (~> 3.2)
193
192
  temple (0.8.2)
194
- thor (1.1.0)
193
+ thor (1.2.1)
195
194
  tilt (2.0.10)
196
195
  tzinfo (2.0.4)
197
196
  concurrent-ruby (~> 1.0)
198
- unicode-types (1.6.0)
197
+ unicode-types (1.7.0)
199
198
  unicode_utils (1.4.0)
200
199
  vcr (3.0.3)
201
- webmock (3.13.0)
202
- addressable (>= 2.3.6)
200
+ webmock (3.14.0)
201
+ addressable (>= 2.8.0)
203
202
  crack (>= 0.3.2)
204
203
  hashdiff (>= 0.4.0, < 2.0.0)
205
- zeitwerk (2.4.2)
204
+ zeitwerk (2.6.0)
206
205
 
207
206
  PLATFORMS
208
207
  ruby
@@ -220,4 +219,4 @@ DEPENDENCIES
220
219
  webmock (~> 3.0, >= 3.0.1)
221
220
 
222
221
  BUNDLED WITH
223
- 2.2.26
222
+ 2.3.17
data/bolognese.gemspec CHANGED
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
18
18
  # Declare dependencies here, rather than in the Gemfile
19
19
  s.add_dependency 'maremma', '>= 4.9.4', '< 5'
20
20
  s.add_dependency 'faraday', '~> 0.17.3'
21
- s.add_dependency 'nokogiri', '~> 1.11.2'
21
+ s.add_dependency 'nokogiri', '>= 1.13.2', '< 1.14'
22
22
  s.add_dependency 'loofah', '~> 2.0', '>= 2.0.3'
23
23
  s.add_dependency 'builder', '~> 3.2', '>= 3.2.2'
24
24
  s.add_dependency 'activesupport', '>= 4.2.5'
data/lib/bolognese/readers/schema_org_reader.rb CHANGED
@@ -28,11 +28,10 @@ module Bolognese
28
28
 
29
29
  url = normalize_id(id)
30
30
  response = Maremma.get(url)
31
- doc = Nokogiri::XML(response.body.fetch("data", nil), nil, 'UTF-8')
32
31
 
33
- # workaround for xhtml documents
34
- nodeset = doc.css("script")
35
- string = nodeset.find { |element| element["type"] == "application/ld+json" }
32
+ # Find the schema.org json from the html body
33
+ doc = Nokogiri::HTML(response.body.fetch("data", nil))
34
+ string = doc.at('script[type="application/ld+json"]')
36
35
  string = string.text if string.present?
37
36
 
38
37
  { "string" => string }
data/lib/bolognese/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Bolognese
2
- VERSION = "1.9.12"
2
+ VERSION = "1.9.17"
3
3
  end