ibm-watson-ruby 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a674a4fac536056ef2d77c05563611891f96c851
-  data.tar.gz: 65216150eda4a68e5b4c48e65731d1f36f268496
+  metadata.gz: 15892bc1e215dd42b242c92c2bf0a5d839a1baa5
+  data.tar.gz: 14373e54c5085c21b72b487349efa0e523cdb36a
 SHA512:
-  metadata.gz: d44956a095c2d4a24d3e50e2d777af4f09e3486c0727ca987357872f2f6a89849f5ec224f51d1ee813f822b2357ce4c16d251663cf49a8ea28dd5e769b8ae264
-  data.tar.gz: 79b8f541e4e55984077012cef9c87887d2e969d9111e3acb4430991ddc8ad648865fa65adc3026d8d5d5547f846ffb5a60c22746ca9984de9a21aa2ae6151810
+  metadata.gz: e2a5ca379e49f61e6370dd72d5f1653d067dc42835e2022c4234cda18192b853bf97e5f5e8f077053dc2e0d242959a19789b30f7513d328323ab180885fd1fed
+  data.tar.gz: a80c6431fb249a96d381699c2421de76436514fccf670e7859eb557ee4f30c29a3a429eb3936120105e0011ce1a9af67a9d0a46562540bfe1f831a6abf686daa

data/lib/ibm_watson/base_service.rb

@@ -52,12 +52,18 @@ module IBMWatson
           verify_no_json_failure(result)
         end
       elsif result.status.between?(400, 499)
-        if result.content_type.mime_type == 'application/json'
-          json_data = JSON.parse(result.body)
-          raise IBMWatson::Errors::WatsonRequestError, "Server returned #{result.status} : #{json_data['error']}"
-        else
-          raise IBMWatson::Errors::WatsonRequestError, "Server returned #{result.status} : #{result.reason}"
-        end
+        generic_error_handler(IBMWatson::Errors::WatsonRequestError, result)
+      elsif result.status.between?(500, 599)
+        generic_error_handler(IBMWatson::Errors::WatsonServerError, result)
+      end
+    end
+
+    def generic_error_handler(erorr_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']}"
+      else
+        raise erorr_klass, "Server returned #{result.status} : #{result.reason}"
       end
     end
 

data/lib/ibm_watson/errors.rb

@@ -2,5 +2,6 @@ module IBMWatson
   module Errors
     class WatsonError < StandardError; end
     class WatsonRequestError < WatsonError; end
+    class WatsonServerError < WatsonError; end
   end
 end

data/lib/ibm_watson/version.rb

@@ -1,3 +1,3 @@
 module IBMWatson
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ibm-watson-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Bram Whillock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-29 00:00:00.000000000 Z
+date: 2017-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -185,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: IBM Watson services in ruby