watir-webdriver 0.6.9 → 0.6.10

data/lib/watir-webdriver/elements/link.rb

@@ -13,7 +13,7 @@ module Watir
     #
     # @see https://www.w3.org/Bugs/Public/show_bug.cgi?id=23192
     #
-    attributes :string => [:href]
+    attribute String, :href, :href
 
   end # Anchor
 end # Watir

data/lib/watir-webdriver/elements/table_cell.rb

@@ -3,14 +3,12 @@ module Watir
     # @private
     attr_writer :locator_class
 
+    alias_method :colspan, :col_span
+    alias_method :rowspan, :row_span
+
     def locator_class
       @locator_class || super
     end
-
-    def colspan
-      value = attribute_value :colspan
-      value ? Integer(value) : 1
-    end
   end # TableCell
 
   class TableCellCollection < ElementCollection

data/lib/watir-webdriver/elements/text_field.rb

@@ -3,7 +3,7 @@ module Watir
   class TextField < Input
     include UserEditable
 
-    attributes Watir::TextArea.typed_attributes
+    inherit_attributes_from Watir::TextArea
     remove_method :type # we want Input#type here, which was overriden by TextArea's attributes
 
     private

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

@@ -4,6 +4,8 @@ module Watir
   module HTML
     class Generator
 
+      IGNORED_ATTRIBUTES = %w(cells elements hash rows span text)
+
       def generate(spec_url, io = StringIO.new)
         @spec_url, @io = spec_url, io
 
@@ -47,6 +49,11 @@ module Watir
         @sorted_interfaces.reject! { |intf| intf.name == "HTMLLinkElement" }
         # frame is implemented manually, see https://github.com/watir/watir-webdriver/issues/204
         @sorted_interfaces.reject! { |intf| intf.name == "HTMLFrameElement"  }
+
+        # cleanup attributes
+        @sorted_interfaces.each do |intf|
+          intf.members.delete_if { |member| IGNORED_ATTRIBUTES.include?(member.name) }
+        end
       end
 
       def write_header
@@ -56,11 +63,16 @@ module Watir
 
       def write_class_defs
         @sorted_interfaces.each do |interface|
-          @io.puts indent(generator.generate(interface))
+          interface = generator.generate(interface)
+          unless interface.empty?
+            interface.gsub!(/^\s+\n/, '') # remove empty lines
+            @io.puts indent(interface)
+          end
         end
       end
 
       def write_container_methods
+        @io.puts "\n\n"
         @io.puts indent("module Container")
 
         @tag2interfaces.sort.each do |tag, interfaces|
@@ -74,6 +86,7 @@ module Watir
 
           # visitor.visit_tag(tag, interfaces.first.name) !?
           @io.puts indent(<<-CODE, 3)
+
 #
 # @return [#{element_class}]
 #
@@ -103,7 +116,7 @@ CODE
       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
 

data/lib/watir-webdriver/html/idl_sorter.rb

@@ -40,7 +40,7 @@ module Watir
       def print_node(node, indent = 0)
         return if @visited.include?(node)
         @visited << node
-        puts " "*indent + node
+        puts " " * indent + node
         tsort_each_child(node) { |child| print_node(child, indent + 2)}
       end
 

data/lib/watir-webdriver/html/spec_extractor.rb

@@ -33,8 +33,8 @@ module Watir
         process if @interfaces.nil?
 
         sorter.sort.map { |name|
-          @interfaces_by_name[name] or puts "ignoring interface: #{name}"
-        }.flatten.compact
+          @interfaces.find { |i| i.name == name } or puts "ignoring interface: #{name}"
+        }.compact
       end
 
       def print_hierarchy
@@ -67,8 +67,9 @@ module Watir
           end
         end
 
-        @interfaces_by_name = @interfaces.group_by { |i| i.name }
+        @interfaces_by_name = @interfaces.group_by(&:name)
         apply_implements(implements)
+        merge_interfaces
       end
 
       def extract_interface_map
@@ -136,6 +137,19 @@ module Watir
         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.members += intf.members
+          final.extended_attributes += intf.extended_attributes
+        end
+
+        @interfaces = non_duplicates
+      end
+
       def idl_parser
         @idl_parser ||= WebIDL::Parser::IDLParser.new
       end

data/lib/watir-webdriver/html/visitor.rb

@@ -83,9 +83,7 @@ module Watir
 
       def element_class(name, attributes, parent)
         [:class, Util.classify(name), [:const, Util.classify(parent)],
-          [:scope,
-            [:block, attributes_call(attributes)]
-          ]
+          *attribute_calls(attributes)
         ]
       end
 
@@ -113,77 +111,51 @@ module Watir
         ]
       end
 
-      def attributes_call(attributes)
-        return if attributes.empty?
-
-        attrs = Hash.new { |hash, key| hash[key] = [] }
-        attributes.sort_by { |a| a.name }.each do |a|
-          type = ruby_type_for(a.type)
-          attrs[type] << ruby_attribute_for(type, a.name)
+      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
 
-        call :attributes, [literal_hash(attrs)]
+      def call(name, args)
+        [:call, nil, name.to_sym, [:arglist] + args]
       end
 
-      def ruby_attribute_for(type, str)
-        str = str.snake_case
+      def ruby_method_name_for(attribute)
+        str = attribute.name.snake_case
 
-        if str =~ /^is_(.+)/ && type == :bool
-          str = $1
+        if attribute.type.name == :Boolean
+          str = $1 if str =~ /^is_(.+)/
+          str << '?'
         end
 
-        str.to_sym
-      end
+        str = 'for' if str == 'html_for'
 
-      def literal_hash(hash)
-        [:hash] + hash.map { |k, v| [[:lit, k.to_sym], [:lit, v]] }.flatten(1)
-      end
-
-      def literal_array(arr)
-        [:array] + arr.map { |e| [:lit, e.to_sym] }
-      end
-
-      def call(name, args)
-        [:call, nil, name.to_sym, [:arglist] + args]
+        str.to_sym
       end
 
       def ruby_type_for(type)
         case type.name.to_s
         when 'DOMString', 'any'
-          :string
+          String
         when 'UnsignedLong', 'Long', 'Integer', 'Short', 'UnsignedShort'
-          :int
+          Fixnum
         when 'Float', /.*Double$/
-          :float
-        when 'Function', /.*EventHandler$/
-          :function
+          Float
         when 'Boolean'
-          :bool
-        when 'Document', 'DocumentFragment'
-          :document
-        when 'DOMTokenList', 'DOMSettableTokenList'
-          :token_list
-        when 'DOMStringMap'
-          :string_map
-        when 'HTMLPropertiesCollection'
-          :properties_collection
-        when /HTML(.*)Element/
-          :html_element
-        when /HTML(.*)Collection/
-          :html_collection
-        when 'CSSStyleDeclaration'
-          :style
-        when /.+List$/
-          :list
-        when 'Date'
-          :date
-        when 'Element'
-          :element
+          'Boolean'
         when 'WindowProxy', 'ValidityState', 'MediaError', 'TimeRanges', 'Location',
              'Any', 'TimedTrackArray', 'TimedTrack', 'TextTrackArray', 'TextTrack',
-             'MediaController', 'TextTrackKind'
+             'MediaController', 'TextTrackKind', 'Function', /.*EventHandler$/,
+             'Document', 'DocumentFragment', 'DOMTokenList', 'DOMSettableTokenList',
+             'DOMStringMap', 'HTMLPropertiesCollection', /HTML(.*)Element/, /HTML(.*)Collection/,
+             'CSSStyleDeclaration',  /.+List$/, 'Date', 'Element'
           # probably completely wrong.
-          :string
+          String
         else
           raise "unknown type: #{type.name}"
         end

data/lib/watir-webdriver/locators/element_locator.rb

@@ -216,9 +216,6 @@ module Watir
         [:class, what]
       when :caption
         [:text, what]
-      when :for
-        assert_valid_as_attribute :html_for
-        [how, what]
       else
         assert_valid_as_attribute how
         [how, what]

data/lib/watir-webdriver/version.rb

@@ -1,3 +1,3 @@
 module Watir
-  VERSION = "0.6.9"
+  VERSION = "0.6.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watir-webdriver
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.6.10
 platform: ruby
 authors:
 - Jari Bakken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-13 00:00:00.000000000 Z
+date: 2014-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
@@ -175,7 +175,6 @@ files:
 - .gitignore
 - .gitmodules
 - .travis.yml
-- .yardopts
 - CHANGES.md
 - Gemfile
 - LICENSE
@@ -246,7 +245,6 @@ files:
 - lib/watir-webdriver/wait/timer.rb
 - lib/watir-webdriver/window.rb
 - lib/watir-webdriver/xpath_support.rb
-- lib/yard/handlers/watir.rb
 - spec/browser_spec.rb
 - spec/click_spec.rb
 - spec/container_spec.rb
@@ -305,3 +303,4 @@ test_files:
 - spec/locator_spec_helper.rb
 - spec/spec_helper.rb
 - spec/special_chars_spec.rb
+has_rdoc: 

data/.yardopts

@@ -1 +0,0 @@
---load ./lib/yard/handlers/watir.rb

data/lib/yard/handlers/watir.rb

@@ -1,55 +0,0 @@
-module YARD
-  module Handlers
-    module Watir
-      #
-      # @private
-      #
-
-      class AttributesHandler < YARD::Handlers::Ruby::Base
-        handles method_call(:attributes)
-
-        TYPES = {
-          :string => "String",
-          :bool => "Boolean",
-          :int => "Integer"
-        }
-
-        def process
-          attributes = try_eval
-
-          if attributes.nil?
-            p :ignoring => statement.source, :in => namespace.to_s if $DEBUG
-            return
-          end
-
-          TYPES.each do |type, return_type|
-            if attributes.member? type
-              create_attributes attributes[type], return_type
-            end
-          end
-        end
-
-        private
-
-        def create_attributes(names, return_type)
-          names.each do |attribute_name|
-            p :adding => "#{namespace}##{attribute_name}" if $DEBUG
-            attribute_name = "#{attribute_name}?".to_sym if return_type == "Boolean"
-            register MethodObject.new(namespace, attribute_name, scope) do |o|
-              o.visibility = :public
-              o.explicit   = false
-              o.docstring.add_tag YARD::Tags::Tag.new(:return, "", return_type)
-            end
-          end
-        end
-
-        def try_eval
-          eval "{#{statement.parameters.source}}"
-        rescue SyntaxError, StandardError
-          nil
-        end
-
-      end # AttributesHandler
-    end # Watir
-  end # Handlers
-end # YARD