tr8n_core 4.0.13 → 4.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dca2df7d8abff227fe6cd78b14724655e1e111a0
-  data.tar.gz: d96499b858853cb354e8bc0f518fc92fe58e37df
+  metadata.gz: dd361efe0829b3be413582a60908233081931b79
+  data.tar.gz: 324b069c69d605c6ec82682c13c00c7717367b74
 SHA512:
-  metadata.gz: fe7f3e60226a364b1f95e9876bfcf60a229ea3d5c39f0fe956faeb64a1daa95968e75f1ad8287e04529d51c81c5345d8e9f0157314e419716e16e3c0efaad45b
-  data.tar.gz: 3a4308861adb7328031deb12d362026d8c57e8b04cf1fac065050b105a155cc352db6c82d99103f1db78c2f0ffe27ba04056fba462e2b03ffa5a1461110531e3
+  metadata.gz: f92d957e3f088ba3fbe94ad063bd3eedb31cf9addc94e87486dc47b9e17b0f67d8641d72d360dfe71a8abcae3e3a7d0a087b4bb6f99422cd8d26f12015f0895c
+  data.tar.gz: 925d69b2e088fe0239cf7426858961d0f1ac8102ef629ef47fe5d5c4fbed5812e3a16322fe9816e075f783cc9f44783bab4aff8c02e0af4f7c18fc23ad50b0b8

data/lib/tr8n/api_client.rb

@@ -92,6 +92,7 @@ class Tr8n::ApiClient < Tr8n::Base
   def execute_request(path, params = {}, opts = {})
     response = nil
     error = nil
+
     Tr8n.logger.trace_api_call(path, params) do
       begin
         if opts[:method] == :post
@@ -99,7 +100,7 @@ class Tr8n::ApiClient < Tr8n::Base
         else
           response = connection.get("#{API_PATH}#{path}", params)
         end
-      rescue Faraday::ConnectionFailed => ex
+      rescue Exception => ex
         Tr8n.logger.error("Failed to execute request: #{ex}")
         error = ex
         nil
@@ -107,8 +108,20 @@ class Tr8n::ApiClient < Tr8n::Base
     end
     raise Tr8n::Exception.new("Error: #{error}") if error
 
-    data = JSON.parse(response.body)
-    raise Tr8n::Exception.new("Error: #{data["error"]}") unless data["error"].nil?
+    if response.status >= 500 and response.status < 600
+      raise Tr8n::Exception.new("Error: #{response.body}")
+    end
+
+    begin
+      data = JSON.parse(response.body)
+    rescue Exception => ex
+      raise Tr8n::Exception.new("Error: #{ex}")
+    end
+
+    unless data["error"].nil?
+      raise Tr8n::Exception.new("Error: #{data["error"]}")
+    end
+
     data
   end
 

data/lib/tr8n/session.rb

@@ -49,7 +49,7 @@ module Tr8n
       host    ||= Tr8n.config.application[:host]
 
       Tr8n.cache.reset_version
-      self.current_source = "/tr8n/core" # default source
+      self.current_source = '/tr8n/core' # default source
       self.application = Tr8n::Application.new(:host => host, :key => key, :secret => secret).fetch
     end
 

data/lib/tr8n_core/version.rb

@@ -30,5 +30,5 @@
 #++
 
 module Tr8nCore
-  VERSION = '4.0.13'
+  VERSION = '4.0.14'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tr8n_core
 version: !ruby/object:Gem::Version
-  version: 4.0.13
+  version: 4.0.14
 platform: ruby
 authors:
 - Michael Berkovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-27 00:00:00.000000000 Z
+date: 2014-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday