ebsco-discovery-service-api 1.0.4 → 1.1.1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZmVlNjYwZWRlMTFiOTBiN2NlZDlkNzBkY2U2ZDg1MGYyMjAzOTdiOA==
+  data.tar.gz: !binary |-
+    ZjgwMGE2MTViMzRiN2VkNDYxOTMzM2E0YTRjMDcwMTA5NGYxZWRkNA==
+SHA512:
+  metadata.gz: !binary |-
+    NjZjYjE5YjM1ODcwNTljNmYzM2E1M2Y3ZmZiNDNlOWZjOGFkM2JkMzllYjFj
+    MDFjODI4OTIyZTQxZTgwNTUwMDY4NzllYWE1ZTRkZWRjNGViNDAyZDljYzNm
+    MjUyMzFhNjg4ZDkwNThkYjM3NzBlMWQzYmM3Y2VjMTczZjQ5ZDU=
+  data.tar.gz: !binary |-
+    OWUyOTI5ZGMzZmE2MmI2MzUzZGNhNWFjODA3NTFjZmYxM2U3ODIzZGQ0N2Qw
+    YzA2OTFmMGVmMzhlOWUzMjExZTYzODA0Mjg1NTEzYzIzZGMzYzU1NzQ5ZDhi
+    NWU1Mzc2OTEzMTM3OGUxYTc3YWFmZDIzYTZhODlhNjRlNDU2MTE=

data/lib/ebsco-discovery-service-api.rb

@@ -13,12 +13,11 @@ module EDSApi
 	# Connection object. Does what it says. ConnectionHandler is what is usually desired and wraps auto-reonnect features, etc.
 	class Connection
 
-	  attr_accessor :auth_token, :session_token, :debug_notes, :guest
+	  attr_accessor :auth_token, :session_token, :guest
 	  attr_writer :userid, :password
 	  
 	  # Init the object with userid and pass.
 		def uid_init(userid, password, profile, guest = 'y')
-			@debug_notes = "<p>Setting guest as " << guest.to_s << "</p>"
 			@userid = userid
 			@password = password
 			@profile = profile
@@ -41,13 +40,13 @@ module EDSApi
 			req["Content-Type"] = "application/xml"
 			req["Accept"] = "application/json" #if format == :json
 			req.body = xml
-			@debug_notes << "<p>UID Authentication Call to " << uri.to_s << ": " << xml << "</p>";
 			https = Net::HTTP.new(uri.hostname, uri.port)
+			https.read_timeout=10 
 			https.use_ssl = true
 			https.verify_mode = OpenSSL::SSL::VERIFY_NONE
 			begin
 			  doc = JSON.parse(https.request(req).body)
-			rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
+			rescue Timeout::Error, Errno::EINVAL, Net::ReadTimeout, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
 			  about "No response from server"
 			end
 			if doc.has_key?('ErrorNumber')
@@ -61,11 +60,12 @@ module EDSApi
 			req = Net::Http:Post.new(uri.request_uri)
 			req["Accept"] = "application/json" #if format == :json
 			https = Net::HTTP.new(uri.hostname, uri.port)
+			https.read_timeout=10
 			https.use_ssl = true
 			https.verify_mode = OpenSSL::SSL::VERIFY_NONE
 			begin
 			  doc = JSON.parse(https.request(req).body)
-			rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
+			rescue Timeout::Error, Net::ReadTimeout, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
 			  abort "No response from server"
 			end
 			@auth_token = doc['AuthToken']
@@ -76,15 +76,15 @@ module EDSApi
 			req = Net::HTTP::Get.new(uri.request_uri)
 			req['x-authenticationToken'] = @auth_token
 			req['Accept'] = "application/json"
-			@debug_notes << "<p>CREATE SESSION Call to " << uri.to_s << " with auth token: " << req['x-authenticationToken'].to_s << "</p>";
 #			Net::HTTP.start(uri.hostname, uri.port) { |http|
 #  			doc = JSON.parse(http.request(req).body)
 #				return doc['SessionToken']
 #			}
-			Net::HTTP.start(uri.hostname, uri.port) { |http|
+			Net::HTTP.start(uri.hostname, uri.port, :read_timeout => 10) { |http|
+  			
   			begin
 			  return http.request(req).body
-			rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
+			rescue Timeout::Error, Net::ReadTimeout, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
 			  abort "No response from server"
 			end
 			}
@@ -94,10 +94,10 @@ module EDSApi
 			uri = URI "#{API_URL}edsapi/rest/endsession?sessiontoken=#{CGI::escape(session_token)}"
 			req = Net::HTTP::Get.new(uri.request_uri)
 			req['x-authenticationToken'] = @auth_token
-			Net::HTTP.start(uri.hostname, uri.port) { |http|
+			Net::HTTP.start(uri.hostname, uri.port, :read_timeout => 10) { |http|
   			begin
 			  http.request(req)
-			rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
+			rescue Timeout::Error, Net::ReadTimeout, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
 			  abort "No response from server"
 			end
 			}
@@ -108,15 +108,15 @@ module EDSApi
 			uri = URI "#{API_URL}edsapi/rest/Search?#{options}"
 			#return uri.request_uri
 			req = Net::HTTP::Get.new(uri.request_uri)
+
 			req['x-authenticationToken'] = @auth_token
 			req['x-sessionToken'] = @session_token
 			req['Accept'] = 'application/json' #if format == :json
-			@debug_notes << "<p>SEARCH Call to " << uri.to_s << " with auth token: " << req['x-authenticationToken'].to_s << " and session token: " << req['x-sessionToken'].to_s << "</p>";
 
-			Net::HTTP.start(uri.hostname, uri.port) { |http|
+			Net::HTTP.start(uri.hostname, uri.port, :read_timeout => 10) { |http|
   			begin
 			  return http.request(req).body
-			rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
+			rescue Timeout::Error, Net::ReadTimeout, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
 			  abort "No response from server"
 			end
 			}
@@ -131,12 +131,11 @@ module EDSApi
 			req['x-authenticationToken'] = @auth_token
 			req['x-sessionToken'] = @session_token
 			req['Accept'] = 'application/json' #if format == :json
-			@debug_notes << "<p>RETRIEVE Call to " << uri.to_s << " with auth token: " << req['x-authenticationToken'].to_s << " and session token: " << req['x-sessionToken'].to_s << "</p>";
 
-			Net::HTTP.start(uri.hostname, uri.port) { |http|
+			Net::HTTP.start(uri.hostname, uri.port, :read_timeout => 10) { |http|
   			begin
 			  return http.request(req).body
-			rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
+			rescue Timeout::Error, Net::ReadTimeout, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
 			  abort "No response from server"
 			end
 			}
@@ -148,11 +147,10 @@ module EDSApi
 			req['x-authenticationToken'] = @auth_token
 			req['x-sessionToken'] = @session_token
 			req['Accept'] = 'application/json' #if format == :json
-			@debug_notes << "<p>INFO Call to " << uri.to_s << " with auth token: " << req['x-authenticationToken'].to_s << " and session token: " << req['x-sessionToken'].to_s << "</p>";
-			Net::HTTP.start(uri.hostname, uri.port) { |http|
+			Net::HTTP.start(uri.hostname, uri.port, :read_timeout => 10) { |http|
   			begin
 			  return http.request(req).body
-			rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
+			rescue Timeout::Error, Net::ReadTimeout, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
 			  abort "No response from server"
 			end
 			}
@@ -188,7 +186,6 @@ module EDSApi
 			loop do
 				result = JSON.parse(super(options, format))
 				if result.has_key?('ErrorNumber')
-					@debug_notes << "<p>Found ERROR " << result['ErrorNumber'].to_s
 					case result['ErrorNumber']
 					      when "108"
 						      @session_token = self.create_session

metadata

@@ -1,16 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ebsco-discovery-service-api
 version: !ruby/object:Gem::Version
-  version: 1.0.4
-  prerelease: 
+  version: 1.1.1
 platform: ruby
 authors:
-- Richard McCormack
 - Eric Frierson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-18 00:00:00.000000000 Z
+date: 2015-10-01 00:00:00.000000000 Z
 dependencies: []
 description: Set of Ruby functions to interface with the EBSCO Discovery Service API.
 email: eds@ebscohost.com
@@ -21,26 +19,25 @@ files:
 - lib/ebsco-discovery-service-api.rb
 homepage: http://rubygems.org/gems/ebsco-discovery-service-api
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: EBSCO Discovery Service API Ruby Library
 test_files: []