webdrone 1.7.8 → 1.8.0

data/lib/webdrone/form.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Webdrone
   class Browser
     def form
@@ -6,7 +8,8 @@ module Webdrone
   end
 
   class Form
-    attr_accessor :a0, :data
+    attr_accessor :data
+    attr_reader :a0
 
     def initialize(a0)
       @a0 = a0
@@ -15,9 +18,9 @@ module Webdrone
 
     def with_xpath(xpath = nil, &block)
       old_xpath, @xpath = @xpath, xpath
-      instance_eval &block
-    rescue => exception
-      Webdrone.report_error(@a0, exception)
+      instance_eval(&block)
+    rescue StandardError => error
+      Webdrone.report_error(@a0, error)
     ensure
       @xpath = old_xpath
     end
@@ -29,15 +32,15 @@ module Webdrone
 
       yield
     ensure
-      File.open(".#{filename}.lock", File::RDWR | File::CREAT, 0644) do |file|
+      File.open(".#{filename}.lock", File::RDWR | File::CREAT, 0o644) do
         items = {}
         items[item] = data
 
         begin
           workbook = RubyXL::Parser.parse(filename)
           worksheet = workbook[sheet]
-          worksheet = workbook.add_worksheet sheet unless worksheet
-        rescue
+          worksheet ||= workbook.add_worksheet sheet
+        rescue StandardError
           workbook = RubyXL::Workbook.new
           worksheet = workbook[0]
           worksheet.sheet_name = sheet
@@ -45,7 +48,7 @@ module Webdrone
 
         rows = worksheet.sheet_data.rows.collect do |row|
           row.cells.collect do |cell|
-            cell.value if cell != nil
+            cell&.value
           end
         end
         heads = rows.shift || []
@@ -54,11 +57,11 @@ module Webdrone
           key = nil
           row.each_with_index do |val, i|
             val = val.to_s if val
-            if i == 0
+            if i.zero?
               key = val
             elsif key
               items[key] = {} unless items[key]
-              items[key][heads[i]] = val if heads[i] != nil and items[key][heads[i]] == nil
+              items[key][heads[i]] = val if !heads[i].nil? && items[key][heads[i]].nil?
             end
           end
         end
@@ -88,10 +91,10 @@ module Webdrone
     end
 
     def set(key, val, n: 1, visible: true, scroll: false, parent: nil, mark: false)
-      item = self.find_item(key, n: n, visible: visible, scroll: scroll, parent: parent)
+      item = find_item(key, n: n, visible: visible, scroll: scroll, parent: parent)
       @a0.mark.mark_item item if mark
       if item.tag_name == 'select'
-        option = item.find_element :xpath, XPath::HTML.option(val).to_s
+        option = item.find_element :xpath, Webdrone::XPath.option(val).to_s
         option.click
       else
         item.clear
@@ -99,56 +102,59 @@ module Webdrone
       end
       @data[key] = val if @data
       nil
-    rescue => exception
-      Webdrone.report_error(@a0, exception)
+    rescue StandardError => error
+      Webdrone.report_error(@a0, error)
     end
 
     def get(key, n: 1, visible: true, scroll: false, parent: nil, mark: false)
-      item = self.find_item(key, n: n, visible: visible, scroll: scroll, parent: parent)
+      item = find_item(key, n: n, visible: visible, scroll: scroll, parent: parent)
       @a0.mark.mark_item item if mark
       item[:value]
-    rescue => exception
-      Webdrone.report_error(@a0, exception)
+    rescue StandardError => error
+      Webdrone.report_error(@a0, error)
     end
 
     def clic(key, n: 1, visible: true, scroll: false, parent: nil, mark: false)
-      item = self.find_item(key, n: n, visible: visible, scroll: scroll, parent: parent)
+      item = find_item(key, n: n, visible: visible, scroll: scroll, parent: parent)
       @a0.mark.mark_item item if mark
       item.click
-    rescue => exception
-      Webdrone.report_error(@a0, exception)
+    rescue StandardError => error
+      Webdrone.report_error(@a0, error)
     end
 
     def mark(key, n: 1, visible: true, scroll: false, parent: nil, color: '#af1616', times: nil, delay: nil, shot: nil)
-      @a0.mark.mark_item self.find_item(key, n: n, visible: visible, scroll: scroll, parent: parent), color: color, times: times, delay: delay, shot: shot
-    rescue => exception
-      Webdrone.report_error(@a0, exception)
+      @a0.mark.mark_item find_item(key, n: n, visible: visible, scroll: scroll, parent: parent), color: color, times: times, delay: delay, shot: shot
+    rescue StandardError => error
+      Webdrone.report_error(@a0, error)
     end
 
     def submit(key = nil, n: 1, visible: true, scroll: false, parent: nil, mark: false)
-      self.find_item(key, n: n, visible: visible, scroll: scroll, parent: parent) if key
+      item = find_item(key, n: n, visible: visible, scroll: scroll, parent: parent) if key
+      @a0.mark.mark_item item if mark
       @lastitem.submit
-    rescue => exception
-      Webdrone.report_error(@a0, exception)
+    rescue StandardError => error
+      Webdrone.report_error(@a0, error)
     end
 
     def xlsx(sheet: nil, filename: nil)
       @a0.xlsx.dict(sheet: sheet, filename: filename).each do |k, v|
-        self.set k, v
+        set k, v
       end
-    rescue => exception
-      Webdrone.report_error(@a0, exception)
+    rescue StandardError => error
+      Webdrone.report_error(@a0, error)
     end
 
     protected
-      def find_item(key, n: 1, visible: true, scroll: false, parent: nil)
+
+    def find_item(key, n: 1, visible: true, scroll: false, parent: nil)
+      @lastitem = \
         if @xpath.respond_to? :call
-          @lastitem = @a0.find.xpath @xpath.call(key).to_s, n: n, visible: visible, scroll: scroll, parent: parent
-        elsif @xpath.is_a? String and @xpath.include? '%s'
-          @lastitem = @a0.find.xpath sprintf(@xpath, key), n: n, visible: visible, scroll: scroll, parent: parent
+          @a0.find.xpath @xpath.call(key).to_s, n: n, visible: visible, scroll: scroll, parent: parent
+        elsif @xpath.is_a?(String) && @xpath.include?('%s')
+          @a0.find.xpath sprintf(@xpath, key), n: n, visible: visible, scroll: scroll, parent: parent
         else
-          @lastitem = @a0.find.xpath XPath::HTML.field(key).to_s, n: n, visible: visible, scroll: scroll, parent: parent
+          @a0.find.xpath Webdrone::XPath.field(key).to_s, n: n, visible: visible, scroll: scroll, parent: parent
         end
-      end
+    end
   end
 end

data/lib/webdrone/html.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Webdrone
   class Browser
     def html
@@ -6,7 +8,7 @@ module Webdrone
   end
 
   class Html
-    attr_accessor :a0
+    attr_reader :a0
 
     def initialize(a0)
       @a0 = a0
@@ -15,12 +17,12 @@ module Webdrone
     def find_html(text, n: 1, all: false, visible: true, scroll: false, parent: nil)
       item = @a0.find.send __callee__, text, n: n, all: all, visible: visible, scroll: scroll, parent: parent
       if item.is_a? Array
-        item.collect { |x| x.attribute 'innerHTML'}
+        item.collect { |x| x.attribute 'innerHTML' }
       else
         item.attribute 'innerHTML'
       end
-    rescue => exception
-      Webdrone.report_error(@a0, exception)
+    rescue StandardError => error
+      Webdrone.report_error(@a0, error)
     end
 
     alias_method :id,     :find_html

data/lib/webdrone/logg.rb

@@ -1,12 +1,18 @@
+# frozen_string_literal: true
+
 module Webdrone
   class MethodLogger < Module
-    def initialize(methods_0 = nil)
-      @methods_0 = methods_0
+    class << self
+      attr_accessor :last_time, :screenshot
+    end
+
+    def initialize(methods = nil)
+      @methods = methods
     end
 
     def included(base)
-      @methods_0 = base.instance_methods(false) if @methods_0 == nil
-      method_list = @methods_0
+      @methods ||= base.instance_methods(false)
+      method_list = @methods
       base.class_eval do
         method_list.each do |method_name|
           original_method = instance_method(method_name)
@@ -14,18 +20,17 @@ module Webdrone
             caller_location = Kernel.caller_locations[0]
             cl_path = caller_location.path
             cl_line = caller_location.lineno
-            if @a0.conf.logger and Gem.path.none? { |path| cl_path.include? path }
-              $a0_webdrone_logger_last_time = Time.new unless $a0_webdrone_logger_last_time
-              ini = $a0_webdrone_logger_last_time
-              $a0_webdrone_screenshot = nil
+            if @a0.conf.logger && Gem.path.none? { |path| cl_path.include? path }
+              ini = ::Webdrone::MethodLogger.last_time ||= Time.new
+              ::Webdrone::MethodLogger.screenshot = nil
               begin
                 result = original_method.bind(self).call(*args, &block)
-                fin = $a0_webdrone_logger_last_time = Time.new
-                @a0.logs.trace(ini, fin, cl_path, cl_line, base, method_name, args, result, nil, $a0_webdrone_screenshot)
+                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)
                 result
-              rescue => exception
-                fin = $a0_webdrone_logger_last_time = Time.new
-                @a0.logs.trace(ini, fin, cl_path, cl_line, base, method_name, args, nil, exception, $a0_webdrone_screenshot)
+              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)
                 raise exception
               end
             else
@@ -44,7 +49,7 @@ module Webdrone
   end
 
   class Logs
-    attr_accessor :a0
+    attr_reader :a0
 
     def initialize(a0)
       @a0 = a0
@@ -55,9 +60,9 @@ module Webdrone
 
     def trace(ini, fin, from, lineno, base, method_name, args, result, exception, screenshot)
       exception = "#{exception.class}: #{exception}" if exception
-      printf @format, (fin-ini), base, method_name, args, (result || exception)
+      printf @format, (fin - ini), base, method_name, args, (result || exception)
       CSV.open(@path, "a+") do |csv|
-        csv << [ini.strftime('%Y-%m-%d %H:%M:%S.%L %z'), (fin-ini), from, lineno, base, method_name, args, result, exception, screenshot]
+        csv << [ini.strftime('%Y-%m-%d %H:%M:%S.%L %z'), (fin - ini), from, lineno, base, method_name, args, result, exception, screenshot]
       end
       @group_trace_count = @group_trace_count.map { |x| x + 1 }
     end
@@ -72,28 +77,33 @@ module Webdrone
       exception = nil
       begin
         yield
-      rescue => e
+      rescue StandardError => e
         exception = e
         bindings = Kernel.binding.callers
-        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 }
-            result[:exception] = {}
-            result[:exception][:line] = location[:lineno]
-            result[:exception][:path] = location[:path]
-            break
-          end
-        end        
+          next unless Gem.path.none? { |path| location[:path].include? path }
+
+          result[:exception] = {}
+          result[:exception][:line] = location[:lineno]
+          result[:exception][:path] = location[:path]
+
+          break
+        end
       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)
       puts "abort_error: #{abort_error} exception: #{exception}"
-      exit if abort_error == true and exception
+      exit if abort_error == true && exception
     end
 
     def setup_format
-      cols, line = HighLine::SystemExtensions.terminal_size
+      begin
+        cols, _line = HighLine.default_instance.terminal.terminal_size
+      rescue StandardError
+        cols = 120
+      end
       total = 6 + 15 + 11 + 5
       w = cols - total
       w /= 2
@@ -128,54 +138,54 @@ module Webdrone
   end
 
   class Clic
-    include MethodLogger.new [:id, :css, :link, :button, :on, :option, :xpath]
+    include MethodLogger.new %i[id css link button on option xpath]
   end
 
   class Conf
-    include MethodLogger.new [:timeout=, :outdir=, :error=, :developer=, :logger=]
+    include MethodLogger.new %i[timeout= outdir= error= developer= logger=]
   end
 
   class Ctxt
-    include MethodLogger.new [:create_tab, :close_tab, :with_frame, :reset, :with_alert, :ignore_alert, :with_conf]
+    include MethodLogger.new %i[create_tab close_tab with_frame reset with_alert ignore_alert with_conf]
   end
 
   class Find
-    include MethodLogger.new [:id, :css, :link, :button, :on, :option, :xpath]
+    include MethodLogger.new %i[id css link button on option xpath]
   end
 
   class Form
-    include MethodLogger.new [:with_xpath, :save, :set, :get, :clic, :mark, :submit, :xlsx]
+    include MethodLogger.new %i[with_xpath save set get clic mark submit xlsx]
   end
 
   class Html
-    include MethodLogger.new [:id, :css, :link, :button, :on, :option, :xpath]
+    include MethodLogger.new %i[id css link button on option xpath]
   end
 
   class Mark
-    include MethodLogger.new [:id, :css, :link, :button, :on, :option, :xpath]
+    include MethodLogger.new %i[id css link button on option xpath]
   end
 
   class Open
-    include MethodLogger.new [:url, :reload]
+    include MethodLogger.new %i[url reload]
   end
 
   class Shot
-    include MethodLogger.new [:screen]
+    include MethodLogger.new %i[screen]
   end
 
   class Text
-    include MethodLogger.new [:id, :css, :link, :button, :on, :option, :xpath]
+    include MethodLogger.new %i[id css link button on option xpath]
   end
 
   class Vrfy
-    include MethodLogger.new [:id, :css, :link, :button, :on, :option, :xpath]
+    include MethodLogger.new %i[id css link button on option xpath]
   end
 
   class Wait
-    include MethodLogger.new [:for, :time]
+    include MethodLogger.new %i[for time]
   end
 
   class Xlsx
-    include MethodLogger.new [:dict, :rows, :both, :save, :reset]
+    include MethodLogger.new %i[dict rows both save reset]
   end
 end

data/lib/webdrone/mark.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Webdrone
   class Browser
     def mark
@@ -6,7 +8,8 @@ module Webdrone
   end
 
   class Mark
-    attr_accessor :a0, :default_times, :default_delay, :clear
+    attr_accessor :default_times, :default_delay, :clear
+    attr_reader :a0
 
     def initialize(a0)
       @a0 = a0
@@ -18,8 +21,8 @@ module Webdrone
     def mark(text, n: 1, all: false, visible: true, scroll: false, parent: nil, color: '#af1616', times: nil, delay: nil, shot: nil)
       item = @a0.find.send __callee__, text, n: n, all: all, visible: visible, scroll: scroll, parent: parent
       mark_item item, color: color, times: times, delay: delay, shot: shot, text: text
-    rescue => exception
-      Webdrone.report_error(@a0, exception)
+    rescue StandardError => error
+      Webdrone.report_error(@a0, error)
     end
 
     alias_method :id,     :mark
@@ -41,7 +44,7 @@ module Webdrone
         mark_item_border item, color
         sleep delay
       end
-      @a0.shot.screen shot.is_a?(String) ? shot : text  if shot
+      @a0.shot.screen shot.is_a?(String) ? shot : text if shot
       mark_clear item if @clear
       item
     end
@@ -54,8 +57,8 @@ module Webdrone
       style = color ? "'2px solid #{color}'" : "null"
       set_outline = "arguments[0].style.outline = #{style}"
       if item.is_a? Array
-        item.each do |item|
-          @a0.exec.script(set_outline, item)
+        item.each do |subitem|
+          @a0.exec.script(set_outline, subitem)
         end
       else
         @a0.exec.script(set_outline, item)

data/lib/webdrone/open.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Webdrone
   class Browser
     def open
@@ -6,7 +8,7 @@ module Webdrone
   end
 
   class Open
-    attr_accessor :a0
+    attr_reader :a0
 
     def initialize(a0)
       @a0 = a0
@@ -14,14 +16,14 @@ module Webdrone
 
     def url(url)
       @a0.driver.get url
-    rescue => exception
-      Webdrone.report_error(@a0, exception)
+    rescue StandardError => error
+      Webdrone.report_error(@a0, error)
     end
 
     def reload
       @a0.driver.navigate.refresh
-    rescue => exception
-      Webdrone.report_error(@a0, exception)
+    rescue StandardError => error
+      Webdrone.report_error(@a0, error)
     end
   end
 end