ebsco-eds 0.2.9.pre → 0.3.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c181e960b6639886aa6ef318e40e78f9f8db0846
-  data.tar.gz: b56327ab29bb0032bc6914cc674f41cf330d3609
+  metadata.gz: 5353c7f332e965904370d4defe3ffddc1c188992
+  data.tar.gz: b2fb35896f412a06d76c3889337b9741f14d4bc9
 SHA512:
-  metadata.gz: 578554408924a621087faeb1d83ee418f7238ce9fc9fd171084853b9566620c03ccfeeeb20ae320fb08f7798b2959b7305d101862fa3205bd46521bfb4a19719
-  data.tar.gz: 9cc7a39fd98a1d6cb67e99d41e71c8befe0105b90655a2427be75d46f6dbabbdb02431afd9d75563af5a10ef58b3d1cd3458dba90dbc990838a4c3afe9b02ab0
+  metadata.gz: c586fb16ec00a3b975b24ff65a762e9aaff0993d4578fee0ed2f4f8f8b142e9abfb95f61fadccaf40ac2d2375bc13ea1c365f4178f399f30de85028b1e552646
+  data.tar.gz: cbc65d09fa611f4f25cd51d9529b0722e3be36ee3cfc1b226467d6d2beb67d72383a6b59ef14195e67838bcbc3e5b9c885ab4b2ff203670479a374cd29852160

data/ebsco-eds.gemspec

@@ -44,6 +44,7 @@ Gem::Specification.new do |spec|
   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.0'
+  spec.add_dependency 'net-http-persistent', '~> 2.9'
 
   spec.add_development_dependency 'bundler', '~> 1.13'
   spec.add_development_dependency 'rake', '~> 12.0'

data/lib/ebsco/eds/configuration.rb

@@ -28,13 +28,14 @@ module EBSCO
             :user_agent => 'EBSCO EDS GEM v0.0.1',
             :interface_id => 'edsapi_ruby_gem',
             :log => 'faraday.log',
+            :log_level => 'INFO',
             :max_attempts => 2,
             :max_results_per_page => 100,
             :ebook_preferred_format => 'ebook-pdf',
             :use_cache => true,
             :eds_cache_dir => ENV['TMPDIR'] || '/tmp',
             :timeout => 60,
-            :open_timeout => 6
+            :open_timeout => 12
         }
         @valid_config_keys = @config.keys
       end

data/lib/ebsco/eds/info.rb

@@ -144,7 +144,7 @@ module EBSCO
       # ====================================================================================
 
       def default_results_per_page
-        @view_result_settings['ResultsPerPage']
+        @view_result_settings['ResultsPerPage'].to_i
       end
 
       def max_results_per_page

data/lib/ebsco/eds/options.rb

@@ -41,6 +41,11 @@ module EBSCO
           end
         end
 
+        # add page default of 1
+        unless options.has_key?('page') || options.has_key?('page_number')
+          options['page'] = 1
+        end
+
         options.each do |key, value|
 
           case key
@@ -50,7 +55,7 @@ module EBSCO
 
             # SOLR: Need to add page actions whenever other actions are present since the other actions
             # will always reset the page to 1 even though a PageNumber is present in RetrievalCriteria.
-            when 'page'
+            when 'page', 'page_number'
               @Actions.push "GoToPage(#{value.to_i})"
 
             # solr facet translation
@@ -545,8 +550,8 @@ module EBSCO
             when :page_number, 'page_number', 'page'
               @PageNumber = value.to_i
             # solr starts at page 0
-            when 'start'
-              @PageNumber = value.to_i + 1
+            # when 'start'
+            #  @PageNumber = value.to_i + 1
 
             # ====================================================================================
             # highlight

data/lib/ebsco/eds/results.rb

@@ -88,7 +88,7 @@ module EBSCO
       # returns solr search response format
       def to_solr
 
-        solr_start = (page_number-1) * results_per_page
+        solr_start = 0
         hl_hash = {}
         solr_docs = []
         research_starters = []
@@ -105,6 +105,7 @@ module EBSCO
             end
             solr_docs.push(record.to_attr_hash)
           }
+          solr_start = solr_docs[0]['eds_result_id']-1
         end
 
         if @research_starters.any?
@@ -289,7 +290,7 @@ module EBSCO
       #      "AutoSuggest"=>"n"
       #    }
       def search_criteria
-        if @results['SearchRequestGet']['QueryString']
+        if @results['SearchRequestGet'] && @results['SearchRequestGet']['QueryString']
           params = CGI::parse(@results['SearchRequestGet']['QueryString'])
           sc = {}
           sc['SearchMode'] = params['searchmode'].nil? ? 'all' : params['searchmode'][0].to_s
@@ -352,7 +353,7 @@ module EBSCO
 
       # Current page number for the results. Returns an integer.
       def page_number
-        retrieval_criteria['PageNumber'] || 1
+        retrieval_criteria['PageNumber']
       end
 
       # Results per page. Returns an integer.

data/lib/ebsco/eds/session.rb

@@ -1,13 +1,15 @@
 require 'ebsco/eds/version'
 require 'ebsco/eds/info'
 require 'ebsco/eds/results'
+require 'net/http/persistent'
 require 'faraday'
 require 'faraday/detailed_logger'
 require 'faraday_middleware'
+require 'faraday/adapter/net_http_persistent'
+require 'faraday_eds_middleware'
 require 'logger'
 require 'json'
 require 'active_support'
-require 'faraday_eds_middleware'
 require 'ebsco/eds/configuration'
 require 'digest/md5'
 
@@ -127,7 +129,6 @@ module EBSCO
             end :
             @debug = @config[:debug]
 
-
         # use cache for auth token and info calls?
         if @use_cache
           cache_dir = File.join(@cache_dir, 'faraday_eds_cache')
@@ -222,8 +223,6 @@ module EBSCO
         end
       end
 
-      # todo: need a lookahead and lookbehind option for blacklight next/previous detail page - do search but don't change the current_page
-
       # :category: Search & Retrieve Methods
       # Performs a simple search. All other search options assume default values.
       #
@@ -290,38 +289,44 @@ module EBSCO
         max = rpp * pnum
         min = max - rpp + 1
         result_index = rid - min
-        cached_results = search(options)
+        cached_results = search(options, false, false)
+        cached_results_found = cached_results.stat_total_hits
 
         # last result in set, get next result
         if rid == max
-          @search_options.add_actions("GoToPage(#{cached_results.page_number+1})", @info)
-          next_result_set = search({}, true, false)
+          options_next = options
+          options_next['page'] = cached_results.page_number+1
+          next_result_set = search(options_next, false, false)
           result_next = next_result_set.records.first
         else
-          result_next = cached_results.records[result_index+1]
-        end
-
-        if result_next.nil?
-          puts 'ERROR: result_next is nil'
+          unless rid == cached_results_found
+            result_next = cached_results.records[result_index+1]
+          end
         end
 
-        # first result in set that's not the very first result, get previous result
-        if result_index == 0 and rid != 1
-          @search_options.add_actions("GoToPage(#{cached_results.page_number-1})", @info)
-          previous_result_set = search({}, true, false)
-          result_prev = previous_result_set.records.last
+        if result_index == 0
+          # first result in set that's not the very first result, get previous result
+          if rid != 1
+            options_previous = options
+            options_previous['page'] = cached_results.page_number-1
+            previous_result_set = search(options_previous, false, false)
+            result_prev = previous_result_set.records.last
+          end
         else
           result_prev = cached_results.records[result_index-1]
         end
 
-        if result_prev.nil?
-          puts 'ERROR: result_prev is nil'
-        end
-
         # return json result set with just the previous and next records in it
         r = empty_results(cached_results.stat_total_hits)
         results = EBSCO::EDS::Results.new(r)
-        results.records = [result_prev, result_next]
+        next_previous_records = []
+        unless result_prev.nil?
+          next_previous_records << result_prev
+        end
+        unless result_next.nil?
+          next_previous_records << result_next
+        end
+        results.records = next_previous_records
         results.to_solr
 
       end
@@ -669,11 +674,7 @@ module EBSCO
                   json_payload = JSON.generate(payload)
                   # add a cache_id to post search requests to make them cacheable
                   if path == '/edsapi/rest/Search'
-                    # replacements to avoid duplicate caches
-                    json_payload = json_payload.gsub(/"PageNumber":[0-9]+,/,'')
-                    json_payload = json_payload.gsub(/"ResultsPerPage":"([0-9]+)"/,'"ResultsPerPage":\1')
-                    json_payload = json_payload.gsub(/"Actions":\[]/,'"Actions":["GoToPage(1)"]')
-                    # puts 'CHECKSUM PAYLOAD: ' + json_payload.inspect
+                    # puts 'CHECKSUM PAYLOAD: ' + json_payload
                     checksum = Digest::MD5.hexdigest json_payload
                     path << '?cache_id=' + checksum
                   end
@@ -752,7 +753,7 @@ module EBSCO
 
       def connection
         logger = Logger.new(@config[:log])
-        logger.level = Logger::DEBUG
+        logger.level = Logger.const_get(@config[:log_level])
         Faraday.new(url: @config[:eds_api_base]) do |conn|
           conn.headers['Content-Type'] = 'application/json;charset=UTF-8'
           conn.headers['Accept'] = 'application/json'
@@ -760,13 +761,13 @@ module EBSCO
           conn.headers['x-authenticationToken'] = @auth_token ? @auth_token : ''
           conn.headers['User-Agent'] = @config[:user_agent]
           conn.request :url_encoded
-          conn.use :eds_caching_middleware, store: @cache_store if @use_cache
+          conn.use :eds_caching_middleware, store: @cache_store, logger: @debug ? logger : nil if @use_cache
           conn.use :eds_exception_middleware
           conn.response :json, content_type: /\bjson$/
           conn.response :detailed_logger, logger if @debug
           conn.options[:open_timeout] = @config[:open_timeout]
           conn.options[:timeout] = @config[:timeout]
-          conn.adapter Faraday.default_adapter
+          conn.adapter :net_http_persistent
         end
       end
 

data/lib/ebsco/eds/version.rb

@@ -1,5 +1,5 @@
 module EBSCO
   module EDS
-    VERSION = '0.2.9.pre'
+    VERSION = '0.3.0.pre'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ebsco-eds
 version: !ruby/object:Gem::Version
-  version: 0.2.9.pre
+  version: 0.3.0.pre
 platform: ruby
 authors:
 - Bill McKinney
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-31 00:00:00.000000000 Z
+date: 2017-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -211,6 +211,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: net-http-persistent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.9'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement