ebsco-eds 0.3.9.pre → 0.3.10.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88c36614b1fbb632bebaf7a434361448bfe8f10c
-  data.tar.gz: defab014eb6c9d3981645d0a8043a6d50da4b01f
+  metadata.gz: d7cb58338dd3b45c9b2413aef42f374c017133d1
+  data.tar.gz: 9758d4f58edac9420f206cd39bbddf3f89ad0e62
 SHA512:
-  metadata.gz: 1516d8eea3b331946a0981e2f49e85790ff0ff23dd0cfaa8fabaa404b203c04bc65e06c0a9f711cccca9431c3a5fecb07bc094932d2ddde31d377e27a49ef019
-  data.tar.gz: acd0f9937320e66135b1904c3d00e05c9ae5ad2a35572fe2c8fa053de0f3f9676d9d9de28eef486e80acb0f0a493b343ce2f975230577fe8bdccac5b06886596
+  metadata.gz: 6ceffcd8ae42678e12cad2302a7e667e5b2bde94b960d8dea7b841a3d44ec88fec65869b5ab5d597df7a030e7786c4357da0aa35007322dfffabbd91d16268b2
+  data.tar.gz: ebadaa47d521204c0c7090fbd111de0da7605084b55d3591b1906c68a5e655e8155ebd63e277bfbeaa3ba79bd87f243430913b3295998a3c15976c8a5a13bcb4

data/ebsco-eds.gemspec

@@ -45,6 +45,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'csl-styles', '~> 1.0', '>= 1.0.1.5'
   spec.add_dependency 'activesupport', '~> 5.0'
   spec.add_dependency 'net-http-persistent', '~> 2.9'
+  spec.add_dependency 'sanitize', '~> 4.5.0'
 
   spec.add_development_dependency 'bundler', '~> 1.13'
   spec.add_development_dependency 'rake', '~> 12.0'

data/lib/ebsco/eds/configuration.rb

@@ -37,7 +37,8 @@ module EBSCO
             :timeout => 60,
             :open_timeout => 12,
             :max_page_jumps => 6,
-            :max_page_jump_attempts => 10
+            :max_page_jump_attempts => 10,
+            :recover_from_bad_source_type => false
         }
         @valid_config_keys = @config.keys
       end

data/lib/ebsco/eds/record.rb

@@ -1,6 +1,7 @@
 require 'yaml'
 require 'json'
 require 'cgi'
+require 'sanitize'
 
 module EBSCO
 
@@ -750,7 +751,7 @@ module EBSCO
           if _item_property.nil?
             nil
           else
-            CGI.unescapeHTML(_item_property['Data'])
+            sanitize_data(_item_property['Data'])
           end
         end
       end
@@ -764,11 +765,23 @@ module EBSCO
           if _item_property.nil?
             nil
           else
-            CGI.unescapeHTML(_item_property['Data'])
+            sanitize_data(_item_property['Data'])
           end
         end
       end
 
+      # sanitize html, allow custom links
+      def sanitize_data(data)
+        html = CGI.unescapeHTML(data.to_s)
+        sanitize_config = Sanitize::Config.merge(Sanitize::Config::RELAXED,
+                                                 :elements => Sanitize::Config::RELAXED[:elements] + ['relatesto', 'searchlink'],
+                                                 :attributes => Sanitize::Config::RELAXED[:attributes].merge(
+                                                     'searchlink' => ['fieldcode', 'term']
+                                                 )
+        )
+        Sanitize.fragment(html, sanitize_config)
+      end
+
       # dynamically add item metadata as 'eds_extra_ItemNameOrLabel'
       def add_extra_item_accessors(item)
         key = item['Name'] ? item['Name'].gsub(/\s+/, '_') : item['Label'].gsub(/\s+/, '_')

data/lib/ebsco/eds/session.rb

@@ -133,6 +133,14 @@ module EBSCO
 
         (ENV.has_key? 'EDS_HOSTS') ? @api_hosts_list = ENV['EDS_HOSTS'].split(',') : @api_hosts_list = @config[:api_hosts_list]
 
+        (ENV.has_key? 'EDS_RECOVER_FROM_BAD_SOURCE_TYPE') ?
+            if %w(y Y yes Yes true True).include?(ENV['EDS_RECOVER_FROM_BAD_SOURCE_TYPE'])
+              @recover_130 = true
+            else
+              @recover_130 = false
+            end :
+            @recover_130 = @config[:recover_from_bad_source_type]
+
         # use cache for auth token, info, search and retrieve calls?
         if @use_cache
           cache_dir = File.join(@cache_dir, 'faraday_eds_cache')
@@ -796,29 +804,32 @@ module EBSCO
                   end
 
                 # invalid source type, attempt to recover gracefully
-                # when '130'
-                #   bad_source_type = e.fault[:error_body]['DetailedErrorDescription']
-                #   bad_source_type.gsub!(/Value Provided\s+/, '')
-                #   bad_source_type.gsub!(/\.\s*$/, '')
-                #   new_actions = []
-                #   payload.Actions.each { |action|
-                #     if action.start_with?('addfacetfilter(SourceType:')
-                #       if bad_source_type.nil?
-                #         # skip the source type since we don't know if it's bad or not
-                #       else
-                #         if !action.include?('SourceType:'+bad_source_type+')')
-                #           # not a bad source type, keep it
-                #           new_actions >> action
-                #         end
-                #       end
-                #     else
-                #       # not a source type action, add it
-                #       new_actions << action
-                #     end
-                #   }
-                #   payload.Actions = new_actions
-                #   do_request(method, path: path, payload: payload, attempt: attempt+1)
-
+                when '130'
+                  if @recover_130
+                    bad_source_type = e.fault[:error_body]['DetailedErrorDescription']
+                    bad_source_type.gsub!(/Value Provided\s+/, '')
+                    bad_source_type.gsub!(/\.\s*$/, '')
+                    new_actions = []
+                    payload.Actions.each { |action|
+                      if action.downcase.start_with?('addfacetfilter(sourcetype:')
+                        if bad_source_type.nil?
+                          # skip the source type since we don't know if it's bad or not
+                        else
+                          if !action.include?('SourceType:'+bad_source_type+')')
+                            # not a bad source type, keep it
+                            new_actions >> action
+                          end
+                        end
+                      else
+                        # not a source type action, add it
+                        new_actions << action
+                      end
+                    }
+                    payload.Actions = new_actions
+                    do_request(method, path: path, payload: payload, attempt: attempt+1)
+                  else
+                    raise e
+                  end
 
                 else
                   raise e

data/lib/ebsco/eds/version.rb

@@ -1,5 +1,5 @@
 module EBSCO
   module EDS
-    VERSION = '0.3.9.pre'
+    VERSION = '0.3.10.pre'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ebsco-eds
 version: !ruby/object:Gem::Version
-  version: 0.3.9.pre
+  version: 0.3.10.pre
 platform: ruby
 authors:
 - Bill McKinney
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-05 00:00:00.000000000 Z
+date: 2017-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -225,6 +225,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.9'
+- !ruby/object:Gem::Dependency
+  name: sanitize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.5.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement