ebsco-eds 0.0.9.pre → 0.1.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f12e4b479c74c3d70975e92889f809890990e32d
-  data.tar.gz: 04c6e2c2635d88502436681c27507d4bd2d50ce6
+  metadata.gz: 8bf7451cbf86071a743681b657692b002f44f390
+  data.tar.gz: 0730b334a687c1af3da7452405e882324475c03c
 SHA512:
-  metadata.gz: 8007fbbc454f4ec46618bfafe929b2341fde6f2e31a9a8e4e7133e635b3712537624acad98d4ea98ae1cf7970a219b77787937b54a91235bcfce23931d1690bf
-  data.tar.gz: 6821b1297656a67a2568a8874c78098cffba292f4460caf83843c6ecafa6ace5d1f9f096f8fb649d2addd0de4c0cd8d02d2a7848600459fdbd567e1694d39afe
+  metadata.gz: eeed69e878b466f93c3d1ea562a826f77fef9305a0e9b10f1925342e5ab9917725ea140e50db7b5d2231ab84f409186267d23ee114485a1c2978246ca62f28a5
+  data.tar.gz: cf5033d8a83440de5aab54af4b5a440c438d0ddd68cc3a7a4653670257b18a30281d23de14d4d8f1fd15c2f3d330acc52c242bd631eb05fa9e7cd58b629f9a2b

data/lib/ebsco/eds.rb

@@ -8,19 +8,7 @@ require 'ebsco/eds/error'
 module EBSCO
 
   module EDS
-    EDS_API_BASE = 'https://eds-api.ebscohost.com'
-    UID_AUTH_URL = '/authservice/rest/uidauth'
-    IP_AUTH_URL = '/authservice/rest/ipauth'
-    CREATE_SESSION_URL = '/edsapi/rest/CreateSession'
-    END_SESSION_URL = '/edsapi/rest/EndSession'
-    INFO_URL = '/edsapi/rest/Info'
-    SEARCH_URL = '/edsapi/rest/Search'
-    RETRIEVE_URL = '/edsapi/rest/Retrieve'
-    USER_AGENT = 'EBSCO EDS GEM v0.0.1'
-    INTERFACE_ID = 'EBSCO EDS GEM v0.0.1'
-    LOG = 'faraday.log'
-    MAX_ATTEMPTS = 2
-    MAX_RESULTS_PER_PAGE = 100
+
   end
 
 end

data/lib/ebsco/eds/configuration.rb

@@ -0,0 +1,63 @@
+require 'yaml'
+
+module EBSCO
+
+  module EDS
+
+    class Configuration
+
+      attr_reader :valid_config_keys
+
+      def initialize
+        # Configuration defaults
+        @config  = {
+            :debug => false,
+            :guest => true,
+            :org => '',
+            :auth => 'user',
+            :auth_token => '',
+            :session_token => '',
+            :eds_api_base => 'https://eds-api.ebscohost.com',
+            :uid_auth_url => '/authservice/rest/uidauth',
+            :ip_auth_url => '/authservice/rest/ipauth',
+            :create_session_url => '/edsapi/rest/CreateSession',
+            :end_session_url => '/edsapi/rest/EndSession',
+            :info_url => '/edsapi/rest/Info',
+            :search_url => '/edsapi/rest/Search',
+            :retrieve_url => '/edsapi/rest/Retrieve',
+            :user_agent => 'EBSCO EDS GEM v0.0.1',
+            :interface_id => 'EBSCO EDS GEM v0.0.1',
+            :log => 'faraday.log',
+            :max_attempts => 2,
+            :max_results_per_page => 100,
+            :ebook_preferred_format => 'ebook-pdf',
+            :use_cache => true,
+            :eds_cache_dir => ENV['TMPDIR'] || '/tmp'
+        }
+        @valid_config_keys = @config.keys
+      end
+
+      def configure(opts = {})
+        opts.each do |k, v|
+          @config[k] = v if @valid_config_keys.include? k
+        end
+        @config
+      end
+
+      def configure_with(file)
+        begin
+          config = YAML.load_file(file ||= 'eds.yaml')
+        rescue Errno::ENOENT
+          #puts 'YAML configuration file couldn\'t be found. Using defaults.'
+          return
+        rescue Psych::SyntaxError
+          #puts 'YAML configuration file contains invalid syntax. Using defaults'
+          return
+        end
+        @config[:file] = file
+        configure(config)
+      end
+    end
+
+  end
+end

data/lib/ebsco/eds/info.rb

@@ -7,7 +7,8 @@ module EBSCO
 
       attr_accessor :available_search_criteria, :view_result_settings, :application_settings, :api_settings
 
-      def initialize(info)
+      def initialize(info, config = {})
+        @results_per_page = config[:max_results_per_page] ? config[:max_results_per_page] : 100
         @available_search_criteria = info['AvailableSearchCriteria']
         @view_result_settings = info['ViewResultSettings']
         @application_settings = info['ApplicationSettings']
@@ -135,7 +136,7 @@ module EBSCO
       end
 
       def max_results_per_page
-        MAX_RESULTS_PER_PAGE
+        @results_per_page
       end
 
       def available_result_list_views

data/lib/ebsco/eds/options.rb

@@ -82,6 +82,7 @@ module EBSCO
               if value.has_key?('content_provider_facet')
                 subj_list = value['content_provider_facet']
                 subj_list.each do |item|
+                  item = eds_sanitize item
                   @Actions.push "addfacetfilter(ContentProvider:#{item})"
                 end
               end
@@ -89,6 +90,7 @@ module EBSCO
               if value.has_key?('library_location_facet')
                 subj_list = value['library_location_facet']
                 subj_list.each do |item|
+                  item = eds_sanitize item
                   @Actions.push "addfacetfilter(LocationLibrary:#{item})"
                 end
               end
@@ -157,7 +159,13 @@ module EBSCO
           #end
         end
       end
-  
+
+      def eds_sanitize(str)
+        pattern = /(\'|\"|\.|\*|\/|\-|\\|\)|\$|\+|\(|\^|\?|\!|\~|\`)/
+        str = str.gsub(pattern){ |match| '\\' + match }
+        str
+      end
+
       # def is_valid_action(action, info)
       #   # actions in info that require an enumerated value (e.g., addlimiter(LA99:Bulgarian))
       #   _available_actions = info.available_actions

data/lib/ebsco/eds/record.rb

@@ -40,14 +40,13 @@ module EBSCO
                         .fetch('IsPartOfRelationships', {})[0]
 
         @bibtex = BibTeX::Entry.new
-        @bibtex = retrieve_bibtex
       end
 
       # \Options hash containing accession number and database ID. This can be passed to the retrieve method.
       def retrieve_options
         options = {}
-        options['an'] = self.accession_number
-        options['dbid'] = self.database_id
+        options['an'] = accession_number
+        options['dbid'] = database_id
         options
       end
 
@@ -90,6 +89,7 @@ module EBSCO
       # The source title (e.g., Journal)
       def source_title
         _retval = bib_source_title || get_item_data_by_name('TitleSource')
+        _reval = nil? if _retval == title # suppress if it's identical to title
         _retval.nil?? nil : CGI.unescapeHTML(_retval)
       end
 
@@ -316,12 +316,12 @@ module EBSCO
 
       # A list of all available links.
       def all_links
-        self.fulltext_links + self.non_fulltext_links
+        fulltext_links + non_fulltext_links
       end
 
       # The first fulltext link.
       def fulltext_link
-        self.fulltext_links.first || {}
+        fulltext_links.first || {}
       end
 
       # All available fulltext links.
@@ -341,13 +341,14 @@ module EBSCO
           end
         end
 
-        htmlfulltextcheck = @record.fetch('FullText',{}).fetch('Text',{}).fetch('Availability',{})
-        if htmlfulltextcheck == '1'
-          link_url = 'detail'
-          link_label = 'Full Text in Browser'
-          link_icon = 'Full Text in Browser Icon'
-          links.push({url: link_url, label: link_label, icon: link_icon, type: 'html'})
-        end
+        # commenting out for now, not sure how 'detail' urls are useful in a blacklight context?
+        # htmlfulltextcheck = @record.fetch('FullText',{}).fetch('Text',{}).fetch('Availability',{})
+        # if htmlfulltextcheck == '1'
+        #   link_url = 'detail'
+        #   link_label = 'Full Text in Browser'
+        #   link_icon = 'Full Text in Browser Icon'
+        #   links.push({url: link_url, label: link_label, icon: link_icon, type: 'html'})
+        # end
 
         if ebscolinks.count > 0
           ebscolinks.each do |ebscolink|
@@ -374,15 +375,19 @@ module EBSCO
         items = @record.fetch('Items',{})
         if items.count > 0
           items.each do |item|
-            if item['Group'] == 'Url'
+            if item['Group'] == 'URL'
               if item['Data'].include? 'linkTerm="'
                 link_start = item['Data'].index('linkTerm="')+15
                 link_url = item['Data'][link_start..-1]
                 link_end = link_url.index('"')-1
                 link_url = link_url[0..link_end]
-                link_label_start = item['Data'].index('link>')+8
-                link_label = item['Data'][link_label_start..-1]
-                link_label = link_label.strip
+                if item['Label']
+                  link_label = item['Label']
+                else
+                  link_label_start = item['Data'].index('link>')+8
+                  link_label = item['Data'][link_label_start..-1]
+                  link_label = link_label.strip
+                end
               else
                 link_url = item['Data']
                 link_label = item['Label']
@@ -436,85 +441,6 @@ module EBSCO
       #:nodoc: all
       # No need to document methods below
 
-      # Experimental bibtex support.
-      def retrieve_bibtex
-
-        @bibtex.key = accession_number
-        @bibtex.title = title.gsub('<highlight>', '').gsub('</highlight>', '')
-        if self.bib_authors_list.length > 0
-          @bibtex.author = self.bib_authors_list.join(' and ').chomp
-        end
-        @bibtex.year = self.publication_year.to_i
-
-        # bibtex type
-        _type = self.publication_type
-        case _type
-          when 'Academic Journal'
-            @bibtex.type = :article
-            @bibtex.journal = source_title
-            unless issue.nil?
-              @bibtex.issue = issue
-            end
-            unless volume.nil?
-              @bibtex.number = volume
-            end
-            if page_start && page_count
-              @bibtex.pages = page_start + '-' + (page_start.to_i + page_count.to_i-1).to_s
-            end
-            if self.bib_publication_month
-              @bibtex.month = self.bib_publication_month.to_i
-            end
-            if doi
-              @bibtex.doi = doi
-              @bibtex.url = 'https://doi.org/' + doi
-            end
-          when 'Conference'
-            @bibtex.type = :conference
-            @bibtex.booktitle = self.source_title
-            if self.issue
-              @bibtex.issue = self.issue
-            end
-            if self.volume
-              @bibtex.number = self.volume
-            end
-            if self.page_start && self.page_count
-              @bibtex.pages = self.page_start + '-' + (self.page_start.to_i + self.page_count.to_i-1).to_s
-            end
-            if self.bib_publication_month
-              @bibtex.month = self.bib_publication_month.to_i
-            end
-            if self.publisher_info
-              @bibtex.publisher = self.publisher_info
-            end
-            if self.series
-              @bibtex.series = self.series
-            end
-          when 'Book', 'eBook'
-            @bibtex.type = :book
-            if self.publisher_info
-              @bibtex.publisher = self.publisher_info
-            end
-            if self.series
-              @bibtex.series = self.series
-            end
-            if self.bib_publication_month
-              @bibtex.month = self.bib_publication_month.to_i
-            end
-            if isbns
-              @bibtex.isbn = self.isbns.first
-            end
-          else
-            @bibtex.type = :other
-        end
-        @bibtex
-      end
-
-      def bibtex_bibliography
-        bib = BibTeX::Bibliography.new
-        bib << @bibtex
-        bib
-      end
-
       # ====================================================================================
       # HEADER: DbId, DbLabel, An, PubType, PubTypeId, AccessLevel
       # ====================================================================================
@@ -825,14 +751,98 @@ module EBSCO
         end
       end
 
+
+      # Experimental bibtex support.
+      def retrieve_bibtex
+
+        @bibtex.key = accession_number
+        @bibtex.title = title.gsub('<highlight>', '').gsub('</highlight>', '')
+        if bib_authors_list.length > 0
+          @bibtex.author = bib_authors_list.join(' and ').chomp
+        end
+        @bibtex.year = publication_year.to_i
+
+        # bibtex type
+        _type = publication_type
+        case _type
+          when 'Academic Journal', 'Reference'
+            @bibtex.type = :article
+            @bibtex.journal = source_title
+            unless issue.nil?
+              @bibtex.issue = issue
+            end
+            unless volume.nil?
+              @bibtex.number = volume
+            end
+            if page_start && page_count
+              @bibtex.pages = page_start + '-' + (page_start.to_i + page_count.to_i-1).to_s
+            end
+            if bib_publication_month
+              @bibtex.month = bib_publication_month.to_i
+            end
+            if doi
+              @bibtex.doi = doi
+              @bibtex.url = 'https://doi.org/' + doi
+            end
+          when 'Conference'
+            @bibtex.type = :conference
+            @bibtex.booktitle = source_title
+            if issue
+              @bibtex.issue = issue
+            end
+            if volume
+              @bibtex.number = volume
+            end
+            if page_start && page_count
+              @bibtex.pages = page_start + '-' + (page_start.to_i + page_count.to_i-1).to_s
+            end
+            if bib_publication_month
+              @bibtex.month = bib_publication_month.to_i
+            end
+            if publisher_info
+              @bibtex.publisher = publisher_info
+            end
+            if series
+              @bibtex.series = series
+            end
+          when 'Book', 'eBook'
+            @bibtex.type = :book
+            if publisher_info
+              @bibtex.publisher = publisher_info
+            end
+            if series
+              @bibtex.series = series
+            end
+            if bib_publication_month
+              @bibtex.month = bib_publication_month.to_i
+            end
+            if isbns
+              @bibtex.isbn = isbns.first
+            end
+          else
+            @bibtex.type = :other
+        end
+        @bibtex
+      end
+
+      ##
+      # wrap bibtex entry in a bibliography so that it can be transformed into citations using citeproc
+      def bibtex_bibliography
+        bib = BibTeX::Bibliography.new
+        bib << @bibtex
+        bib
+      end
+
       # this is used to generate solr fields
-      def to_hash
+      def to_hash(type = 'compact')
         hash = {}
+
+        # information typically required by all views
         if database_id && accession_number
           safe_an = accession_number.gsub(/\./,'_')
           hash['id'] = database_id + '__' + safe_an
         end
-        if !title.nil?
+        unless title.nil?
           hash['title_display'] = title.gsub('<highlight>', '').gsub('</highlight>', '')
         end
         if source_title
@@ -866,22 +876,36 @@ module EBSCO
         if cover_medium_url
           hash['cover_medium_url'] = cover_medium_url
         end
-        if all_links
-          hash['links'] = all_links
+        # generate bibtex entry if it hasn't been done already
+        if @bibtex.key == 'unknown-a'
+          @bibtex = retrieve_bibtex
         end
         unless @bibtex.has_type?(:other)
           hash['citation_apa'] = citation('apa').first.to_s
           hash['citation_mla'] = citation('modern-language-association').first.to_s
           hash['citation_chicago'] = citation('chicago-author-date').first.to_s
         end
-        if doi
-          hash['doi'] = doi
+
+        # extra information typically required by detailed item views
+        if type == 'verbose'
+          if all_links
+            hash['links'] = all_links
+          end
+          if doi
+            hash['doi'] = doi
+          end
+          if html_fulltext
+            hash['html_fulltext'] = html_fulltext
+          end
         end
+
         hash
       end
 
       def to_solr
         # solr response
+        item_hash = to_hash 'verbose'
+        solr_response =
         {
             'responseHeader' => {
                 'status' => 0
@@ -889,12 +913,18 @@ module EBSCO
             'response' => {
                 'numFound' => 1,
                 'start' => 0,
-                'docs' => [to_hash]
+                'docs' => [item_hash]
             }
         }
+        # puts 'SOLR RESPONSE: ' + solr_response.inspect
+        solr_response
       end
 
       def citation(style = 'apa')
+        # generate bibtex entry if it hasn't been done already
+        if @bibtex.key == 'unknown-a'
+          @bibtex = retrieve_bibtex
+        end
         # TODO: catch CSL::ParseError when style can't be found
         CSL::Style.root = File.join(__dir__, 'csl/styles')
         cp = CiteProc::Processor.new style: style, format: 'text'

data/lib/ebsco/eds/session.rb

@@ -7,6 +7,7 @@ require 'logger'
 require 'json'
 require 'active_support'
 require 'faraday_eds_middleware'
+require 'ebsco/eds/configuration'
 
 module EBSCO
 
@@ -23,6 +24,8 @@ module EBSCO
       attr_accessor :auth_token # :nodoc:
       # The session token. This is passed along in the x-sessionToken HTTP header.
       attr_accessor :session_token # :nodoc:
+      # The session configuration.
+      attr_reader :config
 
       # Creates a new session.
       #
@@ -59,14 +62,20 @@ module EBSCO
       #   }
       def initialize(options = {})
 
-
-        cache_dir = File.join(ENV['TMPDIR'] || '/tmp', 'faraday_eds_cache')
-        @cache_store = ActiveSupport::Cache::FileStore.new cache_dir
-
         @session_token = ''
         @auth_token = ''
-        @guest = 'y'
+        @config = {}
 
+        eds_config = EBSCO::EDS::Configuration.new
+        if options[:config]
+          @config = eds_config.configure_with(options[:config])
+          # return default if there is some problem with the yaml file (bad syntax, not found, etc.)
+          @config = eds_config.configure if @config.nil?
+        else
+          @config = eds_config.configure(options)
+        end
+
+        # these properties aren't in the config
         if options.has_key? :user
           @user = options[:user]
         elsif ENV.has_key? 'EDS_USER'
@@ -86,27 +95,18 @@ module EBSCO
         end
         raise EBSCO::EDS::InvalidParameter, 'Session must specify a valid api profile.' if blank?(@profile)
 
-        if options.has_key? :guest
-          @guest = options[:guest] ? 'y' : 'n'
-        elsif ENV.has_key? 'EDS_GUEST'
-          @guest = ENV['EDS_GUEST']
-        end
+        # 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 options.has_key? :org
-          @org = options[:org]
-        elsif ENV.has_key? 'EDS_ORG'
-          @org = ENV['EDS_ORG']
+        # use cache for auth token and info calls?
+        if @config[:use_cache]
+          cache_dir = File.join(@config[:eds_cache_dir], 'faraday_eds_cache')
+          @cache_store = ActiveSupport::Cache::FileStore.new cache_dir
         end
 
-        if options.has_key? :auth
-          @auth_type = options[:auth]
-        elsif ENV.has_key? 'EDS_AUTH'
-          @auth_type = ENV['EDS_AUTH']
-        else
-          @auth_type = 'user'
-        end
-
-        @max_retries = MAX_ATTEMPTS
+        @max_retries = @config[:max_attempts]
 
         if options.has_key? :auth_token
           @auth_token = options[:auth_token]
@@ -119,18 +119,18 @@ module EBSCO
         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: @config[:info_url]), @config)
         @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
+        if @config[: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
 
       end
 
@@ -168,7 +168,7 @@ module EBSCO
           if @search_options.nil?
             @search_results = EBSCO::EDS::Results.new(empty_results)
           else
-            _response = do_request(:post, path: SEARCH_URL, payload: @search_options)
+            _response = do_request(:post, path: @config[:search_url], payload: @search_options)
             @search_results = EBSCO::EDS::Results.new(_response, @info.available_limiters, options)
             @current_page = @search_results.page_number
             @search_results
@@ -181,7 +181,7 @@ module EBSCO
             if @search_options.nil? || !add_actions
               @search_options = EBSCO::EDS::Options.new(options, @info)
             end
-            _response = do_request(:post, path: SEARCH_URL, payload: @search_options)
+            _response = do_request(:post, path: @config[:search_url], payload: @search_options)
             @search_results = EBSCO::EDS::Results.new(_response, @info.available_limiters, options)
             @current_page = @search_results.page_number
             @search_results
@@ -223,20 +223,20 @@ module EBSCO
       #
       def retrieve(dbid:, an:, highlight: nil, ebook: 'ebook-pdf')
         payload = { DbId: dbid, An: an, HighlightTerms: highlight, EbookPreferredFormat: ebook }
-        retrieve_response = do_request(:post, path: RETRIEVE_URL, payload: payload)
+        retrieve_response = do_request(:post, path: @config[:retrieve_url], payload: payload)
         record = EBSCO::EDS::Record.new(retrieve_response)
         # puts 'RECORD: ' + record.pretty_inspect
         record
       end
 
-      def solr_retrieve_list(list: [], highlight: nil, ebook: 'ebook-pdf')
+      def solr_retrieve_list(list: [], highlight: nil)
         records = []
         if list.any?
           list.each { |id|
             dbid = id.split('__').first
             accession = id.split('__').last
             accession.gsub!(/_/, '.')
-            records.push retrieve(dbid: dbid, an: accession, highlight: highlight, ebook: ebook)
+            records.push retrieve(dbid: dbid, an: accession, highlight: highlight, ebook: @config[:ebook_preferred_format])
           }
         end
         r = empty_results(records.length)
@@ -249,7 +249,7 @@ module EBSCO
       # Invalidates the session token. End Session should be called when you know a user has logged out.
       def end
         # todo: catch when there is no valid session?
-        do_request(:post, path: END_SESSION_URL, payload: {:SessionToken => @session_token})
+        do_request(:post, path: @config[:end_session_url], payload: {:SessionToken => @session_token})
         connection.headers['x-sessionToken'] = ''
         @session_token = ''
       end
@@ -555,10 +555,9 @@ module EBSCO
 
       def do_request(method, path:, payload: nil, attempt: 0) # :nodoc:
 
-        if attempt > MAX_ATTEMPTS
+        if attempt > @config[:max_attempts]
           raise EBSCO::EDS::ApiError, 'EBSCO API error: Multiple attempts to perform request failed.'
         end
-
         begin
           resp = connection.send(method) do |req|
             case method
@@ -574,7 +573,7 @@ module EBSCO
             end
           end
           resp.body
-        rescue StandardError => e
+        rescue Error => e
           if e.respond_to? 'fault'
             error_code = e.fault[:error_body]['ErrorNumber'] || e.fault[:error_body]['ErrorCode']
             unless error_code.nil?
@@ -640,16 +639,17 @@ module EBSCO
       private
 
       def connection
-        logger = Logger.new(LOG)
+        logger = Logger.new(@config[:log])
         logger.level = Logger::DEBUG
-        Faraday.new(url: EDS_API_BASE) do |conn|
+        Faraday.new(url: @config[:eds_api_base]) do |conn|
           conn.headers['Content-Type'] = 'application/json;charset=UTF-8'
           conn.headers['Accept'] = 'application/json'
           conn.headers['x-sessionToken'] = @session_token ? @session_token : ''
           conn.headers['x-authenticationToken'] = @auth_token ? @auth_token : ''
-          conn.headers['User-Agent'] = USER_AGENT
+          conn.headers['User-Agent'] = @config[:user_agent]
           conn.request :url_encoded
-          conn.use :eds_middleware, store: @cache_store
+          conn.use :eds_caching_middleware, store: @cache_store if @config[:use_cache]
+          conn.use :eds_exception_middleware
           conn.response :json, content_type: /\bjson$/
           conn.response :logger, logger
           conn.adapter Faraday.default_adapter
@@ -660,10 +660,10 @@ module EBSCO
         if blank?(@auth_token)
           # ip auth
           if (blank?(@user) && blank?(@pass)) || @auth_type.casecmp('ip').zero?
-            resp = do_request(:post, path: IP_AUTH_URL)
+            resp = do_request(:post, path: @config[:ip_auth_url])
           # user auth
           else
-            resp = do_request(:post, path: UID_AUTH_URL, payload:
+            resp = do_request(:post, path: @config[:uid_auth_url], payload:
                 { UserId: @user, Password: @pass })
           end
         end
@@ -672,7 +672,7 @@ module EBSCO
       end
 
       def create_session_token
-        resp = do_request(:get, path: CREATE_SESSION_URL +
+        resp = do_request(:get, path: @config[:create_session_url] +
             '?profile=' + @profile + '&guest=' + @guest +
             '&displaydatabasename=y')
         @session_token = resp['SessionToken']

data/lib/ebsco/eds/version.rb

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

data/lib/faraday/{eds_middleware.rb → eds_caching_middleware.rb}

@@ -2,7 +2,7 @@ require 'faraday'
 
 module Faraday
 
-  class EdsMiddleware < Faraday::Middleware
+  class EdsCachingMiddleware < Faraday::Middleware
 
     INFO_URI = URI.parse('https://eds-api.ebscohost.com/edsapi/rest/Info')
     AUTH_URI = URI.parse('https://eds-api.ebscohost.com/authservice/rest/uidauth')
@@ -35,27 +35,8 @@ module Faraday
         to_response(response_env)
       else
         @app.call(env).on_complete do |response_env|
-          case response_env.status
-            when 200
-              response_env.response_headers['x-faraday-eds-cache'] = 'MISS'
-              cache_response(response_env)
-            when 400
-              raise EBSCO::EDS::BadRequest.new(error_message(response_env))
-            # when 401
-            #   raise EBSCO::EDS::Unauthorized.new
-            # when 403
-            #   raise EBSCO::EDS::Forbidden.new
-            # when 404
-            #   raise EBSCO::EDS::NotFound.new
-            # when 429
-            #   raise EBSCO::EDS::TooManyRequests.new
-            # when 500
-            #   raise EBSCO::EDS::InternalServerError.new
-            # when 503
-            #   raise EBSCO::EDS::ServiceUnavailable.new
-            else
-              raise EBSCO::EDS::BadRequest.new(error_message(response_env))
-          end
+          response_env.response_headers['x-faraday-eds-cache'] = 'MISS'
+          cache_response(response_env)
         end
       end
     end
@@ -130,14 +111,5 @@ module Faraday
       env.response = response
     end
 
-    def error_message(response)
-      # puts response.inspect
-      {
-        method: response.method,
-        url: response.url,
-        status: response.status,
-        error_body: response.body
-      }
-    end
   end
 end

data/lib/faraday/eds_exception_middleware.rb

@@ -0,0 +1,49 @@
+require 'faraday'
+
+module Faraday
+
+  class EdsExceptionMiddleware < Faraday::Middleware
+
+  def initialize(app)
+      super app
+    end
+
+    def call(env)
+      @app.call(env).on_complete do |response|
+        case response.status
+          when 200
+          when 400
+            raise EBSCO::EDS::BadRequest.new(error_message(response))
+          # when 401
+          #   raise EBSCO::EDS::Unauthorized.new
+          # when 403
+          #   raise EBSCO::EDS::Forbidden.new
+          # when 404
+          #   raise EBSCO::EDS::NotFound.new
+          # when 429
+          #   raise EBSCO::EDS::TooManyRequests.new
+          # when 500
+          #   raise EBSCO::EDS::InternalServerError.new
+          # when 503
+          #   raise EBSCO::EDS::ServiceUnavailable.new
+          else
+            raise EBSCO::EDS::BadRequest.new(error_message(response))
+        end
+      end
+    end
+
+    private
+
+    def error_message(response)
+      #puts response.inspect
+      {
+          method: response.method,
+          url: response.url,
+          status: response.status,
+          error_body: response.body
+      }
+    end
+
+  end
+
+end

data/lib/faraday_eds_middleware.rb

@@ -1,7 +1,7 @@
-require 'faraday/eds_middleware'
+require 'faraday/eds_caching_middleware'
+require 'faraday/eds_exception_middleware'
 
-if Faraday.respond_to?(:register_middleware)
-  Faraday.register_middleware eds_middleware: Faraday::EdsMiddleware
-elsif Faraday::Middleware.respond_to?(:register_middleware)
-  Faraday::Middleware.register_middleware eds_middleware: Faraday::EdsMiddleware
+if Faraday::Middleware.respond_to?(:register_middleware)
+  Faraday::Middleware.register_middleware eds_caching_middleware: Faraday::EdsCachingMiddleware
+  Faraday::Middleware.register_middleware eds_exception_middleware: Faraday::EdsExceptionMiddleware
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ebsco-eds
 version: !ruby/object:Gem::Version
-  version: 0.0.9.pre
+  version: 0.1.0.pre
 platform: ruby
 authors:
 - Bill McKinney
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-04 00:00:00.000000000 Z
+date: 2017-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -300,6 +300,7 @@ files:
 - bin/setup
 - ebsco-eds.gemspec
 - lib/ebsco/eds.rb
+- lib/ebsco/eds/configuration.rb
 - lib/ebsco/eds/csl/styles/apa.csl
 - lib/ebsco/eds/csl/styles/chicago-author-date.csl
 - lib/ebsco/eds/csl/styles/modern-language-association.csl
@@ -311,7 +312,8 @@ files:
 - lib/ebsco/eds/results.rb
 - lib/ebsco/eds/session.rb
 - lib/ebsco/eds/version.rb
-- lib/faraday/eds_middleware.rb
+- lib/faraday/eds_caching_middleware.rb
+- lib/faraday/eds_exception_middleware.rb
 - lib/faraday_eds_middleware.rb
 homepage: https://github.com/ebsco/edsapi-ruby
 licenses: