isomorfeus-puppetmaster 0.6.7 → 0.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46ff4eaf02824e175aaa2658203eb3705930c58fb8f94856fab4e966d63b5c38
-  data.tar.gz: 61a1ce159e72d7418a3de7236a174277ee5317a60d6a4cc034dadaba6dcce782
+  metadata.gz: 5331b7d59ce9feee46bef56dc68b74321621bee8b3a5c365dd1bf318961c7a68
+  data.tar.gz: 62771a39c950b9048e58328a1907fb896755637c6c69cdc279de5890a0e03834
 SHA512:
-  metadata.gz: feeada02b02c1be3a73a1bc6f308625653570191fde1ba0b23cc2d3f7c1470d0f4202a9f177a30baecdbf08d9b77a8b568b2d6b88d07d494a851eef215056ed3
-  data.tar.gz: 34cabff359aa0eb2dc14c0d95215c06b60b94a044c266400301a9df3f53167158f7fe0ba8fbf8a901d72a350c2162d3962badd6d737473093175e7a11e63d08c
+  metadata.gz: 63c7d55dfc9841cf556e956d4cceb65ec3f6ebeeb59b7eace2757ffa6e1841ebb5e8eab6e72b7a723feb492816d72aa1eeabaa42bd4f8ed1471fa495bb9f9c44
+  data.tar.gz: d73ae372918c9b65d94085d0fbaa007ac5b249505b76c04924a1f4936639a9db0624371b0cde38f13e8542213349e30f8675ffd59b9d8cc88b1c241d98ee9f70

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/server/executor_middleware.rb

@@ -23,7 +23,7 @@ module Isomorfeus
                                              'Content-Type' => 'application/json')
               else
                 begin
-                  result = TOPLEVEL_BINDING.eval('self').instance_eval(request_hash['code']) if request_hash['code']
+                  result = TOPLEVEL_BINDING.eval(request_hash['code']) if request_hash['code']
                   response = Rack::Response.new(Oj.dump({ 'result' => result }),
                                                 200,
                                                 'Content-Type' => 'application/json')

data/lib/isomorfeus/puppetmaster/version.rb

@@ -1,3 +1,3 @@
 module Isomorfeus
-  PUPPETMASTER_VERSION = '0.6.7'
+  PUPPETMASTER_VERSION = '0.6.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-puppetmaster
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.10
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-18 00:00:00.000000000 Z
+date: 2022-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.2
+        version: 7.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.2
+        version: 7.0.3
 - !ruby/object:Gem::Dependency
   name: method_source
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.13.11
+        version: 3.13.19
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.13.11
+        version: 3.13.19
 - !ruby/object:Gem::Dependency
   name: opal
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.40.5
+        version: 0.41.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.40.5
+        version: 0.41.0
 - !ruby/object:Gem::Dependency
   name: tty-which
   requirement: !ruby/object:Gem::Requirement
@@ -120,14 +120,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.6.5
 - !ruby/object:Gem::Dependency
   name: chunky_png
   requirement: !ruby/object:Gem::Requirement
@@ -162,14 +162,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.49
+        version: 0.7.50
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.49
+        version: 0.7.50
 - !ruby/object:Gem::Dependency
   name: irb
   requirement: !ruby/object:Gem::Requirement
@@ -190,14 +190,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.4
+        version: 1.13.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.4
+        version: 1.13.8
 - !ruby/object:Gem::Dependency
   name: opal-browser
   requirement: !ruby/object:Gem::Requirement
@@ -230,16 +230,16 @@ dependencies:
   name: pdf-reader
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.2
+        version: 2.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.2
+        version: 2.10.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -274,28 +274,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.55.0
+        version: 3.58.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.55.0
+        version: 3.58.0
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.10
+        version: 2.0.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.10
+        version: 2.0.11
 description: Acceptance testing for isomorfeus.
 email: jan@kursator.de
 executables: []