puppeteer-ruby 0.0.6 → 0.0.12

data/lib/puppeteer/remote_object.rb

@@ -52,7 +52,7 @@ class Puppeteer::RemoteObject
     client.send_message('Runtime.getProperties', objectId: @object_id, ownProperties: true)
   end
 
-  # used in ElementHandle#content_frame
+  # used in ElementHandle#content_frame, ElementHandle#upload_file
   def node_info(client)
     client.send_message('DOM.describeNode', objectId: @object_id)
   end
@@ -62,6 +62,15 @@ class Puppeteer::RemoteObject
     client.send_message('DOM.getContentQuads', objectId: @object_id)
   end
 
+  # used in ElementHandle#_box_model
+  def box_model(client)
+    client.send_message('DOM.getBoxModel', objectId: @object_id)
+  rescue => err
+    debug_puts(err)
+    nil
+  end
+
+
   # helper#valueFromRemoteObject
   def value
     if @unserializable_value
@@ -126,4 +135,9 @@ class Puppeteer::RemoteObject
       { value: value }
     end
   end
+
+  # used in ElementHandle#upload_file
+  def set_file_input_files(client, files, backend_node_id)
+    client.send_message('DOM.setFileInputFiles', objectId: @object_id, files: files, backendNodeId: backend_node_id)
+  end
 end

data/lib/puppeteer/target.rb

@@ -33,47 +33,47 @@ class Puppeteer::Target
     #    this._pagePromise = null;
     #    /** @type {?Promise<!Worker>} */
     #    this._workerPromise = null;
-    @initialized_promise = resolvable_future
-    #    this._isClosedPromise = new Promise(fulfill => this._closedCallback = fulfill);
+    @initialize_callback_promise = resolvable_future
+    @initialized_promise = @initialize_callback_promise.then do |success|
+      handle_initialized(success)
+    end
+    @is_closed_promise = resolvable_future
 
     @is_initialized = @target_info.type != 'page' || !@target_info.url.empty?
 
     if @is_initialized
-      handle_initialized(true)
+      @initialize_callback_promise.fulfill(true)
     end
   end
 
-  attr_reader :target_id, :initialized_promise
+  attr_reader :target_id, :initialized_promise, :is_closed_promise
+
+  def closed_callback
+    @is_closed_promise.fulfill(true)
+  end
 
   class InitializeFailure < StandardError; end
 
-  def handle_initialized(success)
+  def ignore_initialize_callback_promise
+    unless @initialize_callback_promise.fulfilled?
+      @initialize_callback_promise.fulfill(false)
+    end
+  end
+
+  private def handle_initialized(success)
     unless success
-      @initialized_promise.reject(InitializeFailure.new('Failed to create target for page'))
+      raise InitializeFailure.new('Failed to create target for page')
     end
-    @on_initialize_succeeded&.call
-    @initialized_promise.fulfill(true)
     opener_page = opener&.page
     if opener_page.nil? || type != 'page'
-      return
+      return true
     end
     #      if (!openerPage.listenerCount(Events.Page.Popup))
     #        return true;
     popup_page = page
     opener_page.emit_event('Events.Page.Popup', popup_page)
-  end
-
-  def on_initialize_succeeded(&block)
-    @on_initialize_succeeded = block
-  end
-
-  def handle_closed
-    @closed = true
-    @on_close&.call
-  end
 
-  def on_close(&block)
-    @on_close = block
+    true
   end
 
   def initialized?
@@ -85,7 +85,7 @@ class Puppeteer::Target
   end
 
   def page
-    if ['page', 'background_page'].include?(@target_info.type) && @page.nil?
+    if ['page', 'background_page', 'webview'].include?(@target_info.type) && @page.nil?
       client = @session_factory.call
       @page = Puppeteer::Page.create(client, self, @ignore_https_errors, @default_viewport, @screenshot_task_queue)
     end
@@ -135,16 +135,16 @@ class Puppeteer::Target
   def opener
     opener_id = @target_info.opener_id
     return nil if opener_id.nil?
-    browser.targets[opener_id]
+    browser.send(:find_target_by_id, opener_id)
   end
 
   # @param {!Protocol.Target.TargetInfo} targetInfo
   def handle_target_info_changed(target_info)
     @target_info = target_info
 
-    if !@is_initialized && (@target_info.type != 'page' || !target_info.url.empty?)
+    if !@is_initialized && (@target_info.type != 'page' || !@target_info.url.empty?)
       @is_initialized = true
-      handle_initialized(true)
+      @initialize_callback_promise.fulfill(true)
     end
   end
 end

data/lib/puppeteer/version.rb

@@ -1,3 +1,3 @@
 class Puppeteer
-  VERSION = '0.0.6'
+  VERSION = '0.0.12'
 end

data/lib/puppeteer/viewport.rb

@@ -33,4 +33,22 @@ class Puppeteer::Viewport
   def landscape?
     @is_landscape
   end
+
+  def merge(
+        width: nil,
+        height: nil,
+        device_scale_factor: nil,
+        is_mobile: nil,
+        has_touch: nil,
+        is_landscape: nil)
+
+    Puppeteer::Viewport.new(
+      width: width || @width,
+      height: height || @height,
+      device_scale_factor: device_scale_factor || @device_scale_factor,
+      is_mobile: is_mobile.nil? ? @is_mobile : is_mobile,
+      has_touch: has_touch.nil? ? @has_touch : has_touch,
+      is_landscape: is_landscape.nil? ? @is_landscape : is_landscape,
+    )
+  end
 end

data/lib/puppeteer/web_socket.rb

@@ -43,6 +43,8 @@ class Puppeteer::WebSocket
     end
   end
 
+  class TransportError < StandardError; end
+
   private def setup
     @ready_state = STATE_CONNECTING
     @driver.on(:open) do
@@ -55,7 +57,7 @@ class Puppeteer::WebSocket
     end
     @driver.on(:error) do |event|
       if !handle_on_error(error_message: event.message)
-        raise Puppeteer::WebSocktTransportError.new(event.message)
+        raise TransportError.new(event.message)
       end
     end
     @driver.on(:message) do |event|

data/lib/puppeteer/web_socket_transport.rb

@@ -6,14 +6,14 @@ class Puppeteer::WebSocketTransport
       url: url,
       max_payload_size: 256 * 1024 * 1024, # 256MB
     )
-    promise = resolvable_future
-    ws.on_open do
-      promise.fulfill(Puppeteer::WebSocketTransport.new(ws))
-    end
-    ws.on_error do |error_message|
-      promise.reject(Puppeteer::WebSocktTransportError.new(error_message))
-    end
-    promise.value!
+    (resolvable_future do |future|
+      ws.on_open do
+        future.fulfill(Puppeteer::WebSocketTransport.new(ws))
+      end
+      ws.on_error do |error_message|
+        future.reject(Puppeteer::WebSocket::TransportError.new(error_message))
+      end
+    end).value!
   end
 
   # @param {!WebSocket::Driver} web_socket

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppeteer-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.12
 platform: ruby
 authors:
 - YusukeIwaki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-25 00:00:00.000000000 Z
+date: 2020-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -177,13 +177,11 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
-- Dockerfile
 - Gemfile
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
-- docker-compose.yml
 - docs/Puppeteer.html
 - docs/Puppeteer/AsyncAwaitBehavior.html
 - docs/Puppeteer/Browser.html
@@ -208,6 +206,8 @@ files:
 - docs/Puppeteer/Device.html
 - docs/Puppeteer/Devices.html
 - docs/Puppeteer/ElementHandle.html
+- docs/Puppeteer/ElementHandle/BoundingBox.html
+- docs/Puppeteer/ElementHandle/BoxModel.html
 - docs/Puppeteer/ElementHandle/ElementNotFoundError.html
 - docs/Puppeteer/ElementHandle/ElementNotVisibleError.html
 - docs/Puppeteer/ElementHandle/Point.html
@@ -219,6 +219,7 @@ files:
 - docs/Puppeteer/ExecutionContext/EvaluationError.html
 - docs/Puppeteer/ExecutionContext/JavaScriptExpression.html
 - docs/Puppeteer/ExecutionContext/JavaScriptFunction.html
+- docs/Puppeteer/FileChooser.html
 - docs/Puppeteer/Frame.html
 - docs/Puppeteer/FrameManager.html
 - docs/Puppeteer/FrameManager/NavigationError.html
@@ -244,6 +245,7 @@ files:
 - docs/Puppeteer/NetworkManager.html
 - docs/Puppeteer/NetworkManager/Credentials.html
 - docs/Puppeteer/Page.html
+- docs/Puppeteer/Page/FileChooserTimeoutError.html
 - docs/Puppeteer/Page/ScreenshotOptions.html
 - docs/Puppeteer/Page/ScriptTag.html
 - docs/Puppeteer/Page/StyleTag.html
@@ -261,6 +263,7 @@ files:
 - docs/Puppeteer/WaitTask/TimeoutError.html
 - docs/Puppeteer/WebSocket.html
 - docs/Puppeteer/WebSocket/DriverImpl.html
+- docs/Puppeteer/WebSocket/TransportError.html
 - docs/Puppeteer/WebSocketTransport.html
 - docs/Puppeteer/WebSocktTransportError.html
 - docs/_index.html
@@ -292,10 +295,14 @@ files:
 - lib/puppeteer/devices.rb
 - lib/puppeteer/dom_world.rb
 - lib/puppeteer/element_handle.rb
+- lib/puppeteer/element_handle/bounding_box.rb
+- lib/puppeteer/element_handle/box_model.rb
+- lib/puppeteer/element_handle/point.rb
 - lib/puppeteer/emulation_manager.rb
 - lib/puppeteer/errors.rb
 - lib/puppeteer/event_callbackable.rb
 - lib/puppeteer/execution_context.rb
+- lib/puppeteer/file_chooser.rb
 - lib/puppeteer/frame.rb
 - lib/puppeteer/frame_manager.rb
 - lib/puppeteer/if_present.rb
@@ -324,6 +331,7 @@ files:
 - lib/puppeteer/web_socket.rb
 - lib/puppeteer/web_socket_transport.rb
 - puppeteer-ruby.gemspec
+- puppeteer-ruby.png
 homepage: https://github.com/YusukeIwaki/puppeteer-ruby
 licenses: []
 metadata: {}

data/Dockerfile

@@ -1,6 +0,0 @@
-FROM ruby:2.6.5
-
-RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
-    && sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \
-    && apt-get update && apt-get install -y google-chrome-stable --no-install-recommends \
-    && rm -rf /var/lib/apt/lists/*

data/docker-compose.yml

@@ -1,15 +0,0 @@
-version: "3"
-services:
-  dev:
-    image: ruby-with-chrome:2.6
-    build:
-      context: .
-      dockerfile: Dockerfile
-    volumes:
-      - .:/usr/src/app
-      - bundler-cache:/usr/local/bundle
-    working_dir: /usr/src/app
-
-volumes:
-  bundler-cache:
-    driver: local