ebsco-eds 0.3.3.pre → 0.3.4.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe6bbef15a6166d55f9a93c2967de4b04860df76
-  data.tar.gz: d1de971e6bb03fdb4069dac04045f1792447d207
+  metadata.gz: d5892ad55aa81cd0c31eafcc91a87de4b81483dc
+  data.tar.gz: 7fc2bd988dd215d75e37a9cf3e33b1b9089bb936
 SHA512:
-  metadata.gz: b081a46c390b6354f04787259b29de23562d9c62852f088f0154608b1f8cc3cd142d525413936a92e803aa58d28b60e5f73454bb98ee376961bd523b2db39160
-  data.tar.gz: cd9387a56052d7b962c6bd97bae1dbfddcdf386ef97adb2a1284efe1ba0e8f68a786ac92556ae14bacd5ee63993dc8aea0d3586ed6b79b2f68ce081745f68038
+  metadata.gz: d557e0ce5b0af80aaed93bb459d1ec14cea8d8bbf94af47db09f80b7321949c5f6842ac19541e1f5f2d04034d73db693ed9e6bc2a01c1f56a041a90f72a313d5
+  data.tar.gz: 6090a2e9243e7996ad50206902ff17bba0b634c4fa21ef421c9fa7e9f3320a7c9619e45f9650e52fcf5053d7596b7884224c50088238fd1b2b4cd745852231ec

data/.env.test

@@ -1,7 +1,6 @@
 EDS_PROFILE=edsapi
-EDS_USER=stanford
-EDS_PASS=trial
+EDS_USER=user
+EDS_PASS=secret
 EDS_AUTH=user
 EDS_GUEST=n
-EDS_ORG=none
-EDS_DEBUG=false
+EDS_ORG=none

data/.gitignore

@@ -18,3 +18,4 @@ faraday.log
 .env
 yaml-sample-records
 *.gem
+.idea

data/lib/ebsco/eds/options.rb

@@ -64,6 +64,7 @@ module EBSCO
               if value.has_key?('eds_publication_type_facet')
                 format_list = value['eds_publication_type_facet']
                 format_list.each do |item|
+                  item = eds_sanitize item
                   @Actions.push "addfacetfilter(SourceType:#{item})"
                 end
               end
@@ -71,6 +72,7 @@ module EBSCO
               if value.has_key?('eds_language_facet')
                 lang_list = value['eds_language_facet']
                 lang_list.each do |item|
+                  item = eds_sanitize item
                   @Actions.push "addfacetfilter(Language:#{item})"
                 end
               end
@@ -78,6 +80,7 @@ module EBSCO
               if value.has_key?('eds_subject_topic_facet')
                 subj_list = value['eds_subject_topic_facet']
                 subj_list.each do |item|
+                  item = eds_sanitize item
                   @Actions.push "addfacetfilter(SubjectEDS:#{item})"
                 end
               end
@@ -85,6 +88,7 @@ module EBSCO
               if value.has_key?('eds_subjects_geographic_facet')
                 subj_list = value['eds_subjects_geographic_facet']
                 subj_list.each do |item|
+                  item = eds_sanitize item
                   @Actions.push "addfacetfilter(SubjectGeographic:#{item})"
                 end
               end
@@ -92,6 +96,7 @@ module EBSCO
               if value.has_key?('eds_publisher_facet')
                 subj_list = value['eds_publisher_facet']
                 subj_list.each do |item|
+                  item = eds_sanitize item
                   @Actions.push "addfacetfilter(Publisher:#{item})"
                 end
               end
@@ -99,6 +104,7 @@ module EBSCO
               if value.has_key?('eds_journal_facet')
                 subj_list = value['eds_journal_facet']
                 subj_list.each do |item|
+                  item = eds_sanitize item
                   @Actions.push "addfacetfilter(Journal:#{item})"
                 end
               end
@@ -106,6 +112,7 @@ module EBSCO
               if value.has_key?('eds_category_facet')
                 subj_list = value['eds_category_facet']
                 subj_list.each do |item|
+                  item = eds_sanitize item
                   @Actions.push "addfacetfilter(Category:#{item})"
                 end
               end

data/lib/ebsco/eds/results.rb

@@ -1,6 +1,7 @@
 require 'ebsco/eds/record'
 require 'yaml'
 require 'cgi'
+require 'date'
 
 module EBSCO
 
@@ -512,7 +513,15 @@ module EBSCO
         maxdate = @results['SearchResult']['AvailableCriteria']['DateRange']['MaxDate']
         minyear = mindate[0..3]
         maxyear = maxdate[0..3]
-        {mindate: mindate, maxdate: maxdate, minyear:minyear, maxyear:maxyear}
+
+        # cap maxdate/maxyear to current year + 1 (to filter any erroneous database metadata)
+        current_year = Time.new.year
+        if maxyear.to_i > current_year
+          maxyear = current_year + 1
+          maxdate = (current_year + 1).to_s + '-01'
+        end
+
+        {mindate: mindate.to_s, maxdate: maxdate.to_s, minyear:minyear.to_s, maxyear:maxyear.to_s}
       end
 
       # Provides alternative search terms to correct spelling, etc.

data/lib/ebsco/eds/session.rb

@@ -696,6 +696,29 @@ module EBSCO
                   @auth_token = nil
                   @auth_token = create_auth_token
                   do_request(method, path: path, payload: payload, attempt: attempt+1)
+                # invalid source type, attempt to recover gracefully
+                # when '130'
+                #   bad_source_type = e.fault[:error_body]['DetailedErrorDescription']
+                #   bad_source_type.gsub!(/Value Provided\s+/, '')
+                #   bad_source_type.gsub!(/\.\s*$/, '')
+                #   new_actions = []
+                #   payload.Actions.each { |action|
+                #     if action.start_with?('addfacetfilter(SourceType:')
+                #       if bad_source_type.nil?
+                #         # skip the source type since we don't know if it's bad or not
+                #       else
+                #         if !action.include?('SourceType:'+bad_source_type+')')
+                #           # not a bad source type, keep it
+                #           new_actions >> action
+                #         end
+                #       end
+                #     else
+                #       # not a source type action, add it
+                #       new_actions << action
+                #     end
+                #   }
+                #   payload.Actions = new_actions
+                #   do_request(method, path: path, payload: payload, attempt: attempt+1)
                 else
                   raise e
               end

data/lib/ebsco/eds/version.rb

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

metadata

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