ebsco-eds 1.1.1 → 1.1.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +1 -1
  3. data/ebsco-eds.gemspec +8 -10
  4. data/lib/ebsco/eds/error.rb +3 -0
  5. data/lib/ebsco/eds/record.rb +16 -2
  6. data/lib/ebsco/eds/session.rb +2 -2
  7. data/lib/ebsco/eds/version.rb +1 -1
  8. metadata +61 -90
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: ad7eef9da8bc0d24c7603cebb0527274751d7b98a8823515f5c3e1fec78a49b9
4
- data.tar.gz: 823e7b5a92adc097af3d723f89b0c6ea8933a2a77c311151a16a6619b7461b43
3
+ metadata.gz: '0947090f0165ca89f0a23f90bd39b1970ec233a3d43723c157d0aaad1dcfeb2d'
4
+ data.tar.gz: a547a9c29c5f3af6243367d1e024a2c85aea3699529268660e4c032477a94736
5
5
  SHA512:
6
- metadata.gz: d7f454baff334b3078566239f6bd7085438d47ddb0d02b92ee5afed73e3392e2c6d2ea198c7451bd2d3bc235aeb30015e64b9c222640d82a99a14b236198ef90
7
- data.tar.gz: 9d6c89117a2cbbb43f1538fbf27222629ebcd7679f3ff62367fc04b2ae27412a48fd6a64f58cd7347a2545054f63dc3a8fbb62adb4ef8cbd37e4fd82095e22af
6
+ metadata.gz: 18a3a686dfa64406517145b2f934e961a6cf4836c6b352393f842c0a45546be09005260cda0abb11ad2bf17bee199529cf72520c47cb7658c6c0489a845a5432
7
+ data.tar.gz: c80c9a40ddcbd05056bf3bc0855e610c9764231a58ecfa14b625116a105c306fcbc31e8144b2ee69446e10b66e195d9ba38367cfd0dc5c6eabf92eb02a07f74b
data/README.md CHANGED
@@ -1,4 +1,4 @@
1
- <img src="https://discovery.ebsco.com/files/pulse-images/EDS-logo_1LINE.png"/>
1
+ ![image](https://user-images.githubusercontent.com/13452564/110336225-a7440c80-7ff2-11eb-996d-6b4395438a22.png)
2
2
 
3
3
  A Ruby interface to the EBSCO Discovery Services API.
4
4
 
data/ebsco-eds.gemspec CHANGED
@@ -6,8 +6,8 @@ require 'ebsco/eds/version'
6
6
  Gem::Specification.new do |spec|
7
7
  spec.name = 'ebsco-eds'
8
8
  spec.version = EBSCO::EDS::VERSION
9
- spec.authors = ['Mike Abrahamson','Ellie Collier','Madeline Dale','Eric Frierson']
10
- spec.email = ['mabrahamson@ebsco.com','ecollier@ebsco.com','mdale@ebsco.com, efrierson@ebsco.com']
9
+ spec.authors = ['Mike Abrahamson','Ellie Collier','Carolyn Clini']
10
+ spec.email = ['mabrahamson@ebsco.com','ecollier@ebsco.com', 'cclini@ebsco.com']
11
11
  spec.summary = 'Summary: EBSCO EDS API'
12
12
  spec.description = 'Description: EBSCO EDS API'
13
13
  spec.homepage = 'https://github.com/ebsco/edsapi-ruby'
@@ -31,23 +31,20 @@ Gem::Specification.new do |spec|
31
31
 
32
32
  spec.required_ruby_version = '>= 2.4'
33
33
 
34
- spec.add_dependency 'faraday', '~> 0'
34
+ spec.add_dependency 'faraday', '< 2.0'
35
35
  spec.add_dependency 'faraday-detailed_logger', '~> 2.0'
36
- spec.add_dependency 'faraday_middleware', '~> 0.11'
37
- spec.add_dependency 'dotenv', '~> 2.2'
38
- spec.add_dependency 'climate_control', '~> 0'
39
- spec.add_dependency 'require_all', '~> 2.0'
36
+ spec.add_dependency 'faraday_middleware', '~> 1.0'
40
37
  spec.add_dependency 'bibtex-ruby', '>= 5.1.0', '< 7.0'
41
38
  spec.add_dependency 'citeproc', '>= 1.0.4', '< 2.0'
42
39
  spec.add_dependency 'csl', '>= 1.4.0', '< 1.6'
43
40
  spec.add_dependency 'citeproc-ruby', '~> 1.0', '>= 1.0.2'
44
41
  spec.add_dependency 'csl-styles', '~> 1.0', '>= 1.0.1.5'
45
- spec.add_dependency 'activesupport', '>= 5.2', '< 6.1'
46
- spec.add_dependency 'net-http-persistent', '~> 3.1'
47
- spec.add_dependency 'sanitize', '~> 5.0'
42
+ spec.add_dependency 'activesupport', '>= 5.2'
43
+ spec.add_dependency 'net-http-persistent', '>= 3.1', '< 5'
48
44
  spec.add_dependency 'public_suffix', '~>4.0'
49
45
 
50
46
  spec.add_development_dependency 'bundler'
47
+ spec.add_development_dependency 'dotenv', '~> 2.2'
51
48
  spec.add_development_dependency 'rake', '~> 12.3'
52
49
  spec.add_development_dependency 'minitest', '~> 5.0'
53
50
  spec.add_development_dependency 'simplecov', '~> 0.17.0'
@@ -55,5 +52,6 @@ Gem::Specification.new do |spec|
55
52
  spec.add_development_dependency 'vcr', '~> 5.0', '>= 5.0.0'
56
53
  spec.add_development_dependency 'minitest-vcr', '~> 1.4', '>= 1.4.0'
57
54
  spec.add_development_dependency 'webmock', '~> 3.6'
55
+ spec.add_development_dependency 'sanitize', '~> 5.0'
58
56
 
59
57
  end
data/lib/ebsco/eds/error.rb CHANGED
@@ -46,5 +46,8 @@ module EBSCO
46
46
  # raised when connection fails
47
47
  class ConnectionFailed < Error; end
48
48
 
49
+ # raised when missing a dependency
50
+ class MissingDependency < Error; end
51
+
49
52
  end
50
53
  end
data/lib/ebsco/eds/record.rb CHANGED
@@ -1,7 +1,6 @@
1
1
  require 'yaml'
2
2
  require 'json'
3
3
  require 'cgi'
4
- require 'sanitize'
5
4
 
6
5
  module EBSCO
7
6
 
@@ -152,6 +151,9 @@ module EBSCO
152
151
  @decode_sanitize_html = ENV['EDS_DECODE_SANITIZE_HTML']
153
152
  end
154
153
 
154
+ require_sanitize if @decode_sanitize_html
155
+
156
+
155
157
  if results_record.key? 'Record'
156
158
  @record = results_record['Record'] # single record returned by retrieve api
157
159
  else
@@ -997,7 +999,13 @@ module EBSCO
997
999
  # add searchlinks when they don't exist
998
1000
  def add_subject_searchlinks(data)
999
1001
  subjects = data
1000
- unless data.include? 'searchLink'
1002
+ if data.include? '&lt;link '
1003
+ subjects = bib_subjects
1004
+ subjects = subjects.map do |su|
1005
+ '&lt;searchLink fieldCode=&quot;DE&quot; term=&quot;%22' + su + '%22&quot;&gt;' + su + '&lt;/searchLink&gt;'
1006
+ end.join('&lt;br /&gt;')
1007
+ end
1008
+ unless subjects.include? 'searchLink'
1001
1009
  subjects = subjects.split('&lt;br /&gt;').map do |su|
1002
1010
  '&lt;searchLink fieldCode=&quot;DE&quot; term=&quot;%22' + su + '%22&quot;&gt;' + su + '&lt;/searchLink&gt;'
1003
1011
  end.join('&lt;br /&gt;')
@@ -1005,6 +1013,12 @@ module EBSCO
1005
1013
  subjects
1006
1014
  end
1007
1015
 
1016
+ def require_sanitize
1017
+ require 'sanitize'
1018
+ rescue Gem::LoadError, LoadError
1019
+ raise EBSCO::EDS::MissingDependency.new 'Sanitize is turned on, but the sanitize gem is not loaded'
1020
+ end
1021
+
1008
1022
  end # Class Record
1009
1023
  end # Module EDS
1010
1024
  end # Module EBSCO
data/lib/ebsco/eds/session.rb CHANGED
@@ -326,11 +326,11 @@ module EBSCO
326
326
  payload = { DbId: dbid, An: an, HighlightTerms: highlight, EbookPreferredFormat: ebook }
327
327
  retrieve_response = do_request(:post, path: @config[:retrieve_url], payload: payload)
328
328
  record = EBSCO::EDS::Record.new(retrieve_response, @config)
329
- record_citation_exports = get_citation_exports({dbid: dbid, an: an, format: @config[:citation_exports_formats]})
329
+ record_citation_exports = get_citation_exports(dbid: dbid, an: an, format: @config[:citation_exports_formats])
330
330
  unless record_citation_exports.nil?
331
331
  record.set_citation_exports(record_citation_exports)
332
332
  end
333
- record_citation_styles = get_citation_styles({dbid: dbid, an: an, format: @config[:citation_styles_formats]})
333
+ record_citation_styles = get_citation_styles(dbid: dbid, an: an, format: @config[:citation_styles_formats])
334
334
  unless record_citation_styles.nil?
335
335
  record.set_citation_styles(record_citation_styles)
336
336
  end
data/lib/ebsco/eds/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module EBSCO
2
2
  module EDS
3
- VERSION = '1.1.1'
3
+ VERSION = '1.1.5'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,32 +1,31 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ebsco-eds
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.1
4
+ version: 1.1.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Mike Abrahamson
8
8
  - Ellie Collier
9
- - Madeline Dale
10
- - Eric Frierson
11
- autorequire:
9
+ - Carolyn Clini
10
+ autorequire:
12
11
  bindir: exe
13
12
  cert_chain: []
14
- date: 2021-03-05 00:00:00.000000000 Z
13
+ date: 2022-07-13 00:00:00.000000000 Z
15
14
  dependencies:
16
15
  - !ruby/object:Gem::Dependency
17
16
  name: faraday
18
17
  requirement: !ruby/object:Gem::Requirement
19
18
  requirements:
20
- - - "~>"
19
+ - - "<"
21
20
  - !ruby/object:Gem::Version
22
- version: '0'
21
+ version: '2.0'
23
22
  type: :runtime
24
23
  prerelease: false
25
24
  version_requirements: !ruby/object:Gem::Requirement
26
25
  requirements:
27
- - - "~>"
26
+ - - "<"
28
27
  - !ruby/object:Gem::Version
29
- version: '0'
28
+ version: '2.0'
30
29
  - !ruby/object:Gem::Dependency
31
30
  name: faraday-detailed_logger
32
31
  requirement: !ruby/object:Gem::Requirement
@@ -47,56 +46,14 @@ dependencies:
47
46
  requirements:
48
47
  - - "~>"
49
48
  - !ruby/object:Gem::Version
50
- version: '0.11'
51
- type: :runtime
52
- prerelease: false
53
- version_requirements: !ruby/object:Gem::Requirement
54
- requirements:
55
- - - "~>"
56
- - !ruby/object:Gem::Version
57
- version: '0.11'
58
- - !ruby/object:Gem::Dependency
59
- name: dotenv
60
- requirement: !ruby/object:Gem::Requirement
61
- requirements:
62
- - - "~>"
63
- - !ruby/object:Gem::Version
64
- version: '2.2'
65
- type: :runtime
66
- prerelease: false
67
- version_requirements: !ruby/object:Gem::Requirement
68
- requirements:
69
- - - "~>"
70
- - !ruby/object:Gem::Version
71
- version: '2.2'
72
- - !ruby/object:Gem::Dependency
73
- name: climate_control
74
- requirement: !ruby/object:Gem::Requirement
75
- requirements:
76
- - - "~>"
77
- - !ruby/object:Gem::Version
78
- version: '0'
79
- type: :runtime
80
- prerelease: false
81
- version_requirements: !ruby/object:Gem::Requirement
82
- requirements:
83
- - - "~>"
84
- - !ruby/object:Gem::Version
85
- version: '0'
86
- - !ruby/object:Gem::Dependency
87
- name: require_all
88
- requirement: !ruby/object:Gem::Requirement
89
- requirements:
90
- - - "~>"
91
- - !ruby/object:Gem::Version
92
- version: '2.0'
49
+ version: '1.0'
93
50
  type: :runtime
94
51
  prerelease: false
95
52
  version_requirements: !ruby/object:Gem::Requirement
96
53
  requirements:
97
54
  - - "~>"
98
55
  - !ruby/object:Gem::Version
99
- version: '2.0'
56
+ version: '1.0'
100
57
  - !ruby/object:Gem::Dependency
101
58
  name: bibtex-ruby
102
59
  requirement: !ruby/object:Gem::Requirement
@@ -204,9 +161,6 @@ dependencies:
204
161
  - - ">="
205
162
  - !ruby/object:Gem::Version
206
163
  version: '5.2'
207
- - - "<"
208
- - !ruby/object:Gem::Version
209
- version: '6.1'
210
164
  type: :runtime
211
165
  prerelease: false
212
166
  version_requirements: !ruby/object:Gem::Requirement
@@ -214,37 +168,26 @@ dependencies:
214
168
  - - ">="
215
169
  - !ruby/object:Gem::Version
216
170
  version: '5.2'
217
- - - "<"
218
- - !ruby/object:Gem::Version
219
- version: '6.1'
220
171
  - !ruby/object:Gem::Dependency
221
172
  name: net-http-persistent
222
173
  requirement: !ruby/object:Gem::Requirement
223
174
  requirements:
224
- - - "~>"
175
+ - - ">="
225
176
  - !ruby/object:Gem::Version
226
177
  version: '3.1'
178
+ - - "<"
179
+ - !ruby/object:Gem::Version
180
+ version: '5'
227
181
  type: :runtime
228
182
  prerelease: false
229
183
  version_requirements: !ruby/object:Gem::Requirement
230
184
  requirements:
231
- - - "~>"
185
+ - - ">="
232
186
  - !ruby/object:Gem::Version
233
187
  version: '3.1'
234
- - !ruby/object:Gem::Dependency
235
- name: sanitize
236
- requirement: !ruby/object:Gem::Requirement
237
- requirements:
238
- - - "~>"
239
- - !ruby/object:Gem::Version
240
- version: '5.0'
241
- type: :runtime
242
- prerelease: false
243
- version_requirements: !ruby/object:Gem::Requirement
244
- requirements:
245
- - - "~>"
188
+ - - "<"
246
189
  - !ruby/object:Gem::Version
247
- version: '5.0'
190
+ version: '5'
248
191
  - !ruby/object:Gem::Dependency
249
192
  name: public_suffix
250
193
  requirement: !ruby/object:Gem::Requirement
@@ -273,6 +216,20 @@ dependencies:
273
216
  - - ">="
274
217
  - !ruby/object:Gem::Version
275
218
  version: '0'
219
+ - !ruby/object:Gem::Dependency
220
+ name: dotenv
221
+ requirement: !ruby/object:Gem::Requirement
222
+ requirements:
223
+ - - "~>"
224
+ - !ruby/object:Gem::Version
225
+ version: '2.2'
226
+ type: :development
227
+ prerelease: false
228
+ version_requirements: !ruby/object:Gem::Requirement
229
+ requirements:
230
+ - - "~>"
231
+ - !ruby/object:Gem::Version
232
+ version: '2.2'
276
233
  - !ruby/object:Gem::Dependency
277
234
  name: rake
278
235
  requirement: !ruby/object:Gem::Requirement
@@ -333,42 +290,42 @@ dependencies:
333
290
  name: vcr
334
291
  requirement: !ruby/object:Gem::Requirement
335
292
  requirements:
336
- - - ">="
337
- - !ruby/object:Gem::Version
338
- version: 5.0.0
339
293
  - - "~>"
340
294
  - !ruby/object:Gem::Version
341
295
  version: '5.0'
296
+ - - ">="
297
+ - !ruby/object:Gem::Version
298
+ version: 5.0.0
342
299
  type: :development
343
300
  prerelease: false
344
301
  version_requirements: !ruby/object:Gem::Requirement
345
302
  requirements:
346
- - - ">="
347
- - !ruby/object:Gem::Version
348
- version: 5.0.0
349
303
  - - "~>"
350
304
  - !ruby/object:Gem::Version
351
305
  version: '5.0'
306
+ - - ">="
307
+ - !ruby/object:Gem::Version
308
+ version: 5.0.0
352
309
  - !ruby/object:Gem::Dependency
353
310
  name: minitest-vcr
354
311
  requirement: !ruby/object:Gem::Requirement
355
312
  requirements:
356
- - - ">="
357
- - !ruby/object:Gem::Version
358
- version: 1.4.0
359
313
  - - "~>"
360
314
  - !ruby/object:Gem::Version
361
315
  version: '1.4'
316
+ - - ">="
317
+ - !ruby/object:Gem::Version
318
+ version: 1.4.0
362
319
  type: :development
363
320
  prerelease: false
364
321
  version_requirements: !ruby/object:Gem::Requirement
365
322
  requirements:
366
- - - ">="
367
- - !ruby/object:Gem::Version
368
- version: 1.4.0
369
323
  - - "~>"
370
324
  - !ruby/object:Gem::Version
371
325
  version: '1.4'
326
+ - - ">="
327
+ - !ruby/object:Gem::Version
328
+ version: 1.4.0
372
329
  - !ruby/object:Gem::Dependency
373
330
  name: webmock
374
331
  requirement: !ruby/object:Gem::Requirement
@@ -383,11 +340,25 @@ dependencies:
383
340
  - - "~>"
384
341
  - !ruby/object:Gem::Version
385
342
  version: '3.6'
343
+ - !ruby/object:Gem::Dependency
344
+ name: sanitize
345
+ requirement: !ruby/object:Gem::Requirement
346
+ requirements:
347
+ - - "~>"
348
+ - !ruby/object:Gem::Version
349
+ version: '5.0'
350
+ type: :development
351
+ prerelease: false
352
+ version_requirements: !ruby/object:Gem::Requirement
353
+ requirements:
354
+ - - "~>"
355
+ - !ruby/object:Gem::Version
356
+ version: '5.0'
386
357
  description: 'Description: EBSCO EDS API'
387
358
  email:
388
359
  - mabrahamson@ebsco.com
389
360
  - ecollier@ebsco.com
390
- - mdale@ebsco.com, efrierson@ebsco.com
361
+ - cclini@ebsco.com
391
362
  executables: []
392
363
  extensions: []
393
364
  extra_rdoc_files: []
@@ -426,7 +397,7 @@ homepage: https://github.com/ebsco/edsapi-ruby
426
397
  licenses:
427
398
  - MIT
428
399
  metadata: {}
429
- post_install_message:
400
+ post_install_message:
430
401
  rdoc_options: []
431
402
  require_paths:
432
403
  - lib
@@ -441,8 +412,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
441
412
  - !ruby/object:Gem::Version
442
413
  version: '0'
443
414
  requirements: []
444
- rubygems_version: 3.0.6
445
- signing_key:
415
+ rubygems_version: 3.2.22
416
+ signing_key:
446
417
  specification_version: 4
447
418
  summary: 'Summary: EBSCO EDS API'
448
419
  test_files: []