isomorfeus-puppetmaster 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 269550731b8d7281a53e106e2bc4cc53b49e95a0e76a7133aac4c2b5f5588f9a
-  data.tar.gz: d7f0c5efc32325a03b4bd30cf6c1c0603935a1c104233d7c2e8a037a465db148
+  metadata.gz: 4f93b2a8c272d241cdc8b2acbe45d8e9b894f2fd667699490474cd9489b00ff9
+  data.tar.gz: 02a64a1ccc84b206526ec90c855aea65191469287b6866d7b6058292dd821486
 SHA512:
-  metadata.gz: ac398c1d1a32b7df39b4e081f8f120e61076f0708641f11b0d246cb7fe1293337e6c4b23510e913c256e5d669f1a1a0982bdedb9c8fafeed1e64c2e2cdab5634
-  data.tar.gz: 92e2477578449cfce8ac2152834038cc4fe198bc03eee7b21994fa019c832edd4cc3143df33314097cb967253be25d759aa80cf335b1a28c0d432494d0b681b0
+  metadata.gz: bb93ec516a523403299a96b6cf961dafcca7e33153348fe5bde2a593f9a66f8a4a717520bd4cb701cbf4744aed16b2ec4e3e9785d5332b467115a9ef0b4c69ac
+  data.tar.gz: 54ce3d4966f83112ff5999c39c827210b072656bdaf3f9cf2bda8197f257316854a64263fc6d6314eddc3b3ed1028989d0e07f6da4a9aaf6728180211fc54cd2

data/README.md

@@ -19,10 +19,10 @@ In Gemfile:
 
 Also requires the following npm modules with recommended versions:
 
-- puppeteer 1.13.0 - for the chromium driver
-- puppeteer-firefox 0.5.0 - for the firefox driver
-- jsdom 14.0.0 - for the jsdom driver
-- canvas 2.4.1 - for the jsdom driver
+- [puppeteer 1.16.0](https://github.com/GoogleChrome/puppeteer#readme) - for the chromium driver
+- [puppeteer-firefox 0.5.0](https://www.npmjs.com/package/puppeteer-firefox) - for the firefox driver
+- [jsdom 14.0.0](https://github.com/jsdom/jsdom#readme) - for the jsdom driver
+- [canvas 2.4.1](https://github.com/Automattic/node-canvas) - for the jsdom driver (optional)
 
 Simply install them in your projects root. Puppetmaster also depends on isomorfeus-speednode, which will be installed automatically.
 Speednode will pickup the node modules then from the projects root node_modules directory.
@@ -31,18 +31,29 @@ Speednode will pickup the node modules then from the projects root node_modules
 
 Puppetmaster provides these drivers:
 - chromium - a real browser, headless, fast
+- chromium_wsl - as above but with options so it can execute within the Windows Linux WSL
 - chromium_debug - opens a chromium browser window with devtools enabled, useful for debugging tests
 - firefox - real firefox, running headless, not so fast
 - firefox_debug - opens a firefox browser window with devtools enabled, useful for debugging tests
 - jsdom - provides a dom implementation in javascript, can execute javascript in the document, super fast, headless, has certain limitations,
   especially because its not rendering anything (no element bounding box, etc.)
+- jsdom_canvas - jsdom driver with additional support for 'canvas', requires certain libraries to be installed, see: [canvas at github](https://github.com/Automattic/node-canvas)
 
-Selecting a driver, for example jsdom:
+Chromium is the default driver. Selecting another driver, for example jsdom:
 ```ruby
 Isomorfeus::Puppetmaster.driver = :jsdom
 ```
-(chromium is the default driver)
 
+Puppetmaster provides support for these rack servers:
+- [agoo](https://github.com/ohler55/agoo)
+- [falcon](https://github.com/socketry/falcon)
+- [iodine](https://github.com/boazsegev/iodine)
+- [puma](https://github.com/puma/puma)
+
+Puma is the default rack server. To assign another rack server:
+```ruby
+Isomorfeus::Puppetmaster.server = :agoo
+```
 
 Getting the app ready and running:
 1. Assign a rack app

data/lib/isomorfeus/puppetmaster/document.rb

@@ -76,7 +76,21 @@ module Isomorfeus
           start_of_code = compiled_ruby.index('*/') + 3
           compiled_ruby = compiled_ruby[start_of_code..-1]
         end
-        javascript = <<~JAVASCRIPT
+        evaluate_script <<~JAVASCRIPT
+          (function(){
+            return #{compiled_ruby}
+          })()
+        JAVASCRIPT
+      end
+
+      def evaluate_with_opal(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
+        evaluate_script <<~JAVASCRIPT
           (function(){
             if (typeof Opal === "undefined") {
               #{Isomorfeus::Puppetmaster.opal_prelude}
@@ -84,7 +98,6 @@ module Isomorfeus
             return #{compiled_ruby}
           })()
         JAVASCRIPT
-        evaluate_script(javascript)
       end
 
       def go_back
@@ -129,6 +142,12 @@ module Isomorfeus
         evaluate_ruby(ruby_source)
       end
 
+      def isomorphic_with_opal(ruby_source = '', &block)
+        ruby_source = Isomorfeus::Puppetmaster.block_source_code(&block) if block_given?
+        Isomorfeus::Puppetmaster.served_app.on_server(ruby_source)
+        evaluate_with_opal(ruby_source)
+      end
+
       def method_missing(name, *args)
         method_name = name.to_s
         if method_name.start_with?('find_by_')

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

@@ -37,6 +37,7 @@ module Isomorfeus
         def initialize(options = {})
           @app = options.delete(:app)
           @options = options.dup
+          @canvas = @options.delete(:canvas) { false }
           @ignore_https_errors = !!@options.delete(:ignore_https_errors)
           @max_width = @options.delete(:max_width) { VIEWPORT_MAX_WIDTH }
           @max_height = @options.delete(:max_height) { VIEWPORT_MAX_HEIGHT }
@@ -248,7 +249,7 @@ module Isomorfeus
 
         def jsdom_launch
           <<~JAVASCRIPT
-            const canvas = require('canvas')
+            #{"const canvas = require('canvas');" if @canvas}
             const jsdom = require('jsdom');
             const Cookie = jsdom.toughCookie.Cookie;
             const MemoryCookieStore = jsdom.toughCookie.MemoryCookieStore;

data/lib/isomorfeus/puppetmaster/driver_registration.rb

@@ -2,6 +2,10 @@ Isomorfeus::Puppetmaster.register_driver(:chromium) do |app|
   Isomorfeus::Puppetmaster::Driver::Puppeteer.new(browser_type: :chromium, headless: true, app: app)
 end
 
+Isomorfeus::Puppetmaster.register_driver(:chromium_wsl) do |app|
+  Isomorfeus::Puppetmaster::Driver::Puppeteer.new(browser_type: :chromium, headless: true, app: app, args: ['--no-sandbox'])
+end
+
 Isomorfeus::Puppetmaster.register_driver(:chromium_debug) do |app|
   Isomorfeus::Puppetmaster::Driver::Puppeteer.new(browser_type: :chromium, headless: false, devtools: true, app: app)
 end
@@ -17,3 +21,7 @@ end
 Isomorfeus::Puppetmaster.register_driver(:jsdom) do |app|
   Isomorfeus::Puppetmaster::Driver::Jsdom.new(app: app)
 end
+
+Isomorfeus::Puppetmaster.register_driver(:jsdom_canvas) do |app|
+  Isomorfeus::Puppetmaster::Driver::Jsdom.new(app: app, canvas: true)
+end

data/lib/isomorfeus/puppetmaster/node.rb

@@ -145,7 +145,21 @@ module Isomorfeus
           start_of_code = compiled_ruby.index('*/') + 3
           compiled_ruby = compiled_ruby[start_of_code..-1]
         end
-        javascript = <<~JAVASCRIPT
+        evaluate_script <<~JAVASCRIPT
+          (function(){
+            return #{compiled_ruby}
+          })()
+        JAVASCRIPT
+      end
+
+      def evaluate_with_opal(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
+        evaluate_script <<~JAVASCRIPT
           (function(){
             if (typeof Opal === "undefined") {
               #{Isomorfeus::Puppetmaster.opal_prelude}
@@ -153,7 +167,6 @@ module Isomorfeus
             return #{compiled_ruby}
           })()
         JAVASCRIPT
-        evaluate_script(javascript)
       end
 
       def get_attribute(attribute)

data/lib/isomorfeus/puppetmaster/server_registration.rb

@@ -1,5 +1,6 @@
 Isomorfeus::Puppetmaster.register_server :agoo do |app, port, _host, **options|
   begin
+    require 'agoo/version'
     require 'rack/handler/agoo'
   rescue LoadError
     raise LoadError, "Unable to load 'agoo' as server."
@@ -11,8 +12,37 @@ Isomorfeus::Puppetmaster.register_server :agoo do |app, port, _host, **options|
   Rack::Handler::Agoo.run(app, { port: port }.merge(options)).join
 end
 
+Isomorfeus::Puppetmaster.register_server :falcon do |app, port, host, **options|
+  begin
+    require 'falcon/version'
+    require 'rack/handler/falcon'
+  rescue LoadError
+    raise LoadError, "Unable to load 'falcon' as server."
+  end
+
+  events.log 'Puppetmaster starting Falcon...'
+  events.log "* Version #{Falcon::VERSION}"
+
+  Rack::Handler::Falcon.run(app, { Host: host, Port: port }.merge(options)).join
+end
+
+Isomorfeus::Puppetmaster.register_server :iodine do |app, port, _host, **options|
+  begin
+    require 'iodine/version'
+    require 'rack/handler/iodine'
+  rescue LoadError
+    raise LoadError, "Unable to load 'iodine' as server."
+  end
+
+  events.log 'Puppetmaster starting Iodine...'
+  events.log "* Version #{Iodine::VERSION}"
+
+  Rack::Handler::Iodine.run(app, { Host: host, Port: port }.merge(options)).join
+end
+
 Isomorfeus::Puppetmaster.register_server :puma do |app, port, host, **options|
   begin
+    require 'puma/const'
     require 'rack/handler/puma'
   rescue LoadError
     raise LoadError, "Unable to load 'puma' as server."

data/lib/isomorfeus/puppetmaster/version.rb

@@ -1,3 +1,3 @@
 module Isomorfeus
-  PUPPETMASTER_VERSION = '0.2.2'
+  PUPPETMASTER_VERSION = '0.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-puppetmaster
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-11 00:00:00.000000000 Z
+date: 2019-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: falcon
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.30.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.30.0
 - !ruby/object:Gem::Dependency
   name: fastimage
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: iodine
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.31
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.31
 - !ruby/object:Gem::Dependency
   name: irb
   requirement: !ruby/object:Gem::Requirement
@@ -224,14 +252,14 @@ dependencies:
   name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.12.0
 - !ruby/object:Gem::Dependency