webdrone 1.16.2 → 1.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f487358146231428767a939df5a958331b4ca65e0051203096af15c8d652d218
-  data.tar.gz: 2816b82fcf89b10ce8a19a9988c7d12fa7cad846d3ee9a2db66377047684bd8c
+  metadata.gz: 3280a123629a2b7fe840fe9bbecf008505491bd91ea26fca460d75bdcd1e0954
+  data.tar.gz: 28cc5a4b420bbc4ddf6366770a026520226a57c43bd9d77f5ee637e1ba226a95
 SHA512:
-  metadata.gz: 4aa55ce3c9ec8c93c2509acaa812a1728172092b5ad5fc3b8b4f9fe10bc39c6692223743188e9c1190bcd880521fa933e1df1f07f9efc2d55fbd6de4c228191f
-  data.tar.gz: 26d7e1388cbdc34f0e69ae66ef71c4203be31f67ae76770f3952f6a03068a6b5fafcc520d0900d404fa2ca4f1a87056ff1f2aa92a0160d3845c3f2b79a44f4eb
+  metadata.gz: 66a68b1424ae2b20c147737d1fb9d7558c25fef7ecfab9e246efd7c44783b2862774b6a69ab43f29e137a100bf2fcc9121299a37360a42ace9da8740cda1ae0c
+  data.tar.gz: 931af4c68353750296c315a54fcffdda78447f5b0e2311372f233fd9131b6071c86986f8cf44083fb77a34d88373ea1c0cd9c3b67553e91907a6a797886bd9bd

data/.rubocop.relaxed.yml

@@ -1,5 +1,5 @@
 # Relaxed.Ruby.Style
-## Version 2.4
+## Version 2.5
 
 Style/Alias:
   Enabled: false
@@ -145,29 +145,8 @@ Lint/AssignmentInCondition:
   Enabled: false
   StyleGuide: https://relaxed.ruby.style/#lintassignmentincondition
 
-Metrics/AbcSize:
+Layout/LineLength:
   Enabled: false
 
-Metrics/BlockNesting:
-  Enabled: false
-
-Metrics/ClassLength:
-  Enabled: false
-
-Metrics/ModuleLength:
-  Enabled: false
-
-Metrics/CyclomaticComplexity:
-  Enabled: false
-
-Metrics/LineLength:
-  Enabled: false
-
-Metrics/MethodLength:
-  Enabled: false
-
-Metrics/ParameterLists:
-  Enabled: false
-
-Metrics/PerceivedComplexity:
+Metrics:
   Enabled: false

data/.rubocop.yml

@@ -1,5 +1,6 @@
 AllCops:
   TargetRubyVersion: 2.6
+  NewCops: enable
 inherit_from:
 - .rubocop.relaxed.yml
 Naming/MethodParameterName:

data/.tool-versions

@@ -1 +1 @@
-ruby 2.7.2
+ruby 2.7.3

data/CHANGELOG.md

@@ -4,6 +4,13 @@ New features are summarized here.
 
 
 
+## v.1.18.0 - 2021-04-24
+### Changed
+- Minimum Ruby version supported is now >= 2.6
+- Added support to Ruby version 3.0
+
+
+
 ## v.1.16.2 - 2021-03-19
 ### Fixed
 - Remove rspec from runtime_dependencies.

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in webdrone.gemspec

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 

data/lib/webdrone.rb

@@ -36,8 +36,8 @@ module Webdrone
   class << self
     attr_accessor :running_pry, :irb_setup_done
 
-    def create(*args)
-      a0 = Webdrone::Browser.new(*args)
+    def create(*args, **kwargs)
+      a0 = Webdrone::Browser.new(*args, **kwargs)
       if block_given?
         begin
           yield a0

data/lib/webdrone/browser.rb

@@ -145,9 +145,10 @@ module Webdrone
     protected
 
     def env_update_bool(binding, var, val_old, val_new)
-      if val_new == 'true'
+      case val_new
+      when 'true'
         val_new = true
-      elsif val_new == 'false'
+      when 'false'
         val_new = false
       else
         puts "Webdrone: ignoring value '#{val_new}' for boolean parameter #{var}."
@@ -160,7 +161,7 @@ module Webdrone
     def env_update(binding)
       bool_vars = %i[create_outdir developer quit_at_exit maximize headless]
       ENV.keys.select { |env| env.start_with? 'WEBDRONE_' }.each do |env|
-        var = env[9..-1].downcase.to_sym
+        var = env[9..].downcase.to_sym
         if binding.local_variable_defined? var
           val_old = binding.local_variable_get(var)
           val_new = ENV[env]

data/lib/webdrone/error.rb

@@ -14,8 +14,8 @@ module Webdrone
 
       begin
         # find location of user error
-        bindings[0..-1].each do |binding|
-          location = { path: binding.eval('__FILE__'), lineno: binding.eval('__LINE__') }
+        bindings[0..].each do |binding|
+          location = { path: binding.source_location[0], lineno: binding.source_location[1] }
           next unless Gem.path.none? { |path| location[:path].include? path }
 
           @location = location

data/lib/webdrone/find.rb

@@ -69,9 +69,10 @@ module Webdrone
 
     def choose(list, n, all, visible, scroll)
       list = list.select do |x|
-        if visible == true
+        case visible
+        when true
           x.displayed?
-        elsif visible == false
+        when false
           !x.displayed?
         else
           true

data/lib/webdrone/logg.rb

@@ -7,6 +7,8 @@ module Webdrone
     end
 
     def initialize(methods = nil)
+      super()
+
       @methods = methods
     end
 
@@ -16,25 +18,26 @@ module Webdrone
       base.class_eval do
         method_list.each do |method_name|
           original_method = instance_method(method_name)
-          define_method method_name do |*args, &block|
+          define_method method_name do |*args, **kwargs, &block|
             caller_location = Kernel.caller_locations[0]
             cl_path = caller_location.path
             cl_line = caller_location.lineno
             if @a0.conf.logger && Gem.path.none? { |path| cl_path.include? path }
               ini = ::Webdrone::MethodLogger.last_time ||= Time.new
               ::Webdrone::MethodLogger.screenshot = nil
+              args_log = [args, kwargs].compact.reject(&:empty?).map(&:to_s).join(' ')
               begin
-                result = original_method.bind(self).call(*args, &block)
+                result = original_method.bind(self).call(*args, **kwargs, &block)
                 fin = ::Webdrone::MethodLogger.last_time = Time.new
-                @a0.logs.trace(ini, fin, cl_path, cl_line, base, method_name, args, result, nil, ::Webdrone::MethodLogger.screenshot)
+                @a0.logs.trace(ini, fin, cl_path, cl_line, base, method_name, args_log, result, nil, ::Webdrone::MethodLogger.screenshot)
                 result
               rescue StandardError => exception
                 fin = ::Webdrone::MethodLogger.last_time = Time.new
-                @a0.logs.trace(ini, fin, cl_path, cl_line, base, method_name, args, nil, exception, ::Webdrone::MethodLogger.screenshot)
+                @a0.logs.trace(ini, fin, cl_path, cl_line, base, method_name, args_log, nil, exception, ::Webdrone::MethodLogger.screenshot)
                 raise exception
               end
             else
-              original_method.bind(self).call(*args, &block)
+              original_method.bind(self).call(*args, **kwargs, &block)
             end
           end
         end
@@ -80,8 +83,8 @@ module Webdrone
       rescue StandardError => e
         exception = e
         bindings = Kernel.binding.callers
-        bindings[0..-1].each do |binding|
-          location = { path: binding.eval('__FILE__'), lineno: binding.eval('__LINE__') }
+        bindings[0..].each do |binding|
+          location = { path: binding.source_location[0], lineno: binding.source_location[1] }
           next unless Gem.path.none? { |path| location[:path].include? path }
 
           result[:exception] = {}
@@ -93,7 +96,7 @@ module Webdrone
       end
       result[:trace_count] = @group_trace_count.pop
       fin = Time.new
-      trace(ini, fin, cl_path, cl_line, Logs, :with_group, [name, abort_error: abort_error], result, exception, nil)
+      trace(ini, fin, cl_path, cl_line, Logs, :with_group, [name, { abort_error: abort_error }], result, exception, nil)
       puts "abort_error: #{abort_error} exception: #{exception}"
       exit if abort_error == true && exception
     end

data/lib/webdrone/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Webdrone
-  VERSION = '1.16.2'
+  VERSION = '1.18.0'
 end

data/lib/webdrone/wait.rb

@@ -20,11 +20,9 @@ module Webdrone
       @ignore << Selenium::WebDriver::Error::InvalidSelectorError
     end
 
-    def for
+    def for(&block)
       if @a0.conf.timeout
-        Selenium::WebDriver::Wait.new(timeout: @a0.conf.timeout, ignore: @ignore).until do
-          yield
-        end
+        Selenium::WebDriver::Wait.new(timeout: @a0.conf.timeout, ignore: @ignore).until(&block)
       else
         yield
       end

data/lib/webdrone/xpath.rb

@@ -58,8 +58,7 @@ module Webdrone
     def field(locator)
       locator = locator.to_s
       xpath = descendant(:input, :textarea, :select)[~attr(:type).one_of('submit', 'image', 'hidden')]
-      xpath = locate_field(xpath, locator)
-      xpath
+      locate_field(xpath, locator)
     end
 
     # Match any `input` or `textarea` element that can be filled with text.
@@ -72,8 +71,7 @@ module Webdrone
     def fillable_field(locator)
       locator = locator.to_s
       xpath = descendant(:input, :textarea)[~attr(:type).one_of('submit', 'image', 'radio', 'checkbox', 'hidden', 'file')]
-      xpath = locate_field(xpath, locator)
-      xpath
+      locate_field(xpath, locator)
     end
 
     # Match any `select` element.

data/webdrone.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'lib/webdrone/version'
 
 Gem::Specification.new do |spec|
@@ -10,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description   = 'See webpage for more info.'
   spec.homepage      = 'http://github.com/a0/a0-webdrone-ruby'
   spec.license       = 'MIT'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.3.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.6.0')
 
   # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
   # delete this section to allow pushing this gem to any host.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webdrone
 version: !ruby/object:Gem::Version
-  version: 1.16.2
+  version: 1.18.0
 platform: ruby
 authors:
 - Aldrin Martoq
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-20 00:00:00.000000000 Z
+date: 2021-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -244,7 +244,7 @@ metadata:
   homepage_uri: http://github.com/a0/a0-webdrone-ruby
   source_code_uri: http://github.com/a0/a0-webdrone-ruby
   changelog_uri: http://github.com/a0/a0-webdrone-ruby/CHANGELOG.md
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -252,15 +252,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: A simple selenium webdriver wrapper, ruby version.
 test_files: []