watir 6.10.1 → 6.10.2

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 "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 "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"

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

@@ -1,115 +1,115 @@
-module Watir
-  module Generator
-    class Base
-
-      def generate(spec_url, io = StringIO.new)
-        @spec_url, @io = spec_url, io
-
-        extract_spec
-        cleanup_spec
-
-        write_header
-        write_class_defs
-        write_container_methods
-        write_footer
-
-        io
-      end
-
-      private
-
-      def generator
-        @generator ||= WebIDL::Generator.new(visitor)
-      end
-
-      def visitor
-        @visitor ||= visitor_class.new
-      end
-
-      def extractor
-        @extractor ||= extractor_class.new(@spec_url)
-      end
-
-      def extract_spec
-        @tag2interfaces    = extractor.process
-        @sorted_interfaces = extractor.sorted_interfaces
-
-        if extractor.errors.any?
-          raise "error extracting spec: #{extractor.errors.join("\n")}"
-        end
-      end
-
-      def cleanup_spec
-        ignored_tags.each do |tag|
-          @tag2interfaces.delete(tag)
-        end
-
-        ignored_interfaces.each do |interface|
-          @sorted_interfaces.reject! { |intf| intf.name == interface }
-        end
-
-        @sorted_interfaces.each do |intf|
-          intf.members.delete_if { |member| ignored_attributes.include?(member.name) }
-        end
-      end
-
-      def write_header
-        @io.puts "# Autogenerated from #{generator_implementation} specification. Edits may be lost."
-        @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
-        end
-      end
-
-      def write_container_methods
-        @io.puts "\n"
-        @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
-
-          tag_string       = tag.inspect
-          singular         = Util.paramify(visitor.classify_regexp, tag)
-          plural           = singular.pluralize
-          element_class    = Util.classify(visitor.classify_regexp, interfaces.first.name)
-          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
-        end
-
-        @io.puts indent("end # Container")
-      end
-
-      def write_footer
-        @io.puts "end # Watir"
-      end
-
-      def indent(code, indent = 1)
-        indent_string = "  " * indent
-        code.split("\n").map { |line| line.empty? ? line : indent_string + line }.join("\n")
-      end
-
-    end # Base
-  end # Generator
-end # Watir
+module Watir
+  module Generator
+    class Base
+
+      def generate(spec_url, io = StringIO.new)
+        @spec_url, @io = spec_url, io
+
+        extract_spec
+        cleanup_spec
+
+        write_header
+        write_class_defs
+        write_container_methods
+        write_footer
+
+        io
+      end
+
+      private
+
+      def generator
+        @generator ||= WebIDL::Generator.new(visitor)
+      end
+
+      def visitor
+        @visitor ||= visitor_class.new
+      end
+
+      def extractor
+        @extractor ||= extractor_class.new(@spec_url)
+      end
+
+      def extract_spec
+        @tag2interfaces    = extractor.process
+        @sorted_interfaces = extractor.sorted_interfaces
+
+        if extractor.errors.any?
+          raise "error extracting spec: #{extractor.errors.join("\n")}"
+        end
+      end
+
+      def cleanup_spec
+        ignored_tags.each do |tag|
+          @tag2interfaces.delete(tag)
+        end
+
+        ignored_interfaces.each do |interface|
+          @sorted_interfaces.reject! { |intf| intf.name == interface }
+        end
+
+        @sorted_interfaces.each do |intf|
+          intf.members.delete_if { |member| ignored_attributes.include?(member.name) }
+        end
+      end
+
+      def write_header
+        @io.puts "# Autogenerated from #{generator_implementation} specification. Edits may be lost."
+        @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
+        end
+      end
+
+      def write_container_methods
+        @io.puts "\n"
+        @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
+
+          tag_string       = tag.inspect
+          singular         = Util.paramify(visitor.classify_regexp, tag)
+          plural           = singular.pluralize
+          element_class    = Util.classify(visitor.classify_regexp, interfaces.first.name)
+          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
+        end
+
+        @io.puts indent("end # Container")
+      end
+
+      def write_footer
+        @io.puts "end # Watir"
+      end
+
+      def indent(code, indent = 1)
+        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

@@ -1,47 +1,47 @@
-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
-          end
-        end
-      end
-
-      def print
-        @visited = []
-        sort.each { |node| print_node(node) }
-      end
-
-      def sort
-        tsort.reverse
-      end
-
-      def tsort_each_node(&blk)
-        @interfaces.each_key(&blk)
-      end
-
-      def tsort_each_child(node, &blk)
-        @interfaces[node].each(&blk)
-      end
-
-      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
-
-    end # IDLSorter
-  end # Generator
-end # Watir
+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
+          end
+        end
+      end
+
+      def print
+        @visited = []
+        sort.each { |node| print_node(node) }
+      end
+
+      def sort
+        tsort.reverse
+      end
+
+      def tsort_each_node(&blk)
+        @interfaces.each_key(&blk)
+      end
+
+      def tsort_each_child(node, &blk)
+        @interfaces[node].each(&blk)
+      end
+
+      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
+
+    end # IDLSorter
+  end # Generator
+end # Watir

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

@@ -1,138 +1,138 @@
-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
-        end
-
-        @interfaces_by_name = @interfaces.group_by(&:name)
-        apply_implements(implements)
-        merge_interfaces
-      end
-
-      def extract_interface_map
-        raise NotImplementedError
-      end
-
-      def drop_issued_interfaces
-        @interface_map.delete_if do |_, interface|
-          issued_interfaces.include?(interface)
-        end
-      end
-
-      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
-
-      def merge_interfaces
-        non_duplicates = @interfaces.uniq(&:name)
-        duplicates = @interfaces - non_duplicates
-
-        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
-
-        @interfaces = non_duplicates
-      end
-
-      def idl_parser
-        @idl_parser ||= WebIDL::Parser::IDLParser.new
-      end
-
-      def sorter
-        @idl_sorter ||= Base::IDLSorter.new(@interfaces)
-      end
-
-    end # SpecExtractor
-  end # Generator
-end # Watir
+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
+        end
+
+        @interfaces_by_name = @interfaces.group_by(&:name)
+        apply_implements(implements)
+        merge_interfaces
+      end
+
+      def extract_interface_map
+        raise NotImplementedError
+      end
+
+      def drop_issued_interfaces
+        @interface_map.delete_if do |_, interface|
+          issued_interfaces.include?(interface)
+        end
+      end
+
+      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
+
+      def merge_interfaces
+        non_duplicates = @interfaces.uniq(&:name)
+        duplicates = @interfaces - non_duplicates
+
+        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
+
+        @interfaces = non_duplicates
+      end
+
+      def idl_parser
+        @idl_parser ||= WebIDL::Parser::IDLParser.new
+      end
+
+      def sorter
+        @idl_sorter ||= Base::IDLSorter.new(@interfaces)
+      end
+
+    end # SpecExtractor
+  end # Generator
+end # Watir