ebsco-eds 0.3.4.pre → 0.3.5.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5892ad55aa81cd0c31eafcc91a87de4b81483dc
-  data.tar.gz: 7fc2bd988dd215d75e37a9cf3e33b1b9089bb936
+  metadata.gz: b01d52fab1ebf5ad7dff691dc253ae50fef72e97
+  data.tar.gz: ce5af9c7d9ad9a251964b555518a170d8319f226
 SHA512:
-  metadata.gz: d557e0ce5b0af80aaed93bb459d1ec14cea8d8bbf94af47db09f80b7321949c5f6842ac19541e1f5f2d04034d73db693ed9e6bc2a01c1f56a041a90f72a313d5
-  data.tar.gz: 6090a2e9243e7996ad50206902ff17bba0b634c4fa21ef421c9fa7e9f3320a7c9619e45f9650e52fcf5053d7596b7884224c50088238fd1b2b4cd745852231ec
+  metadata.gz: 79d7be540a8d86ad94311655d3dd132cd4d39cc34f98241cc9a0284725f4ba0c38681ab5fe062be3bd059c721dad704ef896fa214502ed2bfe385b29c7c22b07
+  data.tar.gz: c21bddfbcca4af8ee6e7a1b4f914fdca7cf1f201454d145d74693baf81006a6f19114521c75ac9fb1c55ff2878875d685004496e6cfb8bf81ca6d1989a817aa6

data/lib/ebsco/eds/options.rb

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

data/lib/ebsco/eds/results.rb

@@ -23,6 +23,9 @@ module EBSCO
 
       attr_reader :raw_options
 
+      attr_accessor :temp_format_facet_results
+      attr_accessor :temp_content_provider_facet_results
+
       # Creates search results from the \EDS API search response. It includes information about the results and a list
       # of Record items.
       def initialize(search_results, additional_limiters = {}, options = {})
@@ -472,7 +475,13 @@ module EBSCO
       #    ]
       def facets (facet_provided_id = 'all')
         facets_hash = []
-        available_facets = @results.fetch('SearchResult',{}).fetch('AvailableFacets',{})
+
+        if temp_format_facet_results.nil?
+          available_facets = @results.fetch('SearchResult',{}).fetch('AvailableFacets',{})
+        else
+          available_facets = temp_format_facet_results.results.fetch('SearchResult',{}).fetch('AvailableFacets',{})
+        end
+
         available_facets.each do |available_facet|
           if available_facet['Id'] == facet_provided_id || facet_provided_id == 'all'
             facet_label = available_facet['Label']
@@ -493,6 +502,14 @@ module EBSCO
       def solr_facets (facet_provided_id = 'all')
         facet_values = []
         available_facets = @results.fetch('SearchResult',{}).fetch('AvailableFacets',{})
+
+        if facet_provided_id == 'SourceType' && !temp_format_facet_results.nil?
+          available_facets = temp_format_facet_results.results.fetch('SearchResult',{}).fetch('AvailableFacets',{})
+        end
+        if facet_provided_id == 'ContentProvider' && !temp_content_provider_facet_results.nil?
+          available_facets = temp_content_provider_facet_results.results.fetch('SearchResult',{}).fetch('AvailableFacets',{})
+        end
+
         available_facets.each do |available_facet|
           if available_facet['Id'] == facet_provided_id || facet_provided_id == 'all'
             available_facet['AvailableFacetValues'].each do |available_facet_value|

data/lib/ebsco/eds/session.rb

@@ -211,8 +211,32 @@ module EBSCO
             if @search_options.nil? || !add_actions
               @search_options = EBSCO::EDS::Options.new(options, @info)
             end
+
             _response = do_request(:post, path: '/edsapi/rest/Search', payload: @search_options)
             @search_results = EBSCO::EDS::Results.new(_response, @info.available_limiters, options)
+
+            # create temp format facet results if needed
+            if options['f']
+              if options['f'].key?('eds_publication_type_facet')
+                format_options = options
+                format_options['f'] = options['f'].except('eds_publication_type_facet')
+                format_search_options = EBSCO::EDS::Options.new(format_options, @info)
+                _format_response = do_request(:post, path: '/edsapi/rest/Search', payload: format_search_options)
+                @search_results.temp_format_facet_results = EBSCO::EDS::Results.new(_format_response, @info.available_limiters, format_options)
+              end
+            end
+
+            # create temp content provider facet results if needed
+            if options['f']
+              if options['f'].key?('eds_content_provider_facet')
+                content_options = options
+                content_options['f'] = options['f'].except('eds_content_provider_facet')
+                content_search_options = EBSCO::EDS::Options.new(content_options, @info)
+                _content_response = do_request(:post, path: '/edsapi/rest/Search', payload: content_search_options)
+                @search_results.temp_content_provider_facet_results = EBSCO::EDS::Results.new(_content_response, @info.available_limiters, content_options)
+              end
+            end
+
             if increment_page
               @current_page = @search_results.page_number
             end
@@ -866,7 +890,7 @@ module EBSCO
       end
 
       def eds_sanitize(str)
-        pattern = /(\'|\"|\*|\/|\-|\\|\)|\$|\+|\(|\^|\?|\!|\~|\`|\:)/
+        pattern = /(\'|\"|\*|\/|\\|\)|\$|\+|\(|\^|\?|\!|\~|\`|\:)/
         str = str.gsub(pattern){ |match| '\\' + match }
         str
       end

data/lib/ebsco/eds/version.rb

@@ -1,5 +1,5 @@
 module EBSCO
   module EDS
-    VERSION = '0.3.4.pre'
+    VERSION = '0.3.5.pre'
   end
 end

metadata

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