puppeteer-ruby 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e6a29713aa4dd143bdd6c4fd1cc84df1bd7037aa920b0d660a62267f6321515
-  data.tar.gz: 46a433d484dfabd019cc0874b8dd6c17182e374fb53d6f6905fde7c1d120d5e6
+  metadata.gz: 8a0821b740ece89c3194c7b9fc7778b18528d38becf524e7a1c50ceffd37ab3c
+  data.tar.gz: 86a3e592c61b4f0095ca3fad2ab0ecb1b031c4dbe4f9607caa52b2b82cf225bd
 SHA512:
-  metadata.gz: 9c5796c2331a9218c1191e1c2869aa5b02c6affdd19f5af23324ee1b257e93d3f328688b19ac14b4060f050c3649a82f6074f0a2b5d66c4bb71f34f46d51557a
-  data.tar.gz: 70bfa15d8c788ab11dbf8cf240a3967a906a15777294b1f8be2be22a64d5f2123a3c4bf44226c35c58bed0614a9b7703d6db498ce283309aa36bb30c5587cea6
+  metadata.gz: e73f8a9f380aadb2e4dd4164be571ee22b688b48b1999720d0ecefb39b62f79a071a709134b00f701b04a1d179bba3efe742d3307fca9bc2d2f56cb305b7bb53
+  data.tar.gz: f03efa136e60899f4eb0e0bd671e60c86b52efb13a59d62754b88961188d1495e7e85e012bb93a11d118e2f5a93375de07c453ef5a5eff7375325c2ec9b2b5ae

data/README.md

@@ -47,6 +47,29 @@ Puppeteer.launch(headless: false, slow_mo: 50, args: ['--guest', '--window-size=
 end
 ```
 
+### Evaluate JavaScript
+
+```ruby
+Puppeteer.launch do |browser|
+  page = browser.pages.last || browser.new_page
+  page.goto 'https://github.com/YusukeIwaki'
+
+  # Get the "viewport" of the page, as reported by the page.
+  dimensions = page.evaluate(<<~JAVASCRIPT)
+  () => {
+    return {
+      width: document.documentElement.clientWidth,
+      height: document.documentElement.clientHeight,
+      deviceScaleFactor: window.devicePixelRatio
+    };
+  }
+  JAVASCRIPT
+
+  puts "dimensions: #{dimensions}"
+  # => dimensions: {"width"=>800, "height"=>600, "deviceScaleFactor"=>1}
+end
+```
+
 More usage examples can be found [here](https://github.com/YusukeIwaki/puppeteer-ruby-example)
 
 ## :bulb: Collaboration with Selenium or Capybara

data/lib/puppeteer.rb

@@ -24,6 +24,7 @@ require 'puppeteer/cdp_session'
 require 'puppeteer/connection'
 require 'puppeteer/console_message'
 require 'puppeteer/devices'
+require 'puppeteer/dialog'
 require 'puppeteer/dom_world'
 require 'puppeteer/emulation_manager'
 require 'puppeteer/execution_context'

data/lib/puppeteer/cdp_session.rb

@@ -81,4 +81,14 @@ class Puppeteer::CDPSession
     @connection = nil
     emit_event 'Events.CDPSession.Disconnected'
   end
+
+  # @param event_name [String]
+  def on(event_name, &block)
+    add_event_listener(event_name, &block)
+  end
+
+  # @param event_name [String]
+  def once(event_name, &block)
+    observe_first(event_name, &block)
+  end
 end

data/lib/puppeteer/connection.rb

@@ -204,8 +204,8 @@ class Puppeteer::Connection
           callback.reject(
             ProtocolError.new(
               method: callback.method,
-              error_message: response['error']['message'],
-              error_data: response['error']['data']))
+              error_message: message['error']['message'],
+              error_data: message['error']['data']))
         else
           callback.resolve(message['result'])
         end

data/lib/puppeteer/dialog.rb

@@ -0,0 +1,34 @@
+class Puppeteer::Dialog
+  def initialize(client, type:, message:, default_value:)
+    @client = client
+    @type = type
+    @message = message
+    @default_value = default_value || ''
+  end
+
+  attr_reader :type, :message, :default_value
+
+  # @param prompt_text - optional text that will be entered in the dialog
+  # prompt. Has no effect if the dialog's type is not `prompt`.
+  #
+  # @returns A promise that resolves when the dialog has been accepted.
+  def accept(prompt_text = nil)
+    if @handled
+      raise 'Cannot accept dialog which is already handled!'
+    end
+    @handled = true
+    @client.send_message('Page.handleJavaScriptDialog', {
+      accept: true,
+      promptText: prompt_text,
+    }.compact)
+  end
+
+  # @returns A promise which will resolve once the dialog has been dismissed
+  def dismiss
+    if @handled
+      raise 'Cannot accept dialog which is already handled!'
+    end
+    @handled = true
+    @client.send_message('Page.handleJavaScriptDialog', accept: false)
+  end
+end

data/lib/puppeteer/frame.rb

@@ -266,9 +266,7 @@ class Puppeteer::Frame
   # @param frame_payload [Hash]
   def navigated(frame_payload)
     @name = frame_payload['name']
-    # TODO(lushnikov): remove this once requestInterception has loaderId exposed.
-    @navigation_url = frame_payload['url']
-    @url = frame_payload['url']
+    @url = "#{frame_payload['url']}#{frame_payload['urlFragment']}"
 
     # Ensure loaderId updated.
     # The order of [Page.lifecycleEvent name="init"] and [Page.frameNavigated] is random... for some reason...

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',
@@ -632,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

data/lib/puppeteer/version.rb

@@ -1,3 +1,3 @@
 class Puppeteer
-  VERSION = '0.0.19'
+  VERSION = '0.0.20'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppeteer-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - YusukeIwaki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-07 00:00:00.000000000 Z
+date: 2020-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -213,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