ferrum_common 0.0.0 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e8ef82a6987019ce9a01dffedf29704905fc53d7f3534cc1654b6a9a7c9220d
-  data.tar.gz: b9d2a38f62cc43372635cfcf679f95868c735b5ad8fbf2d482ac9b640df2e06a
+  metadata.gz: 337f36c693834482dea4e00fcb2d5407b2787df08279bdba679b5e22b3482745
+  data.tar.gz: 01bceb7e7fa64fa3082040ecc11b7c83674ace1a2282153132172cc3e6c12a9f
 SHA512:
-  metadata.gz: 4a7044da6e7ec7c03d56d5b1b2e99f72988476cd93323af8fc9601db4fe9161b534dd8188f9ea57548676776ab05394f5d5c60d7a43fed6bc26ecbd21a93eb2e
-  data.tar.gz: 474977a1cb5ec61a2f1ac62a47d275e34e803754c3554a8f5393c7634e0fe23abbf02fae4c7b1b9d9f48763266868fd00ec8e3df139a0ef3297dbc1a0bbeaaba
+  metadata.gz: 56f406f33b726a82f4aa2f7e8b1c4e39b53ddc14dedea932f550bb1e4d7586d09d835915fd2a219327c7fdfeae34e245ae4721b9f06eb66a2cbec1b743b1f977
+  data.tar.gz: afbcaa65ed2a25940d44290e3e82f4269eb5b74c6cdc80f6d402da7e7d87ff14fd3f704243d7e080f51c9014e74abba580ecc11df39a4c5a6838e9cf98bf5dd2

data/ferrum_common.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name         = "ferrum_common"
-  spec.version      = "0.0.0"
+  spec.version      = "0.1.0"
   spec.summary      = "[WIP] common useful extensions for ferrum or cuprite"
 
   spec.author       = "Victor Maslov aka Nakilon"
@@ -9,7 +9,8 @@ Gem::Specification.new do |spec|
   spec.metadata     = {"source_code_uri" => "https://github.com/nakilon/ferrum_common"}
 
   spec.add_dependency "ferrum"
-  spec.required_ruby_version = ">=2.5"
+  spec.add_dependency "browser_reposition"
+  spec.required_ruby_version = ">=2.5"  # why?
 
   spec.files        = %w{ LICENSE ferrum_common.gemspec lib/ferrum_common.rb }
 end

data/lib/ferrum_common.rb

@@ -1,28 +1,60 @@
 require "ferrum"
 module FerrumCommon
-  def self.new **_
-    Ferrum::Browser.new(**_).tap do |browser|
-      require "browser_reposition"
-      browser.extend(BrowserReposition).reposition
-      browser.define_singleton_method :redo_until_true do |timeout, msg = nil, &block|
-        Timeout.timeout timeout do
-          begin
-            block.call
-          rescue Ferrum::NodeNotFoundError
-            redo
-          end or (sleep timeout*0.1; redo)
-        end
-      rescue Timeout::Error
-        browser.mhtml path: "temp.mhtml"
-        $!.backtrace.reject!{ |_| _[/\/gems\/concurrent-ruby-/] }
-        $!.backtrace.reject!{ |_| _[/\/gems\/ferrum-/] }
-        raise Timeout::Error, "#{$!.to_s} in redo_until_true #{" (#{msg})" if msg}"
+
+  module Common
+
+    def self.mhtml browser, timeout, mtd, msg = nil
+      Timeout.timeout(timeout){ yield }
+    rescue Timeout::Error
+      browser.mhtml path: "temp.mhtml"
+      $!.backtrace.reject!{ |_| _[/\/gems\/concurrent-ruby-/] }
+      $!.backtrace.reject!{ |_| _[/\/gems\/ferrum-/] }
+      raise Timeout::Error, "#{$!.to_s} after #{timeout} sec in #{mtd}#{" (#{msg.respond_to?(:call) ? msg.call : msg})" if msg}"
+    end
+
+    def until_true timeout, msg = nil
+      Module.nesting.first.mhtml self, timeout, __method__, msg do
+        begin
+          yield
+        rescue Ferrum::NodeNotFoundError
+          redo
+        end or (sleep timeout*0.1; redo)
       end
-      browser.define_singleton_method :abort do |msg|
-        Browser.mhtml path: "temp.mhtml"
-        puts Thread.current.backtrace
-        abort msg
+    end
+
+    def until_one type, selector, timeout
+      t = nil
+      Module.nesting.first.mhtml self, timeout, __method__, ->{ "expected exactly one node for #{type} #{selector.inspect}, got #{t ? t.size : "none"}" } do
+        t = begin
+          public_method(type).call selector
+        rescue Ferrum::NodeNotFoundError
+          sleep timeout * 0.1
+          redo
+        end
+        unless 1 == t.size
+          sleep timeout * 0.1
+          redo
+        end
       end
+      t.first
+    end
+
+    def abort msg_or_cause
+      # puts (msg_or_cause.respond_to?(:backtrace) ? msg_or_cause : Thread.current).backtrace
+      puts (msg_or_cause.respond_to?(:full_message) ? msg_or_cause.full_message : Thread.current.backtrace)
+      mhtml path: "temp.mhtml"
+      puts "dumped to ./temp.mhtml"
+      Kernel.abort msg_or_cause.to_s
     end
+
+  end
+  Ferrum::Page.include Common
+  Ferrum::Frame.include Common
+
+  require "browser_reposition"
+  Ferrum::Browser.include Common, BrowserReposition
+  def self.new **_
+    Ferrum::Browser.new(**_).tap(&:reposition)
   end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ferrum_common
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.1.0
 platform: ruby
 authors:
 - Victor Maslov aka Nakilon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-07 00:00:00.000000000 Z
+date: 2023-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ferrum
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: browser_reposition
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: nakilon@gmail.com
 executables: []