watir 6.10.1 → 6.10.2

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

@@ -1,21 +1,21 @@
-module Watir
-  module Generator
-    module Util
-
-      module_function
-
-      def classify(regexp, str)
-        if str =~ regexp
-          $1
-        else
-          str
-        end
-      end
-
-      def paramify(regexp, str)
-        classify(regexp, str).snake_case
-      end
-
-    end # Util
-  end # Generator
-end # Watir
+module Watir
+  module Generator
+    module Util
+
+      module_function
+
+      def classify(regexp, str)
+        if str =~ regexp
+          $1
+        else
+          str
+        end
+      end
+
+      def paramify(regexp, str)
+        classify(regexp, str).snake_case
+      end
+
+    end # Util
+  end # Generator
+end # Watir

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

@@ -1,162 +1,162 @@
-module Watir
-  module Generator
-    class Base::Visitor < WebIDL::RubySexpVisitor
-
-      def initialize
-        super
-
-        # When an interface has multiple IDL definitions in the spec, the inheritance is sometimes
-        # not repeated. So we'll keep track ourselves.
-        @inheritance_map = {}
-
-        @already_defined = []
-      end
-
-      #
-      # WebIDL visitor interface
-      #
-
-      def visit_interface(interface)
-        name   = interface.name
-        parent = interface.inherits.first
-
-        $stderr.puts name
-        return if name !~ interface_regexp || name =~ /(Collection|Document)$/
-
-        if force_inheritance.keys.include?(name)
-          parent = force_inheritance[name]
-        elsif parent
-          @inheritance_map[name] ||= parent.name
-          parent = parent.name
-        else
-          parent = @inheritance_map[name] || return
-        end
-
-        [ :scope,
-          [:block,
-            element_class(interface.name, extract_attributes(interface), parent),
-            collection_class(interface.name)
-          ]
-        ]
-      end
-
-      def visit_module(mod)
-        # ignored
-      end
-
-      def visit_implements_statement(stmt)
-        # ignored
-      end
-
-      # TODO: do everything in the visitor somehow?
-      # problem is we lack the tag name info while walking the interface AST
-      # #
-      # # Watir generator visitor interface
-      # #
-      #
-      # def visit_tag(tag_name, interface_name)
-      #   tag_string       = tag.inspect
-      #   singular         = Util.paramify(classify_regexp, tag)
-      #   plural           = singular.pluralize
-      #   element_class    = Util.classify(classify_regexp, interfaces.first.name)
-      #   collection_class = "#{element_class}Collection"
-      #
-      #   [:defn,
-      #    :a,
-      #    [:args, :"*args"],
-      #    [:scope,
-      #     [:block,
-      #      [:call,
-      #       [:const, :Anchor],
-      #       :new,
-      #       [:arglist,
-      #        [:self],
-      #        [:call,
-      #         [:call, nil, :extract_selector, [:arglist, [:lvar, :args]]],
-      #         :merge,
-      #         [:arglist, [:hash, [:lit, :tag_name], [:str, "a"]]]]]]]]]
-      # end
-
-      private
-
-      def element_class(name, attributes, parent)
-        [:class, Util.classify(classify_regexp, name), [:const, Util.classify(classify_regexp, parent)],
-          *attribute_calls(attributes)
-        ]
-      end
-
-      def extract_attributes(interface)
-        members = interface.members
-        members += interface.implements.flat_map(&:members)
-
-        members.select { |e| e.kind_of?(WebIDL::Ast::Attribute) }.uniq(&:name)
-      end
-
-      def collection_class(name)
-        return if @already_defined.include?(name)
-        @already_defined << name
-        name = Util.classify(classify_regexp, name)
-
-        [:class, "#{name}Collection", [:const, :ElementCollection]]
-      end
-
-      def attribute_calls(attributes)
-        attributes.map do |attribute|
-          call(:attribute, [
-            [:lit, ruby_type_for(attribute.type)],
-            [:lit, ruby_method_name_for(attribute)],
-            [:lit, attribute.name.to_sym]
-          ])
-        end
-      end
-
-      def call(name, args)
-        [:call, nil, name.to_sym, [:arglist] + args]
-      end
-
-      def ruby_method_name_for(attribute)
-        str = if %w(httpEquiv contentEditable acceptCharset isContentEditable).include? attribute.name
-          attribute.name.snake_case
-        else
-          attribute.name.downcase
-        end
-
-        if attribute.type.name == :Boolean
-          str = $1 if str =~ /^is_(.+)/
-          str << '?'
-        end
-
-        str = 'for' if str == 'htmlfor'
-
-        str.to_sym
-      end
-
-      def ruby_type_for(type)
-        case type.name.to_s
-        when 'DOMString', 'any'
-          String
-        when 'UnsignedLong', 'Long', 'Integer', 'Short', 'UnsignedShort',
-             'SVGAnimatedLength'
-          Integer
-        when 'Float', /.*Double$/
-          Float
-        when 'Boolean'
-          'Boolean'
-        when 'WindowProxy', 'ValidityState', 'TimeRanges', 'Location',
-             'Any', 'TimedTrackArray', 'TimedTrack', 'TextTrackArray', 'TextTrack',
-             /Media.+/, 'TextTrackKind', 'Function', /.*EventHandler$/,
-             'Document', 'DocumentFragment', 'DOMTokenList', 'DOMSettableTokenList',
-             'DOMStringMap', 'HTMLPropertiesCollection', /HTML.*Element/, /HTML.*Collection/,
-             'CSSStyleDeclaration',  /.+List$/, 'Date', 'Element', /DOM.+ReadOnly/,
-             /SVGAnimated.+/, /SVG.*Element/, /SVG.*Collection/, 'SVGViewSpec',
-             'Object', 'USVString'
-          # probably completely wrong.
-          String
-        else
-          raise "unknown type: #{type.name}"
-        end
-      end
-
-    end # Visitor
-  end # Generator
-end # Watir
+module Watir
+  module Generator
+    class Base::Visitor < WebIDL::RubySexpVisitor
+
+      def initialize
+        super
+
+        # When an interface has multiple IDL definitions in the spec, the inheritance is sometimes
+        # not repeated. So we'll keep track ourselves.
+        @inheritance_map = {}
+
+        @already_defined = []
+      end
+
+      #
+      # WebIDL visitor interface
+      #
+
+      def visit_interface(interface)
+        name   = interface.name
+        parent = interface.inherits.first
+
+        $stderr.puts name
+        return if name !~ interface_regexp || name =~ /(Collection|Document)$/
+
+        if force_inheritance.keys.include?(name)
+          parent = force_inheritance[name]
+        elsif parent
+          @inheritance_map[name] ||= parent.name
+          parent = parent.name
+        else
+          parent = @inheritance_map[name] || return
+        end
+
+        [ :scope,
+          [:block,
+            element_class(interface.name, extract_attributes(interface), parent),
+            collection_class(interface.name)
+          ]
+        ]
+      end
+
+      def visit_module(mod)
+        # ignored
+      end
+
+      def visit_implements_statement(stmt)
+        # ignored
+      end
+
+      # TODO: do everything in the visitor somehow?
+      # problem is we lack the tag name info while walking the interface AST
+      # #
+      # # Watir generator visitor interface
+      # #
+      #
+      # def visit_tag(tag_name, interface_name)
+      #   tag_string       = tag.inspect
+      #   singular         = Util.paramify(classify_regexp, tag)
+      #   plural           = singular.pluralize
+      #   element_class    = Util.classify(classify_regexp, interfaces.first.name)
+      #   collection_class = "#{element_class}Collection"
+      #
+      #   [:defn,
+      #    :a,
+      #    [:args, :"*args"],
+      #    [:scope,
+      #     [:block,
+      #      [:call,
+      #       [:const, :Anchor],
+      #       :new,
+      #       [:arglist,
+      #        [:self],
+      #        [:call,
+      #         [:call, nil, :extract_selector, [:arglist, [:lvar, :args]]],
+      #         :merge,
+      #         [:arglist, [:hash, [:lit, :tag_name], [:str, "a"]]]]]]]]]
+      # end
+
+      private
+
+      def element_class(name, attributes, parent)
+        [:class, Util.classify(classify_regexp, name), [:const, Util.classify(classify_regexp, parent)],
+          *attribute_calls(attributes)
+        ]
+      end
+
+      def extract_attributes(interface)
+        members = interface.members
+        members += interface.implements.flat_map(&:members)
+
+        members.select { |e| e.kind_of?(WebIDL::Ast::Attribute) }.uniq(&:name)
+      end
+
+      def collection_class(name)
+        return if @already_defined.include?(name)
+        @already_defined << name
+        name = Util.classify(classify_regexp, name)
+
+        [:class, "#{name}Collection", [:const, :ElementCollection]]
+      end
+
+      def attribute_calls(attributes)
+        attributes.map do |attribute|
+          call(:attribute, [
+            [:lit, ruby_type_for(attribute.type)],
+            [:lit, ruby_method_name_for(attribute)],
+            [:lit, attribute.name.to_sym]
+          ])
+        end
+      end
+
+      def call(name, args)
+        [:call, nil, name.to_sym, [:arglist] + args]
+      end
+
+      def ruby_method_name_for(attribute)
+        str = if %w(httpEquiv contentEditable acceptCharset isContentEditable).include? attribute.name
+          attribute.name.snake_case
+        else
+          attribute.name.downcase
+        end
+
+        if attribute.type.name == :Boolean
+          str = $1 if str =~ /^is_(.+)/
+          str << '?'
+        end
+
+        str = 'for' if str == 'htmlfor'
+
+        str.to_sym
+      end
+
+      def ruby_type_for(type)
+        case type.name.to_s
+        when 'DOMString', 'any'
+          String
+        when 'UnsignedLong', 'Long', 'Integer', 'Short', 'UnsignedShort',
+             'SVGAnimatedLength'
+          Integer
+        when 'Float', /.*Double$/
+          Float
+        when 'Boolean'
+          'Boolean'
+        when 'WindowProxy', 'ValidityState', 'TimeRanges', 'Location',
+             'Any', 'TimedTrackArray', 'TimedTrack', 'TextTrackArray', 'TextTrack',
+             /Media.+/, 'TextTrackKind', 'Function', /.*EventHandler$/,
+             'Document', 'DocumentFragment', 'DOMTokenList', 'DOMSettableTokenList',
+             'DOMStringMap', 'HTMLPropertiesCollection', /HTML.*Element/, /HTML.*Collection/,
+             'CSSStyleDeclaration',  /.+List$/, 'Date', 'Element', /DOM.+ReadOnly/,
+             /SVGAnimated.+/, /SVG.*Element/, /SVG.*Collection/, 'SVGViewSpec',
+             'Object', 'USVString'
+          # probably completely wrong.
+          String
+        else
+          raise "unknown type: #{type.name}"
+        end
+      end
+
+    end # Visitor
+  end # Generator
+end # Watir

data/lib/watir/generator/html.rb

@@ -1,15 +1,15 @@
-ActiveSupport::Inflector.inflections do |inflect|
-  inflect.plural 'body', 'bodys'
-  inflect.plural 'tbody', 'tbodys'
-  inflect.plural 'canvas', 'canvases'
-  inflect.plural 'ins', 'inses'
-  inflect.plural /^s$/, 'ss'
-  inflect.plural 'meta', 'metas'
-  inflect.plural 'details', 'detailses'
-  inflect.plural 'data', 'datas'
-  inflect.plural 'datalist', 'datalists'
-end
-
-require "watir/generator/html/generator"
-require "watir/generator/html/spec_extractor"
-require "watir/generator/html/visitor"
+ActiveSupport::Inflector.inflections do |inflect|
+  inflect.plural 'body', 'bodys'
+  inflect.plural 'tbody', 'tbodys'
+  inflect.plural 'canvas', 'canvases'
+  inflect.plural 'ins', 'inses'
+  inflect.plural /^s$/, 'ss'
+  inflect.plural 'meta', 'metas'
+  inflect.plural 'details', 'detailses'
+  inflect.plural 'data', 'datas'
+  inflect.plural 'datalist', 'datalists'
+end
+
+require "watir/generator/html/generator"
+require "watir/generator/html/spec_extractor"
+require "watir/generator/html/visitor"

data/lib/watir/generator/html/generator.rb

@@ -1,36 +1,36 @@
-module Watir
-  module Generator
-    class HTML < Base
-
-      private
-
-      def ignored_tags
-        # ignore the link element for now
-        %w(link)
-      end
-
-      def ignored_interfaces
-        ignored = ignored_tags.map { |tag| "HTML#{tag.capitalize}Element" }
-        # frame is implemented manually, see https://github.com/watir/watir/issues/204
-        ignored << 'HTMLFrameElement'
-      end
-
-      def ignored_attributes
-        %w(cells elements hash rows span text size selected? style width height tHead tFoot)
-      end
-
-      def generator_implementation
-        'HTML'
-      end
-
-      def visitor_class
-        HTML::Visitor
-      end
-
-      def extractor_class
-        HTML::SpecExtractor
-      end
-
-    end # Generator
-  end # HTML
-end # Watir
+module Watir
+  module Generator
+    class HTML < Base
+
+      private
+
+      def ignored_tags
+        # ignore the link element for now
+        %w(link)
+      end
+
+      def ignored_interfaces
+        ignored = ignored_tags.map { |tag| "HTML#{tag.capitalize}Element" }
+        # frame is implemented manually, see https://github.com/watir/watir/issues/204
+        ignored << 'HTMLFrameElement'
+      end
+
+      def ignored_attributes
+        %w(cells elements hash rows span text size selected? style width height tHead tFoot)
+      end
+
+      def generator_implementation
+        'HTML'
+      end
+
+      def visitor_class
+        HTML::Visitor
+      end
+
+      def extractor_class
+        HTML::SpecExtractor
+      end
+
+    end # Generator
+  end # HTML
+end # Watir