universa 3.9.14.4 → 3.9.14.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c65df7eb10cecce1c09779fbf90508acfdfa635b16c389dadf2374c593fcaf1
-  data.tar.gz: 64fb25fb4ac49fe211e72eae959356a102d19ab4a7fd0b4983c918d68be8b895
+  metadata.gz: 6ae1a913ccceca74c1765be44a6a50bfbd7ff87b2d2a7d211a6524dce04de3f7
+  data.tar.gz: 98bb8fc5bfeb2aebee862444eb0b0993467a1fd94e4024b997779940bd663de8
 SHA512:
-  metadata.gz: c0b58987523a8f1afe197155d5d2a405b0d6d984a9eaa3f56ca5e42bcce247aca142ff38686df12bb60d0b1789f352ab2daba63674d06a0e8e1aa96c2b3bc1ad
-  data.tar.gz: 386da928e46af503cc2efc09f5c6d1311126bfac4a908580ece195197fc8b973b711f2191db20e68947fe49b990c1a864e5124e448622580ec409abbefff049f
+  metadata.gz: aa9b9f139f4982742f3ef894edaac98ebe07c2a39be49d8e86d1e4f0bbc51a21b67217dfee2163cce916dada313b6e9b7cef3027109764e1c2acebb64940f850
+  data.tar.gz: bcd99facf5c9ee84a4a2382825b3af65718966d880d1d19be17966cb8ca261eb4e503ff5a37018283f93f99e8d94e8d573a345de5624b0450f0f92b30cff0946

data/bin/umi/bin/umi

@@ -344,7 +344,7 @@ declare -r lib_dir="$(realpath "${app_home}/../lib")"
 declare -a app_mainclass=(com.icodici.farcallscala.Main)
 
 declare -r script_conf_file="${app_home}/../conf/application.ini"
-declare -r app_classpath="$lib_dir/com.icodici.umi-0.8.35.jar:$lib_dir/org.scala-lang.scala-library-2.12.7.jar:$lib_dir/com.icodici.universa_core-3.9.14.jar:$lib_dir/org.yaml.snakeyaml-1.18.jar:$lib_dir/com.icodici.nanohttpd-2.1.0.jar:$lib_dir/com.icodici.common_tools-3.9.14.jar:$lib_dir/com.eclipsesource.minimal-json.minimal-json-0.9.4.jar:$lib_dir/net.java.dev.jna.jna-4.5.1.jar:$lib_dir/org.checkerframework.checker-qual-2.3.2.jar:$lib_dir/com.icodici.crypto-3.9.14.jar:$lib_dir/com.madgag.spongycastle.core-1.58.0.0.jar:$lib_dir/com.squareup.jnagmp.jnagmp-2.0.0.jar:$lib_dir/com.typesafe.play.play-json_2.12-2.6.10.jar:$lib_dir/com.typesafe.play.play-functional_2.12-2.6.10.jar:$lib_dir/org.scala-lang.scala-reflect-2.12.7.jar:$lib_dir/org.typelevel.macro-compat_2.12-1.1.1.jar:$lib_dir/joda-time.joda-time-2.9.9.jar:$lib_dir/com.fasterxml.jackson.core.jackson-core-2.8.11.jar:$lib_dir/com.fasterxml.jackson.core.jackson-annotations-2.8.11.jar:$lib_dir/com.fasterxml.jackson.datatype.jackson-datatype-jdk8-2.8.11.jar:$lib_dir/com.fasterxml.jackson.core.jackson-databind-2.8.11.1.jar:$lib_dir/com.fasterxml.jackson.datatype.jackson-datatype-jsr310-2.8.11.jar:$lib_dir/org.scala-sbt.ipcsocket.ipcsocket-1.0.0.jar:$lib_dir/net.java.dev.jna.jna-platform-4.5.0.jar:$lib_dir/net.sf.jopt-simple.jopt-simple-4.9.jar"
+declare -r app_classpath="$lib_dir/com.icodici.umi-0.8.36.jar:$lib_dir/org.scala-lang.scala-library-2.12.7.jar:$lib_dir/com.icodici.universa_core-3.9.14.jar:$lib_dir/org.yaml.snakeyaml-1.18.jar:$lib_dir/com.icodici.nanohttpd-2.1.0.jar:$lib_dir/com.icodici.common_tools-3.9.14.jar:$lib_dir/com.eclipsesource.minimal-json.minimal-json-0.9.4.jar:$lib_dir/net.java.dev.jna.jna-4.5.1.jar:$lib_dir/org.checkerframework.checker-qual-2.3.2.jar:$lib_dir/com.icodici.crypto-3.9.14.jar:$lib_dir/com.madgag.spongycastle.core-1.58.0.0.jar:$lib_dir/com.squareup.jnagmp.jnagmp-2.0.0.jar:$lib_dir/com.typesafe.play.play-json_2.12-2.6.10.jar:$lib_dir/com.typesafe.play.play-functional_2.12-2.6.10.jar:$lib_dir/org.scala-lang.scala-reflect-2.12.7.jar:$lib_dir/org.typelevel.macro-compat_2.12-1.1.1.jar:$lib_dir/joda-time.joda-time-2.9.9.jar:$lib_dir/com.fasterxml.jackson.core.jackson-core-2.8.11.jar:$lib_dir/com.fasterxml.jackson.core.jackson-annotations-2.8.11.jar:$lib_dir/com.fasterxml.jackson.datatype.jackson-datatype-jdk8-2.8.11.jar:$lib_dir/com.fasterxml.jackson.core.jackson-databind-2.8.11.1.jar:$lib_dir/com.fasterxml.jackson.datatype.jackson-datatype-jsr310-2.8.11.jar:$lib_dir/org.scala-sbt.ipcsocket.ipcsocket-1.0.0.jar:$lib_dir/net.java.dev.jna.jna-platform-4.5.0.jar:$lib_dir/net.sf.jopt-simple.jopt-simple-4.9.jar"
 
 # java_cmd is overrode in process_args when -java-home is used
 declare java_cmd=$(get_java_cmd)

data/bin/umi/bin/umi.bat

@@ -80,7 +80,7 @@ rem "-J" is stripped, "-D" is left as is, and everything is appended to JAVA_OPT
 set _JAVA_PARAMS=
 set _APP_ARGS=
 
-set "APP_CLASSPATH=%APP_LIB_DIR%\com.icodici.umi-0.8.35.jar;%APP_LIB_DIR%\org.scala-lang.scala-library-2.12.7.jar;%APP_LIB_DIR%\com.icodici.universa_core-3.9.14.jar;%APP_LIB_DIR%\org.yaml.snakeyaml-1.18.jar;%APP_LIB_DIR%\com.icodici.nanohttpd-2.1.0.jar;%APP_LIB_DIR%\com.icodici.common_tools-3.9.14.jar;%APP_LIB_DIR%\com.eclipsesource.minimal-json.minimal-json-0.9.4.jar;%APP_LIB_DIR%\net.java.dev.jna.jna-4.5.1.jar;%APP_LIB_DIR%\org.checkerframework.checker-qual-2.3.2.jar;%APP_LIB_DIR%\com.icodici.crypto-3.9.14.jar;%APP_LIB_DIR%\com.madgag.spongycastle.core-1.58.0.0.jar;%APP_LIB_DIR%\com.squareup.jnagmp.jnagmp-2.0.0.jar;%APP_LIB_DIR%\com.typesafe.play.play-json_2.12-2.6.10.jar;%APP_LIB_DIR%\com.typesafe.play.play-functional_2.12-2.6.10.jar;%APP_LIB_DIR%\org.scala-lang.scala-reflect-2.12.7.jar;%APP_LIB_DIR%\org.typelevel.macro-compat_2.12-1.1.1.jar;%APP_LIB_DIR%\joda-time.joda-time-2.9.9.jar;%APP_LIB_DIR%\com.fasterxml.jackson.core.jackson-core-2.8.11.jar;%APP_LIB_DIR%\com.fasterxml.jackson.core.jackson-annotations-2.8.11.jar;%APP_LIB_DIR%\com.fasterxml.jackson.datatype.jackson-datatype-jdk8-2.8.11.jar;%APP_LIB_DIR%\com.fasterxml.jackson.core.jackson-databind-2.8.11.1.jar;%APP_LIB_DIR%\com.fasterxml.jackson.datatype.jackson-datatype-jsr310-2.8.11.jar;%APP_LIB_DIR%\org.scala-sbt.ipcsocket.ipcsocket-1.0.0.jar;%APP_LIB_DIR%\net.java.dev.jna.jna-platform-4.5.0.jar;%APP_LIB_DIR%\net.sf.jopt-simple.jopt-simple-4.9.jar"
+set "APP_CLASSPATH=%APP_LIB_DIR%\com.icodici.umi-0.8.36.jar;%APP_LIB_DIR%\org.scala-lang.scala-library-2.12.7.jar;%APP_LIB_DIR%\com.icodici.universa_core-3.9.14.jar;%APP_LIB_DIR%\org.yaml.snakeyaml-1.18.jar;%APP_LIB_DIR%\com.icodici.nanohttpd-2.1.0.jar;%APP_LIB_DIR%\com.icodici.common_tools-3.9.14.jar;%APP_LIB_DIR%\com.eclipsesource.minimal-json.minimal-json-0.9.4.jar;%APP_LIB_DIR%\net.java.dev.jna.jna-4.5.1.jar;%APP_LIB_DIR%\org.checkerframework.checker-qual-2.3.2.jar;%APP_LIB_DIR%\com.icodici.crypto-3.9.14.jar;%APP_LIB_DIR%\com.madgag.spongycastle.core-1.58.0.0.jar;%APP_LIB_DIR%\com.squareup.jnagmp.jnagmp-2.0.0.jar;%APP_LIB_DIR%\com.typesafe.play.play-json_2.12-2.6.10.jar;%APP_LIB_DIR%\com.typesafe.play.play-functional_2.12-2.6.10.jar;%APP_LIB_DIR%\org.scala-lang.scala-reflect-2.12.7.jar;%APP_LIB_DIR%\org.typelevel.macro-compat_2.12-1.1.1.jar;%APP_LIB_DIR%\joda-time.joda-time-2.9.9.jar;%APP_LIB_DIR%\com.fasterxml.jackson.core.jackson-core-2.8.11.jar;%APP_LIB_DIR%\com.fasterxml.jackson.core.jackson-annotations-2.8.11.jar;%APP_LIB_DIR%\com.fasterxml.jackson.datatype.jackson-datatype-jdk8-2.8.11.jar;%APP_LIB_DIR%\com.fasterxml.jackson.core.jackson-databind-2.8.11.1.jar;%APP_LIB_DIR%\com.fasterxml.jackson.datatype.jackson-datatype-jsr310-2.8.11.jar;%APP_LIB_DIR%\org.scala-sbt.ipcsocket.ipcsocket-1.0.0.jar;%APP_LIB_DIR%\net.java.dev.jna.jna-platform-4.5.0.jar;%APP_LIB_DIR%\net.sf.jopt-simple.jopt-simple-4.9.jar"
 set "APP_MAIN_CLASS=com.icodici.farcallscala.Main"
 set "SCRIPT_CONF_FILE=%APP_HOME%\conf\application.ini"
 

data/lib/universa/binder.rb

@@ -20,8 +20,8 @@ module Universa
     end
 
     # Create hew Binder from any hash. Keys will be converted to strings.
-    def self.of hash
-      invoke_static "of", hash.transform_keys(&:to_s)
+    def self.of *args
+      invoke_static "of", *args
     end
 
     # Retrieve binder keys

data/lib/universa/umi.rb

@@ -260,7 +260,9 @@ module Universa
 
     # convert single argument to UMI value to pass
     def prepare(x)
+      # p [:pre, x]
       if x.respond_to?(:_as_umi_arg)
+        # p ["uniarg"]
         x._as_umi_arg(self)
       else
         case x
@@ -279,13 +281,16 @@ module Universa
           when String
             x.encoding == Encoding::BINARY ? {__type: 'binary', base64: Base64.encode64(x)} : x
           when Ref
+            # p [:ref]
             x._as_umi_arg(self)
           when RemoteAdapter
+            # p [:ra, x.__getobj__._as_umi_arg(self)]
             # this need special treatment with direct call:
             x.__getobj__._as_umi_arg(self)
           when Hash
+            # p [:hash]
             result = {}
-            x.each { |k,v| result[k] = prepare(v)}
+            x.each {|k, v| result[k] = prepare(v)}
             result
           else
             x
@@ -296,7 +301,7 @@ module Universa
     # Convert remote call result from UMI structures to ruby types
     def encode_result value
       case value
-        when Hashie::Mash
+        when Hash
           type = value.__type
           case type
             when 'RemoteObject';
@@ -306,7 +311,8 @@ module Universa
             when 'unixtime';
               Time.at(value.seconds)
             else
-              value
+              # Deep hash conversion
+              value.transform_values! {|v| encode_result(v)}
           end
         when Hashie::Array
           value.map {|x| encode_result x}

data/lib/universa/version.rb

@@ -1,4 +1,4 @@
 module Universa
   # Current gem version
-  VERSION = "3.9.14.4"
+  VERSION = "3.9.14.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: universa
 version: !ruby/object:Gem::Version
-  version: 3.9.14.4
+  version: 3.9.14.5
 platform: ruby
 authors:
 - sergeych
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-25 00:00:00.000000000 Z
+date: 2019-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: farcall
@@ -139,7 +139,7 @@ files:
 - bin/umi/lib/com.icodici.common_tools-3.9.14.jar
 - bin/umi/lib/com.icodici.crypto-3.9.14.jar
 - bin/umi/lib/com.icodici.nanohttpd-2.1.0.jar
-- bin/umi/lib/com.icodici.umi-0.8.35.jar
+- bin/umi/lib/com.icodici.umi-0.8.36.jar
 - bin/umi/lib/com.icodici.universa_core-3.9.14.jar
 - bin/umi/lib/com.madgag.spongycastle.core-1.58.0.0.jar
 - bin/umi/lib/com.squareup.jnagmp.jnagmp-2.0.0.jar