puppeteer-ruby 0.34.3 → 0.37.0

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.34.3'
+  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-ruby.rb

@@ -0,0 +1,2 @@
+# just an alias.
+require 'puppeteer'

data/lib/puppeteer.rb

@@ -5,7 +5,6 @@ module Puppeteer; end
 require 'puppeteer/env'
 
 # Custom data types.
-require 'puppeteer/device'
 require 'puppeteer/events'
 require 'puppeteer/errors'
 require 'puppeteer/geolocation'
@@ -44,6 +43,7 @@ require 'puppeteer/keyboard'
 require 'puppeteer/launcher'
 require 'puppeteer/lifecycle_watcher'
 require 'puppeteer/mouse'
+require 'puppeteer/network_conditions'
 require 'puppeteer/network_manager'
 require 'puppeteer/page'
 require 'puppeteer/protocol_stream_reader'
@@ -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.17.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.34.3
+  version: 0.37.0
 platform: ruby
 authors:
 - YusukeIwaki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-27 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.17.0
+        version: 1.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.17.0
+        version: 1.21.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -244,15 +244,14 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - CHANGELOG.md
-- Dockerfile
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
-- docker-compose.yml
 - docs/api_coverage.md
+- lib/puppeteer-ruby.rb
 - lib/puppeteer.rb
 - lib/puppeteer/aria_query_handler.rb
 - lib/puppeteer/browser.rb
@@ -275,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
@@ -294,7 +294,6 @@ files:
 - lib/puppeteer/keyboard/key_description.rb
 - lib/puppeteer/keyboard/us_keyboard_layout.rb
 - lib/puppeteer/launcher.rb
-- lib/puppeteer/launcher/base.rb
 - lib/puppeteer/launcher/browser_options.rb
 - lib/puppeteer/launcher/chrome.rb
 - lib/puppeteer/launcher/chrome_arg_options.rb
@@ -302,8 +301,11 @@ files:
 - lib/puppeteer/launcher/launch_options.rb
 - lib/puppeteer/lifecycle_watcher.rb
 - lib/puppeteer/mouse.rb
+- lib/puppeteer/network_condition.rb
+- lib/puppeteer/network_conditions.rb
 - lib/puppeteer/network_manager.rb
 - lib/puppeteer/page.rb
+- lib/puppeteer/page/metrics.rb
 - lib/puppeteer/page/pdf_options.rb
 - lib/puppeteer/page/screenshot_options.rb
 - lib/puppeteer/page/screenshot_task_queue.rb
@@ -314,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

data/Dockerfile

@@ -1,9 +0,0 @@
-FROM circleci/ruby:3.0.0-rc1-buster-node-browsers
-
-USER root
-
-RUN wget -O nightly.tar.bz2 "https://download.mozilla.org/?product=firefox-nightly-latest-ssl&os=linux64&lang=en-US" \
-    && tar xf nightly.tar.bz2 \
-    && ln -s $(pwd)/firefox/firefox /usr/bin/firefox
-
-USER circleci

data/docker-compose.yml

@@ -1,34 +0,0 @@
-version: "3"
-services:
-  chrome:
-    tty: true
-    stdin_open: true
-    build: .
-    environment:
-      BUNDLE_PATH: /usr/local/bundle
-      DEBUG: 1
-      CI: 1
-    volumes:
-      - .:/puppeteer-ruby
-      - bundle-data:/usr/local/bundle
-    working_dir: /puppeteer-ruby
-    command: bundle exec rspec
-
-  firefox:
-    tty: true
-    stdin_open: true
-    build: .
-    environment:
-      BUNDLE_PATH: /usr/local/bundle
-      PUPPETEER_PRODUCT_RSPEC: firefox
-      DEBUG: 1
-      CI: 1
-    volumes:
-      - .:/puppeteer-ruby
-      - bundle-data:/usr/local/bundle
-    working_dir: /puppeteer-ruby
-    command: bundle exec rspec spec/integration/
-
-volumes:
-  bundle-data:
-    driver: local

data/lib/puppeteer/launcher/base.rb

@@ -1,66 +0,0 @@
-module Puppeteer::Launcher
-  class Base
-    # @param {string} projectRoot
-    # @param {string} preferredRevision
-    def initialize(project_root:, preferred_revision:, is_puppeteer_core:)
-      @project_root = project_root
-      @preferred_revision = preferred_revision
-      @is_puppeteer_core = is_puppeteer_core
-    end
-
-    class ExecutablePathNotFound < StandardError; end
-
-    # @returns [String] Chrome Executable file path.
-    # @raise [ExecutablePathNotFound]
-    def resolve_executable_path
-      if !@is_puppeteer_core
-        # puppeteer-core doesn't take into account PUPPETEER_* env variables.
-        executable_path = ENV['PUPPETEER_EXECUTABLE_PATH']
-        if FileTest.exist?(executable_path)
-          return executable_path
-        end
-        raise ExecutablePathNotFound.new(
-          "Tried to use PUPPETEER_EXECUTABLE_PATH env variable to launch browser but did not find any executable at: #{executable_path}",
-        )
-      end
-
-      # temporal logic.
-      if Puppeteer.env.darwin?
-        case self
-        when Chrome
-          '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome'
-        when Firefox
-          '/Applications/Firefox Nightly.app/Contents/MacOS/firefox'
-        end
-      elsif Puppeteer.env.windows?
-        case self
-        when Chrome
-          'C:\Program Files\Google\Chrome\Application\chrome.exe'
-          # 'C:\Program Files (x86)\Microsoft\Edge\Application\msedge.exe'
-        when Firefox
-          'C:\Program Files\Firefox Nightly\firefox.exe'
-        end
-      else
-        case self
-        when Chrome
-          '/usr/bin/google-chrome'
-        when Firefox
-          '/usr/bin/firefox'
-        end
-      end
-
-      # const browserFetcher = new BrowserFetcher(launcher._projectRoot);
-      # if (!launcher._isPuppeteerCore) {
-      #   const revision = process.env['PUPPETEER_CHROMIUM_REVISION'];
-      #   if (revision) {
-      #     const revisionInfo = browserFetcher.revisionInfo(revision);
-      #     const missingText = !revisionInfo.local ? 'Tried to use PUPPETEER_CHROMIUM_REVISION env variable to launch browser but did not find executable at: ' + revisionInfo.executablePath : null;
-      #     return {executablePath: revisionInfo.executablePath, missingText};
-      #   }
-      # }
-      # const revisionInfo = browserFetcher.revisionInfo(launcher._preferredRevision);
-      # const missingText = !revisionInfo.local ? `Browser is not downloaded. Run "npm install" or "yarn install"` : null;
-      # return {executablePath: revisionInfo.executablePath, missingText};
-    end
-  end
-end