aranha-selenium 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b47d04d2522cd3c057f72c318c546bbc58e1c43ea7f09008f7e1f8a496951b60
-  data.tar.gz: 58212effa6d0e6a2d0dd87fa97ea2862865d953c481d6b2dc8541af494a347f0
+  metadata.gz: b77cef3090b92e53523e8b58ca223c3f3d507d3f389fcb93b5ea14293761ffa4
+  data.tar.gz: f7c4ad1976d059fda2b14ea3634575ca1e8a3c32233f00f51bfe0727865a4a0d
 SHA512:
-  metadata.gz: a477eead3f991fb2d1085805ecb207a06d067d7a31c68c2243908ab60fb0c043edd185a1e88f2f7bf0b416f7ee9e2996a4e783275eceebf9fe5e39c453a7405d
-  data.tar.gz: 90848d780baee798fae498fe2d2672eb8e5e3be52aa4323363785ac59c06007baac9a2b9048821675588f62cf8ee635d8f7cb6f5cd384ef0e28d9d5945565ba4
+  metadata.gz: 68e0c97869bfdf83a45fbcdc3d04eda5987148b85954657289e8ab40f8025f5fb508e22baef3ef4475fe9037d39c6ded8462dbc6d139d79daac0e1ca0d7ad5c7
+  data.tar.gz: 987ab2d37efc2c98701485c36b03393640185e8a89fa804a510a4671a1d651ce3dc62fa9f9247deaa9aecd23e65b29e8514ec829a665da40d731679cbf553691

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'tmpdir'
+
+module Aranha
+  module Selenium
+    class Session < ::SimpleDelegator
+      class Downloads
+        attr_reader :dir
+
+        def initialize
+          @dir = ::Dir.mktmpdir
+        end
+
+        def current
+          Dir.glob("#{dir}/**/*")
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+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)
+        end
+
+        def find_or_not_element(find_element_args)
+          r = find_elements(find_element_args)
+          r.any? ? r.first : nil
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Aranha
+  module Selenium
+    class Session < ::SimpleDelegator
+      module Select
+        def select_option(field, value, *find_element_args)
+          select = find_element(*find_element_args)
+          option = ::Selenium::WebDriver::Support::Select.new(select)
+          option.select_by(field, value)
+        end
+
+        def select_option_by_text(text, *find_element_args)
+          select_option(:text, text, *find_element_args)
+        end
+
+        def select_option_by_value(value, *find_element_args)
+          select_option(:value, value, *find_element_args)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Aranha
+  module Selenium
+    class Session < ::SimpleDelegator
+      module Wait
+        WAIT_DEFAULT_TIMEOUT = 15
+
+        def wait(timeout = nil)
+          timeout ||= wait_default_timeout
+          ::Selenium::WebDriver::Wait.new(timeout: timeout)
+        end
+
+        def wait_default_timeout
+          WAIT_DEFAULT_TIMEOUT
+        end
+
+        def wait_for_click(find_element_args)
+          wait.until do
+            element = find_element(find_element_args)
+            element ? element_click(element) : nil
+          end
+        end
+
+        def wait_for_element(find_element_args)
+          wait.until { find_element(find_element_args) }
+        end
+
+        def wait_for_download
+          initial_downloads = downloads.current
+          yield
+          new_downloads = []
+          wait.until do
+            new_downloads = downloads.current - initial_downloads
+            new_downloads.any?
+          end
+          new_downloads.first
+        end
+
+        def wait_for_url_change(&block)
+          previous_url = current_url
+          block&.call
+
+          wait.until { current_url != previous_url }
+        end
+      end
+    end
+  end
+end

data/lib/aranha/selenium/session.rb

@@ -1,15 +1,17 @@
 # frozen_string_literal: true
 
 require 'aranha/selenium/driver_factory'
+require 'eac_ruby_utils/core_ext'
 
 module Aranha
   module Selenium
     class Session < ::SimpleDelegator
-      attr_reader :downloads, :wait
+      require_sub __FILE__, include_modules: true
+      enable_simple_cache
+      attr_reader :downloads
 
       def initialize(options = {})
         @downloads = Downloads.new
-        @wait = ::Selenium::WebDriver::Wait.new(timeout: 15)
         super(
           ::Aranha::Selenium::DriverFactory.create_driver(
             options.merge(download_dir: @downloads.dir)
@@ -17,61 +19,6 @@ module Aranha
         )
       end
 
-      # @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)
-      end
-
-      def find_or_not_element(find_element_args)
-        r = find_elements(find_element_args)
-        r.any? ? r.first : nil
-      end
-
-      def select_option(field, value, *find_element_args)
-        select = find_element(*find_element_args)
-        option = ::Selenium::WebDriver::Support::Select.new(select)
-        option.select_by(field, value)
-      end
-
-      def select_option_by_text(text, *find_element_args)
-        select_option(:text, text, *find_element_args)
-      end
-
-      def select_option_by_value(value, *find_element_args)
-        select_option(:value, value, *find_element_args)
-      end
-
-      def wait_for_click(find_element_args)
-        wait.until do
-          element = find_element(find_element_args)
-          element ? element_click(element) : nil
-        end
-      end
-
-      def wait_for_element(find_element_args)
-        wait.until { find_element(find_element_args) }
-      end
-
-      def wait_for_download
-        initial_downloads = downloads.current
-        yield
-        new_downloads = []
-        wait.until do
-          new_downloads = downloads.current - initial_downloads
-          new_downloads.any?
-        end
-        new_downloads.first
-      end
-
-      def wait_for_url_change(&block)
-        previous_url = current_url
-        block&.call
-
-        wait.until { current_url != previous_url }
-      end
-
       def current_source
         element = find_element(xpath: '/html[1]')
         raise 'Root element not found' unless element
@@ -80,25 +27,14 @@ module Aranha
         "<html>\n#{s}\n</html>\n"
       end
 
-      class Downloads
-        attr_reader :dir
-
-        def initialize
-          @dir = ::Dir.mktmpdir
-        end
-
-        def current
-          Dir.glob("#{dir}/**/*")
-        end
-      end
-
       private
 
       def element_click(element)
         element.click
         element
       rescue ::Selenium::WebDriver::Error::ElementClickInterceptedError,
-             ::Selenium::WebDriver::Error::ElementNotInteractableError
+             ::Selenium::WebDriver::Error::ElementNotInteractableError,
+             ::Selenium::WebDriver::Error::StaleElementReferenceError
         nil
       end
     end

data/lib/aranha/selenium/version.rb

@@ -2,6 +2,6 @@
 
 module Aranha
   module Selenium
-    VERSION = '0.4.2'
+    VERSION = '0.5.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aranha-selenium
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-04 00:00:00.000000000 Z
+date: 2022-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.102'
+        version: '0.106'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.102.1
+        version: 0.106.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.102'
+        version: '0.106'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.102.1
+        version: 0.106.1
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -78,6 +78,10 @@ files:
 - lib/aranha/selenium/driver_factory/firefox.rb
 - lib/aranha/selenium/driver_factory/firefox_auto_download_mime_types
 - lib/aranha/selenium/session.rb
+- lib/aranha/selenium/session/downloads.rb
+- lib/aranha/selenium/session/find.rb
+- lib/aranha/selenium/session/select.rb
+- lib/aranha/selenium/session/wait.rb
 - lib/aranha/selenium/version.rb
 homepage: 
 licenses: []