puppeteer-ruby 0.36.0 → 0.37.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d4af926ca9ad39046dcc4ce9507622bf72c3263b747516ee1ba642c02e8e38d
-  data.tar.gz: 3eff89952883a47270dee6a9ee7281609dbbe7bac197eada9e6b6dcabbaa1f78
+  metadata.gz: 9e46056e6227e597554a407d47c132610af952d42b1cd7c2149e2046e0d8f1bb
+  data.tar.gz: 99a5c6fd6885181e32c72086a768c60583738974a3c86a05a693af2b97b51bc3
 SHA512:
-  metadata.gz: d83085eb31bb6d0d9f125e4c82fe172f46676bc373bd7652b2be430984570f7facff20bd3b1da20dbcb41beca52a740064b9b6d5cb6f51a69bf8f4f97e699947
-  data.tar.gz: 141bed0475d5e40a0ddb9ec0cb2a82f44313a14e835a7d5cc271a413dad0c9881658a81f0ec0567d7896a7658539fc131bb5069c1c07c6573f6b633c99a53f8e
+  metadata.gz: d4b1032b52bb5a0ad92e57f0bac5fe5208b785679f1d7efff0ab335cb28478f6110979102d0ec4759ef2f86654b4d231e018aa9cdb3982dc1ffa2e985fa4c55f
+  data.tar.gz: 42f81fe580fcb85b5c57397962362c3c6b0ba7462fe210c65ee017b9e73c0a3d9d091c03a7b18f6e6d78f3a3c52572a5d0bb8284f1087412344a184e8624170d

data/CHANGELOG.md

@@ -1,51 +1,57 @@
-### master [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.36.0...master)]
+### master [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.37.0...master)]
 
-* xxx
+- xxx
+
+### 0.37.0 [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.36.0...0.37.0)]
+
+New features:
+
+- Some features introduced in Puppeteer 10.4
 
 ### 0.36.0 [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.35.1...0.36.0)]
 
 New features:
 
-* Drag and Drop feature introduced in Puppeteer 10.1
-* `Page#emulateNetworkConditions`, `Page#emulateCPUThrottling`
-* `Page#exposeFunction`
-* Metrics
+- Drag and Drop feature introduced in Puppeteer 10.1
+- `Page#emulateNetworkConditions`, `Page#emulateCPUThrottling`
+- `Page#exposeFunction`
+- Metrics
 
 ### 0.35.1 [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.35.0...0.35.1)]
 
 New features:
 
-* Allow Rails users to use this library without `require 'puppeteer'`.
+- Allow Rails users to use this library without `require 'puppeteer'`.
 
 ### 0.35.0 [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.34.3...0.35.0)]
 
 New features:
 
-* Add `channel` parameter for Puppeteer.launch. Now `channel: chrome` or `channel: chrome-canary` (chrome-beta, chrome-dev is also available) automatically detects the executablePath of Google Chrome. Windows/macOS users can also use `channel: msedge`.
+- Add `channel` parameter for Puppeteer.launch. Now `channel: chrome` or `channel: chrome-canary` (chrome-beta, chrome-dev is also available) automatically detects the executablePath of Google Chrome. Windows/macOS users can also use `channel: msedge`.
 
 ### 0.34.3 [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.34.2...0.34.3)]
 
 Bugfix:
 
-* Fix wait_for_xxx's timeout error type.
+- Fix wait_for_xxx's timeout error type.
 
 ### 0.34.2 [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.34.1...0.34.2)]
 
 New features:
 
-* Add `Page#bring_to_front`.
+- Add `Page#bring_to_front`.
 
 ### 0.34.1 [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.34.0...0.34.1)]
 
 Bugfix:
 
-* Fix `Page#pdf` to work without `path` parameter.
+- Fix `Page#pdf` to work without `path` parameter.
 
 ### 0.34.0 [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.33.0...0.34.0)]
 
 New features:
 
-* Sync API with block
+- Sync API with block
 
 ### 0.33.0 [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.32.4...0.33.0)]
 
@@ -53,170 +59,169 @@ NOTE: Requires Ruby version >= 2.6 explicitly since this version.
 
 Bugfix:
 
-* Fix PDF options to work correctly on decimal numbers specified.
+- Fix PDF options to work correctly on decimal numbers specified.
 
 ### 0.32.4 [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.32.3...0.32.4)]
 
 Bugfix:
 
-* Fix `#type_text` to input '<' correctly.
+- Fix `#type_text` to input '<' correctly.
 
 ### 0.32.3 [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.32.2...0.32.3)]
 
 Bugfix:
 
-* Fix puppeteer-ruby to work on Rails in development mode.
-
+- Fix puppeteer-ruby to work on Rails in development mode.
 
 ### 0.32.2 [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.32.1...0.32.2)]
 
 Bugfix:
 
-* Fix full_page option in screenshot.
+- Fix full_page option in screenshot.
 
 ### 0.32.1 [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.32.0...0.32.1)]
 
 Bugfix:
 
-* Fix WebSocket to work with `wss://...` endpoint (ex. browserless.io)
+- Fix WebSocket to work with `wss://...` endpoint (ex. browserless.io)
 
 ### 0.32.0 [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.31.6...0.32.0)]
 
 New features:
 
-* Tracing
-* JS/CSS coverages
+- Tracing
+- JS/CSS coverages
 
 Improvement:
 
-* Increase stability [#92](https://github.com/YusukeIwaki/puppeteer-ruby/pull/92)
+- Increase stability [#92](https://github.com/YusukeIwaki/puppeteer-ruby/pull/92)
 
 ### 0.31.6 [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.31.5...0.31.6)]
 
 Improvement:
 
-* Increase stability [#87](https://github.com/YusukeIwaki/puppeteer-ruby/pull/87)
+- Increase stability [#87](https://github.com/YusukeIwaki/puppeteer-ruby/pull/87)
 
 ### 0.31.5 [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.31.4...0.31.5)]
 
 Bugfix:
 
-* Fix file uploading to work without crash.
+- Fix file uploading to work without crash.
 
 ### 0.31.4 [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.31.3...0.31.4)]
 
 Bugfix:
 
-* Fix PDF options (format, margin, omit_background) to work.
+- Fix PDF options (format, margin, omit_background) to work.
 
 ### 0.31.3 [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.31.1...0.31.3)]
 
 Bugfix:
 
-* Fix `wait_for_selector` to work. *It is strongly recommended to update for 0.29.0-0.31.x users.*
+- Fix `wait_for_selector` to work. _It is strongly recommended to update for 0.29.0-0.31.x users._
 
 ### 0.31.1 [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.31.0...0.31.1)]
 
 Bugfix:
 
-* Fix `Page#pdf` to work on Windows.
+- Fix `Page#pdf` to work on Windows.
 
 ### 0.31.0 [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.30.0...0.31.0)]
 
 New features:
 
-* Now puppeteer-ruby is compatible with Windows
+- Now puppeteer-ruby is compatible with Windows
 
 Bugfix:
 
-* Fix `Page#add_script_tag` and `Page#add_style_tag` to work
+- Fix `Page#add_script_tag` and `Page#add_style_tag` to work
 
 ### 0.30.0 [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.29.0...0.30.0)]
 
 New features:
 
-* S, SS, Seval, SSeval is renamed to query_selector, query_selector_all, eval_on_selector, eval_on_selector_all
+- S, SS, Seval, SSeval is renamed to query_selector, query_selector_all, eval_on_selector, eval_on_selector_all
 
 ### 0.29.0 [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.28.1...0.29.0)]
 
 New features:
 
-* Add `AriaQueryHandler`. Now we can use "aria/...." for selectors.
+- Add `AriaQueryHandler`. Now we can use "aria/...." for selectors.
 
 ### 0.28.1 [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.0.27...0.28.1)]
 
 New features:
 
-* Add `Page#emulate_idle_state`
-* Change versioning rule.
+- Add `Page#emulate_idle_state`
+- Change versioning rule.
 
 ### 0.0.27 [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.0.26...0.0.27)]
 
 New features:
 
-* Now puppeteer-ruby is Ruby 3.0 compatible!
+- Now puppeteer-ruby is Ruby 3.0 compatible!
 
 ### 0.0.26 [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.0.25...0.0.26)]
 
 Bugfix:
 
-* Fix `Page#screenshot` working correctly with `quality` parameter.
+- Fix `Page#screenshot` working correctly with `quality` parameter.
 
 ### 0.0.25 [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.0.23...0.0.25)]
 
 New feature:
 
-* **Cookie** feature: `Page#set_cookie`, `Page#cookies`
+- **Cookie** feature: `Page#set_cookie`, `Page#cookies`
 
 ### 0.0.23 [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.0.22...0.0.23)]
 
 New feature:
 
-* **GeoLocation** feature
-* grant/clear permission
+- **GeoLocation** feature
+- grant/clear permission
 
 Bugfix/Improvement:
 
-* Refactoring for events ([#31](https://github.com/YusukeIwaki/puppeteer-ruby/pull/31))
-* Improve SEND/RECV handling in CDPSession ([#34](https://github.com/YusukeIwaki/puppeteer-ruby/pull/34))
+- Refactoring for events ([#31](https://github.com/YusukeIwaki/puppeteer-ruby/pull/31))
+- Improve SEND/RECV handling in CDPSession ([#34](https://github.com/YusukeIwaki/puppeteer-ruby/pull/34))
 
 ### 0.0.22 [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.0.21...0.0.22)]
 
 Bugfix
 
-* Make `Puppeteer#default_args` to work
-* Respect Firefox launch options
-* Respect `default_viewport: nil`
+- Make `Puppeteer#default_args` to work
+- Respect Firefox launch options
+- Respect `default_viewport: nil`
 
 ### 0.0.21 [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.0.20...0.0.21)]
 
 Bugfix/Improvement:
 
-* Update DeviceDescriptors (list of emulatable devices)
-* Fix bug on inputing "(" ([#25](https://github.com/YusukeIwaki/puppeteer-ruby/pull/25))
+- Update DeviceDescriptors (list of emulatable devices)
+- Fix bug on inputing "(" ([#25](https://github.com/YusukeIwaki/puppeteer-ruby/pull/25))
 
 ### 0.0.20 [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.0.19...0.0.20)]
 
 New feature
 
-* Dialog-handling feature
+- Dialog-handling feature
 
 ### 0.0.19 [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.0.18...0.0.19)]
 
 New feature
 
-* **Firefox support**
+- **Firefox support**
 
 Bugfix/Improvement
 
-* Allow `Page#keyboard` with block ([#18](https://github.com/YusukeIwaki/puppeteer-ruby/pull/18))
+- Allow `Page#keyboard` with block ([#18](https://github.com/YusukeIwaki/puppeteer-ruby/pull/18))
 
 ### 0.0.18 [[diff](https://github.com/YusukeIwaki/puppeteer-ruby/compare/0.0.17...0.0.18)]
 
 New feature
 
-* **Firefox support**
+- **Firefox support**
 
 Bugfix/Improvement
 
-* Allow `Page#keyboard` with block ([#18](https://github.com/YusukeIwaki/puppeteer-ruby/pull/18))
+- Allow `Page#keyboard` with block ([#18](https://github.com/YusukeIwaki/puppeteer-ruby/pull/18))

data/README.md

@@ -156,6 +156,75 @@ RSpec.describe 'hotel.testplanisphere.dev', type: :feature do
 
 The detailed step of configuration can be found [here](https://github.com/YusukeIwaki/puppeteer-ruby-example/tree/master/_with_capybara-rspec).
 
+## :bulb: Use Puppeteer methods simply without Capybara::DSL
+
+We can also use puppeteer-ruby as it is without Capybara DSL. When you want to just test a Rails application simply with Puppeteer, refer this section.
+
+Also, if you have trouble with handling flaky/unstable testcases in existing feature/system specs, consider replacing Capybara::DSL with raw puppeteer-ruby codes like `page.wait_for_selector(...)` or `page.wait_for_navigation { ... }`.
+
+Capybara prepares test server even when Capybara DSL is not used.
+
+Sample configuration is shown below. You can use it by putting the file at `spec/support/puppeteer_ruby.rb` or another location where RSpec loads on initialization.
+
+```ruby
+RSpec.configure do |config|
+  require 'capybara'
+
+  # This driver only requests Capybara to launch test server.
+  # Remark that no Capybara::DSL is available with this driver.
+  class CapybaraNullDriver < Capybara::Driver::Base
+    def needs_server?
+      true
+    end
+  end
+
+  Capybara.register_driver(:null) { CapybaraNullDriver.new }
+
+  config.around(driver: :null) do |example|
+    Capybara.current_driver = :null
+
+    # Rails server is launched here,
+    # (at the first time of accessing Capybara.current_session.server)
+    @base_url = Capybara.current_session.server.base_url
+
+    require 'puppeteer'
+    launch_options = {
+      # Use launch options as you like.
+      channel: :chrome,
+      headless: false,
+    }
+    Puppeteer.launch(**launch_options) do |browser|
+      @puppeteer_page = browser.new_page
+      example.run
+    end
+
+    Capybara.reset_sessions!
+    Capybara.use_default_driver
+  end
+end
+```
+
+Now, we can work with integration test using `Puppeteer::Page` in puppeteer-ruby.
+
+```ruby
+RSpec.describe 'Sample integration tests', driver: :null do
+  let(:page) { @puppeteer_page }
+  let(:base_url) { @base_url }
+
+  it 'should work with Puppeteer' do
+    # null driver only launches server, and Capybara::DSL is unavailable.
+    expect { visit '/' }.to raise_error(/NotImplementedError/)
+
+    page.goto("#{base_url}/")
+
+    # Automation with Puppeteer
+    h1_text = page.eval_on_selector('h1', '(el) => el.textContent')
+    expect(h1_text).to eq('It works!')
+  end
+end
+```
+
+
 ## API
 
 https://yusukeiwaki.github.io/puppeteer-ruby-docs/

data/docs/api_coverage.md

@@ -1,6 +1,6 @@
 # API coverages
-- Puppeteer version: v10.2.0
-- puppeteer-ruby version: 0.36.0
+- Puppeteer version: v10.4.0
+- puppeteer-ruby version: 0.37.0
 
 ## Puppeteer
 
@@ -136,6 +136,7 @@
 * waitForFileChooser => `#wait_for_file_chooser`
 * waitForFunction => `#wait_for_function`
 * waitForNavigation => `#wait_for_navigation`
+* ~~waitForNetworkIdle~~
 * waitForRequest => `#wait_for_request`
 * waitForResponse => `#wait_for_response`
 * waitForSelector => `#wait_for_selector`

data/lib/puppeteer/browser.rb

@@ -223,7 +223,7 @@ class Puppeteer::Browser
   # @param predicate [Proc(Puppeteer::Target -> Boolean)]
   # @return [Puppeteer::Target]
   def wait_for_target(predicate:, timeout: nil)
-    timeout_in_sec = (timeout || 30000).to_i / 1000.0
+    timeout_helper = Puppeteer::TimeoutHelper.new('target', timeout_ms: timeout, default_timeout_ms: 30000)
     existing_target = targets.find { |target| predicate.call(target) }
     return existing_target if existing_target
 
@@ -241,15 +241,9 @@ class Puppeteer::Browser
     end
 
     begin
-      if timeout_in_sec > 0
-        Timeout.timeout(timeout_in_sec) do
-          target_promise.value!
-        end
-      else
+      timeout_helper.with_timeout do
         target_promise.value!
       end
-    rescue Timeout::Error
-      raise Puppeteer::TimeoutError.new("waiting for target failed: timeout #{timeout}ms exceeded")
     ensure
       remove_event_listener(*event_listening_ids)
     end

data/lib/puppeteer/browser_context.rb

@@ -74,6 +74,7 @@ class Puppeteer::BrowserContext
     'clipboard-read' => 'clipboardReadWrite',
     'clipboard-write' => 'clipboardReadWrite',
     'payment-handler' => 'paymentHandler',
+    'persistent-storage' => 'durableStorage',
     'idle-detection' => 'idleDetection',
     # chrome-specific permissions we have.
     'midi-sysex' => 'midiSysex',

data/lib/puppeteer/coverage.rb

@@ -5,10 +5,14 @@ class Puppeteer::Coverage
     @css = Puppeteer::CSSCoverage.new(client)
   end
 
-  def start_js_coverage(reset_on_navigation: nil, report_anonymous_scripts: nil)
+  def start_js_coverage(
+        reset_on_navigation: nil,
+        report_anonymous_scripts: nil,
+        include_raw_script_coverage: nil)
     @js.start(
       reset_on_navigation: reset_on_navigation,
       report_anonymous_scripts: report_anonymous_scripts,
+      include_raw_script_coverage: include_raw_script_coverage,
     )
   end
 
@@ -16,7 +20,11 @@ class Puppeteer::Coverage
     @js.stop
   end
 
-  def js_coverage(reset_on_navigation: nil, report_anonymous_scripts: nil, &block)
+  def js_coverage(
+        reset_on_navigation: nil,
+        report_anonymous_scripts: nil,
+        include_raw_script_coverage: nil,
+        &block)
     unless block
       raise ArgumentError.new('Block must be given')
     end
@@ -24,6 +32,7 @@ class Puppeteer::Coverage
     start_js_coverage(
       reset_on_navigation: reset_on_navigation,
       report_anonymous_scripts: report_anonymous_scripts,
+      include_raw_script_coverage: include_raw_script_coverage,
     )
     block.call
     stop_js_coverage

data/lib/puppeteer/devices.rb

@@ -158,6 +158,84 @@ Puppeteer::DEVICES = Hash[
         isLandscape: true,
       },
     },
+    {
+      name: 'Galaxy S8',
+      userAgent:
+        'Mozilla/5.0 (Linux; Android 7.0; SM-G950U Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3202.84 Mobile Safari/537.36',
+      viewport: {
+        width: 360,
+        height: 740,
+        deviceScaleFactor: 3,
+        isMobile: true,
+        hasTouch: true,
+        isLandscape: false,
+      },
+    },
+    {
+      name: 'Galaxy S8 landscape',
+      userAgent:
+        'Mozilla/5.0 (Linux; Android 7.0; SM-G950U Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3202.84 Mobile Safari/537.36',
+      viewport: {
+        width: 740,
+        height: 360,
+        deviceScaleFactor: 3,
+        isMobile: true,
+        hasTouch: true,
+        isLandscape: true,
+      },
+    },
+    {
+      name: 'Galaxy S9+',
+      userAgent:
+        'Mozilla/5.0 (Linux; Android 8.0.0; SM-G965U Build/R16NW) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.111 Mobile Safari/537.36',
+      viewport: {
+        width: 320,
+        height: 658,
+        deviceScaleFactor: 4.5,
+        isMobile: true,
+        hasTouch: true,
+        isLandscape: false,
+      },
+    },
+    {
+      name: 'Galaxy S9+ landscape',
+      userAgent:
+        'Mozilla/5.0 (Linux; Android 8.0.0; SM-G965U Build/R16NW) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.111 Mobile Safari/537.36',
+      viewport: {
+        width: 658,
+        height: 320,
+        deviceScaleFactor: 4.5,
+        isMobile: true,
+        hasTouch: true,
+        isLandscape: true,
+      },
+    },
+    {
+      name: 'Galaxy Tab S4',
+      userAgent:
+        'Mozilla/5.0 (Linux; Android 8.1.0; SM-T837A) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.80 Safari/537.36',
+      viewport: {
+        width: 712,
+        height: 1138,
+        deviceScaleFactor: 2.25,
+        isMobile: true,
+        hasTouch: true,
+        isLandscape: false,
+      },
+    },
+    {
+      name: 'Galaxy Tab S4 landscape',
+      userAgent:
+        'Mozilla/5.0 (Linux; Android 8.1.0; SM-T837A) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.80 Safari/537.36',
+      viewport: {
+        width: 1138,
+        height: 712,
+        deviceScaleFactor: 2.25,
+        isMobile: true,
+        hasTouch: true,
+        isLandscape: true,
+      },
+    },
     {
       name: 'iPad',
       userAgent:
@@ -1003,6 +1081,58 @@ Puppeteer::DEVICES = Hash[
         isLandscape: true,
       },
     },
+    {
+      name: 'Pixel 3',
+      userAgent:
+        'Mozilla/5.0 (Linux; Android 9; Pixel 3 Build/PQ1A.181105.017.A1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/66.0.3359.158 Mobile Safari/537.36',
+      viewport: {
+        width: 393,
+        height: 786,
+        deviceScaleFactor: 2.75,
+        isMobile: true,
+        hasTouch: true,
+        isLandscape: false,
+      },
+    },
+    {
+      name: 'Pixel 3 landscape',
+      userAgent:
+        'Mozilla/5.0 (Linux; Android 9; Pixel 3 Build/PQ1A.181105.017.A1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/66.0.3359.158 Mobile Safari/537.36',
+      viewport: {
+        width: 786,
+        height: 393,
+        deviceScaleFactor: 2.75,
+        isMobile: true,
+        hasTouch: true,
+        isLandscape: true,
+      },
+    },
+    {
+      name: 'Pixel 4',
+      userAgent:
+        'Mozilla/5.0 (Linux; Android 10; Pixel 4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Mobile Safari/537.36',
+      viewport: {
+        width: 353,
+        height: 745,
+        deviceScaleFactor: 3,
+        isMobile: true,
+        hasTouch: true,
+        isLandscape: false,
+      },
+    },
+    {
+      name: 'Pixel 4 landscape',
+      userAgent:
+        'Mozilla/5.0 (Linux; Android 10; Pixel 4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Mobile Safari/537.36',
+      viewport: {
+        width: 745,
+        height: 353,
+        deviceScaleFactor: 3,
+        isMobile: true,
+        hasTouch: true,
+        isLandscape: true,
+      },
+    },
   ].map do |json|
     [
       json[:name],

data/lib/puppeteer/dom_world.rb

@@ -233,12 +233,13 @@ class Puppeteer::DOMWorld
   # @param url [String?]
   # @param path [String?]
   # @param content [String?]
+  # @param id [String?]
   # @param type [String?]
-  def add_script_tag(url: nil, path: nil, content: nil, type: nil)
+  def add_script_tag(url: nil, path: nil, content: nil, id: nil, type: nil)
     if url
       begin
         return execution_context.
-          evaluate_handle(ADD_SCRIPT_URL, url, type || '').
+          evaluate_handle(ADD_SCRIPT_URL, url, id, type || '').
           as_element
       rescue Puppeteer::ExecutionContext::EvaluationError # for Chrome
         raise "Loading script from #{url} failed"
@@ -251,13 +252,13 @@ class Puppeteer::DOMWorld
       contents = File.read(path)
       contents += "//# sourceURL=#{path.gsub(/\n/, '')}"
       return execution_context.
-        evaluate_handle(ADD_SCRIPT_CONTENT, contents, type || '').
+        evaluate_handle(ADD_SCRIPT_CONTENT, contents, id, type || 'text/javascript').
         as_element
     end
 
     if content
       return execution_context.
-        evaluate_handle(ADD_SCRIPT_CONTENT, content, type || '').
+        evaluate_handle(ADD_SCRIPT_CONTENT, content, id, type || 'text/javascript').
         as_element
     end
 
@@ -265,11 +266,11 @@ class Puppeteer::DOMWorld
   end
 
   ADD_SCRIPT_URL = <<~JAVASCRIPT
-  async (url, type) => {
+  async (url, id, type) => {
     const script = document.createElement('script');
     script.src = url;
-    if (type)
-      script.type = type;
+    if (id) script.id = id;
+    if (type) script.type = type;
     const promise = new Promise((res, rej) => {
       script.onload = res;
       script.onerror = rej;
@@ -281,11 +282,11 @@ class Puppeteer::DOMWorld
   JAVASCRIPT
 
   ADD_SCRIPT_CONTENT = <<~JAVASCRIPT
-  (content, type) => {
-    if (type === undefined) type = 'text/javascript';
+  (content, id, type) => {
     const script = document.createElement('script');
     script.type = type;
     script.text = content;
+    if (id) script.id = id;
     let error = null;
     script.onerror = e => error = e;
     document.head.appendChild(script);

data/lib/puppeteer/element_handle/offset.rb

@@ -0,0 +1,28 @@
+class Puppeteer::ElementHandle < Puppeteer::JSHandle
+  # A class to represent (x, y)-offset coordinates
+  class Offset
+    def initialize(x:, y:)
+      @x = x
+      @y = y
+    end
+
+    def self.from(offset)
+      case offset
+      when nil
+        nil
+      when Hash
+        if offset[:x] && offset[:y]
+          Offset.new(x: offset[:x], y: offset[:y])
+        else
+          raise ArgumentError.new('offset parameter must have x, y coordinates')
+        end
+      when Offset
+        offset
+      else
+        raise ArgumentError.new('Offset.from(Hash|Offset)')
+      end
+    end
+
+    attr_reader :x, :y
+  end
+end

data/lib/puppeteer/element_handle/point.rb

@@ -21,6 +21,17 @@ class Puppeteer::ElementHandle < Puppeteer::JSHandle
       )
     end
 
+    def ==(other)
+      case other
+      when Hash
+        @x == other[:x] && @y == other[:y]
+      when Point
+        @x == other.x && @y == other.y
+      else
+        super
+      end
+    end
+
     attr_reader :x, :y
   end
 end

data/lib/puppeteer/element_handle.rb

@@ -1,5 +1,6 @@
 require_relative './element_handle/bounding_box'
 require_relative './element_handle/box_model'
+require_relative './element_handle/offset'
 require_relative './element_handle/point'
 
 class Puppeteer::ElementHandle < Puppeteer::JSHandle
@@ -79,7 +80,9 @@ class Puppeteer::ElementHandle < Puppeteer::JSHandle
     end
   end
 
-  def clickable_point
+  def clickable_point(offset = nil)
+    offset_param = Offset.from(offset)
+
     result =
       begin
         @remote_object.content_quads(@client)
@@ -105,6 +108,19 @@ class Puppeteer::ElementHandle < Puppeteer::JSHandle
       raise ElementNotVisibleError.new
     end
 
+    if offset_param
+      # Return the point of the first quad identified by offset.
+      quad = quads.first
+      min_x = quad.map(&:x).min
+      min_y = quad.map(&:y).min
+      if min_x && min_y
+        return Point.new(
+          x: min_x + offset_param.x,
+          y: min_y + offset_param.y,
+        )
+      end
+    end
+
     # Return the middle point of the first quad.
     quads.first.reduce(:+) / 4
   end
@@ -139,9 +155,10 @@ class Puppeteer::ElementHandle < Puppeteer::JSHandle
   # @param delay [Number]
   # @param button [String] "left"|"right"|"middle"
   # @param click_count [Number]
-  def click(delay: nil, button: nil, click_count: nil)
+  # @param offset [Hash]
+  def click(delay: nil, button: nil, click_count: nil, offset: nil)
     scroll_into_view_if_needed
-    point = clickable_point
+    point = clickable_point(offset)
     @page.mouse.click(point.x, point.y, delay: delay, button: button, click_count: click_count)
   end
 
@@ -436,10 +453,12 @@ class Puppeteer::ElementHandle < Puppeteer::JSHandle
   define_async_method :async_Sx
 
   # in JS, #isIntersectingViewport.
+  # @param threshold [Float|nil]
   # @return [Boolean]
-  def intersecting_viewport?
+  def intersecting_viewport?(threshold: nil)
+    option_threshold = threshold || 0
     js = <<~JAVASCRIPT
-    async element => {
+    async (element, threshold) => {
       const visibleRatio = await new Promise(resolve => {
         const observer = new IntersectionObserver(entries => {
           resolve(entries[0].intersectionRatio);
@@ -447,11 +466,12 @@ class Puppeteer::ElementHandle < Puppeteer::JSHandle
         });
         observer.observe(element);
       });
-      return visibleRatio > 0;
+      if (threshold === 1) return visibleRatio === 1;
+      else return visibleRatio > threshold;
     }
     JAVASCRIPT
 
-    evaluate(js)
+    evaluate(js, option_threshold)
   end
 
   # @param quad [Array<Point>]

data/lib/puppeteer/frame.rb

@@ -157,8 +157,9 @@ class Puppeteer::Frame
   # @param path [String?]
   # @param content [String?]
   # @param type [String?]
-  def add_script_tag(url: nil, path: nil, content: nil, type: nil)
-    @main_world.add_script_tag(url: url, path: path, content: content, type: type)
+  # @param id [String?]
+  def add_script_tag(url: nil, path: nil, content: nil, type: nil, id: nil)
+    @main_world.add_script_tag(url: url, path: path, content: content, type: type, id: id)
   end
 
   # @param url [String?]

data/lib/puppeteer/js_coverage.rb

@@ -12,6 +12,14 @@ class Puppeteer::JSCoverage
     attr_reader :url, :ranges, :text
   end
 
+  class ItemWithRawScriptCoverage < Item
+    def initialize(url:, ranges:, text:, raw_script_coverage:)
+      super(url: url, ranges: ranges, text: text)
+      @raw_script_coverage = raw_script_coverage
+    end
+    attr_reader :raw_script_coverage
+  end
+
   # @param client [Puppeteer::CDPSession]
   def initialize(client)
     @client = client
@@ -20,7 +28,10 @@ class Puppeteer::JSCoverage
     @script_sources = {}
   end
 
-  def start(reset_on_navigation: nil, report_anonymous_scripts: nil)
+  def start(
+        reset_on_navigation: nil,
+        report_anonymous_scripts: nil,
+        include_raw_script_coverage: nil)
     raise 'JSCoverage is already enabled' if @enabled
 
     @reset_on_navigation =
@@ -30,6 +41,7 @@ class Puppeteer::JSCoverage
         true
       end
     @report_anonymous_scripts = report_anonymous_scripts || false
+    @include_raw_script_coverage = include_raw_script_coverage || false
     @enabled = true
     @script_urls.clear
     @script_sources.clear
@@ -43,7 +55,7 @@ class Puppeteer::JSCoverage
     await_all(
       @client.async_send_message('Profiler.enable'),
       @client.async_send_message('Profiler.startPreciseCoverage',
-        callCount: false,
+        callCount: @include_raw_script_coverage,
         detailed: true,
       ),
       @client.async_send_message('Debugger.enable'),
@@ -107,11 +119,20 @@ class Puppeteer::JSCoverage
         end
       end
 
-      coverage << Item.new(
-        url: url,
-        ranges: convert_to_disjoint_ranges(flatten_ranges),
-        text: text,
-      )
+      if @include_raw_script_coverage
+        coverage << ItemWithRawScriptCoverage.new(
+          url: url,
+          ranges: convert_to_disjoint_ranges(flatten_ranges),
+          text: text,
+          raw_script_coverage: entry,
+        )
+      else
+        coverage << Item.new(
+          url: url,
+          ranges: convert_to_disjoint_ranges(flatten_ranges),
+          text: text,
+        )
+      end
     end
 
     coverage

data/lib/puppeteer/page/screenshot_options.rb

@@ -15,7 +15,7 @@ class Puppeteer::Page
     # @params options [Hash]
     def initialize(options)
       if options[:type]
-        unless [:png, :jpeg].include?(options[:type].to_sym)
+        unless [:png, :jpeg, :webp].include?(options[:type].to_sym)
           raise ArgumentError.new("Unknown options.type value: #{options[:type]}")
         end
         @type = options[:type]
@@ -25,6 +25,8 @@ class Puppeteer::Page
           @type = 'png'
         elsif mime_types.include?('image/jpeg')
           @type = 'jpeg'
+        elsif mime_types.include?('image/webp')
+          @type = 'webp'
         else
           raise ArgumentError.new("Unsupported screenshot mime type resolved: #{mime_types}, path: #{options[:path]}")
         end

data/lib/puppeteer/page.rb

@@ -404,8 +404,9 @@ class Puppeteer::Page
   # @param path [String?]
   # @param content [String?]
   # @param type [String?]
-  def add_script_tag(url: nil, path: nil, content: nil, type: nil)
-    main_frame.add_script_tag(url: url, path: path, content: content, type: type)
+  # @param id [String?]
+  def add_script_tag(url: nil, path: nil, content: nil, type: nil, id: nil)
+    main_frame.add_script_tag(url: url, path: path, content: content, type: type, id: id)
   end
 
   # @param url [String?]
@@ -965,7 +966,7 @@ class Puppeteer::Page
     main_frame.title
   end
 
-  # @param type [String] "png"|"jpeg"
+  # @param type [String] "png"|"jpeg"|"webp"
   # @param path [String]
   # @param full_page [Boolean]
   # @param clip [Hash]
@@ -1059,11 +1060,20 @@ class Puppeteer::Page
 
   # @return [Enumerable<String>]
   def create_pdf_stream(options = {})
+    timeout_helper = Puppeteer::TimeoutHelper.new('Page.printToPDF',
+                      timeout_ms: options[:timeout],
+                      default_timeout_ms: 30000)
     pdf_options = PDFOptions.new(options)
     omit_background = options[:omit_background]
     set_transparent_background_color if omit_background
-    result = @client.send_message('Page.printToPDF', pdf_options.page_print_args)
-    reset_default_background_color if omit_background
+    result =
+      begin
+        timeout_helper.with_timeout do
+          @client.send_message('Page.printToPDF', pdf_options.page_print_args)
+        end
+      ensure
+        reset_default_background_color if omit_background
+      end
 
     Puppeteer::ProtocolStreamReader.new(
       client: @client,

data/lib/puppeteer/timeout_helper.rb

@@ -0,0 +1,22 @@
+require 'timeout'
+
+class Puppeteer::TimeoutHelper
+  # @param timeout_ms [String|Integer|nil]
+  # @param default_timeout_ms [Integer]
+  def initialize(task_name, timeout_ms:, default_timeout_ms:)
+    @task_name = task_name
+    @timeout_ms = (timeout_ms || default_timeout_ms).to_i
+  end
+
+  def with_timeout(&block)
+    if @timeout_ms > 0
+      begin
+        Timeout.timeout(@timeout_ms / 1000.0, &block)
+      rescue Timeout::Error
+        raise Puppeteer::TimeoutError.new("waiting for #{@task_name} failed: timeout #{@timeout_ms}ms exceeded")
+      end
+    else
+      block.call
+    end
+  end
+end

data/lib/puppeteer/tracing.rb

@@ -27,11 +27,16 @@ class Puppeteer::Tracing
       option_categories << 'disabled-by-default-devtools.screenshot'
     end
 
+    ex_cat = option_categories.select { |cat| cat.start_with?('-') }.map { |cat| cat[1..-1] }
+    in_cat = option_categories.reject { |cat| cat.start_with?('-') }
     @path = path
     @recording = true
     @client.send_message('Tracing.start',
       transferMode: 'ReturnAsStream',
-      categories: option_categories.join(','),
+      traceConfig: {
+        excludedCategories: ex_cat,
+        includedCategories: in_cat,
+      },
     )
   end
 

data/lib/puppeteer/version.rb

@@ -1,3 +1,3 @@
 module Puppeteer
-  VERSION = '0.36.0'
+  VERSION = '0.37.0'
 end

data/lib/puppeteer/web_socket.rb

@@ -55,6 +55,7 @@ class Puppeteer::WebSocket
   def initialize(url:, max_payload_size:)
     @impl = DriverImpl.new(url)
     @driver = ::WebSocket::Driver.client(@impl, max_length: max_payload_size)
+    @driver.set_header('User-Agent', "Puppeteer #{Puppeteer::VERSION}")
 
     setup
     @driver.start

data/lib/puppeteer.rb

@@ -54,6 +54,7 @@ require 'puppeteer/request'
 require 'puppeteer/response'
 require 'puppeteer/target'
 require 'puppeteer/tracing'
+require 'puppeteer/timeout_helper'
 require 'puppeteer/timeout_settings'
 require 'puppeteer/touch_screen'
 require 'puppeteer/version'
@@ -66,17 +67,19 @@ require 'puppeteer/element_handle'
 
 # ref: https://github.com/puppeteer/puppeteer/blob/master/lib/Puppeteer.js
 module Puppeteer
-  module_function def method_missing(method, *args, **kwargs, &block)
-    @puppeteer ||= ::Puppeteer::Puppeteer.new(
-      project_root: __dir__,
-      preferred_revision: '706915',
-      is_puppeteer_core: true,
-    )
-
-    if kwargs.empty? # for Ruby < 2.7
-      @puppeteer.public_send(method, *args, &block)
-    else
-      @puppeteer.public_send(method, *args, **kwargs, &block)
+  @puppeteer ||= ::Puppeteer::Puppeteer.new(
+    project_root: __dir__,
+    preferred_revision: '706915',
+    is_puppeteer_core: true,
+  ).tap do |instance|
+    instance.public_methods(false).each do |method_name|
+      define_singleton_method(method_name) do |*args, **kwargs, &block|
+        if kwargs.empty? # for Ruby < 2.7
+          @puppeteer.public_send(method_name, *args, &block)
+        else
+          @puppeteer.public_send(method_name, *args, **kwargs, &block)
+        end
+      end
     end
   end
 end

data/puppeteer-ruby.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rollbar'
   spec.add_development_dependency 'rspec', '~> 3.10.0 '
   spec.add_development_dependency 'rspec_junit_formatter' # for CircleCI.
-  spec.add_development_dependency 'rubocop', '~> 1.19.0'
+  spec.add_development_dependency 'rubocop', '~> 1.21.0'
   spec.add_development_dependency 'rubocop-rspec'
   spec.add_development_dependency 'sinatra'
   spec.add_development_dependency 'webrick'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppeteer-ruby
 version: !ruby/object:Gem::Version
-  version: 0.36.0
+  version: 0.37.0
 platform: ruby
 authors:
 - YusukeIwaki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-17 00:00:00.000000000 Z
+date: 2021-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 1.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 1.21.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -274,6 +274,7 @@ files:
 - lib/puppeteer/element_handle.rb
 - lib/puppeteer/element_handle/bounding_box.rb
 - lib/puppeteer/element_handle/box_model.rb
+- lib/puppeteer/element_handle/offset.rb
 - lib/puppeteer/element_handle/point.rb
 - lib/puppeteer/emulation_manager.rb
 - lib/puppeteer/env.rb
@@ -315,6 +316,7 @@ files:
 - lib/puppeteer/request.rb
 - lib/puppeteer/response.rb
 - lib/puppeteer/target.rb
+- lib/puppeteer/timeout_helper.rb
 - lib/puppeteer/timeout_settings.rb
 - lib/puppeteer/touch_screen.rb
 - lib/puppeteer/tracing.rb