watir 3.0.0.rc2 → 3.0.0.rc3

data/lib/watir/ie.rb

@@ -18,12 +18,3 @@ $FAST_SPEED = ARGV.delete('-f')
 
 # Eat the -s command line switch (deprecated)
 ARGV.delete('-s')
-
-require 'watir/win32'
-require 'watir/modal_dialog'
-require 'watir/collections'
-
-require 'watir/camel_case'
-
-
-

data/lib/watir/image.rb

@@ -6,15 +6,10 @@ module Watir
   # many of the methods available to this object are inherited from the Element class
   #
   class Image < Element
-    TAG = "IMG"
+    attr_ole :alt
+    attr_ole :src
+    attr_ole :file_created_date, :fileCreatedDate
 
-    def initialize(container, how, what)
-      set_container container
-      @how = how
-      @what = what
-      super nil
-    end
-    
     # this method produces the properties for an image as an array
     def image_string_creator
       n = []
@@ -36,28 +31,22 @@ module Watir
       return r.join("\n")
     end
     
-    # this method returns the file created date of the image
-    def file_created_date
-      assert_exists
-      return @o.invoke("fileCreatedDate")
-    end
-    
     # this method returns the filesize of the image, as an int
     def file_size
       assert_exists
-      return @o.invoke("fileSize").to_i
+      @o.invoke("fileSize").to_i
     end
     
     # returns the width in pixels of the image, as an int
     def width
       assert_exists
-      return @o.invoke("width").to_i
+      @o.invoke("width").to_i
     end
     
     # returns the height in pixels of the image, as an int
     def height
       assert_exists
-      return @o.invoke("height").to_i
+      @o.invoke("height").to_i
     end
     
     # This method attempts to find out if the image was actually loaded by the web browser.
@@ -65,10 +54,8 @@ module Watir
     # We look for these missing properties to see if the image is really there or not.
     # If the Disk cache is full (tools menu -> Internet options -> Temporary Internet Files), it may produce incorrect responses.
     def loaded?
-      locate
-      raise UnknownObjectException, "Unable to locate image using #{@how} and #{@what}" if @o == nil
-      return false if @o.fileCreatedDate == "" and @o.fileSize.to_i == -1
-      return true
+      assert_exists
+      !file_created_date.empty? && file_size != -1
     end
     
     # this method highlights the image (in fact it adds or removes a border around the image)
@@ -119,10 +106,6 @@ module Watir
     end
     private :fill_save_image_dialog
 
-    Watir::Container.module_eval do
-      alias_method :img, :image
-      alias_method :imgs, :images
-    end        
   end
   
 end

data/lib/watir/input_elements.rb

@@ -2,15 +2,15 @@ module Watir
   
   class InputElement < Element #:nodoc:all
     def locate
-      @o = @container.locator_for(InputElementLocator, self.class::INPUT_TYPES, @how, @what, self.class).locate
+      @o = @container.locator_for(InputElementLocator, @specifiers, self.class).locate
     end
 
-    def initialize(container, how, what)
-      set_container container
-      @how = how
-      @what = what
-      super(nil)
-    end
+    attr_ole :disabled?
+    attr_ole :name
+    attr_ole :value
+    attr_ole :alt
+    attr_ole :src
+    attr_ole :type
   end
 
   #
@@ -20,11 +20,7 @@ module Watir
   # This class is the way in which select boxes are manipulated.
   # Normally a user would not need to create this object as it is returned by the Watir::Container#select_list method
   class SelectList < InputElement
-    #:stopdoc:
-    INPUT_TYPES = ["select-one", "select-multiple"]
-    #:startdoc:
-
-    def_wrap :multiple?, :multiple
+    attr_ole :multiple?
 
     # This method clears the selected items in the select box
     def clear
@@ -82,7 +78,7 @@ module Watir
         if value.is_a?(Regexp)
           opt.send(attribute) =~ value
         elsif value.is_a?(String) || value.is_a?(Numeric)
-          opt.send(attribute) == value
+          opt.send(attribute) == value.to_s
         else
           raise TypeError, "#{value.inspect} can be only String, Regexp or Numeric!"
         end
@@ -90,7 +86,11 @@ module Watir
     end
   end
   
-  class Option < NonControlElement
+  class Option < Element
+    attr_ole :disabled?
+    attr_ole :name
+    attr_ole :value
+    attr_ole :label
 
     def select
       perform_action do
@@ -142,10 +142,6 @@ module Watir
   
   # Returned by the Watir::Container#button method
   class Button < InputElement
-    #:stopdoc:
-    INPUT_TYPES = ["button", "submit", "image", "reset"]
-    #:startdoc:
-    
     alias_method :__value, :value
 
     def text
@@ -154,7 +150,6 @@ module Watir
     end
 
     alias_method :value, :text
-
   end
 
   #
@@ -164,15 +159,8 @@ module Watir
   # This class is the main class for Text Fields
   # Normally a user would not need to create this object as it is returned by the Watir::Container#text_field method
   class TextField < InputElement
-    #:stopdoc:
-    INPUT_TYPES = ["text", "password", "textarea"]
-    
-    def_wrap_guard :size
-
-    # Returns true or false if the text field is read only.
-    #   Raises UnknownObjectException if the object can't be found.
-    def_wrap :readonly?, :readOnly
-
+    attr_ole :size
+    attr_ole :readonly?
     alias_method :text, :value
 
     #:startdoc:
@@ -206,7 +194,7 @@ module Watir
     def assert_not_readonly #:nodoc:
       if self.readonly?
         raise ObjectReadOnlyException, 
-          "Textfield #{@how} and #{@what} is read only."
+          "Textfield #{@specifiers.inspect} is read only."
       end
     end
     
@@ -381,27 +369,9 @@ module Watir
 
   end
 
-  class TextArea < TextField
-    INPUT_TYPES = ["textarea"]
-
-    Watir::Container.module_eval do
-      def textareas(how={}, what=nil)
-        TextAreas.new(self, how, what)
-      end
-
-      def textarea(how={}, what=nil)
-        TextArea.new(self, how, what)
-      end
-    end
-  end
-  
   # this class can be used to access hidden field objects
   # Normally a user would not need to create this object as it is returned by the Watir::Container#hidden method
   class Hidden < TextField
-    #:stopdoc:
-    INPUT_TYPES = ["hidden"]
-    #:startdoc:
-    
     # set is overriden in this class, as there is no way to set focus to a hidden field
     def set(n)
       self.value = n
@@ -426,36 +396,30 @@ module Watir
       assert_exists
       false
     end
-    
   end
 
-  # This class contains common methods to both radio buttons and check boxes.
+  # This module contains common methods to both radio buttons and check boxes.
   # Normally a user would not need to create this object as it is returned by the Watir::Container#checkbox or by Watir::Container#radio methods
-  #--
-  # most of the methods available to this element are inherited from the Element class
-  class RadioCheckCommon < InputElement
-    def inspect
-      '#<%s:0x%x located=%s how=%s what=%s value=%s>' % [self.class, hash*2, !!ole_object, @how.inspect, @what.inspect, @value.inspect]
+  module RadioCheckCommon
+    def self.included(base)
+      base.instance_eval do
+        attr_ole :set?, :checked
+        alias_method :checked?, :set?
+      end
     end
-    
-    # This method determines if a radio button or check box is set.
-    # Returns true if set/checked; false if not set/checked.
-    # Raises UnknownObjectException if its unable to locate an object.
-    def set? 
-      assert_exists
-      return @o.checked
+
+    def inspect
+      '#<%s:0x%x located=%s specifiers=%s value=%s>' % [self.class, hash*2, !!ole_object, @specifiers.inspect, @value.inspect]
     end
-    alias checked? set?
-    
-   end
+  end
   
   #--
   #  this class makes the docs better
   #++
   # This class is the watir representation of a radio button.
   # Normally a user would not need to create this object as it is returned by the Watir::Container#radio method
-  class Radio < RadioCheckCommon
-    INPUT_TYPES = ["radio"]
+  class Radio < InputElement
+    include RadioCheckCommon
     # This method clears a radio button. One of them will almost always be set.
     # Returns true if set or false if not set.
     #   Raises UnknownObjectException if its unable to locate an object
@@ -486,8 +450,8 @@ module Watir
 
   # This class is the watir representation of a check box.
   # Normally a user would not need to create this object as it is returned by the Watir::Container#checkbox method
-  class CheckBox < RadioCheckCommon
-    INPUT_TYPES = ["checkbox"]
+  class CheckBox < InputElement
+    include RadioCheckCommon
     # This method checks or unchecks the checkbox.
     # With no arguments supplied it sets the checkbox.
     # Setting false argument unchecks/clears the checkbox.
@@ -511,19 +475,6 @@ module Watir
       set false
     end
 
-    Watir::Container.module_eval do
-      remove_method :check_boxs
-
-      def checkboxes(how={}, what=nil)
-        CheckBoxes.new(self, how, what)
-      end
-
-      remove_method :check_box
-
-      def checkbox(how={}, what=nil)
-        CheckBox.new(self, how, what)
-      end
-    end
   end
 
 end

data/lib/watir/link.rb

@@ -5,19 +5,9 @@ module Watir
   # many of the methods available to this object are inherited from the Element class
   #
   class Link < Element
-    TAG = "A"
+    attr_ole :type
+    attr_ole :href
 
-    # Returns an initialized instance of a link object
-    #   * container  - an instance of a container
-    #   * how         - symbol - how we access the link
-    #   * what         - what we use to access the link, text, url, index etc
-    def initialize(container, how, what)
-      set_container container
-      @how = how
-      @what = what
-      super(nil)
-    end
-    
     # if an image is used as part of the link, this will return true
     def link_has_image
       assert_exists
@@ -51,11 +41,6 @@ module Watir
       return r.join("\n")
     end
 
-    Watir::Container.module_eval do
-      alias_method :a, :link
-      alias_method :as, :links
-    end    
-
   end
   
 end

data/lib/watir/locator.rb

@@ -2,10 +2,12 @@ module Watir
   class Locator
     include Watir
     include Watir::Exception
+    include XpathLocator
 
-    def initialize container, tags, klass
+    def initialize container, specifiers, klass
       @container = container
-      @tags = tags
+      @specifiers = {:index => Watir::IE.base_index}.merge(normalize_specifiers(specifiers))
+      @tags = @specifiers.delete(:tag_name)
       @klass = klass
     end
 
@@ -29,8 +31,9 @@ module Watir
       @document ||= @container.document
     end
 
-    def normalize_specifiers!(specifiers)
-      specifiers.each do |how, what|
+    def normalize_specifiers(specifiers)
+      specifiers.reduce({}) do |memo, pair|
+        how, what = *pair
         case how
         when :index
           what = what.to_i
@@ -46,7 +49,8 @@ module Watir
           what = what.is_a?(Regexp) ? what : what.to_s
         end
 
-        @specifiers[how] = what
+        memo[how] = what
+        memo
       end
     end
 
@@ -80,12 +84,6 @@ module Watir
       @specifiers.keys.any? {|specifier| [:css, :xpath, :ole_object].include? specifier}
     end
 
-    def set_specifier(how, what=nil)
-      specifiers = what ? {how => what} : how
-      @specifiers = {:index => Watir::IE.base_index} # default if not specified
-      normalize_specifiers! specifiers
-    end
-
     def locate_by_id
       # Searching through all elements returned by __ole_inner_elements
       # is *significantly* slower than IE's getElementById() and
@@ -110,9 +108,9 @@ module Watir
       els = []
 
       if @specifiers[:xpath]
-        els = @container.send(:elements_by_xpath, @specifiers[:xpath])
+        els = elements_by_xpath(@specifiers[:xpath])
       elsif @specifiers[:css]
-        els = @container.send(:elements_by_css, @specifiers[:css])
+        els = elements_by_css(@specifiers[:css])
       elsif @specifiers[:ole_object]
         return [@specifiers[:ole_object]]
       end      
@@ -122,18 +120,13 @@ module Watir
 
     def type_matches?(el)
       @tags == ["*"] || 
-        @tags.include?(el.tagName) || 
-        @tags.include?(el.invoke('type')) rescue false
+        @tags.include?(el.tagName.downcase) || 
+        @tags.include?(el.invoke('type').downcase) rescue false
     end
 
     def create_element ole_object
-      if @klass == Element
-        element = Element.new(ole_object)
-      else
-        element = @klass.new(@container, @specifiers, nil)
-        element.ole_object = ole_object
-        def element.locate; @o; end
-      end
+      element = @klass.new(@container, @specifiers.merge(:ole_object => ole_object))
+      def element.locate; @o; end
       element
     end
   end
@@ -161,7 +154,7 @@ module Watir
 
   class FrameLocator < TaggedElementLocator
     def each_element(tag)
-      frames = document.frames
+      frames = @container.page_container.document.frames
       i = 0
       document.getElementsByTagName(tag).each do |ole_object|
         frame = create_element ole_object
@@ -172,14 +165,25 @@ module Watir
     end
 
     def locate
-      # do not locate frames by getElementById or by xpath since can't get the correct
-      # 'document' related with that ole_object like it's done in #each_element
       count = Watir::IE.base_index - 1
       each do |frame|
         count += 1
         return frame.ole_object, frame.document if count == @specifiers[:index]
       end
     end
+
+    def locate_elements_by_xpath_css_ole
+      super.map do |frame|
+        frame = create_element frame
+        each_element(frame.tag_name) do |frame_with_document|
+          if frame_with_document == frame
+            frame = frame_with_document
+            break
+          end
+        end
+        frame
+      end
+    end
   end
 
   class FormLocator < TaggedElementLocator

data/lib/watir/modal_dialog.rb

@@ -16,48 +16,44 @@ module Watir
     end
 
     def locate
+      @modal.wait_until_present rescue raise NoMatchingWindowFoundException
+
       intUnknown = 0
-      begin
-        Watir::until_with_timeout do
-          intPointer = " " * 4 # will contain the int value of the IUnknown*
-          GetUnknown.call(hwnd, intPointer)
-          intArray = intPointer.unpack('L')
-          intUnknown = intArray.first
-          intUnknown > 0
-        end
-      rescue Wait::TimeoutError => e
-        raise NoMatchingWindowFoundException,
-          "Unable to attach to Modal Window after #{e.duration} seconds."
+      Watir::until_with_timeout do
+        intPointer = " " * 4 # will contain the int value of the IUnknown*
+        GetUnknown.call(hwnd, intPointer)
+        intArray = intPointer.unpack('L')
+        intUnknown = intArray.first
+        intUnknown > 0
       end
-      @document = WIN32OLE.connect_unknown(intUnknown)
+      
+      WIN32OLE.connect_unknown(intUnknown)
+    rescue NoMatchingWindowFoundException, Wait::TimeoutError
+      raise NoMatchingWindowFoundException,
+        "Unable to attach to Modal Window."
     end
 
-    def document
-      locate
-      @document
-    end
-    
+    alias_method :document, :locate
+
     def title
       document.title
     end
 
-    def close
+    def close(timeout=5)
+      return unless exists?
       document.parentWindow.close
+      Watir::Wait.until(timeout) {!exists?} rescue nil
+      wait
     end
 
     def attach_command
       "Watir::IE.find(:hwnd, #{@container.hwnd}).modal_dialog"
     end
-      
+
     def wait(no_sleep=false)
-      sleep 1
-      if exists?
-        # do nothing
-      else
-        @container.page_container.wait
-      end
+      @container.page_container.wait unless exists?
     end
-    
+
     def hwnd
       @modal.hwnd
     end
@@ -66,21 +62,11 @@ module Watir
       @modal.active?
     end
 
-    # When checking to see if the modal exists we give it some time to
-    # find it. So if it does see a modal it returns immediately, otherwise it waits and checks
-    def exists?(timeout=5)
-      begin
-        Watir::Wait.until(timeout) {@modal.exists?}
-      rescue Watir::Wait::TimeoutError
-      end
-      return @modal.exists?
+    def exists?
+      @modal.exists?
     end
-    alias :exist? :exists?
 
-    Watir::Container.module_eval do
-      def modal_dialog(*args)
-        ModalDialog.new(self)
-      end
-    end
+    alias_method :exist?, :exists?
+
   end
 end