puppeteer-ruby 0.0.26 → 0.31.0

data/lib/puppeteer/query_handler_manager.rb

@@ -0,0 +1,65 @@
+require 'singleton'
+
+class Puppeteer::QueryHandlerManager
+  include Singleton
+
+  def query_handlers
+    @query_handlers ||= {
+      aria: Puppeteer::AriaQueryHandler.new,
+    }
+  end
+
+  private def default_handler
+    @default_handler ||= Puppeteer::CustomQueryHandler.new(
+      query_one: '(element, selector) => element.querySelector(selector)',
+      query_all: '(element, selector) => element.querySelectorAll(selector)',
+    )
+  end
+
+  class Result
+    def initialize(query_handler:, selector:)
+      @query_handler = query_handler
+      @selector = selector
+    end
+
+    def query_one(element_handle)
+      @query_handler.query_one(element_handle, @selector)
+    end
+
+    def wait_for(dom_world, visible:, hidden:, timeout:)
+      @query_handler.wait_for(dom_world, @selector, visible: visible, hidden: hidden, timeout: timeout)
+    end
+
+    def query_all(element_handle)
+      @query_handler.query_all(element_handle, @selector)
+    end
+
+    def query_all_array(element_handle)
+      @query_handler.query_all_array(element_handle, @selector)
+    end
+  end
+
+  def detect_query_handler(selector)
+    unless /^[a-zA-Z]+\// =~ selector
+      return Result.new(
+        query_handler: default_handler,
+        selector: selector,
+      )
+    end
+
+    chunk = selector.split("/")
+    name = chunk.shift
+    updated_selector = chunk.join("/")
+
+    query_handler = query_handlers[name.to_sym]
+
+    unless query_handler
+      raise ArgumentError.new("Query set to use \"#{name}\", but no query handler of that name was found")
+    end
+
+    Result.new(
+      query_handler: query_handler,
+      selector: updated_selector,
+    )
+  end
+end

data/lib/puppeteer/remote_object.rb

@@ -97,6 +97,18 @@ class Puppeteer::RemoteObject
     nil
   end
 
+  # used in ElementHandle#query_ax_tree
+  def query_ax_tree(client, accessible_name: nil, role: nil)
+    result = client.send_message('Accessibility.queryAXTree', {
+      objectId: @object_id,
+      accessibleName: accessible_name,
+      role: role,
+    }.compact)
+
+    result['nodes'].reject do |node|
+      node['role']['value'] == 'text'
+    end
+  end
 
   # helper#valueFromRemoteObject
   def value

data/lib/puppeteer/version.rb

@@ -1,3 +1,3 @@
 class Puppeteer
-  VERSION = '0.0.26'
+  VERSION = '0.31.0'
 end

data/lib/puppeteer/wait_task.rb

@@ -9,7 +9,7 @@ class Puppeteer::WaitTask
     end
   end
 
-  def initialize(dom_world:, predicate_body:, title:, polling:, timeout:, args: [])
+  def initialize(dom_world:, predicate_body:, title:, polling:, timeout:, args: [], binding_function: nil)
     if polling.is_a?(String)
       if polling != 'raf' && polling != 'mutation'
         raise ArgumentError.new("Unknown polling option: #{polling}")
@@ -27,8 +27,12 @@ class Puppeteer::WaitTask
     @timeout = timeout
     @predicate_body = "return (#{predicate_body})(...args);"
     @args = args
+    @binding_function = binding_function
     @run_count = 0
-    @dom_world._wait_tasks.add(self)
+    @dom_world.send(:_wait_tasks).add(self)
+    if binding_function
+      @dom_world.send(:_bound_functions)[binding_function.name] = binding_function
+    end
     @promise = resolvable_future
 
     # Since page navigation requires us to re-install the pageScript, we should track
@@ -53,8 +57,16 @@ class Puppeteer::WaitTask
 
   def rerun
     run_count = (@run_count += 1)
+    context = @dom_world.execution_context
+
+    return if @terminated || run_count != @run_count
+    if @binding_function
+      @dom_world.add_binding_to_context(context, @binding_function)
+    end
+    return if @terminated || run_count != @run_count
+
     begin
-      success = @dom_world.execution_context.evaluate_handle(
+      success = context.evaluate_handle(
         WAIT_FOR_PREDICATE_PAGE_FUNCTION,
         @predicate_body,
         @polling,
@@ -103,7 +115,7 @@ class Puppeteer::WaitTask
 
   private def cleanup
     @timeout_cleared = true
-    @dom_world._wait_tasks.delete(self)
+    @dom_world.send(:_wait_tasks).delete(self)
   end
 
   private define_async_method :async_rerun

data/lib/puppeteer/web_socket.rb

@@ -18,6 +18,8 @@ class Puppeteer::WebSocket
       @socket.write(data)
     rescue Errno::EPIPE
       raise EOFError.new('already closed')
+    rescue Errno::ECONNRESET
+      raise EOFError.new('closed by remote')
     end
 
     def readpartial(maxlen = 1024)

data/lib/puppeteer/web_socket_transport.rb

@@ -37,6 +37,8 @@ class Puppeteer::WebSocketTransport
 
   def close
     @ws.close
+  rescue EOFError
+    # ignore EOLError. The connection is already closed.
   end
 
   def on_close(&block)

data/puppeteer-ruby.gemspec

@@ -21,14 +21,15 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'concurrent-ruby', '~> 1.1.0'
   spec.add_dependency 'websocket-driver', '>= 0.6.0'
   spec.add_dependency 'mime-types', '>= 3.0'
-  spec.add_development_dependency 'bundler', '~> 1.17'
+  spec.add_development_dependency 'bundler', '~> 2.2.3'
   spec.add_development_dependency 'chunky_png'
   spec.add_development_dependency 'pry-byebug'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rake', '~> 13.0.3'
+  spec.add_development_dependency 'rspec', '~> 3.10.0 '
   spec.add_development_dependency 'rspec_junit_formatter' # for CircleCI.
-  spec.add_development_dependency 'rubocop', '~> 0.90.0'
+  spec.add_development_dependency 'rubocop', '~> 1.11.0'
   spec.add_development_dependency 'rubocop-rspec'
   spec.add_development_dependency 'sinatra'
+  spec.add_development_dependency 'webrick'
   spec.add_development_dependency 'yard'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppeteer-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.31.0
 platform: ruby
 authors:
 - YusukeIwaki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-22 00:00:00.000000000 Z
+date: 2021-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.2.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.2.3
 - !ruby/object:Gem::Dependency
   name: chunky_png
   requirement: !ruby/object:Gem::Requirement
@@ -100,28 +100,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 13.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 13.0.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.10.0
 - !ruby/object:Gem::Dependency
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.90.0
+        version: 1.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.90.0
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -200,9 +214,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
+- ".github/ISSUE_TEMPLATE/bug_report.md"
+- ".github/ISSUE_TEMPLATE/feature_request.md"
 - ".github/stale.yml"
 - ".github/workflows/docs.yml"
 - ".github/workflows/reviewdog.yml"
+- ".github/workflows/windows_check.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -216,6 +233,7 @@ files:
 - bin/setup
 - docker-compose.yml
 - lib/puppeteer.rb
+- lib/puppeteer/aria_query_handler.rb
 - lib/puppeteer/browser.rb
 - lib/puppeteer/browser_context.rb
 - lib/puppeteer/browser_fetcher.rb
@@ -224,6 +242,7 @@ files:
 - lib/puppeteer/concurrent_ruby_utils.rb
 - lib/puppeteer/connection.rb
 - lib/puppeteer/console_message.rb
+- lib/puppeteer/custom_query_handler.rb
 - lib/puppeteer/debug_print.rb
 - lib/puppeteer/define_async_method.rb
 - lib/puppeteer/device.rb
@@ -264,6 +283,7 @@ files:
 - lib/puppeteer/page/pdf_options.rb
 - lib/puppeteer/page/screenshot_options.rb
 - lib/puppeteer/page/screenshot_task_queue.rb
+- lib/puppeteer/query_handler_manager.rb
 - lib/puppeteer/remote_object.rb
 - lib/puppeteer/request.rb
 - lib/puppeteer/response.rb