dtk-common-core 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 761da1d3c760eee2118d0682cb863f96ae6d25d0
-  data.tar.gz: 6c982e3b942de922d81da8c433b2bc4a5c547b1e
+  metadata.gz: 3776202f561b9478c7c420a1311f95b7153d6150
+  data.tar.gz: 8aa7787af06795ea77f783135e3ebad5fe374f65
 SHA512:
-  metadata.gz: b26b22ed5b094f5f8d4681b64daff7c516f3b45bc551e08f12ee195490c8264fadcb0dd44d2f26c31ec6d415555cb38258b3d4a0448eca0563f541f7dec7aa3f
-  data.tar.gz: d1914134f33715cba988e56aa107dfa8d04b17086729737f855bf0729b1404cc56960447df2c833d031795de30774a4d531de0ea096dd6b5967f6fe39e45995b
+  metadata.gz: 2cdc675d41a26e71ac9956f7f30a210d7bdddbb0f80bac945d7e90a1a9f16f67b4ce8c0f9570b8c861ec156f4fa08f6daccd82aaf28ce85c0faaba07063e0b20
+  data.tar.gz: a86b9cdccaeba598ab164bca4d9c51c6447d67962083c6f963558791b205ed61f9a39af0e06a7203119bcbb6d6275752f22c73322ff78c6b694529e5a5647896

data/lib/dtk-common-core/version.rb

@@ -1,3 +1,3 @@
 module DtkCommonCore
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/lib/response.rb

@@ -183,12 +183,27 @@ module DTK
             end
           end
 
+          def safe_json_parse(string)
+            begin
+              JSON.parse(string)
+            rescue => e
+              nil
+            end
+          end
+
+          def errors_field(msg=nil)
+            [msg.nil? ? {} : {'message' => msg}]
+          end
+
           def error_handling(opts={},&block)
             begin
               block.call
-            rescue ::RestClient::ResourceNotFound, RestClient::Request::Unauthorized, RestClient::BadRequest,::RestClient::InternalServerError => e
+            rescue ::RestClient::ResourceNotFound => e
+              Response.new(StatusField => StatusNotok, ErrorsField => errors_field('Resource not found'))
+            rescue  RestClient::Request::Unauthorized, RestClient::BadRequest,::RestClient::InternalServerError => e
               # with latest set of changes we will consider this as special case since most of legacy code is expecting Response class
-              Response.new(StatusField => StatusNotok, ErrorsField => JSON.parse(e.response)['errors'])
+              errors = (safe_json_parse(e.response)||{})['errors']||errors_field('Server Error')
+              Response.new(StatusField => StatusNotok, ErrorsField => errors)
             rescue ::RestClient::Forbidden => e
               return error_response({ErrorsSubFieldCode => RestClientErrors[e.class.to_s]||GenericError, ErrorsOriginalException => e},opts) unless e.inspect.to_s.include?("PG::Error")
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-common-core
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-04 00:00:00.000000000 Z
+date: 2014-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client