unimatrix 3.3.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ed5880f8656f790aa4c540868b4c7adfb1be559
-  data.tar.gz: fa3cddf703111db8dced819489f477472682fbe9
+  metadata.gz: 855794135ee5becfbca9f3a05a06c2161d162f5f
+  data.tar.gz: c993f1bf6e5ec5e5f349acf426aedfbf054abd32
 SHA512:
-  metadata.gz: 03e2c085c727f2d2d0743ff4a678650a1585f2524eb655964e2799426eaf2840f0b3a0164886cdce7b65207ef1ee2a822705b8f86de950e4e115b80947306397
-  data.tar.gz: 945869eb78d4bb6f5ec66d30c53fd9af7e80c05619eec7e222e18f74d2e07a7696abfe87a13eeaf210a0dbdeb12cab07cf46e98e30b0a07900a851653e6b03bc
+  metadata.gz: b9ccc0ca311d3db7ddf1fb99f943fe0e2e26cfe5efc82f6552592385bd1504bed67474bdc35bf501a4bf5805c50f4b8a640b4440869cc7acbc5a200b15bd3e4d
+  data.tar.gz: b83ffd34ed213f719a7bbad2235d75a547b877186f7c111e0852df1431584bf642e448326dc2d649fbf40f33e0f92e4d6fbec828fe2859a6be3c2a7ac9e43312

data/VERSION

@@ -1 +1 @@
-3.3.0
+3.3.1

data/lib/unimatrix.rb

@@ -29,6 +29,7 @@ require 'unimatrix/forbidden_error'
 require 'unimatrix/malformed_parameter_error'
 require 'unimatrix/missing_parameter_error'
 require 'unimatrix/not_found_error'
+require 'unimatrix/timeout_error'
 
 # activist
 require 'unimatrix/activist/task'

data/lib/unimatrix/operation.rb

@@ -55,12 +55,16 @@ module Unimatrix
       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_a?( Error )
+            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

data/lib/unimatrix/request.rb

@@ -8,6 +8,11 @@ module Unimatrix
     def initialize( default_parameters = {} )
       uri   = URI( Unimatrix.configuration.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
@@ -55,16 +60,24 @@ module Unimatrix
           begin
             yield
           rescue Timeout::Error => error
+            log_error( error.inspect )
+            
             error
           end
 
-        unless response.nil? || ( response.is_a?( Response ) && retry_codes.include?( response.code ) )
-          
-          response = nil if response.is_a?( Timeout::Error )
-          
+        unless response.nil? || 
+               ( response.is_a?( Response ) && retry_codes.include?( response.code ) ) || 
+               response.is_a?( Timeout::Error )
+               
           break
         end
       end
+      
+      if response.is_a?( Timeout::Error )
+        response = Unimatrix::TimeoutError.new(
+          message: response.message
+        )
+      end
 
       response
     end
@@ -78,6 +91,14 @@ module Unimatrix
 
       addressable.to_s
     end
+    
+    protected; def log_error( message )
+      if defined?( logger.error )
+        logger.error( message )
+      else
+        puts "Error: #{ message }"
+      end
+    end
 
   end
 

data/lib/unimatrix/timeout_error.rb

@@ -0,0 +1,6 @@
+module Unimatrix
+
+  class TimeoutError < Error
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unimatrix
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Jackson Souza
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-25 00:00:00.000000000 Z
+date: 2018-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -180,6 +180,7 @@ files:
 - lib/unimatrix/resource.rb
 - lib/unimatrix/response.rb
 - lib/unimatrix/serializer.rb
+- lib/unimatrix/timeout_error.rb
 - lib/unimatrix/version.rb
 - lib/unimatrix/zephyrus/conversion_output.rb
 - lib/unimatrix/zephyrus/input.rb
@@ -213,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Unimatrix is used to communicate with Unimatrix APIs.