ibm-watson-ruby 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3645dac214a7d7ed40ca2847c208b071e04d6cb3
-  data.tar.gz: efef17701273dfa9cedf423a22510933d55e4c57
+  metadata.gz: 1029012b09d5ac7420c3e9ea683e1df46bf217d2
+  data.tar.gz: f49da85fe6b30c62bb9493e69ec39e1d0e57723f
 SHA512:
-  metadata.gz: 4fecd39864a899f4e60c4a952e459db6a8fb63a79da90d013032f860b73a95f0563e8196acdfec0ec00fe639f2fb41819978526ff075844cf774c049a9af72e8
-  data.tar.gz: 410346775517131ce05cfd41dffe74069f9aefba26b00da124aabfc4ac0a93da8c960a33aa21a345cb84d7aa80fd6ec455e1539f45f2ab1c80d74c3a976b1d01
+  metadata.gz: 87c5ba161f125abcab2e2bf2584bde03508b93ed14e400c703e045eea4efba23d1b5ee275eb3c118f87464f35af486697705b1a3ee4dad872847dc9d63643df4
+  data.tar.gz: 2406952ba20140fa9b4e01bfc142e0a6b4f5a4478e04367dfcf144eb71d8d25a43ff3e07f4340cfecdd6501e344b4bd725b11ab1cc186309f10778b5e6286adb

data/lib/ibm_watson/base_service.rb

@@ -14,9 +14,14 @@ module IBMWatson
       end
     end
 
-    def initialize(username:, password:)
+    # @param [String] username
+    # @param [String] password
+    # @param [Array] timeouts
+    # See https://github.com/httprb/http/wiki/Timeouts for how this argument is specified.
+    def initialize(username:, password:, timeouts: [:global, {write: 2, connect: 5, read: 5}])
       @username = username
       @password = password
+      @timeouts = timeouts
     end
 
     private
@@ -46,6 +51,10 @@ module IBMWatson
       http_chain.headers(accept: "application/json")
     end
 
+    def handle_timeout_error(timeout_error)
+      raise IBMWatson::Errors::WatsonTimeoutError, timeout_error
+    end
+
     def verify_http_result(result, verify_json: true)
       if result.status.between?(200, 299)
         if verify_json
@@ -58,12 +67,12 @@ module IBMWatson
       end
     end
 
-    def generic_error_handler(erorr_klass, result)
+    def generic_error_handler(error_klass, result)
       if result.content_type.mime_type == 'application/json'
         json_data = JSON.parse(result.body)
-        raise erorr_klass, "Server returned #{result.status} : #{json_data['error']}"
+        raise error_klass, "Server returned #{result.status} : #{json_data['error']}"
       else
-        raise erorr_klass, "Server returned #{result.status} : #{result.reason}"
+        raise error_klass, "Server returned #{result.status} : #{result.reason}"
       end
     end
 
@@ -75,7 +84,7 @@ module IBMWatson
     end
 
     def basic_auth
-      HTTP.basic_auth(user: username, pass: password)
+      HTTP.timeout(*@timeouts).basic_auth(user: username, pass: password)
     end
   end
 end

data/lib/ibm_watson/conversation/service.rb

@@ -12,8 +12,11 @@ module IBMWatson
         IBMWatson::Conversation::Workspace.new.tap do |result_object|
           result_object.from_json(result)
         end
+      rescue HTTP::TimeoutError => error
+        handle_timeout_error(error)
       end
 
+
       def list_workspaces
         url = build_url('workspaces', query: { version: QUERY_VERSION })
         result = accept_json(basic_auth).get(url)
@@ -22,22 +25,30 @@ module IBMWatson
         json_result['workspaces'].map do |workspace_json|
           IBMWatson::Conversation::Workspace.new(workspace_json)
         end
+      rescue HTTP::TimeoutError => error
+        handle_timeout_error(error)
       end
 
       def create_workspace(workspace_data:)
         url = build_url('workspaces', query: { version: QUERY_VERSION })
         upload_workspace(url, workspace_data)
+      rescue HTTP::TimeoutError => error
+        handle_timeout_error(error)
       end
 
       def delete_workspace(workspace_id:)
         url = build_url('workspaces', workspace_id, query: { version: QUERY_VERSION })
         result = accept_json(basic_auth).delete(url)
         verify_http_result(result)
+      rescue HTTP::TimeoutError => error
+        handle_timeout_error(error)
       end
 
       def update_workspace(workspace_id:, workspace_data:)
         url = build_url('workspaces', workspace_id, query: { version: QUERY_VERSION })
         upload_workspace(url, workspace_data)
+      rescue HTTP::TimeoutError => error
+        handle_timeout_error(error)
       end
 
       def message(workspace_id:, input:, context:, alternate_intents: false)
@@ -52,6 +63,8 @@ module IBMWatson
         IBMWatson::Conversation::MessageResponse.new.tap do |result_object|
           result_object.from_json(result)
         end
+      rescue HTTP::TimeoutError => error
+        handle_timeout_error(error)
       end
 
       private

data/lib/ibm_watson/errors.rb

@@ -8,5 +8,8 @@ module IBMWatson
 
     class WatsonServerError < WatsonError
     end
+
+    class WatsonTimeoutError < WatsonServerError
+    end
   end
 end

data/lib/ibm_watson/version.rb

@@ -1,3 +1,3 @@
 module IBMWatson
-  VERSION = "0.3.3"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ibm-watson-ruby
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Bram Whillock
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-19 00:00:00.000000000 Z
+date: 2017-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -239,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: IBM Watson services in ruby