javonet-ruby-sdk 2.1.0 → 2.1.2

data/lib/javonet-ruby-sdk/core/handler/command_handler/get_instance_field_handler.rb

@@ -11,16 +11,16 @@ class GetInstanceFieldHandler < AbstractCommandHandler
 
   def get_instance_field(command)
     begin
-    if command.payload.length != @required_parameters_count
-      raise "Instance field parameters mismatch"
-    end
-    merged_value = '@' + command.payload[1]
-    if command.payload[0].instance_variable_defined?(merged_value)
-      response = command.payload[0].instance_variable_get(merged_value)
-    else
-      raise "Instance field not defined"
-    end
-    return response
+      if command.payload.length != @required_parameters_count
+        raise "Instance field parameters mismatch"
+      end
+      merged_value = '@' + command.payload[1]
+      if command.payload[0].instance_variable_defined?(merged_value)
+        response = command.payload[0].instance_variable_get(merged_value)
+      else
+        raise "Instance field not defined"
+      end
+      return response
     rescue Exception => e
       return e
     end

data/lib/javonet-ruby-sdk/core/handler/command_handler/get_static_field_handler.rb

@@ -11,17 +11,17 @@ class GetStaticFieldHandler < AbstractCommandHandler
 
   def get_static_field(command)
     begin
-    if command.payload.length != @required_parameters_count
-      raise "Static field parameters mismatch"
-    end
+      if command.payload.length != @required_parameters_count
+        raise "Static field parameters mismatch"
+      end
 
-    merged_value = '@@' + command.payload[1]
-    if command.payload[0].class_variable_defined?(merged_value)
-      response = command.payload[0].class_variable_get(merged_value)
-    else
-      response = command.payload[0].const_get(command.payload[1])
-    end
-    return response
+      merged_value = '@@' + command.payload[1]
+      if command.payload[0].class_variable_defined?(merged_value)
+        response = command.payload[0].class_variable_get(merged_value)
+      else
+        response = command.payload[0].const_get(command.payload[1])
+      end
+      return response
     rescue Exception => e
       return e
     end

data/lib/javonet-ruby-sdk/core/handler/command_handler/get_type_handler.rb

@@ -4,6 +4,7 @@ class GetTypeHandler < AbstractCommandHandler
   def initialize
     @required_parameters_count = 1
   end
+
   def process(command)
     begin
       if command.payload.length < @required_parameters_count

data/lib/javonet-ruby-sdk/core/handler/command_handler/invoke_instance_method_handler.rb

@@ -1,25 +1,25 @@
 require_relative 'abstract_command_handler'
 
-
 class InvokeInstanceMethodHandler < AbstractCommandHandler
   def initialize
     @required_parameters_count = 2
   end
+
   def process(command)
     return invoke_instance_method(command)
   end
 
   def invoke_instance_method(command)
     begin
-    if command.payload.length < @required_parameters_count
-      raise "InvokeInstanceMethod parameters mismatch"
-    end
-    if command.payload.length > 2
-      arguments = command.payload[2..]
-      return command.payload[0].send(command.payload[1], *arguments)
-    else
-      return command.payload[0].send(command.payload[1])
-    end
+      if command.payload.length < @required_parameters_count
+        raise "InvokeInstanceMethod parameters mismatch"
+      end
+      if command.payload.length > 2
+        arguments = command.payload[2..]
+        return command.payload[0].send(command.payload[1], *arguments)
+      else
+        return command.payload[0].send(command.payload[1])
+      end
     rescue Exception => e
       return e
     end

data/lib/javonet-ruby-sdk/core/handler/command_handler/invoke_static_method_handler.rb

@@ -4,21 +4,22 @@ class InvokeStaticMethodHandler < AbstractCommandHandler
   def initialize
     @required_parameters_count = 2
   end
+
   def process(command)
     invoke_static_method(command)
   end
 
   def invoke_static_method(command)
     begin
-    if command.payload.length < @required_parameters_count
-      raise "Static method parameters mismatch"
-    end
-    if command.payload.length > @required_parameters_count
-      args = command.payload[2..]
-      command.payload[0].send(command.payload[1],*args)
-    else
-      command.payload[0].send(command.payload[1])
-    end
+      if command.payload.length < @required_parameters_count
+        raise "Static method parameters mismatch"
+      end
+      if command.payload.length > @required_parameters_count
+        args = command.payload[2..]
+        command.payload[0].send(command.payload[1], *args)
+      else
+        command.payload[0].send(command.payload[1])
+      end
     rescue Exception => e
       return e
     end

data/lib/javonet-ruby-sdk/core/handler/command_handler/load_library_handler.rb

@@ -18,7 +18,6 @@ class LoadLibraryHandler < AbstractCommandHandler
       #noinspection RubyResolve
       require(assembly_name)
       return 0
-
     rescue Exception => e
       return e
     end

data/lib/javonet-ruby-sdk/core/handler/command_handler/resolve_instance_handler.rb

@@ -5,6 +5,7 @@ class ResolveInstanceHandler < AbstractCommandHandler
   def initialize
     @required_parameters_count = 1
   end
+
   def process(command)
     return resolve_reference(command)
   end

data/lib/javonet-ruby-sdk/core/handler/command_handler/set_static_field_handler.rb

@@ -1,6 +1,6 @@
 require_relative 'abstract_command_handler'
 
-class  SetStaticFieldHandler < AbstractCommandHandler
+class SetStaticFieldHandler < AbstractCommandHandler
   def initialize
     @required_parameters_count = 3
   end
@@ -11,12 +11,12 @@ class  SetStaticFieldHandler < AbstractCommandHandler
 
   def set_static_field(command)
     begin
-    if command.payload.length != @required_parameters_count
-      raise "Set static field parameters mismatch"
-    end
+      if command.payload.length != @required_parameters_count
+        raise "Set static field parameters mismatch"
+      end
 
-    merged_value = '@@' + command.payload[1]
-    command.payload[0].class_variable_set(merged_value, command.payload[2])
+      merged_value = '@@' + command.payload[1]
+      command.payload[0].class_variable_set(merged_value, command.payload[2])
     rescue Exception => e
       return e
     end

data/lib/javonet-ruby-sdk/core/handler/handler.rb

@@ -17,6 +17,7 @@ require_relative '../../core/handler/command_handler/array_get_item_handler'
 require_relative '../../core/handler/command_handler/array_get_size_handler'
 require_relative '../../core/handler/command_handler/array_get_rank_handler'
 require_relative '../../core/handler/command_handler/array_set_item_handler'
+require_relative '../../core/handler/command_handler/array_handler'
 require_relative '../../core/handler/references_cache'
 require_relative '../../core/handler/handler_dictionary'
 require_relative '../../core/exceptions/exception_serializer'
@@ -42,6 +43,7 @@ class Handler < AbstractHandler
     array_get_size_handler = ArrayGetSizeHandler.new
     array_get_rank_handler = ArrayGetRankHandler.new
     array_set_item_handler = ArraySetItemHandler.new
+    array_handler = ArrayHandler.new
 
 
     $handler_dict[CommandType::VALUE] = value_handler
@@ -60,6 +62,7 @@ class Handler < AbstractHandler
     $handler_dict[CommandType::ARRAY_GET_SIZE] = array_get_size_handler
     $handler_dict[CommandType::ARRAY_GET_RANK] = array_get_rank_handler
     $handler_dict[CommandType::ARRAY_SET_ITEM] = array_set_item_handler
+    $handler_dict[CommandType::ARRAY] = array_handler
 
   end
 

data/lib/javonet-ruby-sdk/core/transmitter/transmitter.rb

@@ -4,17 +4,25 @@ require_relative 'transmitter_wrapper'
 
 class Transmitter
 
-  def self.send_command(messageArray, messageArrayLen)
-    message = FFI::MemoryPointer.new(:uchar, messageArrayLen, true)
-    message.put_array_of_uchar(0, messageArray)
-    responseArrayLen = TransmitterWrapper.SendCommand(message, messageArrayLen)
-    if responseArrayLen >0
-      response = FFI::MemoryPointer.new(:uchar, responseArrayLen, true)
-      TransmitterWrapper.ReadResponse(response, responseArrayLen)
-      responseArray = response.get_array_of_uchar(0, responseArrayLen)
-      return responseArray
+  def self.get_native_error
+    TransmitterWrapper.GetNativeError
+  end
+
+  def self.send_command(message_byte_array, message_byte_array_len)
+    message = FFI::MemoryPointer.new(:uchar, message_byte_array_len, true)
+    message.put_array_of_uchar(0, message_byte_array)
+    response_byte_array_len = TransmitterWrapper.SendCommand(message, message_byte_array_len)
+    if response_byte_array_len > 0
+      response = FFI::MemoryPointer.new(:uchar, response_byte_array_len, true)
+      TransmitterWrapper.ReadResponse(response, response_byte_array_len)
+      response_byte_array = response.get_array_of_uchar(0, response_byte_array_len)
+      return response_byte_array
+    elsif response_byte_array_len == 0
+      error_message = "Response is empty"
+      raise Exception.new error_message
     else
-      raise Exception.new "Javonet native error code: " + responseArrayLen.to_s
+      error_message = get_native_error
+      raise Exception.new "Javonet native error code: " + response_byte_array_len.to_s + ". " + error_message
     end
   end
 
@@ -30,8 +38,14 @@ class Transmitter
     return activate(email, licenceKey, proxyHost, proxyUserName, proxyPassword)
   end
 
-  private_class_method def self.activate(email="", licenceKey="", proxyHost="", proxyUserName="", proxyUserPassword="")
-    return TransmitterWrapper.Activate(email, licenceKey, proxyHost, proxyUserName, proxyUserPassword)
+  private_class_method def self.activate(email = "", licenceKey = "", proxyHost = "", proxyUserName = "", proxyUserPassword = "")
+    activation_result = TransmitterWrapper.Activate(email, licenceKey, proxyHost, proxyUserName, proxyUserPassword)
+    if activation_result < 0
+      error_message = get_native_error
+      raise Exception.new "Javonet activation result: " + activation_result.to_s + ". " + error_message
+    else
+      return activation_result
+    end
   end
 
 end

data/lib/javonet-ruby-sdk/core/transmitter/transmitter_wrapper.rb

@@ -1,15 +1,16 @@
 module TransmitterWrapper
   extend FFI::Library
-    if OS.linux?
-      ffi_lib File.expand_path('../../../Binaries/Native/Linux/X64/libJavonetRubyRuntimeNative.so', __FILE__)
-    elsif OS.mac?
-      ffi_lib File.expand_path('../../../Binaries/Native/MacOs/X64/libJavonetRubyRuntimeNative.dylib', __FILE__)
-    else
-      RubyInstaller::Runtime.add_dll_directory(File.expand_path('../../../Binaries/Native/Windows/X64/', __FILE__))
-      ffi_lib File.expand_path('../../../Binaries/Native/Windows/X64/JavonetRubyRuntimeNative.dll', __FILE__ )
-    end
-    attach_function :SendCommand, [:pointer, :int], :int
-    attach_function :ReadResponse, [:pointer, :int], :int
-    attach_function :Activate, [:pointer, :pointer, :pointer, :pointer, :pointer], :int
+  if OS.linux?
+    ffi_lib File.expand_path('../../../Binaries/Native/Linux/X64/libJavonetRubyRuntimeNative.so', __FILE__)
+  elsif OS.mac?
+    ffi_lib File.expand_path('../../../Binaries/Native/MacOs/X64/libJavonetRubyRuntimeNative.dylib', __FILE__)
+  else
+    RubyInstaller::Runtime.add_dll_directory(File.expand_path('../../../Binaries/Native/Windows/X64/', __FILE__))
+    ffi_lib File.expand_path('../../../Binaries/Native/Windows/X64/JavonetRubyRuntimeNative.dll', __FILE__)
+  end
+  attach_function :SendCommand, [:pointer, :int], :int
+  attach_function :ReadResponse, [:pointer, :int], :int
+  attach_function :Activate, [:pointer, :pointer, :pointer, :pointer, :pointer], :int
+  attach_function :GetNativeError, [], :string
 
 end

data/lib/javonet-ruby-sdk/sdk/internal/invocation_context.rb

@@ -1,8 +1,11 @@
 require_relative 'abstract/abstract_invocation_context'
 require_relative '../../core/interpreter/interpreter'
 require_relative '../../core/exceptions/exception_thrower'
+require_relative 'invocation_context_iterator'
 
 class InvocationContext < AbstractInvocationContext
+  include Enumerable
+
   def initialize(runtime_name, connection_type, tcp_ip_address, command, is_executed = false)
     @is_executed = is_executed
     @runtime_name = runtime_name
@@ -11,7 +14,6 @@ class InvocationContext < AbstractInvocationContext
     @current_command = command
     @response_command = nil
     @interpreter = Interpreter.new
-    @handler = nil
     ObjectSpace.define_finalizer(self, self.finalize(@current_command, @is_executed, @interpreter, @connection_type, @tcp_ip_address))
   end
 
@@ -19,16 +21,37 @@ class InvocationContext < AbstractInvocationContext
     proc do
       if command.command_type == CommandType::REFERENCE && is_executed == true
         destructCommand = Command.new(@runtime_name, CommandType::DESTRUCT_REFERENCE, command.payload)
-        if @runtime_name == RuntimeName::RUBY
-          handler = Handler.new
-          handler.handle_command(destructCommand)
-        else
-          interpreter.execute(destructCommand, connection_type, tcp_ip_address)
-        end
+        interpreter.execute(destructCommand, connection_type, tcp_ip_address)
       end
     end
   end
 
+  def iterator
+    if @current_command.command_type != CommandType::REFERENCE
+      raise "Object is not iterable"
+    else
+      return InvocationContextIterator.new(self)
+    end
+  end
+
+  def [](i)
+    if @current_command.command_type != CommandType::REFERENCE
+      raise "Object is not iterable"
+    else
+      invocation_context_iterator = InvocationContextIterator.new(self)
+      return invocation_context_iterator[i]
+    end
+  end
+
+  def []=(i, value)
+    if @current_command.command_type != CommandType::REFERENCE
+      raise "Object is not iterable"
+    else
+      invocation_context_iterator = InvocationContextIterator.new(self)
+      return invocation_context_iterator[i] = value
+    end
+  end
+
   def execute
     @response_command = @interpreter.execute(@current_command, @connection_type, @tcp_ip_address)
 
@@ -101,21 +124,20 @@ class InvocationContext < AbstractInvocationContext
 
   def build_command(command)
     command.payload.each_index { |i|
-      command.payload[i] = iterate(command.payload[i])
+      command.payload[i] = encapsulate_payload_item(command.payload[i])
     }
     return command.add_arg_to_payload_on_beginning(@current_command)
   end
 
-  def iterate(payload_item)
+  def encapsulate_payload_item(payload_item)
     if payload_item.is_a? InvocationContext
       Command.new(@runtime_name, CommandType::VALUE, [*payload_item.current_command])
     elsif payload_item.is_a? Array
       payload_item.each_index { |i|
-        payload_item[i] = iterate(payload_item)
+        payload_item[i] = encapsulate_payload_item(payload_item[i])
       }
       return Command.new(@runtime_name, CommandType::ARRAY, [*payload_item])
     else
-
       return Command.new(@runtime_name, CommandType::VALUE, [*payload_item])
     end
   end

data/lib/javonet-ruby-sdk/sdk/internal/invocation_context_iterator.rb

@@ -0,0 +1,28 @@
+class InvocationContextIterator
+  include Enumerable
+
+  attr_accessor :_array_as_invocation_context
+  private :_array_as_invocation_context
+
+  def initialize(array_as_invocation_context)
+    @_array_as_invocation_context = array_as_invocation_context
+    @position = -1
+    @array_size = @_array_as_invocation_context.get_size().execute().get_value()
+    @array_as_list = [1, 2, 3, 4, 5]
+    @array_as_list.each_index { |i|
+      @array_as_list[i] = _array_as_invocation_context.get_index(i)
+    }
+  end
+
+  def each(&block)
+    return @array_as_list.each(&block)
+  end
+
+  def [](i)
+    return @_array_as_invocation_context.get_index(i)
+  end
+
+  def []=(i, value)
+    return @_array_as_invocation_context.set_index(value, i).execute
+  end
+end

data/lib/javonet-ruby-sdk/sdk/internal/runtime_context.rb

@@ -70,16 +70,16 @@ class RuntimeContext < AbstractRuntimeContext
 
   def build_command(command)
     command.payload.each_index {|i|
-      command.payload[i] = iterate(command.payload[i])
+      command.payload[i] = encapsulate_payload_item(command.payload[i])
     }
     return command.add_arg_to_payload_on_beginning(@current_command)
   end
 
-  def iterate(payload_item)
+  def encapsulate_payload_item(payload_item)
     if payload_item.is_a? Array
-      payload_item.each_index { |i|
-        payload_item[i] = iterate(payload_item)
-      }
+    payload_item.each_index { |i|
+      payload_item[i] = encapsulate_payload_item(payload_item[i])
+    }
       return Command.new(@runtime_name, CommandType::ARRAY, [*payload_item])
     else
       return Command.new(@runtime_name, CommandType::VALUE, [*payload_item])

data/lib/javonet-ruby-sdk/utils/command.rb

@@ -62,7 +62,7 @@ class Command
   end
 
   def create_array_response(array)
-    return Command.new(@runtime_name, CommandType::ARRAY, [array])
+    return Command.new(@runtime_name, CommandType::ARRAY_REFERENCE, [array])
   end
 
   def drop_first_payload_argument

data/lib/javonet-ruby-sdk/utils/command_type.rb

@@ -17,11 +17,12 @@ class CommandType
   GENERATE_LIB = 15
   INVOKE_GLOBAL_METHOD = 16
   DESTRUCT_REFERENCE = 17
-  ARRAY = 18
+  ARRAY_REFERENCE = 18
   ARRAY_GET_ITEM = 19
   ARRAY_GET_SIZE = 20
   ARRAY_GET_RANK = 21
   ARRAY_SET_ITEM = 22
+  ARRAY = 23
 
   def self.get_name(command_number)
     case command_number
@@ -62,7 +63,7 @@ class CommandType
     when 17
       return 'DESTRUCT_REFERENCE'
     when 18
-      return 'ARRAY'
+      return 'ARRAY_REFERENCE'
     when 19
       return 'ARRAY_GET_ITEM'
     when 20
@@ -71,6 +72,8 @@ class CommandType
       return 'ARRAY_GET_RANK'
     when 22
       return 'ARRAY_SET_ITEM'
+    when 23
+      return 'ARRAY'
     end
   end
 end