isomorfeus-puppetmaster 0.3.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b561df47e49a821a455d0034483297f2ef7623ba837dc61cca99bd5b3dd033d6
-  data.tar.gz: 409d3e25bb92e5686ec76ec91dd415ef7caedb8a90042c161721755d565ab35c
+  metadata.gz: 2d453a12b9cc8f801e1e81fdda6e615d7d256253eec19b60c7c969c8bf08bd72
+  data.tar.gz: cbef053148c753b2b03c6b15e1bb815af51dfdc7821a10d422c803862ac57dcd
 SHA512:
-  metadata.gz: 950ecc09d8988b7355ee5e1f61b4d30c6ac390226c43415a0267d8c84e575c2fa93b08612e213a7945235228a1220c8b81d02fc22d2e173ad7ca74d6d7b8160e
-  data.tar.gz: 77cecab7b46eadef0f9692cf61bd02b67039896b1de1a597c23a671b6f4eed4d31f5c66fab2b41aeb2fff3f04be18041b09343bf64bb771b3251b694dd46105c
+  metadata.gz: 42dd469ad600d330aa8904a31d638c8915bd6f49aba4990ff76c3bc92886d662f08d483128be27ffc6fdb4cf136a552b6f9a648c4609c1f4e50a0a61fa664ca8
+  data.tar.gz: 5dc01c153258ca15823abaa9ad535869cebc5aced2b5e5af6c1346b64b73a4666b68969320e06a589ce9b0064e8b1889657da5742e3f39699d2505798a7865e3

data/README.md

@@ -19,9 +19,7 @@ In Gemfile:
 
 Also requires the following npm modules with recommended versions:
 
-- [puppeteer 2.0.0](https://github.com/GoogleChrome/puppeteer#readme) - for the chromium driver
-- [jsdom 15.2.1](https://github.com/jsdom/jsdom#readme) - for the jsdom driver
-- [canvas 2.6.0](https://github.com/Automattic/node-canvas) - for the jsdom driver (optional)
+- [puppeteer 9.1.x](https://github.com/GoogleChrome/puppeteer#readme) - for the chromium driver
 
 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.
@@ -30,15 +28,11 @@ 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
-- 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)
 
-Chromium is the default driver. Selecting another driver, for example jsdom:
+Chromium is the default driver. Selecting another driver, for example firefox:
 ```ruby
-Isomorfeus::Puppetmaster.driver = :jsdom
+Isomorfeus::Puppetmaster.driver = :chromium_debug
 ```
 
 Puppetmaster provides support for these rack servers:

data/lib/isomorfeus/puppetmaster/document.rb

@@ -15,7 +15,6 @@ module Isomorfeus
         clear_cookies
         clear_extra_headers
         clear_url_blacklist
-        click
         close
         cookies
         console
@@ -34,15 +33,11 @@ module Isomorfeus
         html
         open_new_document
         remove_cookie
-        render_base64
         reset_user_agent
         right_click
-        save_pdf
-        save_screenshot
         scroll_by
         scroll_to
         set_authentication_credentials
-        set_cookie
         set_extra_headers
         set_url_blacklist
         set_user_agent
@@ -56,6 +51,14 @@ module Isomorfeus
         wait_for_xpath
       ]
 
+      document_forward_kwargs %i[
+        click
+        render_base64
+        save_pdf
+        save_screenshot
+        set_cookie
+      ]
+
       attr_reader :handle, :response
 
       def initialize(driver, handle, response)
@@ -175,11 +178,11 @@ module Isomorfeus
       alias_method :visit, :goto
 
       def has_content?(content, **options)
-        body.has_content?(content, options)
+        body.has_content?(content, **options)
       end
 
       def has_css?(selector, **options)
-        body.has_css?(selector, options)
+        body.has_css?(selector, **options)
       end
 
       def has_current_path?(other_path)
@@ -187,11 +190,11 @@ module Isomorfeus
       end
 
       def has_text?(text, **options)
-        body.has_text?(text, options)
+        body.has_text?(text, **options)
       end
 
       def has_xpath?(query, **options)
-        body.has_xpath?(query, options)
+        body.has_xpath?(query, **options)
       end
 
       def isomorphic(ruby_source = '', &block)
@@ -260,7 +263,7 @@ module Isomorfeus
       protected
 
       def compile_ruby_source(source_code)
-        # TODO maybe use compile server
+        # TODO maybe use compile server, which can cache code
         Opal.compile(source_code, parse_comments: false)
       end
     end

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

@@ -36,10 +36,11 @@ module Isomorfeus
 
         def initialize(options = {})
           # https://pptr.dev/#?product=Puppeteer&version=v1.12.2&show=api-puppeteerlaunchoptions
-          # init ExecJs context
+          # init ExecJS context
           @app = options.delete(:app)
           @options = options.dup
           @browser_type = @options.delete(:browser_type) { :chromium }
+          @options[:product] = "'#{@browser_type}'" unless @options.key?(:product)
           @max_width = @options.delete(:max_width) { VIEWPORT_MAX_WIDTH }
           @max_height = @options.delete(:max_height) { VIEWPORT_MAX_HEIGHT }
           @width = @options.delete(:width) { VIEWPORT_DEFAULT_WIDTH > @max_width ? @max_width : VIEWPORT_DEFAULT_WIDTH }
@@ -218,7 +219,7 @@ module Isomorfeus
           get_result
         end
 
-        def chromium_require
+        def default_require
           <<~JAVASCRIPT
             const MasterPuppeteer = require('puppeteer');
           JAVASCRIPT
@@ -277,8 +278,8 @@ module Isomorfeus
         def puppeteer_launch
           # todo target_handle, puppeteer save path
           puppeteer_require = case @browser_type
-                              when :chrome then chromium_require
-                              when :chromium then chromium_require
+                              when :chrome then default_require
+                              when :chromium then default_require
                               else
                                 raise "Browser type #{@browser_type} not supported!"
                               end

data/lib/isomorfeus/puppetmaster/driver_registration.rb

@@ -1,11 +1,9 @@
+require 'tty-which'
+
 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

data/lib/isomorfeus/puppetmaster/self_forwardable.rb

@@ -10,6 +10,14 @@ module Isomorfeus
             end
           end
 
+          base.define_singleton_method(:document_forward_kwargs) do |methods|
+            methods.each do |method|
+              define_method(method) do |*args, **kwargs, &block|
+                @driver.send("document_#{method}", self, *args, **kwargs, &block)
+              end
+            end
+          end
+
           base.define_singleton_method(:frame_forward) do |methods|
             methods.each do |method|
               define_method(method) do |*args|

data/lib/isomorfeus/puppetmaster/version.rb

@@ -1,3 +1,3 @@
 module Isomorfeus
-  PUPPETMASTER_VERSION = '0.3.5'
+  PUPPETMASTER_VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-puppetmaster
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors:
 - Jan Biedermann
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-26 00:00:00.000000000 Z
+date: 2021-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.11
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.11
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: method_source
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.10.1
+        version: 3.11.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.10.1
+        version: 3.11.1
 - !ruby/object:Gem::Dependency
   name: opal
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: unparser
+  name: tty-which
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,19 +123,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: agoo
+  name: unparser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.11.7
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.11.7
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: chunky_png
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.30.0
+        version: 0.38.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.30.0
+        version: 0.38.0
 - !ruby/object:Gem::Dependency
   name: fastimage
   requirement: !ruby/object:Gem::Requirement
@@ -178,20 +178,6 @@ 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.38
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.7.38
 - !ruby/object:Gem::Dependency
   name: irb
   requirement: !ruby/object:Gem::Requirement
@@ -212,28 +198,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: 1.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
@@ -254,28 +240,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.1
+        version: 5.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.1
+        version: 5.3.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -310,14 +296,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.1.0
 description: Acceptance testing for isomorfeus.
 email: jan@kursator.de
 executables: []
@@ -372,7 +358,7 @@ licenses:
 - MIT
 metadata:
   github_repo: ssh://github.com/isomorfeus/gems
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -387,8 +373,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Acceptance testing for isomorfeus.
 test_files: []