unimatrix 3.3.1 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 855794135ee5becfbca9f3a05a06c2161d162f5f
-  data.tar.gz: c993f1bf6e5ec5e5f349acf426aedfbf054abd32
+  metadata.gz: 1e4a9781565879afc0c5d8edf0efdc4291a772bc
+  data.tar.gz: 2c8bfda82d8c2438d8dc8368eebbdff6fada85a5
 SHA512:
-  metadata.gz: b9ccc0ca311d3db7ddf1fb99f943fe0e2e26cfe5efc82f6552592385bd1504bed67474bdc35bf501a4bf5805c50f4b8a640b4440869cc7acbc5a200b15bd3e4d
-  data.tar.gz: b83ffd34ed213f719a7bbad2235d75a547b877186f7c111e0852df1431584bf642e448326dc2d649fbf40f33e0f92e4d6fbec828fe2859a6be3c2a7ac9e43312
+  metadata.gz: 5e017c0e73f8b915f4add49d20e4597ea1e350c9410561f497c798a8794ecb58ecd311689174f50ca25e27bae36470238e67c31a91016265cf76b46c44acd760
+  data.tar.gz: c4afdc30cc2b46c36668cbfeb169215d37a9994a4631a61d29bc39cd7f513252e38faaa101d055f3a68ddace1fd2263459132ccdbf7457910e51115abe5e7577

data/VERSION

@@ -1 +1 @@
-3.3.1
+3.3.2

data/lib/unimatrix/authorization/operation.rb

@@ -5,7 +5,9 @@ module Unimatrix::Authorization
       result = nil
       Request.new.tap do | request |
         response = request.destroy( @path, @parameters )
-        if response.present?
+        if response_is_error?( response )
+          result = response
+        elsif response.present?
           result = response.resources
         end
       end
@@ -17,12 +19,16 @@ module Unimatrix::Authorization
       response = nil
       Request.new.tap do | request |
         request.get( @path, @parameters ).tap do | response |
-          result = response.resources
-          if block_given?
-            case block.arity
-              when 0; yield
-              when 1; yield result
-              when 2; yield result, response
+          if response_is_error?( response )
+            result = response
+          else
+            result = response.resources
+            if block_given?
+              case block.arity
+                when 0; yield
+                when 1; yield result
+                when 2; yield result, response
+              end
             end
           end
         end
@@ -35,7 +41,9 @@ module Unimatrix::Authorization
       Request.new.tap do | request |
         serializer = Unimatrix::Serializer.new( objects )
         response = request.post( @path, @parameters, serializer.serialize( node ) )
-        if response.present?
+        if response_is_error?( response )
+          result = response
+        else
           result = response.resources
           if block_given?
             case block.arity
@@ -55,6 +63,10 @@ module Unimatrix::Authorization
         @parameters.deep_merge( parameters || {} )
       )
     end
+    
+    protected; def response_is_error?( response )
+      response.is_a?( Error ) || response.is_a?( Unimatrix::Error )
+    end
 
   end
 

data/lib/unimatrix/authorization/request.rb

@@ -7,6 +7,11 @@ module Unimatrix::Authorization
     def initialize( default_parameters = {} )
       uri   = URI( Unimatrix.configuration.authorization_url )
       @http = Net::HTTP.new( uri.host, uri.port )
+      
+      timeout_limit = ( ENV[ 'TIMEOUT_LIMIT' ] || 60 ).to_i
+      
+      @http.open_timeout = timeout_limit
+      @http.read_timeout = timeout_limit
 
       @http.use_ssl = ( uri.scheme == 'https' )
       @http.verify_mode = OpenSSL::SSL::VERIFY_NONE
@@ -15,36 +20,24 @@ module Unimatrix::Authorization
     end
 
     def get( path, parameters = {} )
-      response = nil
-
-      begin
-        response = Response.new(
+      attempt_request do
+        Response.new(
           @http.get( compose_request_path( path, parameters ) ),
           path
         )
-      rescue Timeout::Error
-        response = nil
       end
-
-      response
     end
 
     def post( path, parameters = {}, body = {} )
-      response = nil
-
-      begin
+      attempt_request do
         request = Net::HTTP::Post.new(
           compose_request_path( path, parameters ),
           { 'Content-Type' =>'application/json' }
         )
         request.body = body.to_json
 
-        response = Response.new( @http.request( request ), path )
-      rescue Timeout::Error
-        response = nil
+        Response.new( @http.request( request ), path )
       end
-
-      response
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unimatrix
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
 platform: ruby
 authors:
 - Jackson Souza
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-26 00:00:00.000000000 Z
+date: 2018-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport