aranha-selenium 0.7.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 951e9e5db49e16c7825f8b24707b6b61236b78bef2a5b99c73860291e7dc7b23
-  data.tar.gz: 7ed611aadeb3401b3e2e5c2d43f5d5554be7f92d32ffe8ec8e0bb25c93f7f93e
+  metadata.gz: 8049f9b39bc5bdcf4b0d1f99c2d56ebe27de42a6753ab6265761af7af4133e60
+  data.tar.gz: bb330a8b485846dcb70a32845f8e0ed98a70d80051e12e0efba9ad2341052fee
 SHA512:
-  metadata.gz: 893bc2edc73ec2c6c2004729d3515e86bfd6ee809f2b5cf183647e308873fb8a6b4e970ccd3e721007c25dddcc7b64be0b7bde884298eb5c63c993ec2e14b3d4
-  data.tar.gz: '04994c6b945fac7288c65232de46af2d4b10d2b1edc26c0b0ef1159462b09c28a38931c71df156f53d9a35b66391c5a306b69b6aa73cb67634496c1eaa625fe7'
+  metadata.gz: 4602f4e1be967594d4611a7e84d4d785196e633a4f35da9a909ed3998383f6b936bd056cd359ed8cd44b0841903f2883dd432aabb06aff0520a7f246688a19da
+  data.tar.gz: 12e8385c7eed3bf717a8bc90a57e39e20c08a577f14bb48994cc33a5eee172fe8b301fa93da7193e55adb3ef910eb2841bcfc117d93d165691e3253885770b15

data/lib/aranha/selenium/driver_factory.rb

@@ -42,7 +42,9 @@ module Aranha
 
       # @return [Aranha::Selenium::DriverOptions]
       def driver_options
-        ::Aranha::Selenium::DriverOptions.assert(options.except(:driver))
+        ::Aranha::Selenium::DriverOptions.default.merge(
+          ::Aranha::Selenium::DriverOptions.assert(options.except(:driver))
+        )
       end
 
       require_sub __FILE__

data/lib/aranha/selenium/driver_options.rb

@@ -17,8 +17,8 @@ module Aranha
         end
 
         # @return [Aranha::Selenium::DriverOptions]
-        def instance
-          @instance ||= new
+        def default
+          @default ||= new
         end
       end
 
@@ -39,6 +39,8 @@ module Aranha
         user_values.each { |k, v| send("#{k}=", v) }
       end
 
+      compare_by :to_h
+
       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 }
@@ -54,6 +56,17 @@ module Aranha
         end
       end
 
+      # @param other [Aranha::Selenium::DriverOptions]
+      # @return [Aranha::Selenium::DriverOptions]
+      def merge(other)
+        self.class.assert(to_h.merge(other.to_h))
+      end
+
+      # @return [Hash]
+      def to_h
+        options.values.reject { |opt| opt.user_value.nil? }.to_h { |opt| [opt.key, opt.user_value] }
+      end
+
       private
 
       def options

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

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Aranha
+  module Selenium
+    class Session < ::SimpleDelegator
+      class FormRequest
+        class Field
+          class << self
+            # @param source [Enumeration, Hash]
+            # @return [Array<Aranha::Selenium::Session::FormRequest::Field>]
+            def assert_all(source)
+              if source.is_a?(::Hash)
+                assert_all_from_hash(source)
+              elsif source.is_a?(::Enumeration)
+                assert_all_from_enumerable(source)
+              else
+                raise ::ArgumentError, "Invalid source type: #{source.class}"
+              end
+            end
+
+            private
+
+            def assert_all_from_enumerable(source)
+              source.map { |e| new(*e) }
+            end
+
+            def assert_all_from_hash(source)
+              source.map { |k, v| new(k, v) }
+            end
+          end
+
+          common_constructor :name, :value
+
+          # @return [String]
+          def to_js_object
+            "'#{name}': '#{value}'"
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'eac_templates/core_ext'
+
+module Aranha
+  module Selenium
+    class Session < ::SimpleDelegator
+      class FormRequest
+        acts_as_instance_method
+        common_constructor :session, :path, :verb, :fields do
+          self.fields = ::Aranha::Selenium::Session::FormRequest::Field.assert_all(fields)
+        end
+
+        def result
+          session.execute_script(script.pretty_debug)
+        end
+
+        private
+
+        # @return [String]
+        def script
+          template.child('form_request_function.js').apply(script_args: script_args)
+        end
+
+        # @return [String]
+        def script_args
+          ["'#{path}'", "'#{verb}'", script_fields_arg].join(', ')
+        end
+
+        # @return [String]
+        def script_fields_arg
+          "{#{fields.map(&:to_js_object).join(', ')}}"
+        end
+
+        require_sub __FILE__
+      end
+    end
+  end
+end

data/lib/aranha/selenium/session.rb

@@ -8,7 +8,7 @@ require 'selenium-webdriver'
 module Aranha
   module Selenium
     class Session < ::SimpleDelegator
-      require_sub __FILE__, include_modules: true
+      require_sub __FILE__, include_modules: true, require_mode: :kernel
       enable_simple_cache
 
       def initialize(options = {})

data/lib/aranha/selenium/version.rb

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

data/template/aranha/selenium/session/form_request/form_request_function.js

@@ -0,0 +1,22 @@
+(function(path, method, params) {
+
+  // The rest of this code assumes you are not using a library.
+  // It can be made less verbose if you use one.
+  const form = document.createElement('form');
+  form.method = method;
+  form.action = path;
+
+  for (const key in params) {
+    if (params.hasOwnProperty(key)) {
+      const hiddenField = document.createElement('input');
+      hiddenField.type = 'hidden';
+      hiddenField.name = key;
+      hiddenField.value = params[key];
+
+      form.appendChild(hiddenField);
+    }
+  }
+
+  document.body.appendChild(form);
+  form.submit();
+})( %%SCRIPT_ARGS%% );

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aranha-selenium
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-09 00:00:00.000000000 Z
+date: 2024-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_fs
@@ -30,14 +30,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.120'
+        version: '0.121'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.120'
+        version: '0.121'
+- !ruby/object:Gem::Dependency
+  name: eac_templates
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -64,14 +84,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
 description: 
 email: 
 executables: []
@@ -90,9 +110,12 @@ files:
 - lib/aranha/selenium/session.rb
 - lib/aranha/selenium/session/downloads.rb
 - lib/aranha/selenium/session/find.rb
+- lib/aranha/selenium/session/form_request.rb
+- lib/aranha/selenium/session/form_request/field.rb
 - lib/aranha/selenium/session/select.rb
 - lib/aranha/selenium/session/wait.rb
 - lib/aranha/selenium/version.rb
+- template/aranha/selenium/session/form_request/form_request_function.js
 homepage: 
 licenses: []
 metadata: {}