aranha-selenium 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b41d3bc5c20bff56137f7b907ed7e1bc29cf746e3f128747aa1725d148c4e629
-  data.tar.gz: 73e5dcdbaefee54d60d578f3e0900b3dda6ff804624b93494a7761844558dcb8
+  metadata.gz: 951e9e5db49e16c7825f8b24707b6b61236b78bef2a5b99c73860291e7dc7b23
+  data.tar.gz: 7ed611aadeb3401b3e2e5c2d43f5d5554be7f92d32ffe8ec8e0bb25c93f7f93e
 SHA512:
-  metadata.gz: 21161163e5f85f2b150961e5349849aecb0e59ae5f9bfef60b3d637f7dc0497fe0cbac46963e90eb85359a89cf6e3277d8d413e6e515c2c2273054b11c4dd956
-  data.tar.gz: fcb40b98de050e8fd7b79c062788fe6d15e3f236080db457974dcae5fa04f0e6a10c73924c434ce3b7b5073bb355d28788615779a3ee7ac4d188d62276a9a6e2
+  metadata.gz: 893bc2edc73ec2c6c2004729d3515e86bfd6ee809f2b5cf183647e308873fb8a6b4e970ccd3e721007c25dddcc7b64be0b7bde884298eb5c63c993ec2e14b3d4
+  data.tar.gz: '04994c6b945fac7288c65232de46af2d4b10d2b1edc26c0b0ef1159462b09c28a38931c71df156f53d9a35b66391c5a306b69b6aa73cb67634496c1eaa625fe7'

data/Gemfile

@@ -4,5 +4,5 @@ source 'https://rubygems.org'
 
 gemspec
 
-local_gemfile = ::File.join(::File.dirname(__FILE__), 'Gemfile.local')
-eval_gemfile local_gemfile if ::File.exist?(local_gemfile)
+local_gemfile = File.join(File.dirname(__FILE__), 'Gemfile.local')
+eval_gemfile local_gemfile if File.exist?(local_gemfile)

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

@@ -1,51 +1,31 @@
 # frozen_string_literal: true
 
-require 'aranha/selenium/defaults'
+require 'aranha/selenium/driver_options'
 require 'eac_ruby_utils/core_ext'
 
 module Aranha
   module Selenium
     class DriverFactory
       class Base
+        # @!attribute [r] options
+        #   @return [Aranha::Selenium::DriverOptions]
+
+        # @!method initialize(options)
+        #   @param options [Aranha::Selenium::DriverOptions]
         common_constructor :options do
-          self.options = options.with_indifferent_access.freeze
+          self.options = ::Aranha::Selenium::DriverOptions.assert(options)
         end
 
         def build
           raise 'Must be overrided'
         end
 
-        def downloads_dir
-          option_value(:downloads_dir)
-        end
-
-        def accept_insecure_certs?
-          option_value(:accept_insecure_certs)
-        end
-
-        def headless?
-          option_value(:headless)
-        end
-
-        def profile_dir
-          option_value(:profile_dir)
-        end
-
-        def profile_name
-          options[:profile_name]
-        end
-
-        def user_agent
-          option_value(:user_agent)
-        end
-
-        private
-
-        def option_value(key)
-          if options.key?(key)
-            options.fetch(key)
-          else
-            ::Aranha::Selenium::Defaults.instance.send(key)
+        ::Aranha::Selenium::DriverOptions.lists.option.each_value do |option_key|
+          method_name = option_key.to_s
+          method_name = "#{method_name}?" if ::Aranha::Selenium::DriverOptions::BOOLEAN_OPTIONS
+                                               .include?(option_key)
+          define_method method_name do
+            options.send(method_name)
           end
         end
       end

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

@@ -40,6 +40,7 @@ module Aranha
           r = {
             'browser.download.dir' => downloads_dir,
             'browser.download.folderList' => 2,
+            'browser.download.start_downloads_in_tmp_dir' => true,
             'browser.helperApps.neverAsk.saveToDisk' => auto_download_mime_types.join(';'),
             'pdfjs.disabled' => true
           }

data/lib/aranha/selenium/driver_factory.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'aranha/selenium/driver_options'
 require 'eac_ruby_utils/core_ext'
 
 module Aranha
@@ -11,10 +12,13 @@ module Aranha
         end
       end
 
-      attr_reader :options
+      # @!attribute [r] options
+      #   @return [ActiveSupport::HashWithIndifferentAccess]
 
-      def initialize(options)
-        @options = options.with_indifferent_access.freeze
+      # @!method initialize(options)
+      #   @param options [ActiveSupport::HashWithIndifferentAccess]
+      common_constructor :options do
+        self.options = options.with_indifferent_access.freeze
       end
 
       def create_driver
@@ -28,16 +32,17 @@ module Aranha
       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)"
+        raise "Unknown Aranha Selenium driver: \"#{driver_name}\" " \
+              "(Class \"Aranha::Selenium::DriverFactory::#{driver_name.classify}\" not found)"
       end
 
       def default_driver_name
         :firefox
       end
 
+      # @return [Aranha::Selenium::DriverOptions]
       def driver_options
-        options.except(:driver)
+        ::Aranha::Selenium::DriverOptions.assert(options.except(:driver))
       end
 
       require_sub __FILE__

data/lib/aranha/selenium/{defaults → driver_options}/option.rb

@@ -5,7 +5,7 @@ require 'eac_ruby_utils/core_ext'
 
 module Aranha
   module Selenium
-    class Defaults
+    class DriverOptions
       class Option
         common_constructor :owner, :key, :sanitizer, default: [nil] do
           self.key = key.to_sym

data/lib/aranha/selenium/driver_options.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/boolean'
+require 'eac_ruby_utils/core_ext'
+require 'tmpdir'
+
+module Aranha
+  module Selenium
+    class DriverOptions
+      class << self
+        # @return [Aranha::Selenium::DriverOptions]
+        # @param [Aranha::Selenium::DriverOptions, Hash]
+        def assert(source)
+          return source if source.is_a?(self)
+
+          new(source)
+        end
+
+        # @return [Aranha::Selenium::DriverOptions]
+        def instance
+          @instance ||= new
+        end
+      end
+
+      enable_listable
+      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_PROFILE_DIR = nil
+      DEFAULT_PROFILE_NAME = nil
+      DEFAULT_USER_AGENT = nil
+
+      # @param user_values [Hash]
+      def initialize(user_values = {})
+        user_values.each { |k, v| send("#{k}=", v) }
+      end
+
+      lists.option.each_value do |key|
+        define_method(key) { send("#{key}_option").value }
+        define_method("#{key}=") { |user_value| send("#{key}_option").user_value = user_value }
+
+        option_proc = nil
+        if BOOLEAN_OPTIONS.include?(key)
+          option_proc = proc { |v| ::EacRubyUtils::Boolean.parse(v) }
+          define_method("#{key}?") { send(key) }
+        end
+
+        define_method("#{key}_option") do
+          options[key] ||= ::Aranha::Selenium::DriverOptions::Option.new(self, key, option_proc)
+        end
+      end
+
+      private
+
+      def options
+        @options ||= {}
+      end
+
+      require_sub __FILE__
+    end
+  end
+end

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

@@ -1,19 +1,25 @@
 # frozen_string_literal: true
 
+require 'eac_fs/file_info'
+require 'eac_ruby_utils/core_ext'
 require 'tmpdir'
 
 module Aranha
   module Selenium
     class Session < ::SimpleDelegator
       class Downloads
-        attr_reader :dir
-
-        def initialize
-          @dir = ::Dir.mktmpdir
+        # @return [Enumerable<Pathname>]
+        def current
+          dir.glob('**/*').select do |path|
+            !::EacFs::FileInfo.new(path).open? && path.size.positive?
+          rescue Errno::ENOENT
+            false
+          end
         end
 
-        def current
-          Dir.glob("#{dir}/**/*")
+        # @return [Pathname]
+        def dir
+          @dir ||= ::Dir.mktmpdir.to_pathname
         end
       end
     end

data/lib/aranha/selenium/session.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'aranha/selenium/driver_options'
 require 'aranha/selenium/driver_factory'
 require 'eac_ruby_utils/core_ext'
 require 'selenium-webdriver'
@@ -9,13 +10,11 @@ module Aranha
     class Session < ::SimpleDelegator
       require_sub __FILE__, include_modules: true
       enable_simple_cache
-      attr_reader :downloads
 
       def initialize(options = {})
-        @downloads = Downloads.new
         super(
           ::Aranha::Selenium::DriverFactory.create_driver(
-            options.merge(download_dir: @downloads.dir)
+            options.merge(::Aranha::Selenium::DriverOptions::OPTION_DOWNLOADS_DIR => downloads.dir)
           )
         )
       end
@@ -28,6 +27,11 @@ module Aranha
         "<html>\n#{s}\n</html>\n"
       end
 
+      # @return [Aranha::Selenium::Session::Downloads]
+      def downloads
+        @downloads ||= ::Aranha::Selenium::Session::Downloads.new
+      end
+
       private
 
       def element_click(element)

data/lib/aranha/selenium/version.rb

@@ -2,6 +2,6 @@
 
 module Aranha
   module Selenium
-    VERSION = '0.7.0'
+    VERSION = '0.7.1'
   end
 end

metadata

@@ -1,35 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: aranha-selenium
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-09 00:00:00.000000000 Z
+date: 2023-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: eac_ruby_utils
+  name: eac_fs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.117'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.117.1
+        version: '0.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.117'
-    - - ">="
+        version: '0.17'
+- !ruby/object:Gem::Dependency
+  name: eac_ruby_utils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.120'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.117.1
+        version: '0.120'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -56,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0.9'
 description: 
 email: 
 executables: []
@@ -72,13 +80,13 @@ 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/driver_options.rb
+- lib/aranha/selenium/driver_options/option.rb
 - lib/aranha/selenium/session.rb
 - lib/aranha/selenium/session/downloads.rb
 - lib/aranha/selenium/session/find.rb
@@ -96,7 +104,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/aranha/selenium/defaults.rb

@@ -1,42 +0,0 @@
-# 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_PROFILE_DIR = nil
-      DEFAULT_USER_AGENT = nil
-
-      %w[accept_insecure_certs downloads_dir headless profile_dir 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