ebsco-eds 0.3.1.pre → 0.3.2.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5bc349f6a65afd5f8dad6d89441d9a72a5d7ee0
-  data.tar.gz: 7c028d8098e5555497964019848680acd3a5b5bb
+  metadata.gz: d797f190f1835212cd39343e0bb70daa23f82fb7
+  data.tar.gz: fdb7753803fe3c2b9b616eaee96eed718713cb5f
 SHA512:
-  metadata.gz: fae36ea68f3dac43929a793b4e835f52537919a6a82319448904aa14881bbca3da12f68b0c951511a636c203e92715ef259b475b9249f61b66d5fefef6a5fcf3
-  data.tar.gz: fd665b635c020835db13eb6d87f2f3ab4b87bd07e81b3cc8ff92a963e1cf2a7a2cb094810b118bb0cea35cd2c2aedf29218794d1f6da43f4eefde6342b4f7114
+  metadata.gz: 230197033cf210c6d2b89e74f2fcd1864cc7181a07cf06cf0a3a8aa59b234e10e842d4fd5eea616013703b1b31cb0913adbacae001b265d3bd40c380add0cfe1
+  data.tar.gz: 6d9655e553cf1eb0827724d47f54320ea64fcd30f004cbd960ace9a8ab62f0d6bf1e0446fbc239f17642f60b63210ffbd1a2b78c0569efea6415c4ed4ad7ca5c

data/lib/ebsco/eds/options.rb

@@ -211,7 +211,7 @@ module EBSCO
       end
 
       def eds_sanitize(str)
-        pattern = /(\'|\"|\*|\/|\-|\\|\)|\$|\+|\(|\^|\?|\!|\~|\`)/
+        pattern = /(\'|\"|\*|\/|\-|\\|\)|\$|\+|\(|\^|\?|\!|\~|\`|\:)/
         str = str.gsub(pattern){ |match| '\\' + match }
         str
       end

data/lib/ebsco/eds/record.rb

@@ -63,6 +63,10 @@ module EBSCO
           :eds_fulltext_word_count,
           :eds_result_id,
           :eds_plink,
+          :eds_ebook_pdf_fulltext_available,
+          :eds_ebook_epub_fulltext_available,
+          :eds_pdf_fulltext_available,
+          :eds_html_fulltext_available,
           :eds_html_fulltext,
           :eds_images,
           :eds_all_links,
@@ -196,9 +200,14 @@ module EBSCO
         @eds_cover_thumb_url = cover_thumb_url
         @eds_cover_medium_url = cover_medium_url
         @eds_fulltext_word_count = get_item_data_by_name('FullTextWordCount').to_i
+        @eds_html_fulltext_available = html_fulltext_available
         @eds_html_fulltext = html_fulltext
         @eds_images = images
         @eds_all_links = all_links
+        # init fulltext available props, reset by fulltext_links method later
+        @eds_pdf_fulltext_available = false
+        @eds_ebook_pdf_fulltext_available = false
+        @eds_ebook_epub_fulltext_available = false
         @eds_fulltext_links = fulltext_links
         @eds_non_fulltext_links = non_fulltext_links
         @eds_code_naics = get_item_data_by_name('CodeNAICS')
@@ -267,7 +276,16 @@ module EBSCO
         end
       end
 
-      # Fulltext.
+      # Fulltext available
+      def html_fulltext_available
+        if @record.fetch('FullText',{}).fetch('Text',{}).fetch('Availability',0) == '1'
+          true
+        else
+          false
+        end
+      end
+
+      # Fulltext - RETRIEVE ONLY
       def html_fulltext
         if @record.fetch('FullText',{}).fetch('Text',{}).fetch('Availability',0) == '1'
           @record.fetch('FullText',{}).fetch('Text',{})['Value']
@@ -334,6 +352,7 @@ module EBSCO
               link_icon = 'PDF Full Text Icon'
               link_url = ebscolink['Url'] || 'detail'
               links.push({url: link_url, label: link_label, icon: link_icon, type: 'pdf'})
+              @eds_pdf_fulltext_available = true
             end
           end
         end
@@ -354,6 +373,7 @@ module EBSCO
               link_icon = 'PDF eBook Full Text Icon'
               link_url = ebscolink['Url'] || 'detail'
               links.push({url: link_url, label: link_label, icon: link_icon, type: 'ebook-pdf'})
+              @eds_ebook_pdf_fulltext_available = true
             end
           end
         end
@@ -365,6 +385,7 @@ module EBSCO
               link_icon = 'ePub eBook Full Text Icon'
               link_url = ebscolink['Url'] || 'detail'
               links.push({url: link_url, label: link_label, icon: link_icon, type: 'ebook-epub'})
+              @eds_ebook_epub_fulltext_available = true
             end
           end
         end
@@ -402,6 +423,7 @@ module EBSCO
               link_icon = 'Linked Full Text Icon'
               link_url = ebscolink['Url'] || 'detail'
               links.push({url: link_url, label: link_label, icon: link_icon, type: 'smartlinks'})
+              @eds_pdf_fulltext_available = true
             end
           end
         end

data/lib/ebsco/eds/session.rb

@@ -528,6 +528,7 @@ module EBSCO
       #   results = session.add_facet('SubjectEDS', 'water quality')
       #
       def add_facet(facet_id, facet_val)
+        facet_val = eds_sanitize(facet_val)
         add_actions "AddFacetFilter(#{facet_id}:#{facet_val})"
       end
 
@@ -841,6 +842,12 @@ module EBSCO
         end
       end
 
+      def eds_sanitize(str)
+        pattern = /(\'|\"|\*|\/|\-|\\|\)|\$|\+|\(|\^|\?|\!|\~|\`|\:)/
+        str = str.gsub(pattern){ |match| '\\' + match }
+        str
+      end
+
     end
 
   end

data/lib/ebsco/eds/version.rb

@@ -1,5 +1,5 @@
 module EBSCO
   module EDS
-    VERSION = '0.3.1.pre'
+    VERSION = '0.3.2.pre'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ebsco-eds
 version: !ruby/object:Gem::Version
-  version: 0.3.1.pre
+  version: 0.3.2.pre
 platform: ruby
 authors:
 - Bill McKinney
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-09 00:00:00.000000000 Z
+date: 2017-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday