isomorfeus-puppetmaster 0.6.8 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a818662d531a1ac2b26ca8aa6e0ce6abb4d9b6c7f89b30f38388cf84a09103d
-  data.tar.gz: 59116b39e62ab2563eea74417a746cb495dc8a5c4bce4be6ee0a75176f24c039
+  metadata.gz: 3df3255c6f71d1809d47fd8c2a8df5a6ba722d7f2cde9f843e23f951a95c1c62
+  data.tar.gz: 6ce553af5784b0e599644bdb297eb2e880b62cfbe4a354c446ff253f6bb9b148
 SHA512:
-  metadata.gz: 6d9aed5578705db190c682f3fe0430386311e886d80f5924c659d168b736ded119b1b207692804e1f7b0153d7c8a9641568ed0c5328c6646c04172fe465509c8
-  data.tar.gz: 911913061aefa31c849cb321135912e9d075c1bd081c9a5e64142bf2b31a367fcdddc1b3ec565f13960c484c6ac5fe17d3a9d990667c8ec92491bd179e040da0
+  metadata.gz: 41747894a43d16c6a3b3032f7a5d64bc53f3f7ec1798c74a19a69a5f32ab43ddd5f5ff788c30613667b5baa38f9a8d47fc2b69d0480bdd649c67ca500e705a84
+  data.tar.gz: dc6bdad6e34ae3db50fc82b13ce7896b1ea619780e0cffd97d816d102be16b7a710045e7ce7a597e93743360debe784ec2577089fb55978f33393790c730d2cc

data/lib/isomorfeus/puppeteer/execution_context.rb

@@ -2,7 +2,17 @@ class Puppeteer::ExecutionContext
   def eval_ruby(ruby_source = '', &block)
     ruby_source = Isomorfeus::Puppetmaster.block_source_code(&block) if block_given?
     compiled_ruby = Isomorfeus::Puppetmaster.compile_ruby_source(ruby_source)
-    res = evaluate "function(){ try { return #{compiled_ruby} } catch (e) { return { error: e.name, message: e.message, stack: e.stack }; }}"
+    res = evaluate <<~JAVASCRIPT
+      function(){
+        let fun = function() {
+          try { return #{compiled_ruby} }
+          catch (e) { return { error: e.name, message: e.message, stack: e.stack }; }
+        }
+        let res = fun();
+        if (res && res.$to_n) { res = res.$to_n() }
+        return (res == Opal.nil) ? null : res;
+      }
+    JAVASCRIPT
     if res.is_a?(Hash) && res.key?('error') && res.key?('message') && res.key?('stack')
       e = RuntimeError.new("#{res['error']}: #{res['message']}")
       e.set_backtrace(res['stack'].lines)
@@ -16,11 +26,16 @@ class Puppeteer::ExecutionContext
     compiled_ruby = Isomorfeus::Puppetmaster.compile_ruby_source(ruby_source)
     res = evaluate <<~JAVASCRIPT
       function(){
-        if (typeof Opal === "undefined") {
-          #{Isomorfeus::Puppetmaster.opal_prelude}
+        let fun = function(){
+          if (typeof Opal === "undefined") {
+            #{Isomorfeus::Puppetmaster.opal_prelude}
+          }
+          try { return #{compiled_ruby} }
+          catch (e) { return { error: e.name, message: e.message, stack: e.stack }; }
         }
-        try { return #{compiled_ruby} }
-        catch (e) { return { error: e.name, message: e.message, stack: e.stack }; }
+        let res = fun();
+        if (res && res.$to_n) { res = res.$to_n() }
+        return (res == Opal.nil) ? null : res;
       }
     JAVASCRIPT
     if res.is_a?(Hash) && res.key?('error') && res.key?('message') && res.key?('stack')
@@ -31,7 +46,6 @@ class Puppeteer::ExecutionContext
     res
   end
 
-
   def await_ruby(ruby_source = '', &block)
     ruby_source = Isomorfeus::Puppetmaster.block_source_code(&block) if block_given?
     ruby_source = "#{ruby_source}.then { |result| $promise_result = result; $promise_resolved = true }.fail { |result| $promise_result = result; $promise_resolved = true }"

data/lib/isomorfeus/puppetmaster/version.rb

@@ -1,3 +1,3 @@
 module Isomorfeus
-  PUPPETMASTER_VERSION = '0.6.8'
+  PUPPETMASTER_VERSION = '0.6.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-puppetmaster
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-01 00:00:00.000000000 Z
+date: 2022-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport