watir 6.13.0 → 6.14.0

data/lib/watir/elements/table.rb

@@ -27,7 +27,7 @@ module Watir
 
     def hashes
       all_rows = rows.locate
-      header_row = all_rows.first || raise(Exception::Error, "no rows in table")
+      header_row = all_rows.first || raise(Exception::Error, 'no rows in table')
 
       all_rows.entries[1..-1].map do |row|
         cell_size_check(header_row, row)
@@ -71,6 +71,5 @@ module Watir
       row_id = index ? "row at index #{index - 1}" : 'designated row'
       raise Exception::Error, "#{row_id} has #{row_size} cells, while header row has #{header_size}"
     end
-
   end # Table
 end # Watir

data/lib/watir/elements/table_cell.rb

@@ -1,6 +1,5 @@
 module Watir
   class TableCell < HTMLElement
-
     def column_header
       current_row = parent(tag_name: 'tr')
       header_row(current_row, index: previous_siblings.size).text
@@ -17,13 +16,13 @@ module Watir
     private
 
     def header_row(current_row, opt)
-      table = self.parent(tag_name: 'table')
+      table = parent(tag_name: 'table')
       header_row = table.tr
 
       table.cell_size_check(header_row, current_row)
 
       header_type = table.th.exist? ? 'th' : 'tr'
-      opt.merge!(tag_name: header_type)
+      opt[:tag_name] = header_type
 
       Watir.tag_to_class[header_type.to_sym].new(header_row, opt)
     end

data/lib/watir/elements/text_field.rb

@@ -2,14 +2,12 @@ module Watir
   class TextField < Input
     include UserEditable
 
-    NON_TEXT_TYPES = %w[file radio checkbox submit reset image button hidden range color date datetime-local]
-
-    protected
+    NON_TEXT_TYPES = %w[file radio checkbox submit reset image button hidden range color date datetime-local].freeze
 
     def selector_string
       selector = @selector.dup
       selector[:type] = '(any text type)'
-      selector[:tag_name] = "input"
+      selector[:tag_name] = 'input'
 
       if @query_scope.is_a?(Browser) || @query_scope.is_a?(IFrame)
         super
@@ -21,11 +19,11 @@ module Watir
 
   module Container
     def text_field(*args)
-      TextField.new(self, extract_selector(args).merge(tag_name: "input"))
+      TextField.new(self, extract_selector(args).merge(tag_name: 'input'))
     end
 
     def text_fields(*args)
-      TextFieldCollection.new(self, extract_selector(args).merge(tag_name: "input"))
+      TextFieldCollection.new(self, extract_selector(args).merge(tag_name: 'input'))
     end
   end # Container
 

data/lib/watir/exception.rb

@@ -11,6 +11,5 @@ module Watir
     class NoMatchingWindowFoundException < Error; end
     class UnknownFrameException < Error; end
     class UnknownRowException < Error; end
-
   end # Exception
 end # Watir

data/lib/watir/extensions/nokogiri.rb

@@ -1,14 +1,12 @@
-require "nokogiri"
+require 'nokogiri'
 
 module Watir
   class Browser
-
     def text
       doc = Nokogiri::HTML(body(index: 0).html)
-      doc.css("script").remove # encoding bug in older libxml?
+      doc.css('script').remove # encoding bug in older libxml?
 
       doc.inner_text
     end
-
   end # Browser
 end # Watir

data/lib/watir/generator.rb

@@ -1,3 +1,3 @@
-require "watir/generator/base"
-require "watir/generator/html"
-require "watir/generator/svg"
+require 'watir/generator/base'
+require 'watir/generator/html'
+require 'watir/generator/svg'

data/lib/watir/generator/base.rb

@@ -1,11 +1,11 @@
-require "nokogiri"
-require "open-uri"
-require "pp"
-require "webidl"
-require "active_support/inflector"
+require 'nokogiri'
+require 'open-uri'
+require 'pp'
+require 'webidl'
+require 'active_support/inflector'
 
-require "watir/generator/base/generator"
-require "watir/generator/base/idl_sorter"
-require "watir/generator/base/spec_extractor"
-require "watir/generator/base/util"
-require "watir/generator/base/visitor"
+require 'watir/generator/base/generator'
+require 'watir/generator/base/idl_sorter'
+require 'watir/generator/base/spec_extractor'
+require 'watir/generator/base/util'
+require 'watir/generator/base/visitor'

data/lib/watir/generator/base/generator.rb

@@ -1,9 +1,9 @@
 module Watir
   module Generator
     class Base
-
       def generate(spec_url, io = StringIO.new)
-        @spec_url, @io = spec_url, io
+        @spec_url = spec_url
+        @io = io
 
         extract_spec
         cleanup_spec
@@ -34,9 +34,7 @@ module Watir
         @tag2interfaces    = extractor.process
         @sorted_interfaces = extractor.sorted_interfaces
 
-        if extractor.errors.any?
-          raise "error extracting spec: #{extractor.errors.join("\n")}"
-        end
+        raise "error extracting spec: #{extractor.errors.join("\n")}" if extractor.errors.any?
       end
 
       def cleanup_spec
@@ -55,23 +53,23 @@ module Watir
 
       def write_header
         @io.puts "# Autogenerated from #{generator_implementation} specification. Edits may be lost."
-        @io.puts "module Watir"
+        @io.puts 'module Watir'
       end
 
       def write_class_defs
         @sorted_interfaces.each do |interface|
           interface = generator.generate(interface)
-          unless interface.empty?
-            interface.gsub!(/^\s+\n/, '') # remove empty lines
-            @io.puts indent(interface)
-            @io.puts "\n"
-          end
+          next if interface.empty?
+
+          interface.gsub!(/^\s+\n/, '') # remove empty lines
+          @io.puts indent(interface)
+          @io.puts "\n"
         end
       end
 
       def write_container_methods
         @io.puts "\n"
-        @io.puts indent("module Container")
+        @io.puts indent('module Container')
 
         @tag2interfaces.sort.each do |tag, interfaces|
           raise "multiple interfaces for tag #{tag.inspect}" if interfaces.map(&:name).uniq.size != 1
@@ -83,33 +81,32 @@ module Watir
           collection_class = "#{element_class}Collection"
 
           # visitor.visit_tag(tag, interfaces.first.name) !?
-          @io.puts indent(<<-CODE, 2)
-
-# @return [#{element_class}]
-def #{singular}(*args)
-  #{element_class}.new(self, extract_selector(args).merge(tag_name: #{tag_string}))
-end
-# @return [#{collection_class}]
-def #{plural}(*args)
-  #{collection_class}.new(self, extract_selector(args).merge(tag_name: #{tag_string}))
-end
-Watir.tag_to_class[#{tag.to_sym.inspect}] = #{element_class}
-
-CODE
+          @io.puts indent(<<~CODE, 2)
+
+            # @return [#{element_class}]
+            def #{singular}(*args)
+              #{element_class}.new(self, extract_selector(args).merge(tag_name: #{tag_string}))
+            end
+            # @return [#{collection_class}]
+            def #{plural}(*args)
+              #{collection_class}.new(self, extract_selector(args).merge(tag_name: #{tag_string}))
+            end
+            Watir.tag_to_class[#{tag.to_sym.inspect}] = #{element_class}
+
+          CODE
         end
 
-        @io.puts indent("end # Container")
+        @io.puts indent('end # Container')
       end
 
       def write_footer
-        @io.puts "end # Watir"
+        @io.puts 'end # Watir'
       end
 
       def indent(code, indent = 1)
-        indent_string = "  " * indent
+        indent_string = '  ' * indent
         code.split("\n").map { |line| line.empty? ? line : indent_string + line }.join("\n")
       end
-
     end # Base
   end # Generator
 end # Watir

data/lib/watir/generator/base/idl_sorter.rb

@@ -2,46 +2,48 @@ require 'tsort'
 
 module Watir
   module Generator
-    class Base::IDLSorter
-      include TSort
-
-      def initialize(interfaces)
-        @interfaces = {}
-
-        interfaces.each do |interface|
-          @interfaces[interface.name] ||= []
-          interface.inherits.each do |inherit|
-            (@interfaces[inherit.name] ||= []) << interface.name
+    module Base
+      class IDLSorter
+        include TSort
+
+        def initialize(interfaces)
+          @interfaces = {}
+
+          interfaces.each do |interface|
+            @interfaces[interface.name] ||= []
+            interface.inherits.each do |inherit|
+              (@interfaces[inherit.name] ||= []) << interface.name
+            end
           end
         end
-      end
 
-      def print
-        @visited = []
-        sort.each { |node| print_node(node) }
-      end
+        def print
+          @visited = []
+          sort.each { |node| print_node(node) }
+        end
 
-      def sort
-        tsort.reverse
-      end
+        def sort
+          tsort.reverse
+        end
 
-      def tsort_each_node(&blk)
-        @interfaces.each_key(&blk)
-      end
+        def tsort_each_node(&blk)
+          @interfaces.each_key(&blk)
+        end
 
-      def tsort_each_child(node, &blk)
-        @interfaces[node].each(&blk)
-      end
+        def tsort_each_child(node, &blk)
+          @interfaces[node].each(&blk)
+        end
 
-      private
+        private
 
-      def print_node(node, indent = 0)
-        return if @visited.include?(node)
-        @visited << node
-        puts " " * indent + node
-        tsort_each_child(node) { |child| print_node(child, indent + 2)}
-      end
+        def print_node(node, indent = 0)
+          return if @visited.include?(node)
 
-    end # IDLSorter
+          @visited << node
+          puts ' ' * indent + node
+          tsort_each_child(node) { |child| print_node(child, indent + 2) }
+        end
+      end # IDLSorter
+    end # Base
   end # Generator
 end # Watir

data/lib/watir/generator/base/spec_extractor.rb

@@ -1,138 +1,156 @@
 module Watir
   module Generator
-    class Base::SpecExtractor
-
-      IDL_SELECTOR = "//pre[contains(@class, 'idl')]".freeze
-
-      class InterfaceNotFound < StandardError; end
-
-      def initialize(uri)
-        @uri = uri
-      end
-
-      def process
-        download_and_parse
-        extract_idl_parts
-        extract_interface_map
-        drop_issued_interfaces
-        build_result
-      rescue
-        p errors
-        raise
-      end
-
-      def errors
-        @errors ||= []
-      end
-
-      #
-      # returns a topoligically sorted array of WebIDL::Ast::Interface objects
-      #
-
-      def sorted_interfaces
-        process if @interfaces.nil?
-
-        sorter.sort.map { |name|
-          @interfaces.find { |i| i.name == name } or puts "ignoring interface: #{name}"
-        }.compact
-      end
-
-      def print_hierarchy
-        process if @interfaces.nil?
-        sorter.print
-      end
-
-      def fetch_interface(interface)
-        @interfaces_by_name[interface] or raise InterfaceNotFound, "#{interface} not found in IDL"
-      end
-
-      private
-
-      def download_and_parse
-        open(@uri) { |io| @doc = Nokogiri.HTML(io) }
-      end
-
-      def extract_idl_parts
-        parsed = @doc.search(IDL_SELECTOR).map {  |e| parse_idl(e.inner_text) }.compact
-
-        implements = []
-        @interfaces = []
-
-        parsed.flatten.each do |element|
-          case element
-          when WebIDL::Ast::Interface
-            @interfaces << element
-          when WebIDL::Ast::ImplementsStatement
-            implements << element
-          end
+    module Base
+      class SpecExtractor
+        IDL_SELECTOR = "//pre[contains(@class, 'idl')]".freeze
+
+        class InterfaceNotFound < StandardError; end
+
+        def initialize(uri)
+          @uri = uri
+        end
+
+        def process
+          download_and_parse
+          extract_idl_parts
+          extract_interface_map
+          drop_issued_interfaces
+          build_result
+        rescue StandardError
+          p errors
+          raise
+        end
+
+        def errors
+          @errors ||= []
         end
 
-        @interfaces_by_name = @interfaces.group_by(&:name)
-        apply_implements(implements)
-        merge_interfaces
-      end
+        #
+        # returns a topoligically sorted array of WebIDL::Ast::Interface objects
+        #
 
-      def extract_interface_map
-        raise NotImplementedError
-      end
+        def sorted_interfaces
+          process if @interfaces.nil?
 
-      def drop_issued_interfaces
-        @interface_map.delete_if do |_, interface|
-          issued_interfaces.include?(interface)
+          idl_sorter.sort.map { |name|
+            @interfaces.find { |i| i.name == name } || puts("ignoring interface: #{name}")
+          }.compact
         end
-      end
 
-      def build_result
-        raise NotImplementedError
-      end
+        def print_hierarchy
+          process if @interfaces.nil?
+          idl_sorter.print
+        end
 
-      def parse_idl(str)
-        result = idl_parser.parse(str)
+        def fetch_interface(interface)
+          @interfaces_by_name[interface] || raise(InterfaceNotFound, "#{interface} not found in IDL")
+        end
+
+        private
 
-        if result
-          result.build
-        else
-          errors << idl_parser.failure_reason
-          nil
+        def download_and_parse
+          URI.open(@uri) { |io| @doc = Nokogiri.HTML(io) }
         end
-      end
 
-      def apply_implements(implements)
-        implements.each do |is|
-          implementor_name = is.implementor.gsub(/^::/, '')
-          implementee_name = is.implementee.gsub(/^::/, '')
+        def extract_idl_parts
+          parsed = @doc.search(IDL_SELECTOR).map { |e| parse_idl(e.inner_text) }.compact
+
+          implements = []
+          includes = []
+          @interfaces = []
+
+          parsed.flatten.each do |element|
+            case element
+            when WebIDL::Ast::Interface
+              @interfaces << element
+            when WebIDL::Ast::ImplementsStatement
+              implements << element
+            when WebIDL::Ast::IncludesStatement
+              includes << element
+            end
+          end
+
+          @interfaces_by_name = @interfaces.group_by(&:name)
+          apply_implements(implements)
+          apply_includes(includes)
+          merge_interfaces
+        end
+
+        def extract_interface_map
+          raise NotImplementedError
+        end
 
-          begin
-            intf = fetch_interface(implementor_name).first
-            intf.implements << fetch_interface(implementee_name).first
-          rescue InterfaceNotFound => ex
-            puts ex.message
+        def drop_issued_interfaces
+          @interface_map.delete_if do |_, interface|
+            issued_interfaces.include?(interface)
           end
         end
-      end
 
-      def merge_interfaces
-        non_duplicates = @interfaces.uniq(&:name)
-        duplicates = @interfaces - non_duplicates
+        def build_result
+          raise NotImplementedError
+        end
+
+        def parse_idl(str)
+          result = idl_parser.parse(str)
+
+          if result
+            result.build
+          else
+            errors << idl_parser.failure_reason
+            nil
+          end
+        end
+
+        def apply_implements(implements)
+          implements.each do |is|
+            implementor_name = is.implementor.gsub(/^::/, '')
+            implementee_name = is.implementee.gsub(/^::/, '')
+
+            begin
+              intf = fetch_interface(implementor_name).first
+              intf.implements << fetch_interface(implementee_name).first
+            rescue InterfaceNotFound => ex
+              puts ex.message
+            end
+          end
+        end
 
-        duplicates.each do |intf|
-          final = non_duplicates.find { |i| i.name == intf.name }
-          final.inherits += intf.inherits
-          final.members += intf.members
-          final.extended_attributes += intf.extended_attributes
+        def apply_includes(includes)
+          includes.each do |is|
+            includer_name = is.includer.gsub(/^::/, '')
+            includee_name = is.includee.gsub(/^::/, '')
+
+            begin
+              intf = fetch_interface(includer_name).first
+              intf.includes << fetch_interface(includee_name).first
+            rescue InterfaceNotFound => ex
+              puts ex.message
+            end
+          end
         end
 
-        @interfaces = non_duplicates
-      end
+        def merge_interfaces
+          non_duplicates = @interfaces.uniq(&:name)
+          duplicates = @interfaces - non_duplicates
 
-      def idl_parser
-        @idl_parser ||= WebIDL::Parser::IDLParser.new
-      end
+          duplicates.each do |intf|
+            final = non_duplicates.find { |i| i.name == intf.name }
+            final.inherits += intf.inherits
+            final.members += intf.members
+            final.extended_attributes += intf.extended_attributes
+          end
 
-      def sorter
-        @idl_sorter ||= Base::IDLSorter.new(@interfaces)
-      end
+          @interfaces = non_duplicates
+        end
 
-    end # SpecExtractor
+        def idl_parser
+          @idl_parser ||= WebIDL::Parser::IDLParser.new
+        end
+
+        def idl_sorter
+          @idl_sorter ||= Base::IDLSorter.new(@interfaces)
+        end
+      end # SpecExtractor
+    end # Base
   end # Generator
 end # Watir