ebsco-discovery-service-api 1.0 → 1.0.1

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

@@ -42,7 +42,11 @@ module EDSApi
 			https = Net::HTTP.new(uri.hostname, uri.port)
 			https.use_ssl = true
 			https.verify_mode = OpenSSL::SSL::VERIFY_NONE
-			doc = JSON.parse(https.request(req).body)
+			begin
+			  doc = JSON.parse(https.request(req).body)
+			rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
+			  about "No response from server"
+			end
 			if doc.has_key?('ErrorNumber')
 			   abort "Bad response from server - error code #{result['ErrorNumber']}"
 			else
@@ -56,7 +60,11 @@ module EDSApi
 			https = Net::HTTP.new(uri.hostname, uri.port)
 			https.use_ssl = true
 			https.verify_mode = OpenSSL::SSL::VERIFY_NONE
-			doc = JSON.parse(https.request(req).body)
+			begin
+			  doc = JSON.parse(https.request(req).body)
+			rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
+			  abort "No response from server"
+			end
 			@auth_token = doc['AuthToken']
 		end
 		# Create the session
@@ -70,7 +78,11 @@ module EDSApi
 #				return doc['SessionToken']
 #			}
 			Net::HTTP.start(uri.hostname, uri.port) { |http|
-  			return http.request(req).body
+  			begin
+			  return http.request(req).body
+			rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
+			  abort "No response from server"
+			end
 			}
 		end
 		# End the session
@@ -79,7 +91,11 @@ module EDSApi
 			req = Net::HTTP::Get.new(uri.request_uri)
 			req['x-authenticationToken'] = @auth_token
 			Net::HTTP.start(uri.hostname, uri.port) { |http|
-  			http.request(req)
+  			begin
+			  http.request(req)
+			rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
+			  abort "No response from server"
+			end
 			}
 			return true
 		end
@@ -92,7 +108,11 @@ module EDSApi
 			req['x-sessionToken'] = @session_token
 			req['Accept'] = 'application/json' #if format == :json
 			Net::HTTP.start(uri.hostname, uri.port) { |http|
-  			return http.request(req).body
+  			begin
+			  return http.request(req).body
+			rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
+			  abort "No response from server"
+			end
 			}
         end
 	  # Retrieve specific information
@@ -103,7 +123,11 @@ module EDSApi
 			req['x-sessionToken'] = @session_token
 			req['Accept'] = 'application/json' #if format == :json
 			Net::HTTP.start(uri.hostname, uri.port) { |http|
-  			return http.request(req).body
+  			begin
+			  return http.request(req).body
+			rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
+			  abort "No response from server"
+			end
 			}
 		end
 		# Info method
@@ -114,7 +138,11 @@ module EDSApi
 			req['x-sessionToken'] = @session_token
 			req['Accept'] = 'application/json' #if format == :json
 			Net::HTTP.start(uri.hostname, uri.port) { |http|
-  			return http.request(req).body
+  			begin
+			  return http.request(req).body
+			rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
+			  abort "No response from server"
+			end
 			}
 		end
 	end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ebsco-discovery-service-api
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors: