cloudi 1.8.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 59b71b8a2fa7b91fdb4821fdfc37b81d80b042d1
-  data.tar.gz: 78ed6318f5d76447519cef2d738717dcb34002d4
+SHA256:
+  metadata.gz: 0471a083e2e81711a27b2efdd1779820cb687f50ea9b1cc8019cbad439c16b30
+  data.tar.gz: aa4a82edf6d025917958595bbc69cee9a72bfb04e4cd2f435f3aa47513b5795c
 SHA512:
-  metadata.gz: 9516794ea7bd534e8f23438d1b5fcc4a508b710e3d27c73798940bb4c73600278fabd0ca3053fe1b8071da5fbeb569b420024fb3768e49af364b96d8e814f0b6
-  data.tar.gz: 4e5a665ee7997d60291f1357a2257dad6c6e19970a483fe560190dd4e5f1784e7eea3d5325d6e8cb255525dd64a661d76cec2731f366d84417f45ffb7b3623ea
+  metadata.gz: 47603319fafe80c8af0ad85bc7e0189663d43d488d72439647b63653dd481474b9d5ff0a21d3eb9d6ba42ac770efe80418e51e69a7673f372f3db5bab7924e98
+  data.tar.gz: 724f8075fee5e275fed0d317604907b0e67e2ff51bd5f0be1e07f513fe85a15ca407db64f1d4bdbf38550c1d9c22ba75562987848d932ba13b54872db8d018be

data.tar.gz.sig

@@ -1,2 +1 @@
-��}�v[�����C�&�$YI}�N�4���q�p^1�43
-�=�	�v����	�s��Rl[@����P��J��p=(���e�n4�!�֘Y�ٙ�E�o�-|�ۛE�,�W�A�hIlӏ�����k��m��C,~-	R�%bƻ<
+?��S���0��X����g
���t(Y5U:�c)�|!�tZ`����j$��Vx�Fe�N
��"��EOcqy%i�f��q��ߝ��I��A�|���9�}�!<�r�O���qx�_ɃiV4n�ҭoP}��
L�bSv-!$$�/H6|�����헙�YN;���b��y��m�G�d�Nn�Mq����|�����^j��Rh��(㫀4N?e?/2�۱����o�c�7��_�Ä<N�7��

data/lib/cloudi.rb

@@ -4,7 +4,7 @@
 #
 # MIT License
 #
-# Copyright (c) 2011-2019 Michael Truog <mjtruog at protonmail dot com>
+# Copyright (c) 2011-2020 Michael Truog <mjtruog at protonmail dot com>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -31,6 +31,7 @@ $stdout.sync = true
 $stderr.sync = true
 
 require 'erlang'
+require 'stringio'
 
 module CloudI
     class API
@@ -62,7 +63,7 @@ module CloudI
             @terminate = false
             @size = buffer_size_str.to_i
             @callbacks = Hash.new
-            @timeout_terminate = 1000 # TIMEOUT_TERMINATE_MIN
+            @timeout_terminate = 10 # TIMEOUT_TERMINATE_MIN
             send(Erlang.term_to_binary(:init))
             poll_request(nil, false)
         end
@@ -253,6 +254,7 @@ module CloudI
                 function = function_queue.shift
                 function_queue.push(function)
             end
+            return_null_response = false
             case command
             when MESSAGE_SEND_ASYNC
                 begin
@@ -272,29 +274,31 @@ module CloudI
                     if not response.kind_of?(String)
                         response = ''
                     end
-                rescue InvalidInputException => e
-                    raise e
                 rescue MessageDecodingException => e
-                    raise e
+                    @terminate = true
+                    return_null_response = true
                 rescue TerminateException => e
-                    raise e
+                    return_null_response = true
                 rescue ReturnAsyncException
                     return
-                rescue ForwardAsyncException
-                    return
                 rescue ReturnSyncException => e
+                    @terminate = true
                     $stderr.puts e.message
                     $stderr.puts e.backtrace
-                    API.assert{false}
+                    return
+                rescue ForwardAsyncException
                     return
                 rescue ForwardSyncException => e
+                    @terminate = true
                     $stderr.puts e.message
                     $stderr.puts e.backtrace
-                    API.assert{false}
                     return
                 rescue
+                    return_null_response = true
                     $stderr.puts $!.message
                     $stderr.puts $!.backtrace
+                end
+                if return_null_response
                     response_info = ''
                     response = ''
                 end
@@ -321,29 +325,31 @@ module CloudI
                     if not response.kind_of?(String)
                         response = ''
                     end
-                rescue InvalidInputException => e
-                    raise e
                 rescue MessageDecodingException => e
-                    raise e
+                    @terminate = true
+                    return_null_response = true
                 rescue TerminateException => e
-                    raise e
+                    return_null_response = true
                 rescue ReturnSyncException
                     return
-                rescue ForwardSyncException
-                    return
                 rescue ReturnAsyncException => e
+                    @terminate = true
                     $stderr.puts e.message
                     $stderr.puts e.backtrace
-                    API.assert{false}
+                    return
+                rescue ForwardSyncException
                     return
                 rescue ForwardAsyncException => e
+                    @terminate = true
                     $stderr.puts e.message
                     $stderr.puts e.backtrace
-                    API.assert{false}
                     return
                 rescue
+                    return_null_response = true
                     $stderr.puts $!.message
                     $stderr.puts $!.backtrace
+                end
+                if return_null_response
                     response_info = ''
                     response = ''
                 end
@@ -402,7 +408,11 @@ module CloudI
 
         def poll_request(timeout, external)
             if @terminate
-                return false
+                if external
+                    return false
+                else
+                    raise TerminateException.new(@timeout_terminate)
+                end
             elsif external and not @initialization_complete
                 send(Erlang.term_to_binary(:polling))
                 @initialization_complete = true
@@ -492,6 +502,9 @@ module CloudI
                     callback(command, name, pattern, request_info, request,
                              request_timeout, priority, trans_id,
                              Erlang.binary_to_term(pid))
+                    if @terminate
+                        return false
+                    end
                 when MESSAGE_RECV_ASYNC, MESSAGE_RETURN_SYNC
                     i += j; j = 4
                     response_info_size = data[i, j].unpack('L')[0]
@@ -622,24 +635,47 @@ module CloudI
             send(Erlang.term_to_binary([:shutdown, reason]))
         end
 
-        def text_key_value_parse(text)
-            result = {}
-            data = text.split(NULL.chr)
-            (0...(data.length)).step(2).each do |i|
-                value = result[data[i]]
+        def self.text_pairs_parse(text)
+            pairs = {}
+            text_segments = text.split(NULL.chr)
+            (0...(text_segments.length)).step(2).each do |i|
+                value = pairs[text_segments[i]]
                 if value == nil
-                    result[data[i]] = data[i + 1]
+                    pairs[text_segments[i]] = text_segments[i + 1]
                 elsif value.kind_of?(Array)
-                    value << data[i + 1]
+                    value << text_segments[i + 1]
+                else
+                    pairs[text_segments[i]] = [value, text_segments[i + 1]]
+                end
+            end
+            return pairs
+        end
+
+        def self.text_pairs_new(pairs, response)
+            text_stream = StringIO.new
+            pairs.each do |key, values|
+                if values.kind_of?(String)
+                    text_stream.write "#{key}\0#{values}\0"
                 else
-                    result[data[i]] = [value, data[i + 1]]
+                    values.each do |value|
+                        text_stream.write "#{key}\0#{value}\0"
+                    end
                 end
             end
-            return result
+            text = text_stream.string
+            if response and text == ''
+                return "\0"
+            else
+                return text
+            end
+        end
+
+        def self.info_key_value_parse(info)
+            return text_pairs_parse(info)
         end
 
-        def info_key_value_parse(message_info)
-            return text_key_value_parse(message_info)
+        def self.info_key_value_new(pairs, response = true)
+            return text_pairs_new(pairs, response)
         end
 
         def self.assert
@@ -650,7 +686,8 @@ module CloudI
         private :callback
         private :handle_events
         private :poll_request
-        private :text_key_value_parse
+        private_class_method :text_pairs_parse
+        private_class_method :text_pairs_new
         private
 
         def send(data)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudi
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Michael Truog
@@ -30,7 +30,7 @@ cert_chain:
   KH+3FIhF8jYeRqq/8g4k6zsZZwRewPjObe3Wm4yEv0f0dxdQRuWcuE7s7z0Bss5J
   YQYB6UQUREuP9rhSHKbAZd9CPR3XW+S7PkeQiWc8ceLFVsfK
   -----END CERTIFICATE-----
-date: 2019-11-28 00:00:00.000000000 Z
+date: 2020-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erlang_rb
@@ -38,40 +38,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: erlang_rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 2.0.0
 description: Ruby CloudI API
 email: mjtruog@protonmail.com
 executables: []
@@ -100,8 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: CloudI API