fsp_harvester 0.1.24 → 0.1.26

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +162 -163
  3. data/lib/fsp_harvester/version.rb +1 -1
  4. data/lib/metadata_harvester.rb +8 -1
  5. metadata +5 -5
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 59c4e0a12f296c4f92fcd776bbd838f8fdfbe417dd8c13f0ab3e86e826428084
4
- data.tar.gz: a788e3672edcf1803f404002a5d1f3e5291df0698194ba2706b7c3540eb31b2d
3
+ metadata.gz: 28c9dc04a4c6b47876df2299f2cf3c5538abd17ca3dfb0e5855cd730542d576b
4
+ data.tar.gz: 1cf14b8a2a63b6a48e2f903de2142ecb90ace3b8ba0358016f40eb63672347e6
5
5
  SHA512:
6
- metadata.gz: b5c071e27dca4527db638e1f3d3ab5d9e578d9456933fbd9941a753e61330639686a91080ba54ff94b9f35f9fa298e316367df73d4a5f80c1df1cee8e8ab81e0
7
- data.tar.gz: 12ef1d967934df1e1de097695585678631a0c0a7d54045441fc7034033569e1035cf3f39120b3466cef904f317aa7e1e4d3c45cf79e8ede75cc4d30b1f5bd78e
6
+ metadata.gz: 53736a81539ffb3a9eac6876722c1eaa15451ec611c7f18e650c6c0d1d4ef33e1edbc1ee2d5c95d82190af61de7defd80c27686c433233ccdefb885981d40999
7
+ data.tar.gz: 7ba4389b25038fad44c298315d3b14ac2bf705d59c53bc2174624ef194b226da22f3303358a611c283facac07a8e05b076c4fff0312c3721089abcc83b6952d3
data/Gemfile.lock CHANGED
@@ -1,10 +1,10 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- fsp_harvester (0.1.23)
4
+ fsp_harvester (0.1.26)
5
5
  json (~> 2.0)
6
6
  linkeddata (~> 3.2)
7
- linkheaders-processor (~> 0.1.18)
7
+ linkheaders-processor (~> 0.1.19)
8
8
  metainspector (~> 5.11.2)
9
9
  parseconfig (~> 1.1)
10
10
  rake (~> 13.0)
@@ -17,26 +17,23 @@ PATH
17
17
  GEM
18
18
  remote: https://rubygems.org/
19
19
  specs:
20
- addressable (2.8.0)
21
- public_suffix (>= 2.0.2, < 5.0)
22
- amazing_print (1.4.0)
20
+ addressable (2.8.5)
21
+ public_suffix (>= 2.0.2, < 6.0)
23
22
  ast (2.4.2)
24
- bcp47 (0.3.3)
25
- i18n
23
+ bcp47_spec (0.2.1)
26
24
  builder (3.2.4)
27
- concurrent-ruby (1.1.10)
28
- connection_pool (2.2.5)
25
+ concurrent-ruby (1.2.2)
26
+ connection_pool (2.4.1)
29
27
  diff-lcs (1.5.0)
30
28
  domain_name (0.5.20190701)
31
29
  unf (>= 0.0.5, < 1.0.0)
32
- ebnf (2.3.1)
33
- amazing_print (~> 1.4)
30
+ ebnf (2.4.0)
34
31
  htmlentities (~> 4.3)
35
- rdf (~> 3.2)
32
+ rdf (~> 3.3)
36
33
  scanf (~> 1.0)
37
- sxp (~> 1.2)
38
- unicode-types (~> 1.7)
39
- faraday (1.10.1)
34
+ sxp (~> 1.3)
35
+ unicode-types (~> 1.8)
36
+ faraday (1.10.3)
40
37
  faraday-em_http (~> 1.0)
41
38
  faraday-em_synchrony (~> 1.0)
42
39
  faraday-excon (~> 1.1)
@@ -56,7 +53,7 @@ GEM
56
53
  faraday-encoding (0.0.5)
57
54
  faraday
58
55
  faraday-excon (1.1.0)
59
- faraday-http-cache (2.4.1)
56
+ faraday-http-cache (2.5.0)
60
57
  faraday (>= 0.8)
61
58
  faraday-httpclient (1.0.1)
62
59
  faraday-multipart (1.0.4)
@@ -68,9 +65,10 @@ GEM
68
65
  faraday-retry (1.0.3)
69
66
  faraday_middleware (1.2.0)
70
67
  faraday (~> 1.0)
71
- fastimage (2.2.6)
72
- haml (5.2.2)
73
- temple (>= 0.8.0)
68
+ fastimage (2.2.7)
69
+ haml (6.1.2)
70
+ temple (>= 0.8.2)
71
+ thor
74
72
  tilt
75
73
  hamster (3.0.0)
76
74
  concurrent-ruby (~> 1.0)
@@ -78,56 +76,54 @@ GEM
78
76
  http-accept (1.7.0)
79
77
  http-cookie (1.0.5)
80
78
  domain_name (~> 0.5)
81
- i18n (1.12.0)
82
- concurrent-ruby (~> 1.0)
83
79
  json (2.6.2)
84
- json-canonicalization (0.3.0)
85
- json-ld (3.2.3)
80
+ json-canonicalization (0.3.2)
81
+ json-ld (3.3.0)
86
82
  htmlentities (~> 4.3)
87
- json-canonicalization (~> 0.3)
83
+ json-canonicalization (~> 0.3, >= 0.3.2)
88
84
  link_header (~> 0.0, >= 0.0.8)
89
85
  multi_json (~> 1.15)
90
- rack (~> 2.2)
91
- rdf (~> 3.2, >= 3.2.9)
92
- json-ld-preloaded (3.2.0)
93
- json-ld (~> 3.2)
94
- rdf (~> 3.2)
95
- ld-patch (3.2.0)
96
- ebnf (~> 2.2)
97
- rdf (~> 3.2)
98
- rdf-xsd (~> 3.2)
99
- sparql (~> 3.2)
100
- sxp (~> 1.2)
86
+ rack (>= 2.2, < 4)
87
+ rdf (~> 3.3)
88
+ json-ld-preloaded (3.3.0)
89
+ json-ld (~> 3.3)
90
+ rdf (~> 3.3)
91
+ ld-patch (3.3.0)
92
+ ebnf (~> 2.4)
93
+ rdf (~> 3.3)
94
+ rdf-xsd (~> 3.3)
95
+ sparql (~> 3.3)
96
+ sxp (~> 1.3)
101
97
  link_header (0.0.8)
102
- linkeddata (3.2.1)
103
- json-ld (~> 3.2, >= 3.2.3)
104
- json-ld-preloaded (~> 3.2)
105
- ld-patch (~> 3.2)
106
- nokogiri (~> 1.13, >= 1.13.8)
107
- rdf (~> 3.2, >= 3.2.9)
108
- rdf-aggregate-repo (~> 3.2, >= 3.2.1)
109
- rdf-hamster-repo (~> 3.2)
110
- rdf-isomorphic (~> 3.2, >= 3.2.1)
111
- rdf-json (~> 3.2)
112
- rdf-microdata (~> 3.2, >= 3.2.1)
113
- rdf-n3 (~> 3.2, >= 3.2.1)
114
- rdf-normalize (~> 0.5)
115
- rdf-ordered-repo (~> 3.2, >= 3.2.1)
116
- rdf-rdfa (~> 3.2)
117
- rdf-rdfxml (~> 3.2)
118
- rdf-reasoner (~> 0.8)
119
- rdf-tabular (~> 3.2, >= 3.2.1)
120
- rdf-trig (~> 3.2)
121
- rdf-trix (~> 3.2)
122
- rdf-turtle (~> 3.2, >= 3.2.1)
123
- rdf-vocab (~> 3.2, >= 3.2.1)
124
- rdf-xsd (~> 3.2, >= 3.2.1)
125
- shacl (~> 0.2, >= 0.2.1)
126
- shex (~> 0.7, >= 0.7.1)
127
- sparql (~> 3.2, >= 3.2.4)
128
- sparql-client (~> 3.2, >= 3.2.1)
98
+ linkeddata (3.3.1)
99
+ json-ld (~> 3.3)
100
+ json-ld-preloaded (~> 3.3)
101
+ ld-patch (~> 3.3)
102
+ nokogiri (~> 1.15, >= 1.15.4)
103
+ rdf (~> 3.2, >= 3.2.1)
104
+ rdf-aggregate-repo (~> 3.2)
105
+ rdf-hamster-repo (~> 3.3)
106
+ rdf-isomorphic (~> 3.3)
107
+ rdf-json (~> 3.3)
108
+ rdf-microdata (~> 3.3)
109
+ rdf-n3 (~> 3.3)
110
+ rdf-normalize (~> 0.7)
111
+ rdf-ordered-repo (~> 3.3)
112
+ rdf-rdfa (~> 3.3)
113
+ rdf-rdfxml (~> 3.3)
114
+ rdf-reasoner (~> 0.9)
115
+ rdf-tabular (~> 3.3)
116
+ rdf-trig (~> 3.3)
117
+ rdf-trix (~> 3.3)
118
+ rdf-turtle (~> 3.3)
119
+ rdf-vocab (~> 3.3)
120
+ rdf-xsd (~> 3.3)
121
+ shacl (~> 0.4)
122
+ shex (~> 0.8)
123
+ sparql (~> 3.3)
124
+ sparql-client (~> 3.3)
129
125
  yaml-ld (~> 0.0)
130
- linkheaders-processor (0.1.18)
126
+ linkheaders-processor (0.1.19)
131
127
  json (~> 2.0)
132
128
  json-ld (~> 3.2)
133
129
  json-ld-preloaded (~> 3.2)
@@ -135,7 +131,7 @@ GEM
135
131
  metainspector (~> 5.11.2)
136
132
  rest-client (~> 2.1)
137
133
  securerandom (~> 0.1.0)
138
- logger (1.5.1)
134
+ logger (1.5.3)
139
135
  matrix (0.4.2)
140
136
  metainspector (5.11.2)
141
137
  addressable (~> 2.7)
@@ -147,90 +143,91 @@ GEM
147
143
  fastimage (~> 2.2)
148
144
  nesty (~> 1.0)
149
145
  nokogiri (~> 1.11)
150
- mime-types (3.4.1)
146
+ mime-types (3.5.1)
151
147
  mime-types-data (~> 3.2015)
152
- mime-types-data (3.2022.0105)
148
+ mime-types-data (3.2023.0808)
153
149
  multi_json (1.15.0)
154
- multipart-post (2.2.3)
150
+ multipart-post (2.3.0)
155
151
  nesty (1.0.2)
156
- net-http-persistent (4.0.1)
152
+ net-http-persistent (4.0.2)
157
153
  connection_pool (~> 2.2)
158
154
  netrc (0.11.0)
159
- nokogiri (1.13.8-x86_64-linux)
155
+ nokogiri (1.15.4-x86_64-linux)
160
156
  racc (~> 1.4)
161
157
  parallel (1.22.1)
162
158
  parseconfig (1.1.2)
163
159
  parser (3.1.2.1)
164
160
  ast (~> 2.4.1)
165
- psych (4.0.4)
161
+ psych (5.1.0)
166
162
  stringio
167
- public_suffix (4.0.7)
168
- racc (1.6.0)
169
- rack (2.2.4)
163
+ public_suffix (5.0.3)
164
+ racc (1.7.1)
165
+ rack (3.0.8)
170
166
  rainbow (3.1.1)
171
167
  rake (13.0.6)
172
- rdf (3.2.9)
168
+ rdf (3.3.1)
169
+ bcp47_spec (~> 0.2)
173
170
  link_header (~> 0.0, >= 0.0.8)
174
- rdf-aggregate-repo (3.2.1)
175
- rdf (~> 3.2)
176
- rdf-hamster-repo (3.2.1)
171
+ rdf-aggregate-repo (3.3.0)
172
+ rdf (~> 3.3)
173
+ rdf-hamster-repo (3.3.0)
177
174
  hamster (~> 3.0)
178
- rdf (~> 3.2, >= 3.2.1)
179
- rdf-isomorphic (3.2.1)
180
- rdf (~> 3.2)
181
- rdf-json (3.2.0)
182
- rdf (~> 3.2)
183
- rdf-microdata (3.2.1)
175
+ rdf (~> 3.3)
176
+ rdf-isomorphic (3.3.0)
177
+ rdf (~> 3.3)
178
+ rdf-json (3.3.0)
179
+ rdf (~> 3.3)
180
+ rdf-microdata (3.3.0)
184
181
  htmlentities (~> 4.3)
185
- nokogiri (~> 1.13)
186
- rdf (~> 3.2)
187
- rdf-rdfa (~> 3.2)
188
- rdf-xsd (~> 3.2)
189
- rdf-n3 (3.2.1)
190
- ebnf (~> 2.2)
191
- rdf (~> 3.2)
192
- sparql (~> 3.2)
193
- sxp (~> 1.2)
194
- rdf-normalize (0.5.0)
195
- rdf (~> 3.2)
196
- rdf-ordered-repo (3.2.1)
197
- rdf (~> 3.2, >= 3.2.1)
198
- rdf-rdfa (3.2.0)
199
- haml (~> 5.2)
182
+ nokogiri (~> 1.15, >= 1.15.4)
183
+ rdf (~> 3.3)
184
+ rdf-rdfa (~> 3.3)
185
+ rdf-xsd (~> 3.3)
186
+ rdf-n3 (3.3.0)
187
+ ebnf (~> 2.4)
188
+ rdf (~> 3.3)
189
+ sparql (~> 3.3)
190
+ sxp (~> 1.3)
191
+ rdf-normalize (0.7.0)
192
+ rdf (~> 3.3)
193
+ rdf-ordered-repo (3.3.0)
194
+ rdf (~> 3.3)
195
+ rdf-rdfa (3.3.0)
196
+ haml (~> 6.1)
200
197
  htmlentities (~> 4.3)
201
- rdf (~> 3.2)
202
- rdf-aggregate-repo (~> 3.2)
203
- rdf-vocab (~> 3.2)
204
- rdf-xsd (~> 3.2)
205
- rdf-rdfxml (3.2.0)
198
+ rdf (~> 3.3)
199
+ rdf-aggregate-repo (~> 3.3)
200
+ rdf-vocab (~> 3.3)
201
+ rdf-xsd (~> 3.3)
202
+ rdf-rdfxml (3.3.0)
203
+ builder (~> 3.2, >= 3.2.4)
206
204
  htmlentities (~> 4.3)
207
- rdf (~> 3.2)
208
- rdf-rdfa (~> 3.2)
209
- rdf-xsd (~> 3.2)
210
- rdf-reasoner (0.8.0)
211
- rdf (~> 3.2)
212
- rdf-xsd (~> 3.2)
213
- rdf-tabular (3.2.1)
205
+ rdf (~> 3.3)
206
+ rdf-xsd (~> 3.3)
207
+ rdf-reasoner (0.9.0)
208
+ rdf (~> 3.3)
209
+ rdf-xsd (~> 3.3)
210
+ rdf-tabular (3.3.0)
214
211
  addressable (~> 2.8)
215
- bcp47 (~> 0.3, >= 0.3.3)
216
- json-ld (~> 3.2)
217
- rdf (~> 3.2, >= 3.2.7)
218
- rdf-vocab (~> 3.2)
219
- rdf-xsd (~> 3.2)
220
- rdf-trig (3.2.0)
221
- ebnf (~> 2.2)
222
- rdf (~> 3.2)
223
- rdf-turtle (~> 3.2)
224
- rdf-trix (3.2.0)
225
- rdf (~> 3.2)
226
- rdf-xsd (~> 3.2)
227
- rdf-turtle (3.2.1)
228
- ebnf (~> 2.3)
229
- rdf (~> 3.2)
230
- rdf-vocab (3.2.1)
231
- rdf (~> 3.2, >= 3.2.4)
232
- rdf-xsd (3.2.1)
233
- rdf (~> 3.2)
212
+ bcp47_spec (~> 0.2)
213
+ json-ld (~> 3.3)
214
+ rdf (~> 3.3)
215
+ rdf-vocab (~> 3.3)
216
+ rdf-xsd (~> 3.3)
217
+ rdf-trig (3.3.0)
218
+ ebnf (~> 2.4)
219
+ rdf (~> 3.3)
220
+ rdf-turtle (~> 3.3)
221
+ rdf-trix (3.3.0)
222
+ rdf (~> 3.3)
223
+ rdf-xsd (~> 3.3)
224
+ rdf-turtle (3.3.0)
225
+ ebnf (~> 2.4)
226
+ rdf (~> 3.3)
227
+ rdf-vocab (3.3.0)
228
+ rdf (~> 3.3)
229
+ rdf-xsd (3.3.0)
230
+ rdf (~> 3.3)
234
231
  rexml (~> 3.2)
235
232
  regexp_parser (2.5.0)
236
233
  rest-client (2.1.0)
@@ -268,49 +265,51 @@ GEM
268
265
  ruby2_keywords (0.0.5)
269
266
  scanf (1.0.0)
270
267
  securerandom (0.1.1)
271
- shacl (0.3.0)
272
- json-ld (~> 3.2)
273
- rdf (~> 3.2, >= 3.2.8)
274
- sparql (~> 3.2, >= 3.2.4)
268
+ shacl (0.4.0)
269
+ json-ld (~> 3.3)
270
+ rdf (~> 3.3)
271
+ sparql (~> 3.3)
275
272
  sxp (~> 1.2)
276
- shex (0.7.1)
277
- ebnf (~> 2.2)
273
+ shex (0.8.0)
274
+ ebnf (~> 2.4)
278
275
  htmlentities (~> 4.3)
279
- json-ld (~> 3.2)
280
- json-ld-preloaded (~> 3.2)
281
- rdf (~> 3.2)
282
- rdf-xsd (~> 3.2)
283
- sparql (~> 3.2)
284
- sxp (~> 1.2)
285
- sparql (3.2.4)
286
- builder (~> 3.2)
287
- ebnf (~> 2.2, >= 2.3.1)
276
+ json-ld (~> 3.3)
277
+ json-ld-preloaded (~> 3.3)
278
+ rdf (~> 3.3)
279
+ rdf-xsd (~> 3.3)
280
+ sparql (~> 3.3)
281
+ sxp (~> 1.3)
282
+ sparql (3.3.0)
283
+ builder (~> 3.2, >= 3.2.4)
284
+ ebnf (~> 2.4)
288
285
  logger (~> 1.5)
289
- rdf (~> 3.2, >= 3.2.8)
290
- rdf-aggregate-repo (~> 3.2)
291
- rdf-xsd (~> 3.2)
292
- sparql-client (~> 3.2, >= 3.2.1)
293
- sxp (~> 1.2, >= 1.2.2)
294
- sparql-client (3.2.1)
295
- net-http-persistent (~> 4.0, >= 4.0.1)
296
- rdf (~> 3.2, >= 3.2.6)
297
- stringio (3.0.2)
298
- sxp (1.2.2)
299
- matrix
300
- rdf (~> 3.2)
301
- temple (0.8.2)
302
- tilt (2.0.11)
286
+ rdf (~> 3.3)
287
+ rdf-aggregate-repo (~> 3.3)
288
+ rdf-xsd (~> 3.3)
289
+ sparql-client (~> 3.3)
290
+ sxp (~> 1.3)
291
+ sparql-client (3.3.0)
292
+ net-http-persistent (~> 4.0, >= 4.0.2)
293
+ rdf (~> 3.3)
294
+ stringio (3.0.8)
295
+ sxp (1.3.0)
296
+ matrix (~> 0.4)
297
+ rdf (~> 3.3)
298
+ temple (0.10.2)
299
+ thor (1.2.2)
300
+ tilt (2.3.0)
303
301
  unf (0.1.4)
304
302
  unf_ext
305
303
  unf_ext (0.0.8.2)
306
304
  unicode-display_width (2.2.0)
307
- unicode-types (1.7.0)
305
+ unicode-types (1.8.0)
308
306
  xml-simple (1.1.9)
309
307
  rexml
310
- yaml-ld (0.0.1)
311
- json-ld (~> 3.2, >= 3.2.2)
312
- psych (~> 4.0)
313
- rdf (~> 3.2)
308
+ yaml-ld (0.0.2)
309
+ json-ld (~> 3.2, >= 3.2.3)
310
+ psych (>= 3.3)
311
+ rdf (~> 3.2, >= 3.2.9)
312
+ rdf-xsd (~> 3.2)
314
313
 
315
314
  PLATFORMS
316
315
  x86_64-linux
data/lib/fsp_harvester/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module FspHarvester
4
- VERSION = "0.1.24"
4
+ VERSION = "0.1.26"
5
5
  end
data/lib/metadata_harvester.rb CHANGED
@@ -161,7 +161,14 @@ module HarvesterTools
161
161
  abbreviation = ''
162
162
  if detected_type
163
163
  detectedcontenttypes = detected_type.content_type # comes back as array of [application/x, application/y]
164
- unless detectedcontenttypes.include? claimed_type
164
+
165
+ case
166
+ when claimed_type =~ /application\/vnd\./ # vnd are domain specific
167
+ contenttype = claimed_type # just pick one arbitrarily, since it doesn't match thedeclared type anyway
168
+ abbreviation = abbreviate_type(contenttype: contenttype)
169
+ @meta.comments << "INFO: using content-type #{contenttype}.\n"
170
+ when detectedcontenttypes.include?(claimed_type)
171
+ warn "detected types #{detectedcontenttypes} claimed type #{claimed_type}"
165
172
  @meta.add_warning(['022', @meta.all_uris.last, "" ])
166
173
  contenttype = detected_type.content_type.first # just pick one arbitrarily, since it doesn't match thedeclared type anyway
167
174
  abbreviation = abbreviate_type(contenttype: contenttype)
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fsp_harvester
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.24
4
+ version: 0.1.26
5
5
  platform: ruby
6
6
  authors:
7
7
  - Mark Wilkinson
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2022-08-20 00:00:00.000000000 Z
11
+ date: 2023-09-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: json
@@ -44,14 +44,14 @@ dependencies:
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: 0.1.18
47
+ version: 0.1.19
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - "~>"
53
53
  - !ruby/object:Gem::Version
54
- version: 0.1.18
54
+ version: 0.1.19
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: metainspector
57
57
  requirement: !ruby/object:Gem::Requirement
@@ -220,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
220
220
  - !ruby/object:Gem::Version
221
221
  version: '0'
222
222
  requirements: []
223
- rubygems_version: 3.2.28
223
+ rubygems_version: 3.3.23
224
224
  signing_key:
225
225
  specification_version: 4
226
226
  summary: Metadata harvester that follows the FAIR Signposting specification.