ebsco-eds 0.1.0.pre → 0.1.2.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bf7451cbf86071a743681b657692b002f44f390
-  data.tar.gz: 0730b334a687c1af3da7452405e882324475c03c
+  metadata.gz: 6eeda3d3770ecc3ee937791ed356de3e9add67a2
+  data.tar.gz: 0ece96451193882edb73c6fccbb3729145417062
 SHA512:
-  metadata.gz: eeed69e878b466f93c3d1ea562a826f77fef9305a0e9b10f1925342e5ab9917725ea140e50db7b5d2231ab84f409186267d23ee114485a1c2978246ca62f28a5
-  data.tar.gz: cf5033d8a83440de5aab54af4b5a440c438d0ddd68cc3a7a4653670257b18a30281d23de14d4d8f1fd15c2f3d330acc52c242bd631eb05fa9e7cd58b629f9a2b
+  metadata.gz: ac1e31542ec79fc475ac929a9dedf458a82c01d36fe025291fe97b1aee91e4be091071783ebee2764b9925736a6f51e6fb670712746c8c5e2ff557dd2fe01996
+  data.tar.gz: 8cac0ad690067315702fe09e8bad1137912c6b366be732500176e637cc2b7265cd4494e86edbd0e915171e5b1e7011b3a787fa61ec71ff19d5cf892c906aab45

data/.env.test

@@ -1,6 +1,7 @@
-EDS_PROFILE=edsapi
-EDS_USER=user
-EDS_PASS=secret
+EDS_PROFILE=eds-api
+EDS_USER=billmckinn
+EDS_PASS=4n~r1me86y
 EDS_AUTH=user
 EDS_GUEST=n
-EDS_ORG=none
+EDS_ORG=none
+CODECOV_TOKEN=d72eb958-f826-40eb-8112-e77a965dc94e

data/README.md

@@ -10,7 +10,7 @@ A Ruby interface to the EBSCO Discovery Services API.
 
 ## Dependencies
 
-* Ruby 2.1+
+* Ruby 2.2+
 
 ## Installation
 

data/ebsco-eds.gemspec

@@ -50,5 +50,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'simplecov', '~> 0'
   spec.add_development_dependency 'codecov', '~> 0.1'
+  spec.add_development_dependency 'vcr', '~> 2.8'
+  spec.add_development_dependency 'minitest-vcr', '~> 0.1.1'
+  spec.add_development_dependency 'webmock', '~> 1.17'
 
 end

data/lib/ebsco/eds/options.rb

@@ -255,11 +255,25 @@ module EBSCO
             # facets
             # ====================================================================================
             when :include_facets
-                @IncludeFacets = value ? 'y' : 'n'
+              @IncludeFacets = value ? 'y' : 'n'
 
             when :facet_filters
               @FacetFilters = value
 
+            # # handle solr facets without causing the page to reset to 1 again?
+            # when 'f'
+            #
+            #   if value.has_key?('content_provider_facet')
+            #     f_filter = {'FilterId' => 1, 'FacetValues' => []}
+            #     flist = value['content_provider_facet']
+            #     flist.each do |item|
+            #       item = eds_sanitize item
+            #       f_filter['FacetValues'].push({'Id' => 'ContentProvider', 'Value' => item})
+            #     end
+            #     @FacetFilters.push f_filter
+            #     puts 'FACET FILTERS: ' + @FacetFilters.inspect
+            #   end
+
             # ====================================================================================
             # sort
             # ====================================================================================
@@ -390,7 +404,7 @@ module EBSCO
             # ====================================================================================
             # results per page
             # ====================================================================================
-            when :results_per_page, 'rows', 'per_page'
+            when :results_per_page, 'results_per_page', 'rows', 'per_page'
               if value.to_i > info.max_results_per_page
                 @ResultsPerPage = info.max_results_per_page
               else
@@ -400,7 +414,7 @@ module EBSCO
             # ====================================================================================
             # page number
             # ====================================================================================
-            when :page_number, 'page'
+            when :page_number, 'page_number', 'page'
               @PageNumber = value.to_i
             # solr starts at page 0
             when 'start'

data/lib/ebsco/eds/session.rb

@@ -65,6 +65,7 @@ module EBSCO
         @session_token = ''
         @auth_token = ''
         @config = {}
+        @guest = true
 
         eds_config = EBSCO::EDS::Configuration.new
         if options[:config]
@@ -97,8 +98,16 @@ module EBSCO
 
         # these config options can be overridden by environment vars
         @auth_type =  (ENV.has_key? 'EDS_AUTH') ? ENV['EDS_AUTH'] : @config[:auth]
-        @guest =      (ENV.has_key? 'EDS_GUEST') ? ENV['EDS_GUEST'] : @config[:guest]
         @org =        (ENV.has_key? 'EDS_ORG') ? ENV['EDS_ORG'] : @config[:org]
+        if ENV.has_key? 'EDS_GUEST'
+          if ['n', 'N', 'no', 'No'].include?(ENV['EDS_GUEST'])
+            @guest = false
+          else
+            @guest = true
+          end
+        else
+          @guest = @config[:guest]
+        end
 
         # use cache for auth token and info calls?
         if @config[:use_cache]
@@ -229,6 +238,24 @@ module EBSCO
         record
       end
 
+      # Create a result set with just the record before and after then index item
+      def solr_retrieve_previous_next(options = {})
+        records = []
+        hits = search(options).stat_total_hits
+        options.update(:results_per_page => 1,
+                       :page_number => (options['previous-next-index'].to_i) - 1,
+                       'page' => (options['previous-next-index'].to_i) - 1)
+        records.push  search(options).records.first
+        options.update(:results_per_page => 1,
+                       :page_number => (options['previous-next-index'].to_i) + 1,
+                       'page' => (options['previous-next-index'].to_i) + 1)
+        records.push  search(options).records.first
+        r = empty_results(hits)
+        results = EBSCO::EDS::Results.new(r)
+        results.records = records
+        results.to_solr
+      end
+
       def solr_retrieve_list(list: [], highlight: nil)
         records = []
         if list.any?
@@ -672,8 +699,9 @@ module EBSCO
       end
 
       def create_session_token
+        guest_string = @guest ? 'y' : 'n'
         resp = do_request(:get, path: @config[:create_session_url] +
-            '?profile=' + @profile + '&guest=' + @guest +
+            '?profile=' + @profile + '&guest=' + guest_string +
             '&displaydatabasename=y')
         @session_token = resp['SessionToken']
       end

data/lib/ebsco/eds/version.rb

@@ -1,5 +1,5 @@
 module EBSCO
   module EDS
-    VERSION = '0.1.0.pre'
+    VERSION = '0.1.2.pre'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ebsco-eds
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre
+  version: 0.1.2.pre
 platform: ruby
 authors:
 - Bill McKinney
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-13 00:00:00.000000000 Z
+date: 2017-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -281,6 +281,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
+- !ruby/object:Gem::Dependency
+  name: minitest-vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.17'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.17'
 description: 'Description: EBSCO EDS API'
 email:
 - bmckinney@ebsco.com, efrierson@ebsco.com