webdrone 1.7.8 → 1.8.0

data/lib/webdrone/clic.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Webdrone
   class Browser
     def clic
@@ -6,7 +8,7 @@ module Webdrone
   end
 
   class Clic
-    attr_accessor :a0
+    attr_reader :a0
 
     def initialize(a0)
       @a0 = a0
@@ -24,8 +26,8 @@ module Webdrone
       else
         item.click
       end
-    rescue => exception
-      Webdrone.report_error(@a0, exception)
+    rescue StandardError => error
+      Webdrone.report_error(@a0, error)
     end
 
     alias_method :id,     :clic

data/lib/webdrone/conf.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Webdrone
   class Browser
     def conf
@@ -6,33 +8,34 @@ module Webdrone
   end
 
   class Conf
-    attr_accessor :a0, :timeout, :outdir, :error, :developer, :logger
+    attr_accessor :developer, :logger
+    attr_reader :a0, :timeout, :outdir, :error
 
     def initialize(a0)
       @a0 = a0
-      @outdir = "."
+      @outdir = '.'
       @error = :raise_report
     end
 
     def timeout=(val)
       @timeout = val
       @a0.driver.manage.timeouts.implicit_wait = val
-    rescue => exception
-      Webdrone.report_error(@a0, exception)
+    rescue StandardError => error
+      Webdrone.report_error(@a0, error)
     end
 
     def outdir=(val)
       @outdir = val
       FileUtils.mkdir_p val
-    rescue => exception
-      Webdrone.report_error(@a0, exception)
+    rescue StandardError => error
+      Webdrone.report_error(@a0, error)
     end
 
     def error=(val)
-      raise "Invalid value '#{val}' for error" if not [:raise_report, :raise, :ignore].include? val
+      raise "Invalid value '#{val}' for error" if !%i[raise_report raise ignore].include? val
       @error = val
-    rescue => exception
-      Webdrone.report_error(@a0, exception)
+    rescue StandardError => error
+      Webdrone.report_error(@a0, error)
     end
   end
 end

data/lib/webdrone/ctxt.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Webdrone
   class Browser
     def ctxt
@@ -6,29 +8,29 @@ module Webdrone
   end
 
   class Ctxt
-    attr_accessor :a0, :current_frame
+    attr_reader :a0
 
     def initialize(a0)
       @a0 = a0
       @framestack = []
     end
-    
+
     def create_tab
       @a0.exec.script "function a0_ctx_create_tab() { var w = window.open(); w.document.open(); w.document.write('A0 CTXT CREATE TAB'); w.document.close(); } a0_ctx_create_tab();"
       @a0.driver.switch_to.window @a0.driver.window_handles.last
-    rescue => exception
-      Webdrone.report_error(@a0, exception)
+    rescue StandardError => error
+      Webdrone.report_error(@a0, error)
     end
-    
+
     def close_tab
       @a0.driver.close
       @a0.driver.switch_to.window @a0.driver.window_handles.last
-    rescue => exception
-      Webdrone.report_error(@a0, exception)
+    rescue StandardError => error
+      Webdrone.report_error(@a0, error)
     end
 
     def with_frame(name)
-      @framestack << name      
+      @framestack << name
       @a0.driver.switch_to.frame name
       if block_given?
         begin
@@ -36,33 +38,33 @@ module Webdrone
         ensure
           @framestack.pop
           @a0.driver.switch_to.default_content
-          @framestack.each { |frame| @a0.driver.switch_to.frame frame}
+          @framestack.each { |frame| @a0.driver.switch_to.frame frame }
         end
       end
       name
-    rescue => exception
-      Webdrone.report_error(@a0, exception)
+    rescue StandardError => error
+      Webdrone.report_error(@a0, error)
     end
-    
+
     def reset
       @a0.driver.switch_to.default_content
       @framestack = []
-    rescue => exception
-      Webdrone.report_error(@a0, exception)
+    rescue StandardError => error
+      Webdrone.report_error(@a0, error)
     end
-    
+
     def with_alert
       @a0.wait.for do
         yield @a0.driver.switch_to.alert
       end
-    rescue => exception
-      Webdrone.report_error(@a0, exception)
+    rescue StandardError => error
+      Webdrone.report_error(@a0, error)
     end
 
     def ignore_alert
       @a0.exec.script 'alert = function(message){return true;};'
-    rescue => exception
-      Webdrone.report_error(@a0, exception)
+    rescue StandardError => error
+      Webdrone.report_error(@a0, error)
     end
 
     def with_conf(new_config)
@@ -74,8 +76,8 @@ module Webdrone
       end
 
       yield
-    rescue => exception
-      Webdrone.report_error(@a0, exception)
+    rescue StandardError => error
+      Webdrone.report_error(@a0, error)
     ensure
       current_config.each do |k, v|
         @a0.conf.send "#{k}=", v

data/lib/webdrone/error.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module Webdrone
   class WebdroneError < RuntimeError
     attr_reader :original, :a0, :binding
 
-    def initialize(msg, original = $!, a0, bindings)
+    def initialize(msg, original, a0, bindings)
       super(msg)
-      @original = original
+      @original = original || $!
       @a0 = a0
       @buffer = []
       @binding = nil
@@ -12,17 +14,18 @@ module Webdrone
 
       begin
         # find location of user error
-        bindings[0..-1].each_with_index do |binding, index|
+        bindings[0..-1].each do |binding|
           location = { path: binding.eval('__FILE__'), lineno: binding.eval('__LINE__') }
-          if Gem.path.none? { |path| location[:path].include? path }
-            @location = location
-            @binding = binding
-            break
-          end
+          next unless Gem.path.none? { |path| location[:path].include? path }
+
+          @location = location
+          @binding = binding
+          break
         end
 
         report if a0.conf.error == :raise_report
-      rescue
+      rescue StandardError
+        nil
       end
     end
 
@@ -33,11 +36,12 @@ module Webdrone
     end
 
     def write_title(title)
-      title = "#{title} " if title.length % 2 != 0
+      title = "#{title} " if title.length.odd?
       title = "== #{title} =="
       filler = "="
       length = (80 - title.length) / 2
-      title = "#{filler*length}#{title}#{filler*length}\n" if length > 1
+      filler_length = filler * length
+      title = "#{filler_length}#{title}#{filler_length}\n" if length > 1
       write_line title
     end
 
@@ -57,61 +61,58 @@ module Webdrone
     end
 
     def report_script
-      begin
-        ini, fin = [@location[:lineno] - 10 - 1, @location[:lineno] + 10 - 1]
-        ini = 0 if ini < 0
-
-        write_title "LOCATION OF ERROR"
-        write_line "#{@location[:path]} AT LINE #{sprintf '%3d', @location[:lineno]}"
-        File.readlines(@location[:path])[ini..fin].each_with_index do |line, index|
-          lno = index + ini + 1
-          if lno == @location[:lineno]
-            write_line sprintf "%3d ==> %s", lno, line
-          else
-            write_line sprintf "%3d     %s", lno, line
-          end
+      ini, fin = [@location[:lineno] - 10 - 1, @location[:lineno] + 10 - 1]
+      ini = 0 if ini.negative?
+
+      write_title "LOCATION OF ERROR"
+      write_line "#{@location[:path]} AT LINE #{sprintf '%3d', @location[:lineno]}"
+      File.readlines(@location[:path])[ini..fin].each_with_index do |line, index|
+        lno = index + ini + 1
+        if lno == @location[:lineno]
+          write_line sprintf "%3d ==> #{line}", lno
+        else
+          write_line sprintf "%3d     #{line}", lno
         end
-
-        dump_error_report
-      rescue
       end
+
+      dump_error_report
+    rescue StandardError
+      nil
     end
 
     def report_screenshot
+      write_title "AUTOMATIC SCREENSHOT"
       begin
-        write_title "AUTOMATIC SCREENSHOT"
-        begin
-          @a0.ctxt.with_conf error: :raise do
-            file = @a0.shot.screen 'a0_webdrone_error_report'
-            write_line "Screenshot saved succesfully filename:"
-            write_line "#{File.expand_path(file.path)}"
-          end
-        rescue => exception
-          write_line "Error Saving screenshot, exception:"
-          write_line "#{exception}"
+        @a0.ctxt.with_conf error: :raise do
+          file = @a0.shot.screen 'a0_webdrone_error_report'
+          write_line "Screenshot saved succesfully filename:"
+          write_line File.expand_path(file.path).to_s
         end
-
-        dump_error_report
-      rescue
+      rescue StandardError => error
+        write_line "Error Saving screenshot, exception:"
+        write_line error.to_s
       end
+
+      dump_error_report
+    rescue StandardError
+      nil
     end
 
     def report_exception
-      begin
-        write_title "EXCEPTION DUMP"
-
-        write_line "#{@original.class}: #{@original.message}"
-        @original.backtrace_locations.each_with_index do |location, index|
-          if location.path == @location[:path] and location.lineno == @location[:lineno]
-            write_line sprintf "%02d: ==> from %s", index, location
-          else
-            write_line sprintf "%02d:     from %s", index, location
-          end
+      write_title "EXCEPTION DUMP"
+
+      write_line "#{@original.class}: #{@original.message}"
+      @original.backtrace_locations.each_with_index do |location, index|
+        if location.path == @location[:path] && location.lineno == @location[:lineno]
+          write_line sprintf "%02d: ==> from #{location}", index
+        else
+          write_line sprintf "%02d:     from #{location}", index
         end
-
-        dump_error_report
-      rescue
       end
+
+      dump_error_report
+    rescue StandardError
+      nil
     end
 
     def report_os
@@ -124,7 +125,7 @@ module Webdrone
     end
 
     def report_time
-      write_title "#{Time.new}"
+      write_title Time.new.to_s
 
       dump_error_report
     end
@@ -134,13 +135,13 @@ module Webdrone
     return if a0.conf.error == :ignore
     if exception.class != WebdroneError
       exception = WebdroneError.new(exception.message, exception, a0, Kernel.binding.callers)
-      if a0.conf.developer and exception.binding
+      if a0.conf.developer && exception.binding
         exception.write_title "STARTING DEVELOPER CONSOLE ON ERROR"
         exception.dump_error_report
         a0.console exception.binding
       end
     end
 
-    raise exception if a0.conf.error == :raise or a0.conf.error == :raise_report
+    raise exception if %i[raise raise_report].include? a0.conf.error
   end
 end

data/lib/webdrone/exec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Webdrone
   class Browser
     def exec
@@ -6,7 +8,7 @@ module Webdrone
   end
 
   class Exec
-    attr_accessor :a0
+    attr_reader :a0
 
     def initialize(a0)
       @a0 = a0
@@ -14,8 +16,8 @@ module Webdrone
 
     def script(script, *more)
       @a0.driver.execute_script(script, *more)
-    rescue => exception
-      Webdrone.report_error(@a0, exception)
+    rescue StandardError => error
+      Webdrone.report_error(@a0, error)
     end
   end
 end

data/lib/webdrone/find.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Webdrone
   class Browser
     def find
@@ -6,7 +8,7 @@ module Webdrone
   end
 
   class Find
-    attr_accessor :a0
+    attr_reader :a0
 
     def initialize(a0)
       @a0 = a0
@@ -17,8 +19,8 @@ module Webdrone
         items = (parent || @a0.driver).find_elements :id, text
         choose(items, n, all, visible, scroll)
       end
-    rescue => exception
-      Webdrone.report_error(@a0, exception)
+    rescue StandardError => error
+      Webdrone.report_error(@a0, error)
     end
 
     def css(text, n: 1, all: false, visible: true, scroll: false, parent: nil)
@@ -26,32 +28,32 @@ module Webdrone
         items = (parent || @a0.driver).find_elements :css, text
         choose(items, n, all, visible, scroll)
       end
-    rescue => exception
-      Webdrone.report_error(@a0, exception)
+    rescue StandardError => error
+      Webdrone.report_error(@a0, error)
     end
 
     def link(text, n: 1, all: false, visible: true, scroll: false, parent: nil)
-      self.xpath XPath::HTML.link(text).to_s, n: n, all: all, visible: visible, scroll: scroll, parent: parent
-    rescue => exception
-      Webdrone.report_error(@a0, exception)
+      xpath Webdrone::XPath.link(text).to_s, n: n, all: all, visible: visible, scroll: scroll, parent: parent
+    rescue StandardError => error
+      Webdrone.report_error(@a0, error)
     end
 
     def button(text, n: 1, all: false, visible: true, scroll: false, parent: nil)
-      self.xpath XPath::HTML.button(text).to_s, n: n, all: all, visible: visible, scroll: scroll, parent: parent
-    rescue => exception
-      Webdrone.report_error(@a0, exception)
+      xpath Webdrone::XPath.button(text).to_s, n: n, all: all, visible: visible, scroll: scroll, parent: parent
+    rescue StandardError => error
+      Webdrone.report_error(@a0, error)
     end
 
     def on(text, n: 1, all: false, visible: true, scroll: false, parent: nil)
-      self.xpath XPath::HTML.link_or_button(text).to_s, n: n, all: all, visible: visible, scroll: scroll, parent: parent
-    rescue => exception
-      Webdrone.report_error(@a0, exception)
+      xpath Webdrone::XPath.link_or_button(text).to_s, n: n, all: all, visible: visible, scroll: scroll, parent: parent
+    rescue StandardError => error
+      Webdrone.report_error(@a0, error)
     end
 
     def option(text, n: 1, all: false, visible: true, scroll: false, parent: nil)
-      self.xpath XPath::HTML.option(text).to_s, n: n, all: all, visible: visible, scroll: scroll, parent: parent
-    rescue => exception
-      Webdrone.report_error(@a0, exception)
+      xpath Webdrone::XPath.option(text).to_s, n: n, all: all, visible: visible, scroll: scroll, parent: parent
+    rescue StandardError => error
+      Webdrone.report_error(@a0, error)
     end
 
     def xpath(text, n: 1, all: false, visible: true, scroll: false, parent: nil)
@@ -59,31 +61,32 @@ module Webdrone
         items = (parent || @a0.driver).find_elements :xpath, text
         choose(items, n, all, visible, scroll)
       end
-    rescue => exception
-      Webdrone.report_error(@a0, exception)
+    rescue StandardError => error
+      Webdrone.report_error(@a0, error)
     end
 
     protected
-      def choose(list, n, all, visible, scroll)
-        list = list.select do |x|
-          if visible == true
-            x.displayed?
-          elsif visible == false
-            not x.displayed?
-          else
-            true
-          end
-        end
 
-        if scroll and list.length > 0
-          @a0.exec.script 'arguments[0].scrollIntoView()', list.first
-        end
-
-        if all
-          list
+    def choose(list, n, all, visible, scroll)
+      list = list.select do |x|
+        if visible == true
+          x.displayed?
+        elsif visible == false
+          !x.displayed?
         else
-          list[n - 1]
+          true
         end
       end
+
+      if scroll && list.length.positive?
+        @a0.exec.script 'arguments[0].scrollIntoView()', list.first
+      end
+
+      if all
+        list
+      else
+        list[n - 1]
+      end
+    end
   end
 end