puppeteer-ruby 0.0.17 → 0.0.22

data/lib/puppeteer/page.rb

@@ -101,7 +101,9 @@ class Puppeteer::Page
     end
     # client.on('Runtime.consoleAPICalled', event => this._onConsoleAPI(event));
     # client.on('Runtime.bindingCalled', event => this._onBindingCalled(event));
-    # client.on('Page.javascriptDialogOpening', event => this._onDialog(event));
+    @client.on_event 'Page.javascriptDialogOpening' do |event|
+      handle_dialog_opening(event)
+    end
     # client.on('Runtime.exceptionThrown', exception => this._handleException(exception.exceptionDetails));
     # client.on('Inspector.targetCrashed', event => this._onTargetCrashed());
     # client.on('Performance.metrics', event => this._emitMetrics(event));
@@ -129,7 +131,7 @@ class Puppeteer::Page
   EVENT_MAPPINGS = {
     close: 'Events.Page.Close',
     # console: 'Events.Page.Console',
-    # dialog: 'Events.Page.Dialog',
+    dialog: 'Events.Page.Dialog',
     domcontentloaded: 'Events.Page.DOMContentLoaded',
     # error:
     frameattached: 'Events.Page.FrameAttached',
@@ -266,7 +268,13 @@ class Puppeteer::Page
     @frame_manager.main_frame
   end
 
-  attr_reader :keyboard, :touch_screen, :coverage, :accessibility
+  attr_reader :touch_screen, :coverage, :accessibility
+
+  def keyboard(&block)
+    @keyboard.instance_eval(&block) unless block.nil?
+
+    @keyboard
+  end
 
   def frames
     @frame_manager.frames
@@ -626,20 +634,17 @@ class Puppeteer::Page
   #   this.emit(Events.Page.Console, message);
   # }
 
-  # _onDialog(event) {
-  #   let dialogType = null;
-  #   if (event.type === 'alert')
-  #     dialogType = Dialog.Type.Alert;
-  #   else if (event.type === 'confirm')
-  #     dialogType = Dialog.Type.Confirm;
-  #   else if (event.type === 'prompt')
-  #     dialogType = Dialog.Type.Prompt;
-  #   else if (event.type === 'beforeunload')
-  #     dialogType = Dialog.Type.BeforeUnload;
-  #   assert(dialogType, 'Unknown javascript dialog type: ' + event.type);
-  #   const dialog = new Dialog(this._client, dialogType, event.message, event.defaultPrompt);
-  #   this.emit(Events.Page.Dialog, dialog);
-  # }
+  private def handle_dialog_opening(event)
+    dialog_type = event['type']
+    unless %w(alert confirm prompt beforeunload).include?(dialog_type)
+      raise ArgumentError.new("Unknown javascript dialog type: #{dialog_type}")
+    end
+    dialog = Puppeteer::Dialog.new(@client,
+              type: dialog_type,
+              message: event['message'],
+              default_value: event['defaultPrompt'])
+    emit_event('Events.Page.Dialog', dialog)
+  end
 
   # @return [String]
   def url
@@ -934,16 +939,16 @@ class Puppeteer::Page
       clip = { x: 0, y: 0, width: width, height: height, scale: 1 }
 
       screen_orientation =
-        if @viewport.landscape?
+        if @viewport&.landscape?
           { angle: 90, type: 'landscapePrimary' }
         else
           { angle: 0, type: 'portraitPrimary' }
         end
       @client.send_message('Emulation.setDeviceMetricsOverride',
-        mobile: @viewport.mobile?,
+        mobile: @viewport&.mobile? || false,
         width: width,
         height: height,
-        deviceScaleFactor: @viewport.device_scale_factor,
+        deviceScaleFactor: @viewport&.device_scale_factor || 1,
         screenOrientation: screen_orientation)
     end
 
@@ -1116,6 +1121,11 @@ class Puppeteer::Page
 
   define_async_method :async_wait_for_selector
 
+  # @param milliseconds [Integer] the number of milliseconds to wait.
+  def wait_for_timeout(milliseconds)
+    main_frame.wait_for_timeout(milliseconds)
+  end
+
   # @param xpath [String]
   # @param visible [Boolean] Wait for element visible (not 'display: none' nor 'visibility: hidden') on true. default to false.
   # @param hidden [Boolean] Wait for element invisible ('display: none' nor 'visibility: hidden') on true. default to false.
@@ -1126,12 +1136,13 @@ class Puppeteer::Page
 
   define_async_method :async_wait_for_xpath
 
-  # @param {Function|string} pageFunction
-  # @param {!{polling?: string|number, timeout?: number}=} options
-  # @param {!Array<*>} args
-  # @return {!Promise<!Puppeteer.JSHandle>}
-  def wait_for_function(page_function, options = {}, *args)
-    main_frame.wait_for_function(page_function, options, *args)
+  # @param page_function [String]
+  # @param args [Integer|Array]
+  # @param polling [String]
+  # @param timeout [Integer]
+  # @return [Puppeteer::JSHandle]
+  def wait_for_function(page_function, args: [], polling: nil, timeout: nil)
+    main_frame.wait_for_function(page_function, args: args, polling: polling, timeout: timeout)
   end
 
   define_async_method :async_wait_for_function

data/lib/puppeteer/remote_object.rb

@@ -6,6 +6,7 @@ class Puppeteer::RemoteObject
   # @param payload [Hash]
   def initialize(payload)
     @object_id = payload['objectId']
+    @type = payload['type']
     @sub_type = payload['subtype']
     @unserializable_value = payload['unserializableValue']
     @value = payload['value']
@@ -42,6 +43,21 @@ class Puppeteer::RemoteObject
     end
   end
 
+  # @return [String]
+  def type_str
+    # used in JSHandle#to_s
+    # original logic:
+    #   if (this._remoteObject.objectId) {
+    #     const type =  this._remoteObject.subtype || this._remoteObject.type;
+    #     return 'JSHandle@' + type;
+    #   }
+    if @object_id
+      @sub_type || @type
+    else
+      nil
+    end
+  end
+
   # used in JSHandle#properties
   def properties(client)
     # original logic:
@@ -64,7 +80,18 @@ class Puppeteer::RemoteObject
 
   # used in ElementHandle#_box_model
   def box_model(client)
-    client.send_message('DOM.getBoxModel', objectId: @object_id)
+    result = client.send_message('DOM.getBoxModel', objectId: @object_id)
+
+    # Firefox returns width/height = 0, content/padding/border/margin = [nil, nil, nil, nil, nil, nil, nil, nil]
+    # while Chrome throws Error(Could not compute box model)
+    model = result['model']
+    if model['width'] == 0 && model['height'] == 0 &&
+      %w(content padding border margin).all? { |key| model[key].all?(&:nil?) }
+
+      debug_puts('Could not compute box model in Firefox.')
+      return nil
+    end
+    result
   rescue => err
     debug_puts(err)
     nil

data/lib/puppeteer/version.rb

@@ -1,3 +1,3 @@
 class Puppeteer
-  VERSION = '0.0.17'
+  VERSION = '0.0.22'
 end

data/lib/puppeteer/wait_task.rb

@@ -25,7 +25,7 @@ class Puppeteer::WaitTask
     @dom_world = dom_world
     @polling = polling
     @timeout = timeout
-    @predicate_body = predicate_body
+    @predicate_body = "return (#{predicate_body})(...args);"
     @args = args
     @run_count = 0
     @dom_world._wait_tasks.add(self)

data/puppeteer-ruby.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec_junit_formatter' # for CircleCI.
-  spec.add_development_dependency 'rubocop', '~> 0.86.0'
+  spec.add_development_dependency 'rubocop', '~> 0.90.0'
   spec.add_development_dependency 'rubocop-rspec'
   spec.add_development_dependency 'sinatra'
   spec.add_development_dependency 'yard'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppeteer-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.22
 platform: ruby
 authors:
 - YusukeIwaki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-28 00:00:00.000000000 Z
+date: 2020-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.86.0
+        version: 0.90.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.86.0
+        version: 0.90.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -193,11 +193,13 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- Dockerfile
 - Gemfile
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
+- docker-compose.yml
 - lib/puppeteer.rb
 - lib/puppeteer/browser.rb
 - lib/puppeteer/browser_context.rb
@@ -211,6 +213,7 @@ files:
 - lib/puppeteer/define_async_method.rb
 - lib/puppeteer/device.rb
 - lib/puppeteer/devices.rb
+- lib/puppeteer/dialog.rb
 - lib/puppeteer/dom_world.rb
 - lib/puppeteer/element_handle.rb
 - lib/puppeteer/element_handle/bounding_box.rb
@@ -234,6 +237,7 @@ files:
 - lib/puppeteer/launcher/browser_options.rb
 - lib/puppeteer/launcher/chrome.rb
 - lib/puppeteer/launcher/chrome_arg_options.rb
+- lib/puppeteer/launcher/firefox.rb
 - lib/puppeteer/launcher/launch_options.rb
 - lib/puppeteer/lifecycle_watcher.rb
 - lib/puppeteer/mouse.rb