playwright-ruby-client 0.6.0 → 0.6.1

data/lib/playwright/channel_owners/binding_call.rb

@@ -3,5 +3,38 @@ module Playwright
     def name
       @initializer['name']
     end
+
+    def call_async(callback)
+      Thread.new(callback) { call(callback) }
+    end
+
+    # @param callback [Proc]
+    def call(callback)
+      frame = ChannelOwners::Frame.from(@initializer['frame'])
+      # It is not desired to use PlaywrightApi.wrap directly.
+      # However it is a little difficult to define wrapper for `source` parameter in generate_api.
+      # Just a workaround...
+      source = {
+        context: PlaywrightApi.wrap(frame.page.context),
+        page: PlaywrightApi.wrap(frame.page),
+        frame: PlaywrightApi.wrap(frame),
+      }
+      args =
+        if @initializer['handle']
+          handle = ChannelOwners::ElementHandle.from(@initializer['handle'])
+          [handle]
+        else
+          @initializer['args'].map do |arg|
+            JavaScript::ValueParser.new(arg).parse
+          end
+        end
+
+      begin
+        result = callback.call(source, *args)
+        @channel.send_message_to_server('resolve', result: JavaScript::ValueSerializer.new(result).serialize)
+      rescue => err
+        @channel.send_message_to_server('reject', error: { error: { message: err.message, name: 'Error' }})
+      end
+    end
   end
 end

data/lib/playwright/channel_owners/browser_context.rb

@@ -67,9 +67,9 @@ module Playwright
     end
 
     private def on_binding(binding_call)
-      func = @binding[binding_call.name]
+      func = @bindings[binding_call.name]
       if func
-        binding_call.call(func)
+        binding_call.call_async(func)
       end
     end
 

data/lib/playwright/channel_owners/element_handle.rb

@@ -301,19 +301,11 @@ module Playwright
       end
 
       def eval_on_selector(selector, pageFunction, arg: nil)
-        if JavaScript.function?(pageFunction)
-          JavaScript::Function.new(pageFunction, arg).eval_on_selector(@channel, selector)
-        else
-          JavaScript::Expression.new(pageFunction).eval_on_selector(@channel, selector)
-        end
+        JavaScript::Expression.new(pageFunction, arg).eval_on_selector(@channel, selector)
       end
 
       def eval_on_selector_all(selector, pageFunction, arg: nil)
-        if JavaScript.function?(pageFunction)
-          JavaScript::Function.new(pageFunction, arg).eval_on_selector_all(@channel, selector)
-        else
-          JavaScript::Expression.new(pageFunction).eval_on_selector_all(@channel, selector)
-        end
+        JavaScript::Expression.new(pageFunction, arg).eval_on_selector_all(@channel, selector)
       end
 
       def wait_for_element_state(state, timeout: nil)

data/lib/playwright/channel_owners/frame.rb

@@ -132,19 +132,11 @@ module Playwright
     end
 
     def evaluate(pageFunction, arg: nil)
-      if JavaScript.function?(pageFunction)
-        JavaScript::Function.new(pageFunction, arg).evaluate(@channel)
-      else
-        JavaScript::Expression.new(pageFunction).evaluate(@channel)
-      end
+      JavaScript::Expression.new(pageFunction, arg).evaluate(@channel)
     end
 
     def evaluate_handle(pageFunction, arg: nil)
-      if JavaScript.function?(pageFunction)
-        JavaScript::Function.new(pageFunction, arg).evaluate_handle(@channel)
-      else
-        JavaScript::Expression.new(pageFunction).evaluate_handle(@channel)
-      end
+      JavaScript::Expression.new(pageFunction, arg).evaluate_handle(@channel)
     end
 
     def query_selector(selector)
@@ -208,19 +200,11 @@ module Playwright
     end
 
     def eval_on_selector(selector, pageFunction, arg: nil)
-      if JavaScript.function?(pageFunction)
-        JavaScript::Function.new(pageFunction, arg).eval_on_selector(@channel, selector)
-      else
-        JavaScript::Expression.new(pageFunction).eval_on_selector(@channel, selector)
-      end
+      JavaScript::Expression.new(pageFunction, arg).eval_on_selector(@channel, selector)
     end
 
     def eval_on_selector_all(selector, pageFunction, arg: nil)
-      if JavaScript.function?(pageFunction)
-        JavaScript::Function.new(pageFunction, arg).eval_on_selector_all(@channel, selector)
-      else
-        JavaScript::Expression.new(pageFunction).eval_on_selector_all(@channel, selector)
-      end
+      JavaScript::Expression.new(pageFunction, arg).eval_on_selector_all(@channel, selector)
     end
 
     def content
@@ -531,14 +515,8 @@ module Playwright
         raise ArgumentError.new("Unknown polling option: #{polling}")
       end
 
-      function_or_expression =
-        if JavaScript.function?(pageFunction)
-          JavaScript::Function.new(pageFunction, arg)
-        else
-          JavaScript::Expression.new(pageFunction)
-        end
-
-      function_or_expression.wait_for_function(@channel, polling: polling, timeout: timeout)
+      expression = JavaScript::Expression.new(pageFunction, arg)
+      expression.wait_for_function(@channel, polling: polling, timeout: timeout)
     end
 
     def title

data/lib/playwright/channel_owners/js_handle.rb

@@ -14,19 +14,11 @@ module Playwright
     end
 
     def evaluate(pageFunction, arg: nil)
-      if JavaScript.function?(pageFunction)
-        JavaScript::Function.new(pageFunction, arg).evaluate(@channel)
-      else
-        JavaScript::Expression.new(pageFunction).evaluate(@channel)
-      end
+      JavaScript::Expression.new(pageFunction, arg).evaluate(@channel)
     end
 
     def evaluate_handle(pageFunction, arg: nil)
-      if JavaScript.function?(pageFunction)
-        JavaScript::Function.new(pageFunction, arg).evaluate_handle(@channel)
-      else
-        JavaScript::Expression.new(pageFunction).evaluate_handle(@channel)
-      end
+      JavaScript::Expression.new(pageFunction, arg).evaluate_handle(@channel)
     end
 
     def get_properties

data/lib/playwright/channel_owners/page.rb

@@ -30,6 +30,7 @@ module Playwright
       @frames << @main_frame
       @opener = ChannelOwners::Page.from_nullable(@initializer['opener'])
 
+      @channel.on('bindingCall', ->(params) { on_binding(ChannelOwners::BindingCall.from(params['binding'])) })
       @channel.once('close', ->(_) { on_close })
       @channel.on('console', ->(params) {
         console_message = ChannelOwners::ConsoleMessage.from(params['message'])
@@ -100,6 +101,14 @@ module Playwright
       end
     end
 
+    private def on_binding(binding_call)
+      func = @bindings[binding_call.name]
+      if func
+        binding_call.call_async(func)
+      end
+      @browser_context.send(:on_binding, binding_call)
+    end
+
     private def on_close
       @closed = true
       @browser_context.send(:remove_page, self)
@@ -306,7 +315,7 @@ module Playwright
         timeout: timeout,
         waitUntil: waitUntil,
       }.compact
-      resp = @channel.send_message_to_server('reoad', params)
+      resp = @channel.send_message_to_server('reload', params)
       ChannelOwners::Response.from_nullable(resp)
     end
 

data/lib/playwright/input_files.rb

@@ -1,5 +1,4 @@
 require 'base64'
-require 'mime/types'
 
 module Playwright
   class InputFiles
@@ -19,13 +18,11 @@ module Playwright
         when String
           {
             name: File.basename(file),
-            mimeType: mime_type_for(file),
             buffer: Base64.strict_encode64(File.read(file)),
           }
         when File
           {
             name: File.basename(file.path),
-            mimeType: mime_type_for(file.path),
             buffer: Base64.strict_encode64(file.read),
           }
         else
@@ -33,10 +30,5 @@ module Playwright
         end
       end
     end
-
-    private def mime_type_for(filepath)
-      mime_types = MIME::Types.type_for(filepath)
-      mime_types.first.to_s || 'application/octet-stream'
-    end
   end
 end

data/lib/playwright/javascript.rb

@@ -1,13 +1,3 @@
 require_relative './javascript/expression'
-require_relative './javascript/function'
 require_relative './javascript/value_parser'
 require_relative './javascript/value_serializer'
-
-module Playwright
-  module JavaScript
-    # Detect if str is likely to be a function
-    module_function def function?(str)
-      ['async', 'function'].any? { |key| str.strip.start_with?(key) } || str.include?('=>')
-    end
-  end
-end

data/lib/playwright/javascript/expression.rb

@@ -1,16 +1,15 @@
 module Playwright
   module JavaScript
     class Expression
-      def initialize(expression)
+      def initialize(expression, arg)
         @expression = expression
-        @serialized_arg = ValueSerializer.new(nil).serialize
+        @serialized_arg = ValueSerializer.new(arg).serialize
       end
 
       def evaluate(channel)
         value = channel.send_message_to_server(
           'evaluateExpression',
           expression: @expression,
-          isFunction: false,
           arg: @serialized_arg,
         )
         ValueParser.new(value).parse
@@ -20,7 +19,6 @@ module Playwright
         resp = channel.send_message_to_server(
           'evaluateExpressionHandle',
           expression: @expression,
-          isFunction: false,
           arg: @serialized_arg,
         )
         ::Playwright::ChannelOwner.from(resp)
@@ -31,7 +29,6 @@ module Playwright
           'evalOnSelector',
           selector: selector,
           expression: @expression,
-          isFunction: false,
           arg: @serialized_arg,
         )
         ValueParser.new(value).parse
@@ -42,7 +39,6 @@ module Playwright
           'evalOnSelectorAll',
           selector: selector,
           expression: @expression,
-          isFunction: false,
           arg: @serialized_arg,
         )
         ValueParser.new(value).parse
@@ -51,7 +47,6 @@ module Playwright
       def wait_for_function(channel, polling:, timeout:)
         params = {
           expression: @expression,
-          isFunction: false,
           arg: @serialized_arg,
           polling: polling,
           timeout: timeout,

data/lib/playwright/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Playwright
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
   COMPATIBLE_PLAYWRIGHT_VERSION = '1.12.0'
 end

data/lib/playwright_api/accessibility.rb

@@ -2,13 +2,13 @@ module Playwright
   # The Accessibility class provides methods for inspecting Chromium's accessibility tree. The accessibility tree is used by
   # assistive technology such as [screen readers](https://en.wikipedia.org/wiki/Screen_reader) or
   # [switches](https://en.wikipedia.org/wiki/Switch_access).
-  # 
+  #
   # Accessibility is a very platform-specific thing. On different platforms, there are different screen readers that might
   # have wildly different output.
-  # 
+  #
   # Rendering engines of Chromium, Firefox and WebKit have a concept of "accessibility tree", which is then translated into
   # different platform-specific APIs. Accessibility namespace gives access to this Accessibility Tree.
-  # 
+  #
   # Most of the accessibility tree gets filtered out when converting from internal browser AX Tree to Platform-specific
   # AX-Tree or by assistive technologies themselves. By default, Playwright tries to approximate this filtering, exposing
   # only the "interesting" nodes of the tree.
@@ -16,101 +16,19 @@ module Playwright
 
     # Captures the current state of the accessibility tree. The returned object represents the root accessible node of the
     # page.
-    # 
+    #
     # > NOTE: The Chromium accessibility tree contains nodes that go unused on most platforms and by most screen readers.
     # Playwright will discard them as well for an easier to process tree, unless `interestingOnly` is set to `false`.
-    # 
+    #
     # An example of dumping the entire accessibility tree:
-    # 
     #
-    # ```js
-    # const snapshot = await page.accessibility.snapshot();
-    # console.log(snapshot);
-    # ```
-    # 
-    # ```java
-    # String snapshot = page.accessibility().snapshot();
-    # System.out.println(snapshot);
-    # ```
-    # 
-    # ```python async
-    # snapshot = await page.accessibility.snapshot()
-    # print(snapshot)
-    # ```
-    # 
     # ```python sync
     # snapshot = page.accessibility.snapshot()
     # print(snapshot)
     # ```
-    # 
-    # ```csharp
-    # var accessibilitySnapshot = await page.Accessibility.SnapshotAsync();
-    # Console.WriteLine(System.Text.Json.JsonSerializer.Serialize(accessibilitySnapshot));
-    # ```
-    # 
+    #
     # An example of logging the focused node's name:
-    # 
     #
-    # ```js
-    # const snapshot = await page.accessibility.snapshot();
-    # const node = findFocusedNode(snapshot);
-    # console.log(node && node.name);
-    # 
-    # function findFocusedNode(node) {
-    #   if (node.focused)
-    #     return node;
-    #   for (const child of node.children || []) {
-    #     const foundNode = findFocusedNode(child);
-    #     return foundNode;
-    #   }
-    #   return null;
-    # }
-    # ```
-    # 
-    # ```csharp
-    # static AccessibilitySnapshotResult findFocusedNode(AccessibilitySnapshotResult root)
-    # {
-    #     var nodes = new Stack<AccessibilitySnapshotResult>(new[] { root });
-    #     while (nodes.Count > 0)
-    #     {
-    #         var node = nodes.Pop();
-    #         if (node.Focused) return node;
-    #         foreach (var innerNode in node.Children)
-    #         {
-    #             nodes.Push(innerNode);
-    #         }
-    #     }
-    # 
-    #     return null;
-    # }
-    # 
-    # var accessibilitySnapshot = await page.Accessibility.SnapshotAsync();
-    # Console.WriteLine(System.Text.Json.JsonSerializer.Serialize(accessibilitySnapshot));
-    # var focusedNode = findFocusedNode(accessibilitySnapshot);
-    # if (focusedNode != null)
-    #     Console.WriteLine(focusedNode.Name);
-    # ```
-    # 
-    # ```java
-    # // FIXME
-    # String snapshot = page.accessibility().snapshot();
-    # ```
-    # 
-    # ```python async
-    # def find_focused_node(node):
-    #     if (node.get("focused"))
-    #         return node
-    #     for child in (node.get("children") or []):
-    #         found_node = find_focused_node(child)
-    #         return found_node
-    #     return None
-    # 
-    # snapshot = await page.accessibility.snapshot()
-    # node = find_focused_node(snapshot)
-    # if node:
-    #     print(node["name"])
-    # ```
-    # 
     # ```python sync
     # def find_focused_node(node):
     #     if (node.get("focused"))
@@ -119,7 +37,7 @@ module Playwright
     #         found_node = find_focused_node(child)
     #         return found_node
     #     return None
-    # 
+    #
     # snapshot = page.accessibility.snapshot()
     # node = find_focused_node(snapshot)
     # if node:

data/lib/playwright_api/android.rb

@@ -1,68 +1,11 @@
 module Playwright
   # Playwright has **experimental** support for Android automation. You can access android namespace via:
-  # 
   #
-  # ```js
-  # const { _android: android } = require('playwright');
-  # ```
-  # 
   # An example of the Android automation script would be:
-  # 
   #
-  # ```js
-  # const { _android: android } = require('playwright');
-  # 
-  # (async () => {
-  #   // Connect to the device.
-  #   const [device] = await android.devices();
-  #   console.log(`Model: ${device.model()}`);
-  #   console.log(`Serial: ${device.serial()}`);
-  #   // Take screenshot of the whole device.
-  #   await device.screenshot({ path: 'device.png' });
-  # 
-  #   {
-  #     // --------------------- WebView -----------------------
-  # 
-  #     // Launch an application with WebView.
-  #     await device.shell('am force-stop org.chromium.webview_shell');
-  #     await device.shell('am start org.chromium.webview_shell/.WebViewBrowserActivity');
-  #     // Get the WebView.
-  #     const webview = await device.webView({ pkg: 'org.chromium.webview_shell' });
-  # 
-  #     // Fill the input box.
-  #     await device.fill({ res: 'org.chromium.webview_shell:id/url_field' }, 'github.com/microsoft/playwright');
-  #     await device.press({ res: 'org.chromium.webview_shell:id/url_field' }, 'Enter');
-  # 
-  #     // Work with WebView's page as usual.
-  #     const page = await webview.page();
-  #     await page.waitForNavigation({ url: /.*microsoft\/playwright.*/ });
-  #     console.log(await page.title());
-  #   }
-  # 
-  #   {
-  #     // --------------------- Browser -----------------------
-  # 
-  #     // Launch Chrome browser.
-  #     await device.shell('am force-stop com.android.chrome');
-  #     const context = await device.launchBrowser();
-  # 
-  #     // Use BrowserContext as usual.
-  #     const page = await context.newPage();
-  #     await page.goto('https://webkit.org/');
-  #     console.log(await page.evaluate(() => window.location.href));
-  #     await page.screenshot({ path: 'page.png' });
-  # 
-  #     await context.close();
-  #   }
-  # 
-  #   // Close the device.
-  #   await device.close();
-  # })();
-  # ```
-  # 
   # Note that since you don't need Playwright to install web browsers when testing Android, you can omit browser download
   # via setting the following environment variable when installing Playwright:
-  # 
+  #
   # ```sh js
   # PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 npm i -D playwright
   # ```
@@ -81,20 +24,20 @@ module Playwright
 
     # -- inherited from EventEmitter --
     # @nodoc
-    def off(event, callback)
-      event_emitter_proxy.off(event, callback)
+    def on(event, callback)
+      event_emitter_proxy.on(event, callback)
     end
 
     # -- inherited from EventEmitter --
     # @nodoc
-    def once(event, callback)
-      event_emitter_proxy.once(event, callback)
+    def off(event, callback)
+      event_emitter_proxy.off(event, callback)
     end
 
     # -- inherited from EventEmitter --
     # @nodoc
-    def on(event, callback)
-      event_emitter_proxy.on(event, callback)
+    def once(event, callback)
+      event_emitter_proxy.once(event, callback)
     end
 
     private def event_emitter_proxy