fixes #85 and #86

Author: bmckinney-ebsco

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). 
 
+## [1.0.5] - 2018-11-02
+### Fixed
+- Fixed a bug where fulltext html becomes nil after sanitizing. [#85](https://github.com/ebsco/edsapi-ruby/issues/85) 
+- Fixed a bug where the url protocol is missing from fulltext custom links. [#86](https://github.com/ebsco/edsapi-ruby/issues/86)
+
+
 ## [1.0.4] - 2018-10-29
 ### Fixed
 - List retrieval returns a repeating list of just the first record. 
@@ -75,6 +81,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Adds KW (keywords) and SH (subject heading) to solr search fields
 
+[1.0.5]: https://github.com/ebsco/edsapi-ruby/compare/1.0.4...1.0.5
 [1.0.4]: https://github.com/ebsco/edsapi-ruby/compare/1.0.3...1.0.4
 [1.0.3]: https://github.com/ebsco/edsapi-ruby/compare/1.0.2...1.0.3
 [1.0.2]: https://github.com/ebsco/edsapi-ruby/compare/1.0.1...1.0.2

lib/ebsco/eds/record.rb

@@ -421,6 +421,14 @@ def fulltext_link(type = 'first')
         fulltext_links.first || {}
       end
 
+      # add protocol if needed
+      def add_protocol(url)
+        unless url[/\Ahttp:\/\//] || url[/\Ahttps:\/\//]
+          url = "https://#{url}"
+        end
+        url
+      end
+
       # All available fulltext links.
       def fulltext_links
 
@@ -514,6 +522,7 @@ def fulltext_links
         if ft_customlinks.count > 0
           ft_customlinks.each do |ft_customlink|
             link_url = ft_customlink['Url']
+            link_url = add_protocol(link_url)
             link_label = ft_customlink['Text']
             link_icon = ft_customlink['Icon']
             links.push({url: link_url, label: link_label, icon: link_icon, type: 'customlink-fulltext', expires: false})
@@ -530,6 +539,7 @@ def non_fulltext_links
         if other_customlinks.count > 0
           other_customlinks.each do |other_customlink|
             link_url = other_customlink['Url']
+            link_url = add_protocol(link_url)
             link_label = other_customlink['Text']
             link_icon = other_customlink['Icon']
             links.push({url: link_url, label: link_label, icon: link_icon, type: 'customlink-other', expires: false})
@@ -947,8 +957,8 @@ def html_decode_and_sanitize(data, config = nil)
         # need to double-unescape data with an ephtml section
         if html =~ /<ephtml>/
           html = CGI.unescapeHTML(html)
-          html = html.gsub!(/\\"/, '"')
-          html = html.gsub!(/\\n /, '')
+          html = html.gsub(/\\"/, '"')
+          html = html.gsub(/\\n /, '')
         end
 
         Sanitize.fragment(html, sanitize_config)

lib/ebsco/eds/version.rb

@@ -1,5 +1,5 @@
 module EBSCO
   module EDS
-    VERSION = '1.0.4'
+    VERSION = '1.0.5'
   end
 end

test/cassettes/html_test/profile_2/test_sanitize_html_fulltext_no_replacements_in_gsub.yml

@@ -89,4 +89,24 @@ def test_sanitize_html_fulltext
     end
   end
 
+
+  def test_sanitize_html_fulltext_no_replacements_in_gsub
+    VCR.use_cassette('html_test/profile_2/test_sanitize_html_fulltext_no_replacements_in_gsub') do
+      session_with_sanitize = EBSCO::EDS::Session.new({guest: false,
+                                                       use_cache: false,
+                                                       profile: 'edsapi',
+                                                       decode_sanitize_html: true,
+                                                       all_subjects_search_links: true})
+
+      if session_with_sanitize.dbid_in_profile 'aph'
+        record = session_with_sanitize.retrieve({dbid: 'aph', an: '87564228'})
+        # puts 'HTML AFTER: ' + record.eds_html_fulltext.to_s
+        assert record.eds_html_fulltext.to_s.include? '<h1 id="AN0087564228-1">Expressing Compassion in the Face of Crisis'
+      else
+        puts "WARNING: skipping test_sanitize_html_fulltext_no_replacements_in_gsub, bah db isn't in the profile."
+      end
+      session_with_sanitize.end
+    end
+  end
+
 end

test/cassettes/linking_test/profile_2/test_customlinks_fulltext_missing_protocol.yml

@@ -26,7 +26,7 @@ def test_customlinks_fulltext
         found_custom_fulltext = false
         record.fulltext_links.each do |link|
           found_catalog_link = true if link[:type] == 'cataloglink'
-          found_custom_fulltext = true if link[:type] = 'customlink-fulltext'
+          found_custom_fulltext = true if link[:type] == 'customlink-fulltext'
         end
         assert found_custom_fulltext && found_catalog_link
       else
@@ -36,6 +36,27 @@ def test_customlinks_fulltext
     end
   end
 
+  def test_customlinks_fulltext_missing_protocol
+    VCR.use_cassette('linking_test/profile_2/test_customlinks_fulltext_missing_protocol') do
+      session = EBSCO::EDS::Session.new({guest: false, use_cache: false, profile: 'edsapi'})
+      if session.dbid_in_profile 'eric'
+        record = session.retrieve({dbid: 'eric', an: 'EJ1050530'})
+        found_customlink_fulltext = false
+        found_protocol = false
+        record.fulltext_links.each do |link|
+          found_customlink_fulltext = true if link[:type] == 'customlink-fulltext'
+          if found_customlink_fulltext
+            found_protocol = true if link[:url] == 'https://eric.ed.gov?id=EJ1050530'
+          end
+        end
+        assert found_customlink_fulltext && found_protocol
+      else
+        puts "WARNING: skipping test_customlinks_fulltext_missing_protocol, eric db isn't in the profile."
+      end
+      session.end
+    end
+  end
+
   def test_non_fulltext_links
     VCR.use_cassette('linking_test/profile_3/test_non_fulltext_links') do
       session = EBSCO::EDS::Session.new({guest: false, use_cache: false, profile: 'edslinkapi'})
@@ -46,7 +67,7 @@ def test_non_fulltext_links
         found_custom_other = false
         record.all_links.each do |link|
           found_catalog_link = true if link[:type] == 'cataloglink'
-          found_custom_other = true if link[:type] = 'customlink-other'
+          found_custom_other = true if link[:type] == 'customlink-other'
         end
         assert found_custom_other && found_catalog_link
       else