isomorfeus-puppetmaster 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b481e8e7cbdaf5306f466442b34746e75b94ae25f0b8c0df4f0f9f1f697ae9d
-  data.tar.gz: '008940290200527c011ec2a629282582943dfb447e0731dfe91c28839844d250'
+  metadata.gz: cd75e7d5e87decf7b2360c99c4f17cd80c3f08fe3366bb5d536c61ed24287289
+  data.tar.gz: 3ac555d46df4ba4e4884ed25f137e6053c55504ce3b8140844d808298690aff1
 SHA512:
-  metadata.gz: 9991f261a20cfc93bed0f58be805beaa0ffd5c6bba33509eac520a334f0ea4efe008005a1b98ef444636785036ecf13ba0bf60a2b2f1282885cdc24b1f3f9e58
-  data.tar.gz: cc1cec085b651ed9611f3dadc3094143d3b73081e7449e00942954bee77f5d43ae9ec5f5cc3baeba16fe61e048c3d91f6066972cfbc85106739404e25644cfd9
+  metadata.gz: 9ad2e07e9036fb54be28d75a2f727a7a088a141eb5961b97ce98c73fa452d9a688029664ae5a7506bd78dbb5a494ba457b6e734cb731fb411b91e7758bdcd733
+  data.tar.gz: 0e6a588c8a19722957e1578b9b4dec0fc5d3222c8dbb6b06c6cd48b1640080589b972d90f7b84864cc83c569fa65265d46a020e555b673c685f01d6b6c376d99

data/README.md

@@ -2,13 +2,14 @@
 
 A framework for acceptance tests or simply running tests in a headless browser. 
 Comes with drivers for chromium headless, firefox and jsdom.
+Allows for writing javascript tests in pure ruby.
 
 ## Chat
 At our [Gitter Isomorfeus Lobby](http://gitter.im/isomorfeus/Lobby) 
 
 ## Running on:
 - [CircleCI](https://circleci.com): [![CircleCI](https://circleci.com/gh/isomorfeus/isomorfeus-puppetmaster/tree/master.svg?style=svg)](https://circleci.com/gh/isomorfeus/isomorfeus-puppetmaster/tree/master)
-- [SemaphoreCI 2.0](https://semaphoreci.com): (no badge yet, and i dont know how to link to public 2.0 repos)
+- [SemaphoreCI 2.0](https://semaphoreci.com): (not yet available)
 - [TravisCI](https://travis-ci.org): [![Build Status](https://travis-ci.org/isomorfeus/isomorfeus-puppetmaster.svg?branch=master)](https://travis-ci.org/isomorfeus/isomorfeus-puppetmaster)
  
 ## Installation
@@ -107,9 +108,28 @@ Both open documents can then be independently interacted with:
 doc.visit('/go')
 doc2.goto('/location')
 ```
+### Documents and Ruby
+
+Ruby can be executed within documents by simply providing a block or a string:
+```ruby
+doc.evaluate_ruby do
+  $document['my_id'].class_names
+end
+
+# or
+
+doc.evaluate_ruby "$document['my_id'].class_names"
+```
+
+The complete API of [opal-browser](https://github.com/opal/opal-browser) is available.
 
 ### Documents and Javascript
 
+Javascript can be be evaluated within documents by simply providing a string:
+```ruby
+doc.evaluate_javascript '1+1' # => 2
+```
+
 #### Executing Javascript
 
 TODO

data/lib/isomorfeus-puppetmaster.rb

@@ -2,7 +2,11 @@ require 'active_support/core_ext/string'
 require 'uri'
 require 'net/http'
 require 'rack'
-
+require 'opal'
+require 'opal-browser'
+require 'unparser'
+require 'method_source'
+require 'securerandom'
 require 'isomorfeus-speednode'
 
 # use execjs speednode for sure, unless something else has been specified
@@ -10,6 +14,8 @@ unless ENV["EXECJS_RUNTIME"]
   ExecJS.runtime = ExecJS::Runtimes::Speednode
 end
 
+# require 'uglifier'
+
 require 'isomorfeus/puppetmaster'
 require 'isomorfeus/puppetmaster/self_forwardable'
 require 'isomorfeus/puppetmaster/errors'
@@ -34,7 +40,7 @@ require 'isomorfeus/puppetmaster/driver/jsdom_document'
 require 'isomorfeus/puppetmaster/driver/jsdom_node'
 require 'isomorfeus/puppetmaster/driver/jsdom'
 require 'isomorfeus/puppetmaster/driver_registration'
-
+require 'isomorfeus/puppetmaster/server/executor_middleware'
 require 'isomorfeus/puppetmaster/server/middleware'
 require 'isomorfeus/puppetmaster/server/checker'
 require 'isomorfeus/puppetmaster/server'

data/lib/isomorfeus/puppetmaster.rb

@@ -2,13 +2,19 @@ module Isomorfeus
   module Puppetmaster
     class << self
       attr_accessor :app, :server_port, :session
-      attr_writer :save_path, :server_host, :server_scheme
+      attr_writer :download_path, :server_host, :server_scheme
       attr_reader :served_app, :server
 
       def boot_app
         @served_app = Isomorfeus::Puppetmaster::Server.new(app, port: server_port, host: server_host).boot
       end
 
+      def block_source_code(&block)
+        source_block = Parser::CurrentRuby.parse(block.source).children.last
+        source_block = source_block.children.last if source_block.type == :block
+        Unparser.unparse(source_block)
+      end
+
       def driver
         @driver ||= :chromium
       end
@@ -22,6 +28,10 @@ module Isomorfeus
         @drivers ||= {}
       end
 
+      def opal_prelude
+        @opal_prelude ||= build_opal_prelude
+      end
+
       def register_driver(name, &block)
         drivers[name.to_sym] = block
       end
@@ -30,8 +40,8 @@ module Isomorfeus
         servers[name.to_sym] = block
       end
 
-      def save_path
-        @save_path ||= Dir.pwd
+      def download_path
+        @download_path ||= Dir.pwd
       end
 
       def server=(name)
@@ -57,6 +67,12 @@ module Isomorfeus
       def servers
         @servers ||= {}
       end
+
+      private
+
+      def build_opal_prelude
+        js = Opal::Builder.new.build_str("require 'opal'\nrequire 'opal-browser'", 'puppetmaster_opal_prelude').to_s
+      end
     end
   end
 end

data/lib/isomorfeus/puppetmaster/document.rb

@@ -69,6 +69,24 @@ module Isomorfeus
         @driver.browser
       end
 
+      def evaluate_ruby(ruby_source = '', &block)
+        ruby_source = Isomorfeus::Puppetmaster.block_source_code(&block) if block_given?
+        compiled_ruby = compile_ruby_source(ruby_source)
+        if compiled_ruby.start_with?('/*')
+          start_of_code = compiled_ruby.index('*/') + 3
+          compiled_ruby = compiled_ruby[start_of_code..-1]
+        end
+        javascript = <<~JAVASCRIPT
+          (function(){
+            if (typeof Opal === "undefined") {
+              #{Isomorfeus::Puppetmaster.opal_prelude}
+            }
+            return #{compiled_ruby}
+          })()
+        JAVASCRIPT
+        evaluate_script(javascript)
+      end
+
       def go_back
         @response = @driver.document_go_back(self)
         self
@@ -105,6 +123,12 @@ module Isomorfeus
         body.has_xpath?(query, options)
       end
 
+      def isomorphic(ruby_source = '', &block)
+        ruby_source = Isomorfeus::Puppetmaster.block_source_code(&block) if block_given?
+        Isomorfeus::Puppetmaster.served_app.on_server(ruby_source)
+        evaluate_ruby(ruby_source)
+      end
+
       def method_missing(name, *args)
         method_name = name.to_s
         if method_name.start_with?('find_by_')
@@ -155,6 +179,13 @@ module Isomorfeus
       #       :assert_no_current_path
       #       assert_title
       #       assert_no_title
+
+      protected
+
+      def compile_ruby_source(source_code)
+        # TODO maybe use compile server
+        Opal.compile(source_code, parse_comments: false)
+      end
     end
   end
 end

data/lib/isomorfeus/puppetmaster/driver/jsdom.rb

@@ -91,12 +91,13 @@ module Isomorfeus
           node_data = await <<~JAVASCRIPT
             var tt = await AllElementHandles[#{frame.handle}].executionContext().evaluate((frame) => {
               node = frame.contentDocument.body;
+              var name = node.nodeName;
               var tag = node.tagName.toLowerCase();
               var type = null;
               if (tag === 'input') { type = node.getAttribute('type'); }
-              return [tag, type];
+              return [name, tag, type];
             }, AllElementHandles[#{frame.handle}]);
-            LastResult = {handle: node_handle, tag: tt[0], type: tt[1]};
+            LastResult = {handle: node_handle, name: tt[0], tag: tt[1], type: tt[2]};
           JAVASCRIPT
           if node_data
             node_data[:css_selector] = 'body'
@@ -116,12 +117,13 @@ module Isomorfeus
           node_data = await <<~JAVASCRIPT
             var tt = await AllElementHandles[#{frame.handle}].executionContext().evaluate((frame) => {
               node = frame.contentDocument.head;
+              var name = node.nodeName;
               var tag = node.tagName.toLowerCase();
               var type = null;
               if (tag === 'input') { type = node.getAttribute('type'); }
-              return [tag, type];
+              return [name, tag, type];
             }, AllElementHandles[#{frame.handle}]);
-            LastResult = {handle: node_handle, tag: tt[0], type: tt[1]};
+            LastResult = {handle: node_handle, name: tt[0], tag: tt[1], type: tt[2]};
           JAVASCRIPT
           if node_data
             node_data[:css_selector] = 'body'

data/lib/isomorfeus/puppetmaster/driver/jsdom_document.rb

@@ -94,8 +94,9 @@ module Isomorfeus
           node_data = @context.exec <<~JAVASCRIPT
             var node = AllDomHandles[#{document.handle}].window.document.body;
             var node_handle = RegisterElementHandle(node);
+            var name = node.nodeName;
             var tag = node.tagName.toLowerCase();
-            return {handle: node_handle, tag: tag, type: null, content_editable: node.isContentEditable};
+            return {handle: node_handle, name: name, tag: tag, type: null, content_editable: node.isContentEditable};
           JAVASCRIPT
           if node_data
             node_data[:css_selector] = 'body'
@@ -282,8 +283,8 @@ module Isomorfeus
         def document_evaluate_script(document, script, *args)
           @context.eval <<~JAVASCRIPT
             AllDomHandles[#{document.handle}].window.eval(
-              `var arguments = #{args};
-              #{script}` 
+              "var arguments = #{ "#{args}".gsub('"', '\"') };" +
+              "#{script.gsub('\\', '\\\\\\').gsub('"', '\"').gsub("\n", "\\n")}"
             )
           JAVASCRIPT
         rescue ExecJS::ProgramError => e
@@ -293,9 +294,9 @@ module Isomorfeus
         def document_execute_script(document, script, *args)
           @context.eval <<~JAVASCRIPT
             AllDomHandles[#{document.handle}].window.eval(
-              `(function() { var arguments = #{args};
-               #{script}
-              })()` 
+              "(function() { var arguments = #{ "#{args}".gsub('"', '\"') };" +
+              "#{script.gsub('\\', '\\\\\\').gsub('"', '\"').gsub("\n", "\\n")}" +
+              "})()" 
             )
           JAVASCRIPT
         rescue ExecJS::ProgramError => e
@@ -308,10 +309,11 @@ module Isomorfeus
             var node = AllDomHandles[#{document.handle}].window.document.querySelector("#{js_escaped_selector}");
             if (node) {
               var node_handle = RegisterElementHandle(node);
-              var tag = node.tagName.toLowerCase();
+              var tag = node.tagName ? node.tagName.toLowerCase() : '';
+              var name = node.nodeName;
               var type = null;
               if (tag === 'input') { type = node.getAttribute('type'); }
-              return {handle: node_handle, tag: tag, type: type, content_editable: node.isContentEditable};
+              return {handle: node_handle, name: name, tag: tag, type: type, content_editable: node.isContentEditable};
             }
           JAVASCRIPT
           if node_data
@@ -331,11 +333,13 @@ module Isomorfeus
             var node_data_array = [];
             if (node_array) {
               for (var i=0; i<node_array.length; i++) {
+                var node = node_array[i];
                 var node_handle = RegisterElementHandle(node_array[i]);
-                var tag = node.tagName.toLowerCase();
+                var tag = node.tagName ? node.tagName.toLowerCase() : '';
+                var name = node.nodeName;
                 var type = null;
                 if (tag === 'input') { type = node.getAttribute('type'); }
-                node_data_array.push({handle: node_handle, tag: tag, type: type, content_editable: node.isContentEditable});
+                node_data_array.push({handle: node_handle, name: name, tag: tag, type: type, content_editable: node.isContentEditable});
               }
             }
             return node_data_array;
@@ -354,12 +358,13 @@ module Isomorfeus
             var xpath_result = document.evaluate("#{js_escaped_query}", document, null, window.XPathResult.ORDERED_NODE_ITERATOR_TYPE, null);
             var node;
             var node_data_array = [];
-            while (node = xpath_result.iterateNext) {
+            while (node = xpath_result.iterateNext()) {
               var node_handle = RegisterElementHandle(node);
-              var tag = node.tagName.toLowerCase();
+              var tag = node.tagName ? node.tagName.toLowerCase() : '';
+              var name = node.nodeName;
               var type = null;
               if (tag === 'input') { type = node.getAttribute('type'); }
-              node_data_array.push({handle: node_handle, tag: tag, type: type, content_editable: node.isContentEditable});
+              node_data_array.push({handle: node_handle, name: name, tag: tag, type: type, content_editable: node.isContentEditable});
             }  
             return node_data_array;
           JAVASCRIPT
@@ -378,10 +383,11 @@ module Isomorfeus
             var node = xpath_result.singleNodeValue;
             if (node) {
               var node_handle = RegisterElementHandle(node);
-              var tag = node.tagName.toLowerCase();
+              var tag = node.tagName ? node.tagName.toLowerCase() : '';
+              var name = node.nodeName;
               var type = null;
               if (tag === 'input') { type = node.getAttribute('type'); }
-              return {handle: node_handle, tag: tag, type: type, content_editable: node.isContentEditable};
+              return {handle: node_handle, name: name, tag: tag, type: type, content_editable: node.isContentEditable};
             }
           JAVASCRIPT
           if node_data
@@ -467,8 +473,9 @@ module Isomorfeus
           node_data = @context.exec <<~JAVASCRIPT
             var node = AllDomHandles[#{document.handle}].window.document.head;
             var node_handle = RegisterElementHandle(node);
+            var name = node.nodeName;
             var tag = node.tagName.toLowerCase();
-            return {handle: node_handle, tag: tag, type: null, content_editable: node.isContentEditable};
+            return {handle: node_handle, name: name, tag: tag, type: null, content_editable: node.isContentEditable};
           JAVASCRIPT
           if node_data
             node_data[:css_selector] = 'body'
@@ -855,10 +862,11 @@ module Isomorfeus
               node = AllDomHandles[#{document.handle}].window.document.querySelector("#{js_escaped_selector}");
               if (node) {
                 var node_handle = RegisterElementHandle(node);
+                var name = node.nodeName;
                 var tag = node.tagName.toLowerCase();
                 var type = null;
                 if (tag === 'input') { type = node.getAttribute('type'); }
-                LastResult = {handle: node_handle, tag: tag, type: type, content_editable: node.isContentEditable};
+                LastResult = {handle: node_handle, name: name, tag: tag, type: type, content_editable: node.isContentEditable};
                 resolve(true);
               }
               else if ((new Date() - start_time) > #{@jsdom_timeout}) { resolve(true); }
@@ -885,10 +893,11 @@ module Isomorfeus
               node = xpath_result.singleNodeValue;
               if (node) {
                 var node_handle = RegisterElementHandle(node);
+                var name = node.nodeName;
                 var tag = node.tagName.toLowerCase();
                 var type = null;
                 if (tag === 'input') { type = node.getAttribute('type'); }
-                LastResult = {handle: node_handle, tag: tag, type: type, content_editable: node.isContentEditable};
+                LastResult = {handle: node_handle, name: name, tag: tag, type: type, content_editable: node.isContentEditable};
                 resolve(true);
               }
               else if ((new Date() - start_time) > #{@jsdom_timeout}) { resolve(true); }

data/lib/isomorfeus/puppetmaster/driver/jsdom_node.rb

@@ -228,7 +228,7 @@ module Isomorfeus
         end
 
         def node_execute_script(node, script, *args)
-          # TODO
+          # TODO this wont work yet
           await <<~JAVASCRIPT
             var node_handle = #{node.handle};
             await AllElementHandles[node_handle].executionContext().evaluateHandle((node, arguments) => {
@@ -239,7 +239,7 @@ module Isomorfeus
         end
 
         def node_evaluate_script(node, script, *args)
-          # TODO
+          # TODO this wont work yet
           await <<~JAVASCRIPT
             var node_handle = #{node.handle};
             await AllElementHandles[node_handle].executionContext().evaluateHandle((node, arguments) => {
@@ -256,10 +256,11 @@ module Isomorfeus
             var node = AllElementHandles[#{node.handle}].querySelector("#{js_escaped_selector}");
             if (node) {
               var node_handle = RegisterElementHandle(node);
+              var name = node.nodeName;
               var tag = node.tagName.toLowerCase();
               var type = null;
               if (tag === 'input') { type = node.getAttribute('type'); }
-              return {handle: node_handle, tag: tag, type: type, content_editable: node.isContentEditable};
+              return {handle: node_handle, name: name, tag: tag, type: type, content_editable: node.isContentEditable};
             }
           JAVASCRIPT
           if node_data
@@ -280,10 +281,11 @@ module Isomorfeus
             if (node_array) {
               for (var i=0; i<node_array.length; i++) {
                 var node_handle = RegisterElementHandle(node_array[i]);
+                var name = node_array[i].nodeName;
                 var tag = node_array[i].tagName.toLowerCase();
                 var type = null;
                 if (tag === 'input') { type = node_array[i].getAttribute('type'); }
-                node_data_array.push({handle: node_handle, tag: tag, type: type, content_editable: node_array[i].isContentEditable});
+                node_data_array.push({handle: node_handle, name: name, tag: tag, type: type, content_editable: node_array[i].isContentEditable});
               }
             }
             return node_data_array;
@@ -302,12 +304,13 @@ module Isomorfeus
             var xpath_result = document.evaluate("#{js_escaped_query}", AllElementHandles[#{node.handle}], null, window.XPathResult.ORDERED_NODE_ITERATOR_TYPE, null);
             var node;
             var node_data_array = [];
-            while (node = xpath_result.iterateNext) {
+            while (node = xpath_result.iterateNext()) {
               var node_handle = RegisterElementHandle(node);
+              var name = node.nodeName;
               var tag = node.tagName.toLowerCase();
               var type = null;
               if (tag === 'input') { type = node.getAttribute('type'); }
-              node_data_array.push({handle: node_handle, tag: tag, type: type, content_editable: node.isContentEditable});
+              node_data_array.push({handle: node_handle, name: name, tag: tag, type: type, content_editable: node.isContentEditable});
             }  
             return node_data_array;
           JAVASCRIPT
@@ -326,10 +329,11 @@ module Isomorfeus
             var node = xpath_result.singleNodeValue;
             if (node) {
               var node_handle = RegisterElementHandle(node);
+              var name = node.nodeName;
               var tag = node.tagName.toLowerCase();
               var type = null;
               if (tag === 'input') { type = node.getAttribute('type'); }
-              return {handle: node_handle, tag: tag, type: type, content_editable: node.isContentEditable};
+              return {handle: node_handle, name: name, tag: tag, type: type, content_editable: node.isContentEditable};
             }
           JAVASCRIPT
           if node_data
@@ -784,10 +788,11 @@ module Isomorfeus
               var node = AllElementHandles[#{node.handle}].querySelector("#{js_escaped_selector}");
               if (node) {
                 var node_handle = RegisterElementHandle(node);
+                var name = node.nodeName;
                 var tag = node.tagName.toLowerCase();
                 var type = null;
                 if (tag === 'input') { type = node.getAttribute('type'); }
-                LastResult = {handle: node_handle, tag: tag, type: type, content_editable: node.isContentEditable};
+                LastResult = {handle: node_handle, name: name, tag: tag, type: type, content_editable: node.isContentEditable};
                 resolve(true);
               }
               else if ((new Date() - start_time) > #{@jsdom_timeout}) { resolve(true); }
@@ -813,10 +818,11 @@ module Isomorfeus
               var node = xpath_result.singleNodeValue;
               if (node) {
                 var node_handle = RegisterElementHandle(node);
+                var name = node.nodeName;
                 var tag = node.tagName.toLowerCase();
                 var type = null;
                 if (tag === 'input') { type = node.getAttribute('type'); }
-                LastResult = {handle: node_handle, tag: tag, type: type, content_editable: node.isContentEditable};
+                LastResult = {handle: node_handle, name: name, tag: tag, type: type, content_editable: node.isContentEditable};
                 resolve(true);
               }
               else if ((new Date() - start_time) > #{@jsdom_timeout}) { resolve(true); }

data/lib/isomorfeus/puppetmaster/driver/puppeteer.rb

@@ -102,12 +102,13 @@ module Isomorfeus
           node_data = await <<~JAVASCRIPT
             var tt = await AllElementHandles[#{frame.handle}].executionContext().evaluate((frame) => {
               node = frame.contentDocument.body;
+              var name = node.nodeName;
               var tag = node.tagName.toLowerCase();
               var type = null;
               if (tag === 'input') { type = node.getAttribute('type'); }
-              return [tag, type];
+              return [name, tag, type];
             }, AllElementHandles[#{frame.handle}]);
-            LastResult = {handle: node_handle, tag: tt[0], type: tt[1]};
+            LastResult = {handle: node_handle, name: tt[0], tag: tt[1], type: tt[2]};
           JAVASCRIPT
           if node_data
             node_data[:css_selector] = 'body'
@@ -127,12 +128,13 @@ module Isomorfeus
           node_data = await <<~JAVASCRIPT
             var tt = await AllElementHandles[#{frame.handle}].executionContext().evaluate((frame) => {
               node = frame.contentDocument.head;
+              var name = node.nodeName;
               var tag = node.tagName.toLowerCase();
               var type = null;
               if (tag === 'input') { type = node.getAttribute('type'); }
-              return [tag, type];
+              return [name, tag, type];
             }, AllElementHandles[#{frame.handle}]);
-            LastResult = {handle: node_handle, tag: tt[0], type: tt[1]};
+            LastResult = {handle: node_handle, name: tt[0], tag: tt[1], type: tt[2]};
           JAVASCRIPT
           if node_data
             node_data[:css_selector] = 'body'
@@ -371,7 +373,7 @@ module Isomorfeus
                 if (!(BrowserType === 'firefox')) {
                   var target = page.target();
                   var cdp_session = await target.createCDPSession();
-                  await cdp_session.send('Page.setDownloadBehavior', {behavior: 'allow', downloadPath: '#{Isomorfeus::Puppetmaster.save_path}'});
+                  await cdp_session.send('Page.setDownloadBehavior', {behavior: 'allow', downloadPath: '#{Isomorfeus::Puppetmaster.download_path}'});
                   if (#{@url_blacklist}.length > 0) { await cdp_session.send('Network.setBlockedURLs', {urls: #{@url_blacklist}}); }
                   await cdp_session.detach();
                 }

data/lib/isomorfeus/puppetmaster/driver/puppeteer_document.rb

@@ -92,10 +92,11 @@ module Isomorfeus
             if (element_handle) {
               var node_handle = RegisterElementHandle(element_handle);
               var tt = await AllElementHandles[node_handle].executionContext().evaluate((node) => {
+                var name = node.nodeName;
                 var tag = node.tagName.toLowerCase();
-                return [tag, null, node.isContentEditable];
+                return [name, tag, null, node.isContentEditable];
               }, AllElementHandles[node_handle]);
-              LastResult = {handle: node_handle, tag: tt[0], type: tt[1], content_editable: tt[2]};
+              LastResult = {handle: node_handle, name: tt[0], tag: tt[1], type: tt[2], content_editable: tt[3]};
             }
           JAVASCRIPT
           if node_data
@@ -342,12 +343,13 @@ module Isomorfeus
             if (element_handle) {
               var node_handle = RegisterElementHandle(element_handle);
               var tt = await AllPageHandles[#{document.handle}].evaluate((node) => {
-                var tag = node.tagName.toLowerCase();
+                var tag = node.tagName ? node.tagName.toLowerCase() : '';
+                var name = node.nodeName;
                 var type = null;
                 if (tag === 'input') { type = node.getAttribute('type'); }
-                return [tag, type, node.isContentEditable];
+                return [name, tag, type, node.isContentEditable];
               }, AllElementHandles[node_handle]);
-              LastResult = {handle: node_handle, tag: tt[0], type: tt[1], content_editable: tt[2]};
+              LastResult = {handle: node_handle, name: tt[0], tag: tt[1], type: tt[2], content_editable: tt[3]};
             }
           JAVASCRIPT
           if node_data
@@ -367,12 +369,13 @@ module Isomorfeus
               for (var i=0; i<element_handle_array.length; i++) {
                 var node_handle = RegisterElementHandle(element_handle_array[i]);
                 var tt = await AllPageHandles[#{document.handle}].evaluate((node) => {
-                  var tag = node.tagName.toLowerCase();
+                  var tag = node.tagName ? node.tagName.toLowerCase() : '';
+                  var name = node.nodeName;
                   var type = null;
                   if (tag === 'input') { type = node.getAttribute('type'); }
-                  return [tag, type, node.isContentEditable];
+                  return [name, tag, type, node.isContentEditable];
                 }, AllElementHandles[node_handle]);
-                node_data_array.push({handle: node_handle, tag: tt[0], type: tt[1], content_editable: tt[2]});
+                node_data_array.push({handle: node_handle, name: tt[0], tag: tt[1], type: tt[2], content_editable: tt[3]});
               }  
             }
             LastResult = node_data_array;
@@ -392,12 +395,13 @@ module Isomorfeus
               for (var i=0; i<element_handle_array.length; i++) {
                 var node_handle = RegisterElementHandle(element_handle_array[i]);
                 var tt = await AllPageHandles[#{document.handle}].evaluate((node) => {
-                  var tag = node.tagName.toLowerCase();
+                  var tag = node.tagName ? node.tagName.toLowerCase() : '';
+                  var name = node.nodeName;
                   var type = null;
                   if (tag === 'input') { type = node.getAttribute('type'); }
-                  return [tag, type, node.isContentEditable];
+                  return [name, tag, type, node.isContentEditable];
                 }, AllElementHandles[node_handle]);
-                node_data_array.push({handle: node_handle, tag: tt[0], type: tt[1], content_editable: tt[2]});
+                node_data_array.push({handle: node_handle, name: tt[0], tag: tt[1], type: tt[2], content_editable: tt[3]});
               }
             }
             LastResult = node_data_array;
@@ -416,12 +420,13 @@ module Isomorfeus
             if (element_handle) {
               var node_handle = RegisterElementHandle(element_handle);
               var tt = await AllPageHandles[#{document.handle}].evaluate((node) => {
-                var tag = node.tagName.toLowerCase();
+                var tag = node.tagName ? node.tagName.toLowerCase() : '';
+                var name = node.nodeName;
                 var type = null;
                 if (tag === 'input') { type = node.getAttribute('type'); }
-                return [tag, type, node.isContentEditable];
+                return [name, tag, type, node.isContentEditable];
               }, AllElementHandles[node_handle]);
-              LastResult = {handle: node_handle, tag: tt[0], type: tt[1], content_editable: tt[2]};
+              LastResult = {handle: node_handle, name: tt[0], tag: tt[1], type: tt[2], content_editable: tt[3]};
             }
           JAVASCRIPT
           if node_data
@@ -553,10 +558,11 @@ module Isomorfeus
             if (element_handle) {
               var node_handle = RegisterElementHandle(element_handle);
               var tt = await AllElementHandles[node_handle].executionContext().evaluate((node) => {
+                var name = node.nodeName;
                 var tag = node.tagName.toLower();
-                return [tag, null, node.isContentEditable];
+                return [name, tag, null, node.isContentEditable];
               }, AllElementHandles[node_handle]);
-              LastResult = {handle: node_handle, tag: tt[0], type: tt[1], content_editable: tt[2]};
+              LastResult = {handle: node_handle, name: tt[0], tag: tt[1], type: tt[2], content_editable: tt[3]};
             }
           JAVASCRIPT
           if node_data
@@ -586,7 +592,7 @@ module Isomorfeus
             if (!(BrowserType === 'firefox')) {
               var new_target = new_page.target();
               var cdp_session = await new_target.createCDPSession();
-              await cdp_session.send('Page.setDownloadBehavior', {behavior: 'allow', downloadPath: '#{Isomorfeus::Puppetmaster.save_path}'});
+              await cdp_session.send('Page.setDownloadBehavior', {behavior: 'allow', downloadPath: '#{Isomorfeus::Puppetmaster.download_path}'});
               if (#{@url_blacklist}.length > 0) { await cdp_session.send('Network.setBlockedURLs', {urls: #{@url_blacklist}}); }
               await cdp_session.detach();
             }
@@ -900,12 +906,13 @@ module Isomorfeus
             if (element_handle) {
               var node_handle = RegisterElementHandle(element_handle);
               var tt = await AllElementHandles[node_handle].executionContext().evaluate((node) => {
+                var name = node.nodeName;
                 var tag = node.tagName.toLowerCase();
                 var type = null;
                 if (tag === 'input') { type = node.getAttribute('type'); }
-                return [tag, type, node.isContentEditable];
+                return [name, tag, type, node.isContentEditable];
               }, AllElementHandles[node_handle]);
-              LastResult = {handle: node_handle, tag: tt[0], type: tt[1], content_editable: tt[2]};
+              LastResult = {handle: node_handle, name: tt[0], tag: tt[1], type: tt[2], content_editable: tt[3]};
             }
           JAVASCRIPT
           if node_data
@@ -923,12 +930,13 @@ module Isomorfeus
             if (element_handle) {
               var node_handle = RegisterElementHandle(element_handle);
               var tt = await AllElementHandles[node_handle].executionContext().evaluate((node) => {
+                var name = node.nodeName;
                 var tag = node.tagName.toLowerCase();
                 var type = null;
                 if (tag === 'input') { type = node.getAttribute('type'); }
-                return [tag, type, node.isContentEditable];
+                return [name, tag, type, node.isContentEditable];
               }, AllElementHandles[node_handle]);
-              LastResult = {handle: node_handle, tag: tt[0], type: tt[1], content_editable: tt[2]};
+              LastResult = {handle: node_handle, name: tt[0], tag: tt[1], type: tt[2], content_editable: tt[3]};
             }
           JAVASCRIPT
           if node_data

data/lib/isomorfeus/puppetmaster/driver/puppeteer_node.rb

@@ -312,12 +312,13 @@ module Isomorfeus
               if (element_handle) {
               var node_handle = RegisterElementHandle(element_handle);
               var tt = await AllElementHandles[node_handle].executionContext().evaluate((node) => {
+                var name = node.nodeName;
                 var tag = node.tagName.toLowerCase();
                 var type = null;
                 if (tag === 'input') { type = node.getAttribute('type'); }
-                return [tag, type, node.isContentEditable];
+                return [name, tag, type, node.isContentEditable];
               }, AllElementHandles[node_handle]);
-              LastResult = {handle: node_handle, tag: tt[0], type: tt[1], content_editable: tt[2]};
+              LastResult = {handle: node_handle, name: tt[0], tag: tt[1], type: tt[2], content_editable: tt[3]};
             }
           JAVASCRIPT
           if node_data
@@ -338,12 +339,13 @@ module Isomorfeus
               for (var i=0; i<element_handle_array.length; i++) {
                 var node_handle = RegisterElementHandle(element_handle_array[i]);
                 var tt = await AllElementHandles[node_handle].executionContext().evaluate((node) => {
+                  var name = node.nodeName;
                   var tag = node.tagName.toLowerCase();
                   var type = null;
                   if (tag === 'input') { type = node.getAttribute('type'); }
-                  return [tag, type, node.isContentEditable];
+                  return [name, tag, type, node.isContentEditable];
                 }, AllElementHandles[node_handle]);
-                node_data_array.push({handle: node_handle, tag: tt[0], type: tt[1], content_editable: tt[2]});
+                node_data_array.push({handle: node_handle, name: tt[0], tag: tt[1], type: tt[2], content_editable: tt[3]});
               }
             }
             LastResult = node_data_array;
@@ -363,12 +365,13 @@ module Isomorfeus
               for (var i=0; i<element_handle_array.length; i++) {
                 var node_handle = RegisterElementHandle(element_handle_array[i]);
                 var tt = await AllElementHandles[node_handle].executionContext().evaluate((node) => {
+                  var name = node.nodeName;
                   var tag = node.tagName.toLowerCase();
                   var type = null;
                   if (tag === 'input') { type = node.getAttribute('type'); }
-                  return [tag, type, node.isContentEditable];
+                  return [name, tag, type, node.isContentEditable];
                 }, AllElementHandles[node_handle]);
-                node_data_array.push({handle: node_handle, tag: tt[0], type: tt[1], content_editable: tt[2]});
+                node_data_array.push({handle: node_handle, name: tt[0], tag: tt[1], type: tt[2], content_editable: tt[3]});
               }  
             }
             LastResult = node_data_array;
@@ -387,12 +390,13 @@ module Isomorfeus
             if (element_handle) {
               var node_handle = RegisterElementHandle(element_handle);
               var tt = await AllElementHandles[node_handle].executionContext().evaluate((node) => {
+                var name = node.nodeName;
                 var tag = node.tagName.toLowerCase();
                 var type = null;
                 if (tag === 'input') { type = node.getAttribute('type'); }
-                return [tag, type, node.isContentEditable];
+                return [name, tag, type, node.isContentEditable];
               }, AllElementHandles[node_handle]);
-              LastResult = {handle: node_handle, tag: tt[0], type: tt[1], content_editable: tt[2]};
+              LastResult = {handle: node_handle, name: tt[0], tag: tt[1], type: tt[2], content_editable: tt[3]};
             }
           JAVASCRIPT
           if node_data
@@ -822,13 +826,14 @@ module Isomorfeus
             if (element_handle) {
               var node_handle = RegisterElementHandle(element_handle);
               var handle = await AllElementHandles[node_handle].evaluate((node) => {
+                var name = node.nodeName;
                 var tag = node.tagName.toLower();
                 var type = null;
                 if (tag === 'input') { type = node.getAttribute('type'); }
-                return [tag, type];
+                return [name, tag, type, node.isContentEditable];
               }, AllElementHandles[node_handle]);
               var tt = await handle.jsonValue();
-              LastResult = {handle: node_handle, tag: tt[0], type: tt[1]};
+              LastResult = {handle: node_handle, name: tt[0], tag: tt[1], type: tt[2], content_editable: tt[3]};
             }
           JAVASCRIPT
           if node_data
@@ -846,13 +851,14 @@ module Isomorfeus
             if (element_handle) {
               var node_handle = RegisterElementHandle(element_handle);
               var handle = await AllElementHandles[node_handle].evaluate((node) => {
+                var name = node.nodeName;
                 var tag = node.tagName.toLower();
                 var type = null;
                 if (tag === 'input') { type = node.getAttribute('type'); }
-                return [tag, type];
+                return [name, tag, type, node.isContentEditable];
               }, AllElementHandles[node_handle]);
               var tt = await handle.jsonValue();
-              LastResult = {handle: node_handle, tag: tt[0], type: tt[1]};
+              LastResult = {handle: node_handle, name: tt[0], tag: tt[1], type: tt[2], content_editable: tt[3]};
             }
           JAVASCRIPT
           if node_data

data/lib/isomorfeus/puppetmaster/dsl.rb

@@ -1,13 +1,24 @@
 module Isomorfeus
   module Puppetmaster
     module DSL
+      def default_document
+        @puppetmaster_default_document ||= get_default_document
+      end
+
       def goto(uri)
-        puppetmaster_session.document_goto(puppetmaster_default_document, uri)
+        puppetmaster_session.document_goto(default_document, uri)
         @puppetmaster_default_document
       end
-
       alias_method :visit, :goto
 
+      def on_server(ruby_source = '', &block)
+        Isomorfeus::Puppetmaster.served_app.on_server(ruby_source, &block)
+      end
+
+      def open_new_session(app = nil, driver = nil)
+        Isomorfeus::Puppetmaster.drivers[driver ? driver : Isomorfeus::Puppetmaster.driver].call(app ? app : Isomorfeus::Puppetmaster.served_app)
+      end
+
       def open_new_document(uri = nil)
         puppetmaster_session.document_open_new_document(uri)
       end
@@ -24,17 +35,10 @@ module Isomorfeus
         puppetmaster_session.document_open_new_document('about:blank')
       end
 
-      def puppetmaster_default_document
-        @puppetmaster_default_document ||= get_default_document
-      end
-
       def puppetmaster_session
-        @@puppetmaster_session ||= new_session(Isomorfeus::Puppetmaster.served_app)
+        @@puppetmaster_session ||= open_new_session(Isomorfeus::Puppetmaster.served_app)
       end
 
-      def new_session(app = nil, driver = nil)
-        Isomorfeus::Puppetmaster.drivers[driver ? driver : Isomorfeus::Puppetmaster.driver].call(app ? app : Isomorfeus::Puppetmaster.served_app)
-      end
     end
   end
 end

data/lib/isomorfeus/puppetmaster/node.rb

@@ -84,7 +84,7 @@ module Isomorfeus
         wait_for_xpath
       ]
 
-      attr_reader :document, :handle, :css_selector, :tag, :xpath_query
+      attr_reader :document, :handle, :css_selector, :name, :tag, :xpath_query
 
       SUPPORTED_HTML_ELEMENTS.each do |element|
         is_name = element == 'a' ? :is_link? : "is_#{element}?".to_sym
@@ -123,6 +123,7 @@ module Isomorfeus
         @document = document
         @driver = driver
         @handle = node_data[:handle] || node_data['handle']
+        @name = node_data[:name] || node_data['name']
         @tag = node_data[:tag] || node_data['tag']
         @type = node_data[:type] || node_data['type']
         @xpath_query = node_data[:xpath_query] || node_data['xpath_query']
@@ -137,6 +138,24 @@ module Isomorfeus
         @driver.node_equal(self, other)
       end
 
+      def evaluate_ruby(ruby_source = '', &block)
+        ruby_source = Isomorfeus::Puppetmaster.block_source_code(&block) if block_given?
+        compiled_ruby = compile_ruby_source(ruby_source)
+        if compiled_ruby.start_with?('/*')
+          start_of_code = compiled_ruby.index('*/') + 3
+          compiled_ruby = compiled_ruby[start_of_code..-1]
+        end
+        javascript = <<~JAVASCRIPT
+          (function(){
+            if (typeof Opal === "undefined") {
+              #{Isomorfeus::Puppetmaster.opal_prelude}
+            }
+            return #{compiled_ruby}
+          })()
+        JAVASCRIPT
+        evaluate_script(javascript)
+      end
+
       def get_attribute(attribute)
         attribute = attribute.to_s
         if !(attribute.start_with?('aria-') || attribute.start_with?('data-'))
@@ -236,6 +255,13 @@ module Isomorfeus
       #       :assert_none_of_selectors,
       #       :assert_no_text,
       #       :refute_selector
+
+      protected
+
+      def compile_ruby_source(source_code)
+        # TODO maybe use compile server
+        Opal.compile(source_code, parse_comments: false)
+      end
     end
   end
 end

data/lib/isomorfeus/puppetmaster/server.rb

@@ -40,6 +40,12 @@ module Isomorfeus
                      extra_middleware: [])
         @app = app
         @extra_middleware = extra_middleware
+        @request_key = Isomorfeus::Puppetmaster::Server::ExecutorMiddleware.class_variable_get(:@@request_key)
+        unless @request_key
+          @request_key = SecureRandom.alphanumeric(128)
+          Isomorfeus::Puppetmaster::Server::ExecutorMiddleware.class_variable_set(:@@request_key, @request_key)
+        end
+        @extra_middleware << Isomorfeus::Puppetmaster::Server::ExecutorMiddleware
         @server_thread = nil # suppress warnings
         @host = host
         @port = port
@@ -56,6 +62,25 @@ module Isomorfeus
         middleware.error
       end
 
+      def on_server(ruby_source = '', &block)
+        ruby_source = Isomorfeus::Puppetmaster.block_source_code(&block) if block_given?
+        request_hash = { 'key' => @request_key, 'code' => ruby_source }
+        response = if using_ssl?
+          http = Net::HTTP.start(@host, @port, { use_ssl: true, verify_mode: OpenSSL::SSL::VERIFY_NONE })
+          http.post('/__executor__', Oj.dump(request_hash, {}))
+        else
+          http = Net::HTTP.start(@host, @port)
+          http.post('/__executor__', Oj.dump(request_hash, {}))
+        end
+        if response.code == '200'
+          result_hash = Oj.load(response.body, {})
+          raise result_hash['error'] if result_hash.has_key?('error')
+          result_hash['result']
+        else
+          raise 'A error occured.'
+        end
+      end
+
       def using_ssl?
         @checker.ssl?
       end

data/lib/isomorfeus/puppetmaster/server/executor_middleware.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Isomorfeus
+  module Puppetmaster
+    class Server
+      class ExecutorMiddleware
+        @@request_key = nil
+
+        def initialize(app)
+          raise '@@request_key not set!' unless @@request_key
+          @app = app
+        end
+
+        def call(env)
+          if env['PATH_INFO'] == '/__executor__' && env['REQUEST_METHOD'] == 'POST'
+            request = Rack::Request.new(env)
+            unless request.body.nil?
+              request_hash = Oj.load(request.body.read, {})
+              if request_hash['key'] != @@request_key
+                Rack::Response.new(Oj.dump({ 'error' => 'wrong key given, execution denied' }, {}), 401, 'Content-Type' => 'application/json').finish
+              end
+              begin
+                result = Object.instance_eval(request_hash['code']) if request_hash['code']
+              rescue Exception => e
+                Rack::Response.new(Oj.dump({ 'error' => "#{e.class}: #{e.message}" }, {}), 200, 'Content-Type' => 'application/json').finish
+              end
+              Rack::Response.new(Oj.dump({ 'result' => result }, {}), 200, 'Content-Type' => 'application/json').finish
+            end
+          else
+            @app.call(env)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/isomorfeus/puppetmaster/version.rb

@@ -1,3 +1,3 @@
 module Isomorfeus
-  PUPPETMASTER_VERSION = '0.1.0'
+  PUPPETMASTER_VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-puppetmaster
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-28 00:00:00.000000000 Z
+date: 2019-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -38,6 +38,76 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: method_source
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: opal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+- !ruby/object:Gem::Dependency
+  name: opal-browser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: unparser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: agoo
   requirement: !ruby/object:Gem::Requirement
@@ -253,6 +323,7 @@ files:
 - lib/isomorfeus/puppetmaster/self_forwardable.rb
 - lib/isomorfeus/puppetmaster/server.rb
 - lib/isomorfeus/puppetmaster/server/checker.rb
+- lib/isomorfeus/puppetmaster/server/executor_middleware.rb
 - lib/isomorfeus/puppetmaster/server/middleware.rb
 - lib/isomorfeus/puppetmaster/server_registration.rb
 - lib/isomorfeus/puppetmaster/version.rb