aranha-selenium 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8049f9b39bc5bdcf4b0d1f99c2d56ebe27de42a6753ab6265761af7af4133e60
-  data.tar.gz: bb330a8b485846dcb70a32845f8e0ed98a70d80051e12e0efba9ad2341052fee
+  metadata.gz: 311e72ca409d486986d984d0f5ad995f9aa83912a2ec5eb3eeb9851b7c1791cf
+  data.tar.gz: a2fedda793addcc387a7a3f59b32f5e6dfc802ea8d139df03fd5c6d93e0826ec
 SHA512:
-  metadata.gz: 4602f4e1be967594d4611a7e84d4d785196e633a4f35da9a909ed3998383f6b936bd056cd359ed8cd44b0841903f2883dd432aabb06aff0520a7f246688a19da
-  data.tar.gz: 12e8385c7eed3bf717a8bc90a57e39e20c08a577f14bb48994cc33a5eee172fe8b301fa93da7193e55adb3ef910eb2841bcfc117d93d165691e3253885770b15
+  metadata.gz: da8d00d672419479fbafeadf723647d7c696d647e27897d0291b503e76fd250e600a04f23354ae5da73b0ecc66e19e8b2f8866e2dbec47b2e112c663f00e703b
+  data.tar.gz: ec09d4e135dba9a5e2c588b49e81f46b572fb81cb9f59ada2c2e80af99455b9e6d4a121a38176021bccacaef6ba0bd920d0ca61384d7db9c314c096ae5e07c62

data/lib/aranha/selenium/driver_factory.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'aranha/selenium/driver_options'
+require 'aranha/selenium/executables'
 require 'eac_ruby_utils/core_ext'
 
 module Aranha
@@ -12,6 +13,11 @@ module Aranha
         end
       end
 
+      DRIVERS = {
+        chrome: :chromedriver,
+        firefox: :geckodriver
+      }.freeze
+
       # @!attribute [r] options
       #   @return [ActiveSupport::HashWithIndifferentAccess]
 
@@ -37,7 +43,11 @@ module Aranha
       end
 
       def default_driver_name
-        :firefox
+        DRIVERS.each do |driver, executable|
+          return driver if ::Aranha::Selenium::Executables.send(executable).exist?
+        end
+
+        raise "No driver found (#{DRIVERS.value.join(', ')})"
       end
 
       # @return [Aranha::Selenium::DriverOptions]

data/lib/aranha/selenium/driver_options.rb

@@ -23,17 +23,31 @@ module Aranha
       end
 
       enable_listable
+      lists.add_symbol :headless, :auto, :no, :yes
       lists.add_symbol :option, :accept_insecure_certs, :downloads_dir, :headless, :profile_dir,
                        :profile_name, :user_agent
       BOOLEAN_OPTIONS = [OPTION_ACCEPT_INSECURE_CERTS, OPTION_HEADLESS].freeze
 
       DEFAULT_DOWNLOADS_DIR = ::File.join(::Dir.tmpdir, 'aranha_downloads_dir')
       DEFAULT_ACCEPT_INSECURE_CERTS = false
-      DEFAULT_HEADLESS = false
+      DEFAULT_HEADLESS = HEADLESS_AUTO
       DEFAULT_PROFILE_DIR = nil
       DEFAULT_PROFILE_NAME = nil
       DEFAULT_USER_AGENT = nil
 
+      HEADLESS_AUTO_ENVVAR = 'DISPLAY'
+
+      OPTIONS_SANITIZERS = {
+        headless: lambda { |value|
+          case value
+          when HEADLESS_AUTO then ENV[HEADLESS_AUTO_ENVVAR].blank?
+          when HEADLESS_NO then false
+          when HEADLESS_YES then true
+          else value.to_bool
+          end
+        }
+      }.freeze
+
       # @param user_values [Hash]
       def initialize(user_values = {})
         user_values.each { |k, v| send("#{k}=", v) }
@@ -45,9 +59,9 @@ module Aranha
         define_method(key) { send("#{key}_option").value }
         define_method("#{key}=") { |user_value| send("#{key}_option").user_value = user_value }
 
-        option_proc = nil
+        option_proc = OPTIONS_SANITIZERS[key]
         if BOOLEAN_OPTIONS.include?(key)
-          option_proc = proc { |v| ::EacRubyUtils::Boolean.parse(v) }
+          option_proc = proc { |v| ::EacRubyUtils::Boolean.parse(v) } if option_proc.blank?
           define_method("#{key}?") { send(key) }
         end
 

data/lib/aranha/selenium/executables.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Aranha
+  module Selenium
+    module Executables
+      class << self
+        enable_simple_cache
+
+        def env
+          ::EacRubyUtils::Envs.local
+        end
+
+        private
+
+        %w[chromedriver geckodriver].each do |program|
+          define_method("#{program.underscore}_uncached") do
+            env.executable(program, '--version')
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -28,11 +28,11 @@ module Aranha
           wait.until { find_element(find_element_args) }
         end
 
-        def wait_for_download
+        def wait_for_download(timeout = nil)
           initial_downloads = downloads.current
           yield
           new_downloads = []
-          wait.until do
+          wait(timeout).until do
             new_downloads = downloads.current - initial_downloads
             new_downloads.any?
           end

data/lib/aranha/selenium/version.rb

@@ -2,6 +2,6 @@
 
 module Aranha
   module Selenium
-    VERSION = '0.9.0'
+    VERSION = '0.10.0'
   end
 end

data/lib/aranha/selenium.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
+require 'eac_ruby_utils/core_ext'
+
 module Aranha
   module Selenium
-    require 'aranha/selenium/driver_factory'
-    require 'aranha/selenium/session'
+    require_sub __FILE__
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aranha-selenium
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-12 00:00:00.000000000 Z
+date: 2024-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_fs
@@ -92,6 +92,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: stub_server
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 description: 
 email: 
 executables: []
@@ -107,6 +121,7 @@ files:
 - lib/aranha/selenium/driver_factory/firefox_auto_download_mime_types
 - lib/aranha/selenium/driver_options.rb
 - lib/aranha/selenium/driver_options/option.rb
+- lib/aranha/selenium/executables.rb
 - lib/aranha/selenium/session.rb
 - lib/aranha/selenium/session/downloads.rb
 - lib/aranha/selenium/session/find.rb