ibm-watson-ruby 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4ad6ca10f77eed8a2386f95b7ac76c1be0c0c1fc
-  data.tar.gz: 6e1dade8c85bd7aaff082706b26e93d3530f93a3
+SHA256:
+  metadata.gz: 6b4b50c8ea12f50a97ee0b4ae90dda7421fb43a2653dd57fe85339ee13ce3461
+  data.tar.gz: cd90a74e6e70b997e2ab0d8eb31fbc9a69f3db56d363f05c1d4a216972ad0ead
 SHA512:
-  metadata.gz: 42686ba010e5d89b984f00038c08c0cb748ace6256ce543d55327320ccd044493a8676407f181fffc8007f5cdb2b5a3a7c32d676c493a92da1166ac66f03b3d7
-  data.tar.gz: 511df1c6c12f0a8bdf39868a602dde5e813caabd30df15e5ac58f4d3caa233c6d31813a746384c91237181f9dc5dd46dd8a672e9ccf5e80b63e90f963b92d8ea
+  metadata.gz: 659a5f47d074988c8625073cfc9a22f63f47bb969035db21587c19a68b1dbc38d375660fb7ace89cfa3a0487e02dddec0c9bc8e4e8f965001ab51cd12a6e1b60
+  data.tar.gz: '01848851c458b159a1353acebf3451208751ee2da1db787154f3f8e99e04fd0dd182f1d3c6278e9d104f1843c17b1587bb3a93820ca3d47afec3c21e7a1b53b4'

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
-ruby "~> 2.3.0"
+ruby "~> 2.5.0"
 
 gemspec

data/lib/ibm_watson/base_service.rb

@@ -31,7 +31,7 @@ module IBMWatson
     attr_reader :username, :password, :timeouts
 
     def default_timeouts
-      TimeoutConfig.new(connect: 5, read: 5)
+      TimeoutConfig.new(connect: 30, read: 30)
     end
 
     def connection
@@ -49,22 +49,28 @@ module IBMWatson
     end
 
     def get(path, *args)
-      result = connection.get(path, *args)
-      verify_http_result(result)
-      JSON.parse(result.body)
+      retry_maybe do
+        result = connection.get(path, *args)
+        verify_http_result(result)
+        JSON.parse(result.body)
+      end
     end
 
     def delete(path, *args)
-      result = connection.delete(path, *args)
-      verify_http_result(result)
-      JSON.parse(result.body)
+      retry_maybe do
+        result = connection.delete(path, *args)
+        verify_http_result(result)
+        JSON.parse(result.body)
+      end
     end
 
     def post(path, body, *args)
-      body = JSON.generate(body) unless body.kind_of?(String)
-      result = connection.post(path, body, *args)
-      verify_http_result(result)
-      JSON.parse(result.body)
+      retry_maybe do
+        body = JSON.generate(body) unless body.kind_of?(String)
+        result = connection.post(path, body, *args)
+        verify_http_result(result)
+        JSON.parse(result.body)
+      end
     end
 
     def parse_array(json_string, model_class, root_key)
@@ -87,6 +93,8 @@ module IBMWatson
         if verify_json
           verify_no_json_failure(result)
         end
+      elsif result.status == 429
+        generic_error_handler(IBMWatson::Errors::RateLimitReached, result)
       elsif result.status.between?(400, 499)
         generic_error_handler(IBMWatson::Errors::WatsonRequestError, result)
       elsif result.status.between?(500, 599)
@@ -97,7 +105,11 @@ module IBMWatson
     def generic_error_handler(error_klass, result)
       if result.headers[:content_type].split(';').first == 'application/json'
         json_data = JSON.parse(result.body)
-        raise error_klass, "Server returned #{result.status} : #{json_data['error']}"
+        if error_klass.respond_to?(:from_data)
+          raise error_klass.new("Server returned #{result.status} : #{json_data['error']}", json_data, result.headers)
+        else
+          raise error_klass, "Server returned #{result.status} : #{json_data['error']}"
+        end
       else
         raise error_klass, "Server returned #{result.status} : #{result.reason}"
       end
@@ -112,8 +124,18 @@ module IBMWatson
 
     def handle_timeout
       yield
+    rescue Net::OpenTimeout => error
+      handle_timeout_error(error)
     rescue Faraday::Error::TimeoutError => error
       handle_timeout_error(error)
     end
+
+    def retry_maybe
+      yield
+    rescue Errors::RateLimitReached => e
+      warn("Rate Limit Reached, waiting for #{e.retry_after} seconds ...")
+      sleep e.retry_after
+      retry
+    end
   end
 end

data/lib/ibm_watson/errors.rb

@@ -6,6 +6,19 @@ module IBMWatson
     class WatsonRequestError < WatsonError
     end
 
+    class RateLimitReached < WatsonRequestError
+      def self.from_data
+        # does nothing, just a marker
+      end
+
+      def initialize(message, data, headers)
+        @retry_after = headers['retry-after'].to_f
+        super(message)
+      end
+
+      attr_reader :retry_after
+    end
+
     class WatsonServerError < WatsonError
     end
 

data/lib/ibm_watson/version.rb

@@ -1,3 +1,3 @@
 module IBMWatson
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ibm-watson-ruby
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Bram Whillock
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-27 00:00:00.000000000 Z
+date: 2018-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -256,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: IBM Watson services in ruby