ebsco-eds 1.1.1 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad7eef9da8bc0d24c7603cebb0527274751d7b98a8823515f5c3e1fec78a49b9
-  data.tar.gz: 823e7b5a92adc097af3d723f89b0c6ea8933a2a77c311151a16a6619b7461b43
+  metadata.gz: e0260317849a9ed9937f14bfb1bce691d11bc37dc031a9707c99aed1239bbc0b
+  data.tar.gz: 4549287d4f9f12edaf968d5439870682c26e91a2334e6145d7d323440f577056
 SHA512:
-  metadata.gz: d7f454baff334b3078566239f6bd7085438d47ddb0d02b92ee5afed73e3392e2c6d2ea198c7451bd2d3bc235aeb30015e64b9c222640d82a99a14b236198ef90
-  data.tar.gz: 9d6c89117a2cbbb43f1538fbf27222629ebcd7679f3ff62367fc04b2ae27412a48fd6a64f58cd7347a2545054f63dc3a8fbb62adb4ef8cbd37e4fd82095e22af
+  metadata.gz: 7a2fcddd103f0e2aa20699e30445e6b3681dafd43564e628d36fcf80d691e6df76861951e5647aa0f760f4f7c22a8b960caa1731acdc710fabd57fe013cb7cd2
+  data.tar.gz: 4f34ec5977c344bf917b52102ea01bdf1dbc34db7b9f005fc5faca5019c808079446d21f1037f009866e9fddc15ee8504182e688b7c303bd02fc22dda74a845b

data/README.md

@@ -1,4 +1,4 @@
-<img src="https://discovery.ebsco.com/files/pulse-images/EDS-logo_1LINE.png"/>
+![image](https://user-images.githubusercontent.com/13452564/110336225-a7440c80-7ff2-11eb-996d-6b4395438a22.png)
 
 A Ruby interface to the EBSCO Discovery Services API.
 

data/ebsco-eds.gemspec

@@ -6,8 +6,8 @@ require 'ebsco/eds/version'
 Gem::Specification.new do |spec|
   spec.name          = 'ebsco-eds'
   spec.version       = EBSCO::EDS::VERSION
-  spec.authors       = ['Mike Abrahamson','Ellie Collier','Madeline Dale','Eric Frierson']
-  spec.email         = ['mabrahamson@ebsco.com','ecollier@ebsco.com','mdale@ebsco.com, efrierson@ebsco.com']
+  spec.authors       = ['Mike Abrahamson','Ellie Collier','Madeline Dale','Eric Frierson','Carolyn Clini']
+  spec.email         = ['mabrahamson@ebsco.com','ecollier@ebsco.com','mdale@ebsco.com', 'efrierson@ebsco.com', 'cclini@ebsco.com']
   spec.summary       = 'Summary: EBSCO EDS API'
   spec.description   = 'Description: EBSCO EDS API'
   spec.homepage      = 'https://github.com/ebsco/edsapi-ruby'
@@ -42,9 +42,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'csl', '>= 1.4.0', '< 1.6'
   spec.add_dependency 'citeproc-ruby', '~> 1.0', '>= 1.0.2'
   spec.add_dependency 'csl-styles', '~> 1.0', '>= 1.0.1.5'
-  spec.add_dependency 'activesupport', '>= 5.2', '< 6.1'
+  spec.add_dependency 'activesupport', '>= 5.2'
   spec.add_dependency 'net-http-persistent', '~> 3.1'
-  spec.add_dependency 'sanitize', '~> 5.0'
   spec.add_dependency 'public_suffix', '~>4.0'
 
   spec.add_development_dependency 'bundler'
@@ -55,5 +54,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'vcr', '~> 5.0', '>= 5.0.0'
   spec.add_development_dependency 'minitest-vcr', '~> 1.4', '>= 1.4.0'
   spec.add_development_dependency 'webmock', '~> 3.6'
+  spec.add_development_dependency 'sanitize', '~> 5.0'
 
 end

data/lib/ebsco/eds/error.rb

@@ -46,5 +46,8 @@ module EBSCO
     # raised when connection fails
     class ConnectionFailed < Error; end
 
+    # raised when missing a dependency
+    class MissingDependency < Error; end
+
   end
 end

data/lib/ebsco/eds/record.rb

@@ -1,7 +1,6 @@
 require 'yaml'
 require 'json'
 require 'cgi'
-require 'sanitize'
 
 module EBSCO
 
@@ -152,6 +151,9 @@ module EBSCO
           @decode_sanitize_html = ENV['EDS_DECODE_SANITIZE_HTML']
         end
 
+        require_sanitize if @decode_sanitize_html
+
+
         if results_record.key? 'Record'
           @record = results_record['Record'] # single record returned by retrieve api
         else
@@ -997,7 +999,13 @@ module EBSCO
       # add searchlinks when they don't exist
       def add_subject_searchlinks(data)
         subjects = data
-        unless data.include? 'searchLink'
+        if data.include? '<link '
+          subjects = bib_subjects
+          subjects = subjects.map do |su|
+            '<searchLink fieldCode="DE" term="%22' + su + '%22">' + su + '</searchLink>'
+          end.join('<br />')
+        end
+        unless subjects.include? 'searchLink'
           subjects = subjects.split('<br />').map do |su|
             '<searchLink fieldCode="DE" term="%22' + su + '%22">' + su + '</searchLink>'
           end.join('<br />')
@@ -1005,6 +1013,12 @@ module EBSCO
         subjects
       end
 
+      def require_sanitize
+        require 'sanitize'
+      rescue Gem::LoadError, LoadError
+        raise EBSCO::EDS::MissingDependency.new 'Sanitize is turned on, but the sanitize gem is not loaded'
+      end
+
     end # Class Record
   end # Module EDS
 end # Module EBSCO

data/lib/ebsco/eds/version.rb

@@ -1,5 +1,5 @@
 module EBSCO
   module EDS
-    VERSION = '1.1.1'
+    VERSION = '1.1.3'
   end
 end

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: ebsco-eds
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.3
 platform: ruby
 authors:
 - Mike Abrahamson
 - Ellie Collier
 - Madeline Dale
 - Eric Frierson
+- Carolyn Clini
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-05 00:00:00.000000000 Z
+date: 2021-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -204,9 +205,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -214,9 +212,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
@@ -231,20 +226,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: sanitize
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: public_suffix
   requirement: !ruby/object:Gem::Requirement
@@ -383,11 +364,27 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.6'
+- !ruby/object:Gem::Dependency
+  name: sanitize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 description: 'Description: EBSCO EDS API'
 email:
 - mabrahamson@ebsco.com
 - ecollier@ebsco.com
-- mdale@ebsco.com, efrierson@ebsco.com
+- mdale@ebsco.com
+- efrierson@ebsco.com
+- cclini@ebsco.com
 executables: []
 extensions: []
 extra_rdoc_files: []