aranha-selenium 0.10.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb4d2b748fa3b35c426bf0c2d995695698c6ec888176066d00a7700e14174407
-  data.tar.gz: 83a4000089a929c22514fd187b7d7df52dd6a4bda4f9b3ad7fb732f35ddef5bc
+  metadata.gz: ce5a9d59bf8990f5766143c7b925f1d2905e927e851201d54ab14b7dbae5d398
+  data.tar.gz: 7f0f04da28cc91b37896e8428ac160fa522f21395cabf910c827ada7b05638d2
 SHA512:
-  metadata.gz: 5c5f1548caad4cd51106223d9bca607212030ff32136bc4ccbf09677d384e824dcb784a0542841851125e1270fc084b2bc77ea3766a42213bc04ab2ff55f20d4
-  data.tar.gz: d99132bee7528f16bbb73dbf6bfd95d827487c228a35e5b7f3c82fef3fe9907a3891eba9ea86e4824b5ad1f43176d5f7a6f647f345e0775100aeefa53f00903f
+  metadata.gz: c62c13201270a5627a8a567742f0f359b1ff3b44bf7b25b4d603b8dfdc6c363d314c8cd6f1a0a0ae3e5242d2462b2383a0bf2fabe6f614ed36deaeb2210f63a1
+  data.tar.gz: 51884da61169b7e5b5d52bbb6df2322b7cfccc0c78c6f060e845700bfa5449edabfc2146bd44aea0b3194219131c103e0858bfc61ff713ff4f4bface95bbb53b

data/lib/aranha/selenium/session/element.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Aranha
+  module Selenium
+    class Session < ::SimpleDelegator
+      class Element
+        common_constructor :session, :find_args
+
+        # @return [Boolean]
+        def click
+          click!
+          true
+        rescue ::Selenium::WebDriver::Error::ElementClickInterceptedError,
+               ::Selenium::WebDriver::Error::ElementNotInteractableError,
+               ::Selenium::WebDriver::Error::NoSuchElementError,
+               ::Selenium::WebDriver::Error::StaleElementReferenceError
+          false
+        end
+
+        # @return [self]
+        # @raise [Selenium::WebDriver::Error::ElementClickInterceptedError]
+        # @raise [Selenium::WebDriver::Error::ElementNotInteractableError]
+        # @raise [Selenium::WebDriver::Error::NoSuchElementError]
+        # @raise [Selenium::WebDriver::Error::StaleElementReferenceError]
+        def click!
+          find!.click
+
+          self
+        end
+
+        # @return [Selenium::WebDriver::Element, nil]
+        def find
+          r = session.find_elements(*find_args)
+          r.any? ? r.first : nil
+        end
+
+        # @return [Selenium::WebDriver::Element]
+        # @raise [Selenium::WebDriver::Error::NoSuchElementError]
+        def find!
+          return find_args.first if find_args.count >= 1 &&
+                                    find_args.first.is_a?(::Selenium::WebDriver::Element)
+
+          session.__getobj__.find_element(*find_args)
+        end
+
+        # @param session_wait_args [Array] Arguments for +Aranha::Selenium::Session::Wait.wait+.
+        # @return [self]
+        def wait_click(*session_wait_args, &block)
+          session.wait(*session_wait_args).until do
+            block.if_present(&:call)
+            click
+          end
+          self
+        end
+      end
+    end
+  end
+end

data/lib/aranha/selenium/session/find.rb

@@ -1,21 +1,24 @@
 # frozen_string_literal: true
 
+require 'aranha/selenium/session/element'
 require 'selenium-webdriver'
 
 module Aranha
   module Selenium
     class Session < ::SimpleDelegator
       module Find
-        # @return [Selenium::WebDriver::Element, nil]
-        def find_element(*args, &block)
-          return args.first if args.count >= 1 && args.first.is_a?(::Selenium::WebDriver::Element)
-
-          __getobj__.find_element(*args, &block)
+        # @param find_element_args [Array] Argujments for +Selenium::WebDriver::Find.find_element+.
+        # @return [Selenium::WebDriver::Element]
+        # @raise [Selenium::WebDriver::Error::NoSuchElementError]
+        def find_element(*find_element_args)
+          element(*find_element_args).find!
         end
 
+        # @param find_element_args [Array] Argujments for +Selenium::WebDriver::Find.find_elements+.
+        # @deprecated Use +{#element}.find+ instead.
+        # @return [Selenium::WebDriver::Element, nil]
         def find_or_not_element(find_element_args)
-          r = find_elements(find_element_args)
-          r.any? ? r.first : nil
+          element(*find_element_args).find
         end
       end
     end

data/lib/aranha/selenium/session/scroll.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require 'selenium-webdriver'
+
+module Aranha
+  module Selenium
+    class Session < ::SimpleDelegator
+      module Scroll
+        NULL_SCROLL = 0
+        DEFAULT_SCROLL = 100
+
+        # @param delta_x [Integer] Number of pixels.
+        # @param delta_y [Integer] Number of pixels.
+        # @return [self]
+        def scroll_by(delta_x, delta_y)
+          execute_script("window.scrollBy(#{delta_x.to_i}, #{delta_y.to_i})")
+
+          self
+        end
+
+        # @param delta_x [Integer] Number of pixels.
+        # @return [self]
+        def scroll_left_by(delta_x = DEFAULT_SCROLL)
+          scroll_right_by(-delta_x)
+        end
+
+        # @param delta_y [Integer] Number of pixels.
+        # @return [self]
+        def scroll_down_by(delta_y = DEFAULT_SCROLL)
+          scroll_by(NULL_SCROLL, delta_y)
+        end
+
+        # @param delta_x [Integer] Number of pixels.
+        # @return [self]
+        def scroll_right_by(delta_x = DEFAULT_SCROLL)
+          scroll_by(delta_x, NULL_SCROLL)
+        end
+
+        # @param delta_y [Integer] Number of pixels.
+        # @return [self]
+        def scroll_up_by(delta_y = DEFAULT_SCROLL)
+          scroll_down_by(-delta_y)
+        end
+      end
+    end
+  end
+end

data/lib/aranha/selenium/session/wait.rb

@@ -17,11 +17,11 @@ module Aranha
           WAIT_DEFAULT_TIMEOUT
         end
 
-        def wait_for_click(find_element_args, timeout = nil)
-          wait(timeout).until do
-            element = find_element(find_element_args)
-            element ? element_click(element) : nil
-          end
+        # @param find_element_args [Array] Argujments for +Selenium::WebDriver::Find.find_element+.
+        # @param timeout [Integer]
+        # @return [Selenium::WebDriver::Element]
+        def wait_for_click(find_element_args, timeout = nil, &block)
+          element(*find_element_args).wait_for_click(timeout, &block).find!
         end
 
         def wait_for_element(find_element_args)

data/lib/aranha/selenium/session.rb

@@ -32,15 +32,9 @@ module Aranha
         @downloads ||= ::Aranha::Selenium::Session::Downloads.new
       end
 
-      private
-
-      def element_click(element)
-        element.click
-        element
-      rescue ::Selenium::WebDriver::Error::ElementClickInterceptedError,
-             ::Selenium::WebDriver::Error::ElementNotInteractableError,
-             ::Selenium::WebDriver::Error::StaleElementReferenceError
-        nil
+      # @return [Aranha::Selenium::Session::Element]
+      def element(*find_args)
+        ::Aranha::Selenium::Session::Element.new(self, find_args)
       end
     end
   end

data/lib/aranha/selenium/version.rb

@@ -2,6 +2,6 @@
 
 module Aranha
   module Selenium
-    VERSION = '0.10.1'
+    VERSION = '0.11.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aranha-selenium
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-21 00:00:00.000000000 Z
+date: 2024-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_fs
@@ -30,34 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.121'
+        version: '0.122'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.121'
+        version: '0.122'
 - !ruby/object:Gem::Dependency
   name: eac_templates
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -124,9 +118,11 @@ files:
 - lib/aranha/selenium/executables.rb
 - lib/aranha/selenium/session.rb
 - lib/aranha/selenium/session/downloads.rb
+- lib/aranha/selenium/session/element.rb
 - lib/aranha/selenium/session/find.rb
 - lib/aranha/selenium/session/form_request.rb
 - lib/aranha/selenium/session/form_request/field.rb
+- lib/aranha/selenium/session/scroll.rb
 - lib/aranha/selenium/session/select.rb
 - lib/aranha/selenium/session/wait.rb
 - lib/aranha/selenium/version.rb