fe_core_ext 0.30.1 → 0.32.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8418dd8035fa99643b26a7960e1f3cf1e16bb0e4605aa64bf8febb14aaf36eda
-  data.tar.gz: ea17906cfd926562a7c39b2ec7460e91b4d232649923389fc7480b3652a151de
+  metadata.gz: f2a87561be521ad11c7d5b9c45c292b44dd806c14e2d4e836df71102bda24b92
+  data.tar.gz: 8f7cb9da94fe4add3c0460a135b2a53ff3ef2b5b4273c2c6531fdff221af7a5e
 SHA512:
-  metadata.gz: 3122f6848091b0fe21a382273895705bfc8ccdf6cf71419fdb487924985e502b87959f6144449d285fae9b98de1b8ff73e130aa731e040f921f3b48a341c82fa
-  data.tar.gz: d82eecef2cd089d5c93e40f2d6bfbda73fa99d2e6ed21b1033d36bc732b964da5d6e0376729e1c0fa70f5929fda16cbdcfffabc2dcf232aadd90aa235c0af734
+  metadata.gz: a99aa40c9559997728260c51822d934d324b534f8ed5498cb5b230d23d7ee5aec2163e88634e1307b782d5ce3ad4f8ceeda37ed93f25d513e594fdaaf0f05ee7
+  data.tar.gz: 00277dc37128f4bd68e0abaec8f5eb5fdd67e858bf831072a876c34d9331d344de5d96b0311e7bba238ac6ca3a1c3a9a6a73c52eb69fba40fd6d1a1fb4462b62

data/fe_core_ext.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "activesupport"
   spec.add_development_dependency "bundler", "~> 2.1"
   spec.add_development_dependency "rake", "~> 12.3"
-  spec.add_development_dependency "rspec", "~> 0"
-  spec.add_development_dependency "selenium-webdriver", "~> 0"
+
+  spec.add_development_dependency "ferrum"
+  spec.add_development_dependency "selenium-webdriver"
 end

data/lib/fe_core_ext/gem_ext/ferrum.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Ferrum
+  class Browser
+    delegate :wait_for_css, :wait_for_xpath, to: :page
+  end
+
+  class Page
+    delegate :wait_for_css, :wait_for_xpath, to: :main_frame
+  end
+
+  class Frame
+    module DOM
+      def wait_for_css(selector, timeout: 3)
+        wait_for_selector(selector, :at_css, timeout)
+      end
+
+      def wait_for_xpath(selector, timeout: 3)
+        wait_for_selector(selector, :at_xpath, timeout)
+      end
+
+      private
+
+      def wait_for_selector(selector, selector_method, timeout)
+        interval = 0.1
+        (timeout / interval).to_i.times do
+          node = send(selector_method, selector)
+          return node if node
+          sleep(interval)
+        end
+        nil
+      end
+    end
+  end
+end

data/lib/fe_core_ext/gem_ext/selenium_webdriver.rb

@@ -1,46 +1,50 @@
-module Selenium::WebDriver::Find
-  def find_element_without_no_element_error(*args)
-    find_element(*args)
-  rescue Selenium::WebDriver::Error::NoSuchElementError
-    nil
-  end
+module Selenium
+  module WebDriver
+    module Find
+      def find_element_without_no_element_error(*args)
+        find_element(*args)
+      rescue Selenium::WebDriver::Error::NoSuchElementError
+        nil
+      end
 
-  def find_elements_without_no_element_error(*args)
-    find_elements(*args)
-  rescue Selenium::WebDriver::Error::NoSuchElementError
-    nil
-  end
+      def find_elements_without_no_element_error(*args)
+        find_elements(*args)
+      rescue Selenium::WebDriver::Error::NoSuchElementError
+        nil
+      end
 
-  def at_xpath(path, wait: nil)
-    if wait.present?
-      driver_wait = Selenium::WebDriver::Wait.new(timeout: wait)
-      driver_wait.until { find_element_without_no_element_error(:xpath, path) }
-    end
-    find_element_without_no_element_error(:xpath, path)
-  end
+      def at_xpath(path, wait: nil)
+        if wait.present?
+          driver_wait = Selenium::WebDriver::Wait.new(timeout: wait)
+          driver_wait.until { find_element_without_no_element_error(:xpath, path) }
+        end
+        find_element_without_no_element_error(:xpath, path)
+      end
 
-  def xpath(path, wait: nil)
-    if wait.present?
-      driver_wait = Selenium::WebDriver::Wait.new(timeout: wait)
-      driver_wait.until { find_elements_without_no_element_error(:xpath, path) }
-    end
-    find_elements_without_no_element_error(:xpath, path)
-  end
+      def xpath(path, wait: nil)
+        if wait.present?
+          driver_wait = Selenium::WebDriver::Wait.new(timeout: wait)
+          driver_wait.until { find_elements_without_no_element_error(:xpath, path) }
+        end
+        find_elements_without_no_element_error(:xpath, path)
+      end
 
-  def at_css(path, wait: nil)
-    if wait.present?
-      driver_wait = Selenium::WebDriver::Wait.new(timeout: wait)
-      driver_wait.until { find_element_without_no_element_error(:css, path) }
-    end
-    find_element_without_no_element_error(:css, path)
-  end
+      def at_css(path, wait: nil)
+        if wait.present?
+          driver_wait = Selenium::WebDriver::Wait.new(timeout: wait)
+          driver_wait.until { find_element_without_no_element_error(:css, path) }
+        end
+        find_element_without_no_element_error(:css, path)
+      end
 
-  def css(path, wait: nil)
-    if wait.present?
-      driver_wait = Selenium::WebDriver::Wait.new(timeout: wait)
-      driver_wait.until { find_elements_without_no_element_error(:css, path) }
+      def css(path, wait: nil)
+        if wait.present?
+          driver_wait = Selenium::WebDriver::Wait.new(timeout: wait)
+          driver_wait.until { find_elements_without_no_element_error(:css, path) }
+        end
+        find_elements_without_no_element_error(:css, path)
+      end
     end
-    find_elements_without_no_element_error(:css, path)
   end
 end
 

data/lib/fe_core_ext/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FeCoreExt
-  VERSION = "0.30.1"
+  VERSION = "0.32.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fe_core_ext
 version: !ruby/object:Gem::Version
-  version: 0.30.1
+  version: 0.32.1
 platform: ruby
 authors:
 - Tetsu
@@ -53,31 +53,31 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '12.3'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: ferrum
   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: selenium-webdriver
   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'
 description: Core class extensions that doesn't supported by active_recored core_ext
@@ -109,6 +109,7 @@ files:
 - lib/fe_core_ext/core_ext/time.rb
 - lib/fe_core_ext/core_ext/uri.rb
 - lib/fe_core_ext/gem_ext.rb
+- lib/fe_core_ext/gem_ext/ferrum.rb
 - lib/fe_core_ext/gem_ext/selenium_webdriver.rb
 - lib/fe_core_ext/version.rb
 homepage: http://github.com/ironsand/fe_core_ext