ebsco-eds 0.0.5.pre → 0.0.6.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43e9ebad04e9e0aaa2b87f2e25d10e1cfad40934
-  data.tar.gz: 94e000ec7b6f2ccac3514dfa6fce6c567df90d76
+  metadata.gz: 52a371da7111d83a7616bdd5de68deabd1c6983a
+  data.tar.gz: 00fae54472789a602ad4cd50cab93f88d4778308
 SHA512:
-  metadata.gz: debbac1ad692666481d61fafe2c67fb667bd44f6c3f6de810720f96caea1da7569632193e20760a7abb151a9eb63baf2de7fe3ed168ffdf64816eea6c3fc7496
-  data.tar.gz: 8c30c14fee4443d7403985ccb9fa58c7e5c21c49666813c0836378439eeebb91ce4f655a028b8764f1a31a8230cab485cb1987f758a2d42d16d685af32503f5b
+  metadata.gz: b195bf1718c6715555487dc15f3d2eaccd62e5a2ec7152fb606a7a07a069b95a66d7758c83b5a04fd7d321b05889965e7e9c75e8eedf7d0933b6244f0ede8207
+  data.tar.gz: a4b22c20bcc5c092dd55414e4cfd4a427049e277e10c2cd4ce76ac8f27184daa9fa69334cd28e4ab2f5afa2885407bb00c0ddabfe55ae319b242b169c9b28daa

data/lib/ebsco/eds/options.rb

@@ -36,57 +36,66 @@ module EBSCO
                   @Actions.push "addfacetfilter(SourceType:#{item})"
                 end
               end
+
               if value.has_key?('language_facet')
                 lang_list = value['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']
                 subj_list.each do |item|
                   @Actions.push "addfacetfilter(SubjectEDS:#{item})"
                 end
               end
+
               if value.has_key?('geographic_facet')
                 subj_list = value['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']
                 subj_list.each do |item|
                   @Actions.push "addfacetfilter(Publisher:#{item})"
                 end
               end
+
               if value.has_key?('journal_facet')
                 subj_list = value['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']
                 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']
                 subj_list.each do |item|
                   @Actions.push "addfacetfilter(ContentProvider:#{item})"
                 end
               end
+
               if value.has_key?('library_location_facet')
                 subj_list = value['library_location_facet']
                 subj_list.each do |item|
                   @Actions.push "addfacetfilter(LocationLibrary:#{item})"
                 end
               end
+
               if value.has_key?('search_limiters')
-                subj_list = value['search_limiters']
-                subj_list.each do |item|
+                _list = value['search_limiters']
+                _list.each do |item|
                   if item == 'Full Text'
                     @Actions.push "addlimiter(FT:y)"
                   end
@@ -99,6 +108,34 @@ module EBSCO
                 end
               end
 
+              if value.has_key?('pub_date_facet')
+                _list = value['pub_date_facet']
+                _this_year = Date.today.year
+                _this_month = Date.today.month
+                _list.each do |item|
+                  if item == 'This year'
+                    _range = _this_year.to_s + '-01/' + _this_year.to_s + '-' + _this_month.to_s
+                    @Actions.push "addlimiter(DT1:#{_range})"
+                  end
+                  if item == 'Last 3 years'
+                    _range = (_this_year-3).to_s + '-' + _this_month.to_s + '/' + _this_year.to_s + '-' + _this_month.to_s
+                    @Actions.push "addlimiter(DT1:#{_range})"
+                  end
+                  if item == 'Last 10 years'
+                    _range = (_this_year-10).to_s + '-' + _this_month.to_s + '/' + _this_year.to_s + '-' + _this_month.to_s
+                    @Actions.push "addlimiter(DT1:#{_range})"
+                  end
+                  if item == 'Last 50 years'
+                    _range = (_this_year-50).to_s + '-' + _this_month.to_s + '/' + _this_year.to_s + '-' + _this_month.to_s
+                    @Actions.push "addlimiter(DT1:#{_range})"
+                  end
+                  if item == 'More than 50 years ago'
+                    _range = '0000-01/' + (_this_year-50).to_s + '-12'
+                    @Actions.push "addlimiter(DT1:#{_range})"
+                  end
+                end
+              end
+
             else
 
           end

data/lib/ebsco/eds/record.rb

@@ -22,7 +22,7 @@ module EBSCO
         if results_record.key? 'Record'
           @record = results_record['Record'] # single record returned by retrieve api
         else
-          @record = results_record  # set of records returned by search api
+          @record = results_record # set of records returned by search api
         end
 
         @items = @record.fetch('Items', {})
@@ -79,7 +79,7 @@ module EBSCO
       # The title.
       def title
         _retval = get_item_data_by_name('Title') || bib_title
-        # todo: make this configurable
+        # TODO: make this configurable
         if _retval.nil?
           _retval = 'This title is unavailable for guests, please login to see more information.'
         end
@@ -812,6 +812,9 @@ module EBSCO
         if cover_medium_url
           hash['cover_medium_url'] = cover_medium_url
         end
+        if all_links
+          hash['links'] = all_links
+        end
         hash
       end
 

data/lib/ebsco/eds/results.rb

@@ -121,6 +121,7 @@ module EBSCO
         category_facet = solr_facets('Category')
         content_provider_facet = solr_facets('ContentProvider')
         library_location_facet = solr_facets('LocationLibrary')
+        pub_date_facet = solr_pub_date_facets
         facet = true
 
         # solr response
@@ -149,6 +150,7 @@ module EBSCO
                         'format' => format,
                         'language_facet' => language_facet,
                         'subject_topic_facet' => subject_topic_facet,
+                        'pub_date_facet' => pub_date_facet,
                         'publisher_facet' => publisher_facet,
                         'journal_facet' => journal_facet,
                         'geographic_facet' => geographic_facet,
@@ -161,6 +163,24 @@ module EBSCO
 
       end
 
+      # Publication date facets:
+      # - This year
+      # - Last 3 years
+      # - Last 10 years
+      # - Last 50 years
+      # - More than 50 years ago
+      def solr_pub_date_facets
+        pub_date_facets = []
+        if stat_total_hits.to_i > 0
+          pub_date_facets.push('This year').push('')
+          pub_date_facets.push('Last 3 years').push('')
+          pub_date_facets.push('Last 10 years').push('')
+          pub_date_facets.push('Last 50 years').push('')
+          pub_date_facets.push('More than 50 years ago').push('')
+        end
+        pub_date_facets
+      end
+
       # Translate limiters found in calls to Info endpoint into solr facet fields if they are turned on
       def solr_search_limiters
         search_limiters = []

data/lib/ebsco/eds/session.rb

@@ -108,16 +108,24 @@ module EBSCO
           @auth_token = create_auth_token
         end
 
-        if options.has_key? :session_token
+        if options.key? :session_token
           @session_token = options[:session_token]
         else
           @session_token = create_session_token
         end
 
-        @info = EBSCO::EDS::Info.new(do_request(:get, path: INFO_URL))
+        @info ||= EBSCO::EDS::Info.new(do_request(:get, path: INFO_URL))
         @current_page = 0
         @search_options = nil
 
+        # DEBUG
+        # if options.key? :caller
+        #   puts 'CREATE SESSION CALLER: ' + options[:caller].inspect
+        #   puts 'CALLER OPTIONS: ' + options.inspect
+        # end
+        # puts 'AUTH TOKEN: ' + @auth_token.inspect
+        # puts 'SESSION TOKEN: ' + @session_token.inspect
+
       end
 
       # :category: Search & Retrieve Methods
@@ -208,9 +216,11 @@ module EBSCO
       #   record = session.retrieve({dbid: 'asn', an: '108974507'})
       #
       def retrieve(dbid:, an:, highlight: nil, ebook: 'ebook-pdf')
-        payload = {:DbId => dbid, :An => an, :HighlightTerms => highlight, :EbookPreferredFormat =>  ebook}
+        payload = { DbId: dbid, An: an, HighlightTerms: highlight, EbookPreferredFormat: ebook }
         retrieve_response = do_request(:post, path: RETRIEVE_URL, payload: payload)
-        EBSCO::EDS::Record.new(retrieve_response)
+        record = EBSCO::EDS::Record.new(retrieve_response)
+        # puts 'RECORD: ' + record.pretty_inspect
+        record
       end
 
       def solr_retrieve_list(list: [], highlight: nil, ebook: 'ebook-pdf')
@@ -558,10 +568,10 @@ module EBSCO
             end
           end
           resp.body
-        rescue Exception => e
+        rescue StandardError => e
           if e.respond_to? 'fault'
             error_code = e.fault[:error_body]['ErrorNumber'] || e.fault[:error_body]['ErrorCode']
-            if not error_code.nil?
+            unless error_code.nil?
               case error_code
                 # session token missing
                 when '108', '109'

data/lib/ebsco/eds/version.rb

@@ -1,5 +1,5 @@
 module EBSCO
   module EDS
-    VERSION = '0.0.5.pre'
+    VERSION = '0.0.6.pre'
   end
 end

metadata

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