ebsco-eds 0.1.6.pre → 0.1.7.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b3dbb922292492bd576647444871ee036ab22f3
-  data.tar.gz: d3dd7ec0dfa262a0c0d57322c3f613c1ba88e9de
+  metadata.gz: 3d77f232f59d0394231f3b1ad9e01366e549b7ce
+  data.tar.gz: ce77a40006520d940d6bd668103fbd49078b40b5
 SHA512:
-  metadata.gz: 4a3aaa3574121dc01e2f17b4ad9bf21bbdc153eb4de4f806a34e047efc712172634a7a2f69588c509f88e85db49cc556800026f22334c627affeb200ebd32661
-  data.tar.gz: f6df3932a249f65bfbc8b94a25eebd97eed5b5ab9bf1d0b575659d8b9126976ce0cbf2043dde2ab4a413da7099bea0cca1d8af5d649d1699c6549aa01e50ad87
+  metadata.gz: f8806ae9eff53f3334ca2d64be2b068e036d2349d9585b91c47c2c3cbfcf27ab84b183ff1aaed14894e875fe82f131ccbfcc8f1345d6605877ef60f8b66dd615
+  data.tar.gz: 434ecced7c11e8220e9fdc1dc640dac20b8886f0db6b41f09f5aa647b3676d0d5e28cedbf6d345cac42b0847ef8dc363dae99bb63ab5fe18024ce7c85707563e

data/README.md

@@ -10,7 +10,7 @@ A Ruby interface to the EBSCO Discovery Services API.
 
 ## Dependencies
 
-* Ruby 2.1+
+* Ruby 2.2+
 
 ## Installation
 
@@ -33,6 +33,7 @@ Or install it yourself as:
 - [Configuration](https://github.com/ebsco/edsapi-ruby/wiki/Configuration)
 - [Quick Start](https://github.com/ebsco/edsapi-ruby/wiki/Quick-Start)
 - [Blacklight Support](https://github.com/ebsco/edsapi-ruby/wiki/Solr-and-Blacklight-Support)
+- [Citation Formats (Experimental)](https://github.com/ebsco/edsapi-ruby/wiki/Citation-Formats-(Experimental))
 
 ### Models
 

data/lib/ebsco/eds/options.rb

@@ -30,73 +30,89 @@ module EBSCO
             # solr facet translation
             # "f"=>{"format"=>["eBooks"]}
             when 'f'
-              if value.has_key?('format')
-                format_list = value['format']
+              if value.has_key?('eds_publication_type_facet')
+                format_list = value['eds_publication_type_facet']
                 format_list.each do |item|
                   @Actions.push "addfacetfilter(SourceType:#{item})"
                 end
               end
 
-              if value.has_key?('language_facet')
-                lang_list = value['language_facet']
+              if value.has_key?('eds_language_facet')
+                lang_list = value['eds_language_facet']
                 lang_list.each do |item|
                   @Actions.push "addfacetfilter(Language:#{item})"
                 end
               end
 
-              if value.has_key?('subject_topic_facet')
-                subj_list = value['subject_topic_facet']
+              if value.has_key?('eds_subject_topic_facet')
+                subj_list = value['eds_subject_topic_facet']
                 subj_list.each do |item|
                   @Actions.push "addfacetfilter(SubjectEDS:#{item})"
                 end
               end
 
-              if value.has_key?('geographic_facet')
-                subj_list = value['geographic_facet']
+              if value.has_key?('eds_subjects_geographic_facet')
+                subj_list = value['eds_subjects_geographic_facet']
                 subj_list.each do |item|
                   @Actions.push "addfacetfilter(SubjectGeographic:#{item})"
                 end
               end
 
-              if value.has_key?('publisher_facet')
-                subj_list = value['publisher_facet']
+              if value.has_key?('eds_publisher_facet')
+                subj_list = value['eds_publisher_facet']
                 subj_list.each do |item|
                   @Actions.push "addfacetfilter(Publisher:#{item})"
                 end
               end
 
-              if value.has_key?('journal_facet')
-                subj_list = value['journal_facet']
+              if value.has_key?('eds_journal_facet')
+                subj_list = value['eds_journal_facet']
                 subj_list.each do |item|
                   @Actions.push "addfacetfilter(Journal:#{item})"
                 end
               end
 
-              if value.has_key?('category_facet')
-                subj_list = value['category_facet']
+              if value.has_key?('eds_category_facet')
+                subj_list = value['eds_category_facet']
                 subj_list.each do |item|
                   @Actions.push "addfacetfilter(Category:#{item})"
                 end
               end
 
-              if value.has_key?('content_provider_facet')
-                subj_list = value['content_provider_facet']
+              if value.has_key?('eds_content_provider_facet')
+                subj_list = value['eds_content_provider_facet']
                 subj_list.each do |item|
                   item = eds_sanitize item
                   @Actions.push "addfacetfilter(ContentProvider:#{item})"
                 end
               end
 
-              if value.has_key?('library_location_facet')
-                subj_list = value['library_location_facet']
+              if value.has_key?('eds_library_location_facet')
+                subj_list = value['eds_library_location_facet']
                 subj_list.each do |item|
                   item = eds_sanitize item
                   @Actions.push "addfacetfilter(LocationLibrary:#{item})"
                 end
               end
 
-              if value.has_key?('search_limiters')
-                _list = value['search_limiters']
+              if value.has_key?('eds_library_collection_facet')
+                subj_list = value['eds_library_collection_facet']
+                subj_list.each do |item|
+                  item = eds_sanitize item
+                  @Actions.push "addfacetfilter(CollectionLibrary:#{item})"
+                end
+              end
+
+              if value.has_key?('eds_author_university_facet')
+                subj_list = value['eds_author_university_facet']
+                subj_list.each do |item|
+                  item = eds_sanitize item
+                  @Actions.push "addfacetfilter(AuthorUniversity:#{item})"
+                end
+              end
+
+              if value.has_key?('eds_search_limiters_facet')
+                _list = value['eds_search_limiters_facet']
                 _list.each do |item|
                   if item == 'Full Text'
                     @Actions.push "addlimiter(FT:y)"
@@ -110,8 +126,8 @@ module EBSCO
                 end
               end
 
-              if value.has_key?('pub_date_facet')
-                _list = value['pub_date_facet']
+              if value.has_key?('eds_publication_year_facet')
+                _list = value['eds_publication_year_facet']
                 _this_year = Date.today.year
                 _this_month = Date.today.month
                 _list.each do |item|
@@ -161,7 +177,7 @@ module EBSCO
       end
 
       def eds_sanitize(str)
-        pattern = /(\'|\"|\.|\*|\/|\-|\\|\)|\$|\+|\(|\^|\?|\!|\~|\`)/
+        pattern = /(\'|\"|\*|\/|\-|\\|\)|\$|\+|\(|\^|\?|\!|\~|\`)/
         str = str.gsub(pattern){ |match| '\\' + match }
         str
       end

data/lib/ebsco/eds/record.rb

@@ -113,7 +113,7 @@ module EBSCO
         @eds_publication_type_id = @record['Header']['PubTypeId']
         @eds_publication_date = bib_publication_date || get_item_data_by_name('DatePub')
         @eds_publication_year = bib_publication_year || get_item_data_by_name('DatePub')
-        @eds_publisher_info = get_item_data_by_label('Publication Information')
+        @eds_publication_info = get_item_data_by_label('Publication Information')
         @eds_document_type = get_item_data_by_name('TypeDocument')
         @eds_document_doi = get_item_data_by_name('DOI') || bib_doi
         @eds_document_oclc = get_item_data_by_label('OCLC')
@@ -150,8 +150,8 @@ module EBSCO
       # \Options hash containing accession number and database ID. This can be passed to the retrieve method.
       def retrieve_options
         options = {}
-        options['an'] = accession_number
-        options['dbid'] = database_id
+        options['an'] = @eds_accession_number
+        options['dbid'] = @eds_database_id
         options
       end
 

data/lib/ebsco/eds/results.rb

@@ -88,6 +88,8 @@ module EBSCO
         solr_start = (page_number-1) * results_per_page
         hl_hash = {}
         solr_docs = []
+        research_starters = []
+        publication_matches = []
 
         if @records.any?
           @records.each { |record|
@@ -102,6 +104,14 @@ module EBSCO
           }
         end
 
+        if @research_starters.any?
+          @research_starters.each { |record| research_starters.push(record.to_attr_hash) }
+        end
+
+        if publication_match.any?
+          publication_match.each { |record| publication_matches.push(record.to_attr_hash) }
+        end
+
         status = 0
         wt = 'ruby'
         qtime = stat_total_time

data/lib/ebsco/eds/version.rb

@@ -1,5 +1,5 @@
 module EBSCO
   module EDS
-    VERSION = '0.1.6.pre'
+    VERSION = '0.1.7.pre'
   end
 end

metadata

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