ferrum 0.19.0 → 0.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a719b34dd1893e7c0ba2b71e121e1a2b7cc7950b96a1e462ac6a3a9f36c04e0
-  data.tar.gz: 4c96a549ff3aa00d76420b43c2f7b4870cacb712d390efe7394ad2a8245f6825
+  metadata.gz: 07c9e2d0d81f6b0919d937f91e2432ce2a64890b78981d2088d606f8ce088d8f
+  data.tar.gz: 595a3850a55afed99b8a537b9c544fc706c8ca66f6531b4233b0f5adfa637500
 SHA512:
-  metadata.gz: 1a4e9981f2e6334b2862a073eb645b893bbebd42399f0e4b3090d98ea3d69ab0d3104bebe34f86e66b3ec2ea01b827efa28b75c2be55482de6f89a8b082b2113
-  data.tar.gz: acab89439a3655e51c3173bc30199bbccb6511567803fa16f066b26fbd6e5934f75492b6ed6383c8c59a27e397e23c781226abd439c551bc6be63c001868bc3a
+  metadata.gz: 2c8f277c645602793e5c9f63e89f12c810668ba9fd8d45585c090a220343abb4ea40769e5c03baa4c59d1aed530282db5bcaa30d151a7662f85142556dcfdd49
+  data.tar.gz: a4113a1261c436899348992e3514796c3dccffd425003e2d10da7d398bd743f6b864cbc85d8fd48efc33d42f8ce5e4c3546fcc209b813c5417982c4f8dca893e

data/lib/ferrum/browser/options/chrome.rb

@@ -48,7 +48,6 @@ module Ferrum
           "disable-smooth-scrolling" => nil,
           "disable-sync" => nil,
           "disable-translate" => nil,
-          "disable-web-security" => nil,
           "enable-automation" => nil,
           "enable-features" => %w[
             NetworkService

data/lib/ferrum/client/web_socket.rb

@@ -16,6 +16,7 @@ module Ferrum
       WEBSOCKET_BUG_SLEEP = 0.05
       DEFAULT_PORTS = { "ws" => 80, "wss" => 443 }.freeze
       SKIP_LOGGING_SCREENSHOTS = !ENV["FERRUM_LOGGING_SCREENSHOTS"]
+      ESCAPE_OR_LONE_SURROGATE = /\\u[dD][89abAB]\h{2}\\u[dD][c-fC-F]\h{2}|\\u([dD][89a-fA-F]\h{2})|\\./
 
       attr_reader :url, :messages
 
@@ -223,14 +224,12 @@ module Ferrum
       rescue JSON::NestingError
         # nop
       rescue JSON::ParserError
-        safely_parse_escaped_json(data)
+        safely_parse_lone_surrogates(data)
       end
 
-      def safely_parse_escaped_json(data)
-        unescaped_unicode =
-          data.gsub(/\\u([\da-fA-F]{4})/) { |_| [::Regexp.last_match(1)].pack("H*").unpack("n*").pack("U*") }
-        escaped_data = unescaped_unicode.encode("UTF-8", "UTF-8", undef: :replace, invalid: :replace, replace: "?")
-        JSON.parse(escaped_data, max_nesting: false)
+      def safely_parse_lone_surrogates(data)
+        replaced = data.gsub(ESCAPE_OR_LONE_SURROGATE) { |escape| ::Regexp.last_match(1) ? "\\ufffd" : escape }
+        JSON.parse(replaced, max_nesting: false)
       rescue JSON::ParserError
         # nop
       end

data/lib/ferrum/client.rb

@@ -376,7 +376,8 @@ module Ferrum
       # Node has disappeared while we were trying to get it
       when "No node with given id found",
            "Could not find node with given id",
-           "Inspected target navigated or closed"
+           "Inspected target navigated or closed",
+           "Argument should belong to the same JavaScript world as target object"
         raise NodeNotFoundError, error
       # Context is lost, page is reloading
       when "Cannot find context with specified id"

data/lib/ferrum/frame/dom.rb

@@ -116,7 +116,8 @@ module Ferrum
       # Returns the element in which the window is embedded.
       #
       # @return [Node, nil]
-      #   The element in which the window is embedded.
+      #   The element in which the window is embedded, `nil` for the main frame
+      #   and for a frame from a different origin than its parent.
       #
       # @example
       #   browser.go_to("https://developer.mozilla.org/en-US/docs/Web/HTML/Element/iframe")

data/lib/ferrum/mouse.rb

@@ -152,6 +152,7 @@ module Ferrum
       from_y = @y
       @x = x
       @y = y
+      button = pressed_button
 
       steps.times do |i|
         new_x = from_x + ((@x - from_x) * ((i + 1) / steps.to_f))
@@ -162,6 +163,7 @@ module Ferrum
                       type: "mouseMoved",
                       x: new_x,
                       y: new_y,
+                      button: button,
                       buttons: @buttons)
       end
 
@@ -185,6 +187,10 @@ module Ferrum
       button
     end
 
+    def pressed_button
+      BUTTON_MASKS.find { |_name, mask| mask.positive? && @buttons.anybits?(mask) }&.first || "none"
+    end
+
     def register_event_button(type, button)
       case type
       when "mousePressed"

data/lib/ferrum/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ferrum
-  VERSION = "0.19.0"
+  VERSION = "0.19.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ferrum
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.19.1
 platform: ruby
 authors:
 - Dmitry Vorotilin