ebsco-eds 0.3.0.pre → 0.3.1.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5353c7f332e965904370d4defe3ffddc1c188992
-  data.tar.gz: b2fb35896f412a06d76c3889337b9741f14d4bc9
+  metadata.gz: c5bc349f6a65afd5f8dad6d89441d9a72a5d7ee0
+  data.tar.gz: 7c028d8098e5555497964019848680acd3a5b5bb
 SHA512:
-  metadata.gz: c586fb16ec00a3b975b24ff65a762e9aaff0993d4578fee0ed2f4f8f8b142e9abfb95f61fadccaf40ac2d2375bc13ea1c365f4178f399f30de85028b1e552646
-  data.tar.gz: cbc65d09fa611f4f25cd51d9529b0722e3be36ee3cfc1b226467d6d2beb67d72383a6b59ef14195e67838bcbc3e5b9c885ab4b2ff203670479a374cd29852160
+  metadata.gz: fae36ea68f3dac43929a793b4e835f52537919a6a82319448904aa14881bbca3da12f68b0c951511a636c203e92715ef259b475b9249f61b66d5fefef6a5fcf3
+  data.tar.gz: fd665b635c020835db13eb6d87f2f3ab4b87bd07e81b3cc8ff92a963e1cf2a7a2cb094810b118bb0cea35cd2c2aedf29218794d1f6da43f4eefde6342b4f7114

data/lib/ebsco/eds/session.rb

@@ -129,7 +129,7 @@ module EBSCO
             end :
             @debug = @config[:debug]
 
-        # use cache for auth token and info calls?
+        # use cache for auth token, info, search and retrieve calls?
         if @use_cache
           cache_dir = File.join(@cache_dir, 'faraday_eds_cache')
           @cache_store = ActiveSupport::Cache::FileStore.new cache_dir
@@ -255,9 +255,9 @@ module EBSCO
       #
       def retrieve(dbid:, an:, highlight: nil, ebook: 'ebook-pdf')
         payload = { DbId: dbid, An: an, HighlightTerms: highlight, EbookPreferredFormat: ebook }
-        # retrieve_response = do_request(:post, path: @config[:retrieve_url], payload: payload)
-        retrieve_params = "?an=#{an}&dbid=#{dbid}&ebookpreferredformat=#{ebook}"
-        retrieve_response = do_request(:get, path: @config[:retrieve_url] + retrieve_params)
+        retrieve_response = do_request(:post, path: @config[:retrieve_url], payload: payload)
+        #retrieve_params = "?an=#{an}&dbid=#{dbid}&ebookpreferredformat=#{ebook}"
+        #retrieve_response = do_request(:get, path: @config[:retrieve_url] + retrieve_params)
         record = EBSCO::EDS::Record.new(retrieve_response)
         # puts 'RECORD: ' + record.pretty_inspect
         record
@@ -668,16 +668,11 @@ module EBSCO
                   qs = CGI.escape(payload.to_query_string)
                   path << '?' + qs
                 end
-                req.url path
+               req.url path
               when :post
                 unless payload.nil?
                   json_payload = JSON.generate(payload)
-                  # add a cache_id to post search requests to make them cacheable
-                  if path == '/edsapi/rest/Search'
-                    # puts 'CHECKSUM PAYLOAD: ' + json_payload
-                    checksum = Digest::MD5.hexdigest json_payload
-                    path << '?cache_id=' + checksum
-                  end
+                  path << get_cache_id(path, json_payload) if @use_cache
                   req.body = json_payload
                 end
                 req.url path
@@ -837,6 +832,15 @@ module EBSCO
         }
       end
 
+      # generate a cache id for search and retrieve post requests, using a hash of the payload + guest mode
+      def get_cache_id(path, payload)
+        if path == '/edsapi/rest/Search' or path == '/edsapi/rest/Retrieve'
+          '?cache_id=' + Digest::MD5.hexdigest(payload + @guest.to_s)
+        else
+          ''
+        end
+      end
+
     end
 
   end

data/lib/ebsco/eds/version.rb

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

metadata

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