aranha-selenium 0.4.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b47d04d2522cd3c057f72c318c546bbc58e1c43ea7f09008f7e1f8a496951b60
-  data.tar.gz: 58212effa6d0e6a2d0dd87fa97ea2862865d953c481d6b2dc8541af494a347f0
+  metadata.gz: 7aceb03be8d423ca084646615d2869147f8ae89137f8c753732dabebde6032f5
+  data.tar.gz: f39cd164dd36c4f333693a8d33ebadce8a5a13de0a70c25ce039714ace68c8b3
 SHA512:
-  metadata.gz: a477eead3f991fb2d1085805ecb207a06d067d7a31c68c2243908ab60fb0c043edd185a1e88f2f7bf0b416f7ee9e2996a4e783275eceebf9fe5e39c453a7405d
-  data.tar.gz: 90848d780baee798fae498fe2d2672eb8e5e3be52aa4323363785ac59c06007baac9a2b9048821675588f62cf8ee635d8f7cb6f5cd384ef0e28d9d5945565ba4
+  metadata.gz: 6caca3383682a545705954abbc971b07aa3a259ca03bc1c9be2d29b26274cf410d31fb67bf87ea408d1361a3bc9d748a2b0dcc90416662b91c63bf1d9794a218
+  data.tar.gz: 35a436b59edc41e266a5553ea8ffb495329d3b74ccd2ea4634a034a8cd8a659d39adaccf77bf14f5671bbb431a8feedded5f2c06926345b3aaa8bb81b1f21f10

data/lib/aranha/selenium/defaults/option.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'aranha/selenium/driver_factory'
+require 'eac_ruby_utils/core_ext'
+
+module Aranha
+  module Selenium
+    class Defaults
+      class Option
+        common_constructor :owner, :key, :sanitizer, default: [nil] do
+          self.key = key.to_sym
+        end
+        attr_accessor :user_value
+
+        # @return [String]
+        def constant_name
+          "default_#{key}".upcase
+        end
+
+        # @return [Object]
+        def default_value
+          owner.class.const_get(constant_name)
+        end
+
+        # @return [String]
+        def envvar_name
+          "aranha_selenium_#{key}".upcase
+        end
+
+        # @return [Object]
+        def value
+          sanitized_value do
+            next ENV.fetch(envvar_name) if ENV.key?(envvar_name)
+            next user_value unless user_value.nil?
+
+            default_value
+          end
+        end
+
+        private
+
+        def sanitized_value(&block)
+          r = block.call
+          sanitizer.present? ? sanitizer.call(r) : r
+        end
+      end
+    end
+  end
+end

data/lib/aranha/selenium/defaults.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/boolean'
+require 'eac_ruby_utils/core_ext'
+require 'tmpdir'
+
+module Aranha
+  module Selenium
+    class Defaults
+      include ::Singleton
+
+      DEFAULT_DOWNLOADS_DIR = ::File.join(::Dir.tmpdir, 'aranha_downloads_dir')
+      DEFAULT_ACCEPT_INSECURE_CERTS = false
+      DEFAULT_HEADLESS = false
+      DEFAULT_USER_AGENT = nil
+
+      %w[accept_insecure_certs downloads_dir headless user_agent].each do |key|
+        define_method(key) { send("#{key}_option").value }
+        define_method("#{key}=") { |user_value| send("#{key}_option").user_value = user_value }
+        define_method("#{key}_option") do
+          options[key] ||= ::Aranha::Selenium::Defaults::Option.new(self, key)
+        end
+      end
+
+      # @return [Aranha::Selenium::Defaults::Option]
+      def headless_option
+        options['headless'] ||= ::Aranha::Selenium::Defaults::Option.new(
+          self, 'headless', ->(v) { ::EacRubyUtils::Boolean.parse(v) }
+        )
+      end
+
+      private
+
+      def options
+        @options ||= {}
+      end
+
+      require_sub __FILE__
+    end
+  end
+end

data/lib/aranha/selenium/driver_factory/base.rb

@@ -1,44 +1,14 @@
 # frozen_string_literal: true
 
-require 'active_support/json'
-require 'active_support/core_ext/hash/indifferent_access'
-require 'selenium-webdriver'
-require 'tmpdir'
+require 'aranha/selenium/defaults'
+require 'eac_ruby_utils/core_ext'
 
 module Aranha
   module Selenium
     class DriverFactory
       class Base
-        DEFAULT_DOWNLOADS_DIR = ::File.join(::Dir.tmpdir, 'aranha_downloads_dir')
-        DEFAULT_ACCEPT_INSECURE_CERTS = false
-        DEFAULT_HEADLESS = false
-        DEFAULT_USER_AGENT = nil
-
-        class << self
-          attr_writer :default_accept_insecure_certs, :default_downloads_dir, :default_headless,
-                      :default_user_agent
-
-          def default_downloads_dir
-            @default_downloads_dir || DEFAULT_DOWNLOADS_DIR
-          end
-
-          def default_accept_insecure_certs
-            @default_accept_insecure_certs || DEFAULT_ACCEPT_INSECURE_CERTS
-          end
-
-          def default_headless
-            @default_headless || DEFAULT_HEADLESS
-          end
-
-          def default_user_agent
-            @default_user_agent || DEFAULT_USER_AGENT
-          end
-        end
-
-        attr_reader :options
-
-        def initialize(options)
-          @options = options.with_indifferent_access.freeze
+        common_constructor :options do
+          self.options = options.with_indifferent_access.freeze
         end
 
         def build
@@ -75,7 +45,7 @@ module Aranha
           if options.key?(key)
             options.fetch(key)
           else
-            ::Aranha::Selenium::DriverFactory::Base.send("default_#{key}")
+            ::Aranha::Selenium::Defaults.instance.send(key)
           end
         end
       end

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, timeout = nil)
+          wait(timeout).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.6.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.6.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-04 00:00:00.000000000 Z
+date: 2023-05-28 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.117'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.102.1
+        version: 0.117.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.102'
+        version: '0.117'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.102.1
+        version: 0.117.1
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -72,12 +72,18 @@ extra_rdoc_files: []
 files:
 - Gemfile
 - lib/aranha/selenium.rb
+- lib/aranha/selenium/defaults.rb
+- lib/aranha/selenium/defaults/option.rb
 - lib/aranha/selenium/driver_factory.rb
 - lib/aranha/selenium/driver_factory/base.rb
 - lib/aranha/selenium/driver_factory/chrome.rb
 - 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: []