aranha-selenium 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 152c6519e39e5d3fca131dcae37c5809b2de71e7bc0948a1712895dfc6817c53
-  data.tar.gz: c687b992ac4a06a0adb3dc255f81f195a99b4adbba331dc52a6a6931cd41d755
+  metadata.gz: 84a1574369d362da959a63ff1af76bd97f39dea090f9cdf495b6d3a9ca1c7ba6
+  data.tar.gz: 67cbfad2f7f0eddcf3ebe58fa6b4f733010fc8f3d8c298fa44264fee56b6d91e
 SHA512:
-  metadata.gz: b589490c2fbf06e0f3e572caff2c8a56c650899dc0b78e4f6c911af2ba10c6cb2dad40cf6f0edb6c6c834d5ffea566ae06745981fd1a7a1058e95ccf81ba5681
-  data.tar.gz: 4b83ccedda3ae287770d90eeba8145ad76ea0a54b5b926ef6ac32984bf8591acc54e692283156348c91aa84934f71000419e472e2af4fb5b4a5ae52d88ef3803
+  metadata.gz: 64d4ba285e322f00658dd57322a32c2e5b687d85d26f79c61aaafc13d37cfb3bfb4a011aed89ae6e218742645f69ffb45bce515c94bd12026d9f301656613265
+  data.tar.gz: 6c66a97c362e7cde017559d8a59307f883fbb9a52be1dc8b408283fe08738636962a9cc832bbbf5684baf0574fe34eb6a2f45bbef07bb437396cde5c11ca7c29

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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Aranha
+  module Selenium
+    class DriverFactory
+      class CreateSpecifiedDriver
+        acts_as_instance_method
+        common_constructor :factory, :driver_name, :options
+
+        # @return [Aranha::Selenium::DriverFactory::Base]
+        def result
+          driver_class.new(driver_options).build
+        end
+
+        protected
+
+        # @return [Class<Aranha::Selenium::DriverFactory::Base>]
+        def driver_class
+          driver_class_name = driver_name.to_s.classify
+          Aranha::Selenium::DriverFactory.const_get(driver_class_name)
+        rescue NameError
+          raise "Unknown Aranha Selenium driver: \"#{driver_name}\" " \
+                "(Class \"Aranha::Selenium::DriverFactory::#{driver_class_name}\" not found)"
+        end
+
+        # @return [Aranha::Selenium::DriverOptions]
+        def driver_options
+          ::Aranha::Selenium::DriverOptions.default.merge(options)
+        end
+      end
+    end
+  end
+end

data/lib/aranha/selenium/driver_factory.rb

@@ -9,51 +9,46 @@ module Aranha
         end
       end
 
-      DRIVERS = {
-        chrome: :chromedriver,
-        firefox: :geckodriver
-      }.freeze
+      DRIVERS = %i[chrome firefox].freeze
+
+      attr_reader :driver_name_from_options
 
       # @!attribute [r] options
-      #   @return [ActiveSupport::HashWithIndifferentAccess]
+      #   @return [Aranha::Selenium::DriverOptions]
 
       # @!method initialize(options)
       #   @param options [ActiveSupport::HashWithIndifferentAccess]
       common_constructor :options do
-        self.options = options.with_indifferent_access.freeze
+        self.options = options.with_indifferent_access
+        self.driver_name_from_options = options.delete(:driver)
+        self.options = ::Aranha::Selenium::DriverOptions.assert(options)
       end
 
+      # @return [Aranha::Selenium::DriverFactory::Base]
       def create_driver
-        driver_class.new(driver_options).build
-      end
-
-      def driver_name
-        (options[:driver] || default_driver_name).to_s
-      end
-
-      def driver_class
-        Aranha::Selenium::DriverFactory.const_get(driver_name.classify)
-      rescue NameError
-        raise "Unknown Aranha Selenium driver: \"#{driver_name}\" " \
-              "(Class \"Aranha::Selenium::DriverFactory::#{driver_name.classify}\" not found)"
+        if driver_name_from_options.present?
+          create_specified_driver(driver_name_from_options, options)
+        else
+          create_unspecified_driver
+        end
       end
 
-      def default_driver_name
-        DRIVERS.each do |driver, executable|
-          return driver if ::Aranha::Selenium::Executables.send(executable).exist?
+      # @return [Aranha::Selenium::DriverFactory::Base]
+      def create_unspecified_driver
+        DRIVERS.each do |e|
+          return create_specific_driver(e, options)
+        rescue Selenium::WebDriver::Error::SessionNotCreatedError
+          # do nothing
         end
 
-        raise "No driver found (#{DRIVERS.value.join(', ')})"
+        raise "No driver available (Tried: #{DRIVERS.join(', ')})"
       end
 
-      # @return [Aranha::Selenium::DriverOptions]
-      def driver_options
-        ::Aranha::Selenium::DriverOptions.default.merge(
-          ::Aranha::Selenium::DriverOptions.assert(options.except(:driver))
-        )
-      end
+      protected
+
+      attr_writer :driver_name_from_options
 
-      require_sub __FILE__
+      require_sub __FILE__, require_mode: :kernel
     end
   end
 end

data/lib/aranha/selenium/driver_options.rb

@@ -84,8 +84,6 @@ module Aranha
       def options
         @options ||= {}
       end
-
-      require_sub __FILE__
     end
   end
 end

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'eac_fs/file_info'
-
 require 'tmpdir'
 
 module Aranha

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'eac_templates/core_ext'
-
 module Aranha
   module Selenium
     class Session < ::SimpleDelegator
@@ -31,8 +29,6 @@ module Aranha
         def script_fields_arg
           "{#{fields.map(&:to_js_object).join(', ')}}"
         end
-
-        require_sub __FILE__
       end
     end
   end

data/lib/aranha/selenium/version.rb

@@ -2,6 +2,6 @@
 
 module Aranha
   module Selenium
-    VERSION = '0.13.0'
+    VERSION = '0.14.0'
   end
 end

data/lib/aranha/selenium.rb

@@ -9,3 +9,5 @@ module Aranha
 end
 
 require 'aranha'
+require 'eac_fs'
+require 'eac_templates'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aranha-selenium
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-01-19 00:00:00.000000000 Z
+date: 2026-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha
@@ -31,6 +31,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.20'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.20.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,26 +41,23 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.20'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.20.1
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.128'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.128.5
+        version: '0.130'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.128'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.128.5
+        version: '0.130'
 - !ruby/object:Gem::Dependency
   name: eac_templates
   requirement: !ruby/object:Gem::Requirement
@@ -82,30 +82,36 @@ dependencies:
   name: rexml
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.4.4
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.40'
+        version: '4.43'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.40'
+        version: '4.43'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -113,6 +119,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.12'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.12.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -120,6 +129,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.12'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.12.2
 - !ruby/object:Gem::Dependency
   name: stub_server
   requirement: !ruby/object:Gem::Requirement
@@ -145,11 +157,11 @@ files:
 - 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/create_specified_driver.rb
 - lib/aranha/selenium/driver_factory/firefox.rb
 - 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/element.rb

data/lib/aranha/selenium/executables.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-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