watir-webdriver 0.0.6 → 0.0.7

data/watir-webdriver.gemspec

@@ -5,17 +5,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{watir-webdriver}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jari Bakken"]
-  s.date = %q{2010-07-27}
+  s.date = %q{2010-08-20}
   s.description = %q{WebDriver-backed Watir}
   s.email = %q{jari.bakken@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc",
-     "TODO"
+     "README.rdoc"
   ]
   s.files = [
     ".document",
@@ -24,18 +23,16 @@ Gem::Specification.new do |s|
      "LICENSE",
      "README.rdoc",
      "Rakefile",
-     "TODO",
      "VERSION",
      "lib/watir-webdriver.rb",
-     "lib/watir-webdriver/base_element.rb",
+     "lib/watir-webdriver/attribute_helper.rb",
      "lib/watir-webdriver/browser.rb",
      "lib/watir-webdriver/browserbot.js",
-     "lib/watir-webdriver/collections/buttons_collection.rb",
      "lib/watir-webdriver/collections/element_collection.rb",
-     "lib/watir-webdriver/collections/table_rows_collection.rb",
-     "lib/watir-webdriver/collections/text_fields_collection.rb",
+     "lib/watir-webdriver/collections/table_row_collection.rb",
      "lib/watir-webdriver/container.rb",
      "lib/watir-webdriver/core_ext/string.rb",
+     "lib/watir-webdriver/element.rb",
      "lib/watir-webdriver/elements/button.rb",
      "lib/watir-webdriver/elements/checkbox.rb",
      "lib/watir-webdriver/elements/file_field.rb",
@@ -43,32 +40,35 @@ Gem::Specification.new do |s|
      "lib/watir-webdriver/elements/form.rb",
      "lib/watir-webdriver/elements/frame.rb",
      "lib/watir-webdriver/elements/generated.rb",
-     "lib/watir-webdriver/elements/headings.rb",
      "lib/watir-webdriver/elements/hidden.rb",
      "lib/watir-webdriver/elements/image.rb",
      "lib/watir-webdriver/elements/input.rb",
      "lib/watir-webdriver/elements/link.rb",
      "lib/watir-webdriver/elements/option.rb",
      "lib/watir-webdriver/elements/radio.rb",
-     "lib/watir-webdriver/elements/select_list.rb",
+     "lib/watir-webdriver/elements/select.rb",
      "lib/watir-webdriver/elements/table.rb",
      "lib/watir-webdriver/elements/table_row.rb",
      "lib/watir-webdriver/elements/text_field.rb",
      "lib/watir-webdriver/exception.rb",
      "lib/watir-webdriver/extensions/nokogiri.rb",
+     "lib/watir-webdriver/html.rb",
+     "lib/watir-webdriver/html/generator.rb",
+     "lib/watir-webdriver/html/idl_sorter.rb",
+     "lib/watir-webdriver/html/spec_extractor.rb",
+     "lib/watir-webdriver/html/util.rb",
+     "lib/watir-webdriver/html/visitor.rb",
      "lib/watir-webdriver/locators/button_locator.rb",
      "lib/watir-webdriver/locators/element_locator.rb",
      "lib/watir-webdriver/locators/table_row_locator.rb",
      "lib/watir-webdriver/locators/text_field_locator.rb",
      "lib/watir-webdriver/xpath_support.rb",
-     "spec/base_element_spec.rb",
+     "lib/yard/handlers/watir.rb",
+     "spec/element_spec.rb",
      "spec/html/keylogger.html",
+     "spec/input_spec.rb",
      "spec/spec_helper.rb",
-     "support/html5/html5.idl",
-     "support/html5/old/html5.idl",
-     "support/html5/old/html5_extras.idl",
-     "support/html5/watir_visitor.rb",
-     "support/yard_handlers.rb",
+     "support/html5.html",
      "watir-webdriver.gemspec"
   ]
   s.homepage = %q{http://github.com/jarib/watir-webdriver}
@@ -77,7 +77,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Watir on WebDriver}
   s.test_files = [
-    "spec/base_element_spec.rb",
+    "spec/element_spec.rb",
+     "spec/input_spec.rb",
      "spec/spec_helper.rb",
      "spec/watirspec/area_spec.rb",
      "spec/watirspec/areas_spec.rb",
@@ -86,8 +87,11 @@ Gem::Specification.new do |s|
      "spec/watirspec/buttons_spec.rb",
      "spec/watirspec/checkbox_spec.rb",
      "spec/watirspec/checkboxes_spec.rb",
+     "spec/watirspec/collections_spec.rb",
      "spec/watirspec/dd_spec.rb",
      "spec/watirspec/dds_spec.rb",
+     "spec/watirspec/del_spec.rb",
+     "spec/watirspec/dels_spec.rb",
      "spec/watirspec/div_spec.rb",
      "spec/watirspec/divs_spec.rb",
      "spec/watirspec/dl_spec.rb",
@@ -110,10 +114,13 @@ Gem::Specification.new do |s|
      "spec/watirspec/hns_spec.rb",
      "spec/watirspec/image_spec.rb",
      "spec/watirspec/images_spec.rb",
+     "spec/watirspec/ins_spec.rb",
+     "spec/watirspec/inses_spec.rb",
      "spec/watirspec/label_spec.rb",
      "spec/watirspec/labels_spec.rb",
      "spec/watirspec/li_spec.rb",
      "spec/watirspec/lib/guards.rb",
+     "spec/watirspec/lib/implementation.rb",
      "spec/watirspec/lib/server.rb",
      "spec/watirspec/lib/spec_helper.rb",
      "spec/watirspec/lib/watirspec.rb",
@@ -165,21 +172,24 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<selenium-webdriver>, [">= 0.0.26"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<webidl>, [">= 0"])
+      s.add_development_dependency(%q<webidl>, [">= 0.0.4"])
       s.add_development_dependency(%q<sinatra>, [">= 1.0"])
+      s.add_development_dependency(%q<nokogiri>, [">= 0"])
       s.add_development_dependency(%q<activesupport>, [">= 2.3.5"])
     else
       s.add_dependency(%q<selenium-webdriver>, [">= 0.0.26"])
       s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<webidl>, [">= 0"])
+      s.add_dependency(%q<webidl>, [">= 0.0.4"])
       s.add_dependency(%q<sinatra>, [">= 1.0"])
+      s.add_dependency(%q<nokogiri>, [">= 0"])
       s.add_dependency(%q<activesupport>, [">= 2.3.5"])
     end
   else
     s.add_dependency(%q<selenium-webdriver>, [">= 0.0.26"])
     s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<webidl>, [">= 0"])
+    s.add_dependency(%q<webidl>, [">= 0.0.4"])
     s.add_dependency(%q<sinatra>, [">= 1.0"])
+    s.add_dependency(%q<nokogiri>, [">= 0"])
     s.add_dependency(%q<activesupport>, [">= 2.3.5"])
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: watir-webdriver
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Jari Bakken
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-27 00:00:00 +02:00
+date: 2010-08-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,10 +56,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 23
         segments: 
         - 0
-        version: "0"
+        - 0
+        - 4
+        version: 0.0.4
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -78,9 +80,23 @@ dependencies:
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: nokogiri
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -92,7 +108,7 @@ dependencies:
         - 5
         version: 2.3.5
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 description: WebDriver-backed Watir
 email: jari.bakken@gmail.com
 executables: []
@@ -102,7 +118,6 @@ extensions: []
 extra_rdoc_files: 
 - LICENSE
 - README.rdoc
-- TODO
 files: 
 - .document
 - .gitignore
@@ -110,18 +125,16 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
-- TODO
 - VERSION
 - lib/watir-webdriver.rb
-- lib/watir-webdriver/base_element.rb
+- lib/watir-webdriver/attribute_helper.rb
 - lib/watir-webdriver/browser.rb
 - lib/watir-webdriver/browserbot.js
-- lib/watir-webdriver/collections/buttons_collection.rb
 - lib/watir-webdriver/collections/element_collection.rb
-- lib/watir-webdriver/collections/table_rows_collection.rb
-- lib/watir-webdriver/collections/text_fields_collection.rb
+- lib/watir-webdriver/collections/table_row_collection.rb
 - lib/watir-webdriver/container.rb
 - lib/watir-webdriver/core_ext/string.rb
+- lib/watir-webdriver/element.rb
 - lib/watir-webdriver/elements/button.rb
 - lib/watir-webdriver/elements/checkbox.rb
 - lib/watir-webdriver/elements/file_field.rb
@@ -129,32 +142,35 @@ files:
 - lib/watir-webdriver/elements/form.rb
 - lib/watir-webdriver/elements/frame.rb
 - lib/watir-webdriver/elements/generated.rb
-- lib/watir-webdriver/elements/headings.rb
 - lib/watir-webdriver/elements/hidden.rb
 - lib/watir-webdriver/elements/image.rb
 - lib/watir-webdriver/elements/input.rb
 - lib/watir-webdriver/elements/link.rb
 - lib/watir-webdriver/elements/option.rb
 - lib/watir-webdriver/elements/radio.rb
-- lib/watir-webdriver/elements/select_list.rb
+- lib/watir-webdriver/elements/select.rb
 - lib/watir-webdriver/elements/table.rb
 - lib/watir-webdriver/elements/table_row.rb
 - lib/watir-webdriver/elements/text_field.rb
 - lib/watir-webdriver/exception.rb
 - lib/watir-webdriver/extensions/nokogiri.rb
+- lib/watir-webdriver/html.rb
+- lib/watir-webdriver/html/generator.rb
+- lib/watir-webdriver/html/idl_sorter.rb
+- lib/watir-webdriver/html/spec_extractor.rb
+- lib/watir-webdriver/html/util.rb
+- lib/watir-webdriver/html/visitor.rb
 - lib/watir-webdriver/locators/button_locator.rb
 - lib/watir-webdriver/locators/element_locator.rb
 - lib/watir-webdriver/locators/table_row_locator.rb
 - lib/watir-webdriver/locators/text_field_locator.rb
 - lib/watir-webdriver/xpath_support.rb
-- spec/base_element_spec.rb
+- lib/yard/handlers/watir.rb
+- spec/element_spec.rb
 - spec/html/keylogger.html
+- spec/input_spec.rb
 - spec/spec_helper.rb
-- support/html5/html5.idl
-- support/html5/old/html5.idl
-- support/html5/old/html5_extras.idl
-- support/html5/watir_visitor.rb
-- support/yard_handlers.rb
+- support/html5.html
 - watir-webdriver.gemspec
 - spec/watirspec/area_spec.rb
 - spec/watirspec/areas_spec.rb
@@ -163,8 +179,11 @@ files:
 - spec/watirspec/buttons_spec.rb
 - spec/watirspec/checkbox_spec.rb
 - spec/watirspec/checkboxes_spec.rb
+- spec/watirspec/collections_spec.rb
 - spec/watirspec/dd_spec.rb
 - spec/watirspec/dds_spec.rb
+- spec/watirspec/del_spec.rb
+- spec/watirspec/dels_spec.rb
 - spec/watirspec/div_spec.rb
 - spec/watirspec/divs_spec.rb
 - spec/watirspec/dl_spec.rb
@@ -187,10 +206,13 @@ files:
 - spec/watirspec/hns_spec.rb
 - spec/watirspec/image_spec.rb
 - spec/watirspec/images_spec.rb
+- spec/watirspec/ins_spec.rb
+- spec/watirspec/inses_spec.rb
 - spec/watirspec/label_spec.rb
 - spec/watirspec/labels_spec.rb
 - spec/watirspec/li_spec.rb
 - spec/watirspec/lib/guards.rb
+- spec/watirspec/lib/implementation.rb
 - spec/watirspec/lib/server.rb
 - spec/watirspec/lib/spec_helper.rb
 - spec/watirspec/lib/watirspec.rb
@@ -268,7 +290,8 @@ signing_key:
 specification_version: 3
 summary: Watir on WebDriver
 test_files: 
-- spec/base_element_spec.rb
+- spec/element_spec.rb
+- spec/input_spec.rb
 - spec/spec_helper.rb
 - spec/watirspec/area_spec.rb
 - spec/watirspec/areas_spec.rb
@@ -277,8 +300,11 @@ test_files:
 - spec/watirspec/buttons_spec.rb
 - spec/watirspec/checkbox_spec.rb
 - spec/watirspec/checkboxes_spec.rb
+- spec/watirspec/collections_spec.rb
 - spec/watirspec/dd_spec.rb
 - spec/watirspec/dds_spec.rb
+- spec/watirspec/del_spec.rb
+- spec/watirspec/dels_spec.rb
 - spec/watirspec/div_spec.rb
 - spec/watirspec/divs_spec.rb
 - spec/watirspec/dl_spec.rb
@@ -301,10 +327,13 @@ test_files:
 - spec/watirspec/hns_spec.rb
 - spec/watirspec/image_spec.rb
 - spec/watirspec/images_spec.rb
+- spec/watirspec/ins_spec.rb
+- spec/watirspec/inses_spec.rb
 - spec/watirspec/label_spec.rb
 - spec/watirspec/labels_spec.rb
 - spec/watirspec/li_spec.rb
 - spec/watirspec/lib/guards.rb
+- spec/watirspec/lib/implementation.rb
 - spec/watirspec/lib/server.rb
 - spec/watirspec/lib/spec_helper.rb
 - spec/watirspec/lib/watirspec.rb

data/TODO

@@ -1,15 +0,0 @@
-TODO:
-
-- frames
-- tables
-
-MAYBE:
-
-- support selector arg to collection methods? i.e. browser.buttons(class: "foo")
-
-DONE:
-
-- check if selector attributes are valid (BaseElement.attribute_list ?) to get MissingWayOfFindingObjectException
-- fix watirspec to not be so picky about exception messages
-- text_field should cover both <input type="whatever"> and <textarea>
-- buttons should cover both <input type="button"> and <button>

data/lib/watir-webdriver/base_element.rb

@@ -1,361 +0,0 @@
-# encoding: utf-8
-
-module Watir
-  class BaseElement
-    include Exception
-    include Container
-    include Selenium
-
-    IGNORED_ATTRIBUTES = [:text, :hash]
-
-    class << self
-      attr_writer :default_selector
-
-      def typed_attributes
-        @typed_attributes ||= Hash.new { |hash, type| hash[type] = []  }
-      end
-
-      def attribute_list
-        @attribute_list ||= (
-          list = typed_attributes.values.flatten
-          list += ancestors[1..-1].map do |e|
-            e.attribute_list if e.respond_to?(:attribute_list)
-          end.compact.flatten
-        ).uniq
-      end
-
-      def attributes(attribute_map = nil)
-        if attribute_map.nil?
-          return attribute_list
-        end
-
-        add_attributes attribute_map
-
-        attribute_map.each do |type, attribs|
-          attribs.each do |name|
-            # we don't want to override methods like :text or :hash
-            next if IGNORED_ATTRIBUTES.include?(name)
-            define_attribute(type, name)
-          end
-        end
-      end
-
-      def default_selector
-        @default_selector ||= {}
-      end
-
-      private
-
-      def inherited(klass)
-        klass.default_selector = default_selector.dup
-      end
-
-      def define_attribute(type, name)
-        method_name    = method_name_for(type, name)
-        attribute_name = attribute_for_method(name)
-
-        (@attributes ||= []) << attribute_name
-
-        case type
-        when :string
-          define_string_attribute(method_name, attribute_name)
-        when :bool
-          define_boolean_attribute(method_name, attribute_name)
-        when :int
-          define_int_attribute(method_name, attribute_name)
-        else
-          # $stderr.puts "treating #{type.inspect} as string for now"
-        end
-      end
-
-      def define_string_attribute(mname, aname)
-        define_method mname do
-          assert_exists
-          @element.attribute(aname).to_s
-        end
-      end
-
-      def define_boolean_attribute(mname, aname)
-        define_method mname do
-          assert_exists
-          !!@element.attribute(aname)
-        end
-      end
-
-      def define_int_attribute(mname, aname)
-        define_method mname do
-          assert_exists
-          @element.attribute(aname).to_i
-        end
-      end
-
-      def container_method(name)
-        klass = self
-        Container.add name do |*args|
-          klass.new(self, *args)
-        end
-      end
-
-      def collection_method(name)
-        constant_name = "#{name.to_s.camel_case}Collection"
-        return if Watir.const_defined?(constant_name)
-
-        element_class = self
-        klass = Watir.const_set(
-          constant_name,
-          Class.new(ElementCollection)
-        )
-
-        Container.add name do
-          klass.new(self, element_class)
-        end
-      end
-
-      def add_attributes(attributes)
-        attributes.each do |type, attr_list|
-          typed_attributes[type] += attr_list
-        end
-      end
-
-      def identifier(selector)
-        Watir.tag_to_class[selector[:tag_name]] = self
-        default_selector.merge! selector
-      end
-
-      def method_name_for(type, attribute)
-        # TODO: rethink this - this list could get pretty long...
-        name = case attribute
-               when :html_for
-                 'for'
-               when :col_span
-                 'colspan'
-               when :row_span
-                 'rowspan'
-               else
-                 attribute.to_s
-               end
-
-        name << "?" if type == :bool
-
-        name
-      end
-
-      def attribute_for_method(method)
-        case method.to_sym
-        when :class_name
-          'class'
-        when :html_for
-          'for'
-        when :read_only
-          'readonly'
-        when :http_equiv
-          'http-equiv'
-        else
-          method.to_s
-        end
-      end
-    end # class << self
-
-    def initialize(parent, *selectors)
-      @parent   = parent
-      @selector = extract_selector(selectors).merge(self.class.default_selector)
-
-      if @selector.has_key?(:element)
-        @element = @selector[:element]
-      end
-    end
-
-    def exists?
-      assert_exists
-      true
-    rescue UnknownObjectException, UnknownFrameException
-      false
-    end
-    alias_method :exist?, :exists?
-
-    def inspect
-      if @selector.has_key?(:element)
-        '#<%s:0x%x located=%s selector=%s>' % [self.class, hash*2, !!@element, '{:element=>(webdriver element)}']
-      else
-        '#<%s:0x%x located=%s selector=%s>' % [self.class, hash*2, !!@element, @selector.inspect]
-      end
-    end
-
-    def text
-      assert_exists
-      @element.text
-    end
-
-    def tag_name
-      assert_exists
-      @element.tag_name
-    end
-
-    def click
-      assert_exists
-      assert_enabled
-      @element.click
-      run_checkers
-    end
-
-    def double_click
-      assert_exists
-      raise NotImplementedError, "need support in WebDriver"
-
-      @element.double_click
-      run_checkers
-    end
-
-    def right_click
-      assert_exists
-      raise NotImplementedError, "need support in WebDriver"
-
-      @element.right_click
-      run_checkers
-    end
-
-    def flash
-      assert_exists
-      original_color = driver.execute_script("arguments[0].style.backgroundColor", @element)
-      10.times do |n|
-        color = (n % 2 == 0) ? "red" : original_color
-        driver.execute_script("arguments[0].style.backgroundColor = '#{color}'", @element)
-      end
-    end
-
-    def value
-      assert_exists
-
-      begin
-        @element.value
-      rescue WebDriver::Error::ElementNotEnabledError
-        ""
-      end
-    end
-
-    def attribute_value(attribute_name)
-      assert_exists
-      @element.attribute attribute_name
-    end
-
-    def html
-      assert_exists
-      browserbot('getOuterHTML', @element).strip
-    end
-
-    def send_keys(*args)
-      assert_exists
-      @element.send_keys(*args)
-    end
-
-    #
-    # Note: Firefox queues focus events until the window actually has focus.
-    #
-    # See http://code.google.com/p/selenium/issues/detail?id=157
-    #
-
-    def focus
-      assert_exists
-      driver.execute_script "return arguments[0].focus()", @element
-    end
-
-    def fire_event(event_name, bubble = false)
-      assert_exists
-      event_name = event_name.to_s.sub(/^on/, '')
-      browserbot('triggerEvent', @element, event_name, bubble)
-    end
-
-    def parent
-      assert_exists
-
-      e = driver.execute_script "return arguments[0].parentNode", @element
-
-      if e.kind_of?(WebDriver::Element)
-        Watir.element_class_for(e.tag_name).new(@parent, :element, e)
-      end
-    end
-
-    def driver
-      @parent.driver
-    end
-
-    def element
-      assert_exists
-      @element
-    end
-    alias_method :wd, :element # ensures duck typing with Browser
-
-    def visible?
-      assert_exists
-      @element.displayed?
-    end
-
-    def style(property = nil)
-      if property
-        assert_exists
-        @element.style property
-      else
-        attribute_value "style" || ''
-      end
-    end
-
-    def run_checkers
-      @parent.run_checkers
-    end
-
-  protected
-
-    def assert_exists
-      @element ||= locate
-
-      unless @element
-        raise UnknownObjectException, "unable to locate element, using #{selector_string}"
-      end
-    end
-
-    def browser
-      @parent.browser
-    end
-
-    def locate
-      @parent.assert_exists
-      ElementLocator.new(@parent.wd, @selector, self.class.attribute_list).locate
-    end
-
-  private
-
-    def selector_string
-      @selector.inspect
-    end
-
-    def attribute?(attribute)
-      assert_exists
-      driver.execute_script "return !!arguments[0].getAttributeNode(arguments[1]);", @element, attribute.to_s.downcase
-    end
-
-    def assert_enabled
-      raise ObjectDisabledException, "object is disabled #{selector_string}" unless @element.enabled?
-    end
-
-    def assert_writable
-      assert_enabled
-      raise ObjectReadOnlyException if respond_to?(:readonly?) && readonly?
-    end
-
-    def extract_selector(selectors)
-      case selectors.size
-      when 2
-        { selectors[0] => selectors[1] }
-      when 1
-        unless selectors.first.is_a? Hash
-          raise ArgumentError, "expected Hash or (:how, 'what')"
-        end
-
-        selectors.first
-      else
-        raise ArgumentError, "wrong number of arguments (#{selectors.size} for 2)"
-      end
-    end
-
-  end # BaseElement
-end # Watir