Skip to content

Commit 7da72da

Browse files
author
Chris Park
committed
Merge branch 'fhasanaj-RCB-402_publish_docker' into develop
2 parents 1b4bdbf + 754121a commit 7da72da

2 files changed

Lines changed: 18 additions & 9 deletions

File tree

docker/run_ruby.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ cp -r -n /source/. .
8787

8888
#Build rosette_api gem
8989
gem build rosette_api.gemspec
90-
gem install ./rosette_api-1.0.3.gem
90+
gem install ./rosette_api-*.gem
9191

9292
#Run the examples
9393
if [ ! -z ${API_KEY} ]; then

lib/request_builder.rb

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,15 @@ def prepare_multipart_request(params)
8484
post_body << "\r\n\r\n--#{boundary}--\r\n"
8585

8686
# Create the HTTP objects
87-
uri = URI.parse @alternate_url
88-
http = Net::HTTP.new uri.host, uri.port
89-
http.use_ssl = uri.scheme == 'https'
90-
request = Net::HTTP::Post.new uri.request_uri
87+
begin
88+
uri = URI.parse @alternate_url
89+
http = Net::HTTP.new uri.host, uri.port
90+
http.use_ssl = uri.scheme == 'https'
91+
request = Net::HTTP::Post.new uri.request_uri
92+
rescue
93+
raise RosetteAPIError.new 'connectionError', 'Failed to establish connection with Rosette API server.'
94+
end
95+
9196
request.add_field 'Content-Type', "multipart/form-data; boundary=#{boundary}"
9297
request.add_field 'X-RosetteAPI-Key', @user_key
9398
request.add_field 'X-RosetteAPI-Binding', 'ruby'
@@ -101,11 +106,15 @@ def prepare_multipart_request(params)
101106
#
102107
# Returns JSON response or raises RosetteAPIError if encountered.
103108
def send_get_request
104-
uri = URI.parse @alternate_url
105-
http = Net::HTTP.new uri.host, uri.port
106-
http.use_ssl = uri.scheme == 'https'
109+
begin
110+
uri = URI.parse @alternate_url
111+
http = Net::HTTP.new uri.host, uri.port
112+
http.use_ssl = uri.scheme == 'https'
107113

108-
request = Net::HTTP::Get.new uri.request_uri
114+
request = Net::HTTP::Get.new uri.request_uri
115+
rescue
116+
raise RosetteAPIError.new 'connectionError', 'Failed to establish connection with Rosette API server.'
117+
end
109118
request['X-RosetteAPI-Key'] = @user_key
110119

111120
self.get_response http, request

0 commit comments

Comments
 (0)