ebsco-eds 0.1.8.pre → 0.1.9.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 674580c39f9ae75ae1929f22f0bdec8d08ed27d5
-  data.tar.gz: 22c1a6c187b8fabbc4ffe4ae029acd503dfcfbbc
+  metadata.gz: 9322677a3b97bef467b3d279b234faa7f781ac19
+  data.tar.gz: ca5db0366fda7a4b726f029eb72b28a9395f4445
 SHA512:
-  metadata.gz: bc663ca74fb63459b96aa4c5f6ad854325598d4618619aa28c3461f7df019cc17fc3e6b024d351d96e0687930d1f6ceb8133e4ea979f80e304bd433f385fb455
-  data.tar.gz: c2a3f28a5434b681b64cdb704383227ad6881b01b4c0d86a27b0f8daca9a6d0afb129397ea43877ecb9b6c5b2474c6bb0173ab65ae35520b7d35648e26913211
+  metadata.gz: 3f526a7dd1c6b4d2f83d0f0d96d7bebd2a9c9f1c3560478cc86315109e929bf4c8f5c076885c04fd8ae573124005da87c4d3d1f954009e7c99a88f1290b8f0fd
+  data.tar.gz: 53927107a26b31dc85dc6c764547d537d48822c59d0fb164c35b1cf6973df01bbf1986d0a71d23fd017b20fcf15293477dbb75a9bf5d21789ca4f3e48d0fe7eb

data/lib/ebsco/eds/record.rb

@@ -23,11 +23,15 @@ module EBSCO
           :eds_abstract,
           :eds_authors,
           :eds_author_affiliations,
+          :eds_authors_composed,
           :eds_subjects,
           :eds_subjects_geographic,
           :eds_subjects_person,
+          :eds_subjects_genre,
           :eds_author_supplied_keywords,
+          :eds_descriptors,
           :eds_notes,
+          :eds_subset,
           :eds_languages,
           :eds_page_count,
           :eds_page_start,
@@ -60,6 +64,8 @@ module EBSCO
           :eds_all_links,
           :eds_fulltext_links,
           :eds_non_fulltext_links,
+          :eds_code_naics,
+          :eds_abstract_supplied_copyright,
           # publication record attributes
           :eds_publication_id,
           :eds_publication_is_searchable,
@@ -95,23 +101,29 @@ module EBSCO
                         .fetch('IsPartOfRelationships', {})[0]
 
         # accessors:
+        @eds_result_id = @record['ResultId']
+        @eds_plink = @record['PLink']
         @eds_accession_number = @record['Header']['An'].to_s
         @eds_database_id = @record['Header']['DbId'].to_s
         @eds_database_name = @record['Header']['DbLabel']
         @eds_access_level = @record['Header']['AccessLevel']
         @eds_relevancy_score =  @record['Header']['RelevancyScore']
+        @id = @eds_database_id + '__' + @eds_accession_number.gsub(/\./,'_')
         @eds_title = title
         @eds_source_title = source_title
         @eds_composed_title = source_title_composed
         @eds_other_titles = other_titles
         @eds_abstract = abstract
-        @eds_authors = bib_authors || get_item_data_by_name('Author')
+        @eds_authors = bib_authors_list
+        @eds_authors_composed = get_item_data_by_name('Author')
         @eds_author_affiliations = get_item_data_by_name('AffiliationAuthor')
         @eds_subjects = bib_subjects || get_item_data_by_name('Subject')
         @eds_subjects_geographic = get_item_data_by_name('SubjectGeographic')
         @eds_subjects_person = get_item_data_by_name('SubjectPerson')
-        @eds_author_supplied_keywords = get_item_data_by_label('Author-Supplied Keywords')
+        @eds_subjects_genre = get_item_data_by_name('SubjectGenre')
+        @eds_author_supplied_keywords = get_item_data_by_name('Keyword')
         @eds_notes = notes
+        @eds_subset = get_item_data_by_name('Subset')
         @eds_languages = get_item_data_by_name('Language') || bib_languages
         @eds_page_count = bib_page_count
         @eds_page_start = bib_page_start
@@ -137,14 +149,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_result_id = @record['ResultId']
-        @eds_plink = @record['PLink']
         @eds_html_fulltext = html_fulltext
         @eds_images = images
         @eds_all_links = all_links
         @eds_fulltext_links = fulltext_links
         @eds_non_fulltext_links = non_fulltext_links
-        @id = @eds_database_id + '__' + @eds_accession_number.gsub(/\./,'_')
+        @eds_code_naics = get_item_data_by_name('CodeNAICS')
+        @eds_abstract_supplied_copyright = get_item_data_by_name('AbstractSuppliedCopyright')
+        @eds_descriptors = get_item_data_by_label('Descriptors')
 
         @eds_publication_id = @record['Header']['PublicationId']
         @eds_publication_is_searchable = @record['Header']['IsSearchable']

data/lib/ebsco/eds/session.rb

@@ -2,6 +2,7 @@ require 'ebsco/eds/version'
 require 'ebsco/eds/info'
 require 'ebsco/eds/results'
 require 'faraday'
+require 'faraday/detailed_logger'
 require 'faraday_middleware'
 require 'logger'
 require 'json'
@@ -99,6 +100,10 @@ module EBSCO
         # these config options can be overridden by environment vars
         @auth_type =  (ENV.has_key? 'EDS_AUTH') ? ENV['EDS_AUTH'] : @config[:auth]
         @org =        (ENV.has_key? 'EDS_ORG') ? ENV['EDS_ORG'] : @config[:org]
+        @debug =      (ENV.has_key? 'EDS_DEBUG') ? ENV['EDS_DEBUG'] : @config[:debug]
+        @use_cache =  (ENV.has_key? 'EDS_USE_CACHE') ? ENV['EDS_USE_CACHE'] : @config[:use_cache]
+        @cache_dir =  (ENV.has_key? 'EDS_CACHE_DIR') ? ENV['EDS_CACHE_DIR'] : @config[:eds_cache_dir]
+
         if ENV.has_key? 'EDS_GUEST'
           if ['n', 'N', 'no', 'No'].include?(ENV['EDS_GUEST'])
             @guest = false
@@ -110,8 +115,8 @@ module EBSCO
         end
 
         # use cache for auth token and info calls?
-        if @config[:use_cache]
-          cache_dir = File.join(@config[:eds_cache_dir], 'faraday_eds_cache')
+        if @use_cache
+          cache_dir = File.join(@cache_dir, 'faraday_eds_cache')
           @cache_store = ActiveSupport::Cache::FileStore.new cache_dir
         end
 
@@ -132,7 +137,7 @@ module EBSCO
         @current_page = 0
         @search_options = nil
 
-        if @config[:debug]
+        if @debug
           if options.key? :caller
             puts 'CREATE SESSION CALLER: ' + options[:caller].inspect
             puts 'CALLER OPTIONS: ' + options.inspect
@@ -676,10 +681,10 @@ 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 @config[:use_cache]
+          conn.use :eds_caching_middleware, store: @cache_store if @use_cache
           conn.use :eds_exception_middleware
           conn.response :json, content_type: /\bjson$/
-          conn.response :logger, logger if @config[:debug]
+          conn.response :detailed_logger, logger if @debug
           conn.adapter Faraday.default_adapter
         end
       end

data/lib/ebsco/eds/version.rb

@@ -1,5 +1,5 @@
 module EBSCO
   module EDS
-    VERSION = '0.1.8.pre'
+    VERSION = '0.1.9.pre'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ebsco-eds
 version: !ruby/object:Gem::Version
-  version: 0.1.8.pre
+  version: 0.1.9.pre
 platform: ruby
 authors:
 - Bill McKinney
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-30 00:00:00.000000000 Z
+date: 2017-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday