watir 2.0.4 → 3.0.0.rc1

data/lib/watir/element_collections.rb

@@ -4,7 +4,7 @@ module Watir
   class ElementCollections
     include Enumerable
 
-    # Super class for all the iteractor classes
+    # Super class for all the iterator classes
     #   * container - an instance of an IE object
     def initialize(container, how, what)
       if how == :index || (how.is_a?(Hash) && how[:index])
@@ -30,19 +30,14 @@ module Watir
 
     # iterate through each of the elements in the collection in turn
     def each
-      @container.tagged_element_locator(element_tag, @how, @what, element_class).each {|element| yield element}
+      @container.locator_for(TaggedElementLocator, element_tags, @how, @what, element_class).each {|element| yield element}
     end
 
     # allows access to a specific item in the collection
     def [](n)
       number = n - Watir::IE.base_index
       offset = Watir::IE.zero_based_indexing ? (length - 1) : length
-
-      unless number.between?(0, offset)
-        raise Exception::MissingWayOfFindingObjectException,
-          "Can't find #{element_tag.downcase} with :index #{n} from #{self.class} with size of #{length}"
-      end
-      return iterator_object(number)
+      iterator_object(number) || element_class.new(@container, :index, n)
     end
 
     def first
@@ -65,15 +60,22 @@ module Watir
 
     def iterator_object(i)
       count = 0
-      each {|e| return e if count == i; count += 1}
+      each do |e|
+        return e if (i >= 0 && count == i) || (i < 0 && count == length + i)
+        count += 1
+      end
     end
 
     def element_class
       Watir.const_get self.class.name.split("::").last.chop
     end
 
-    def element_tag
-      element_class.const_defined?(:TAG) ? element_class::TAG : element_class.name.split("::").last
+    def element_tags
+      tags = @how.is_a?(Hash) && @how[:tag_name] ? [@how[:tag_name].upcase] : 
+             element_class.const_defined?(:TAG) ? [element_class::TAG] : 
+             element_class.const_defined?(:TAGS) ? element_class::TAGS : 
+             [element_class.name.split("::").last.upcase]      
+      tags
     end
   end
 end

data/lib/watir/form.rb

@@ -1,6 +1,8 @@
 module Watir
 
   class Form < Element
+    TAG = 'FORM'
+
     #   * container   - the containing object, normally an instance of IE
     #   * how         - symbol - how we access the form (:name, :id, :index, :action, :method)
     #   * what        - what we use to access the form
@@ -33,13 +35,13 @@ module Watir
     end    
 
     def locate
-      @o = @container.locator_for(FormLocator, @how, @what).locate
+      @o = @container.locator_for(FormLocator, [self.class::TAG], @how, @what, self.class).locate
     end
 
     # Submit the data -- equivalent to pressing Enter or Return to submit a form.
     def submit 
       assert_exists
-      @o.invoke('submit')
+      @o.submit if dispatch_event "onSubmit"
       @container.wait
     end
     

data/lib/watir/frame.rb

@@ -1,13 +1,13 @@
 module Watir
   class Frame < Element
     include PageContainer
-    TAG = ['FRAME', 'IFRAME']
+    TAGS = ['FRAME', 'IFRAME']
 
     attr_accessor :document
 
     # Find the frame denoted by how and what in the container and return its ole_object
     def locate
-      frame, document = @container.locator_for(FrameLocator, @how, @what).locate
+      frame, document = @container.locator_for(FrameLocator, self.class::TAGS, @how, @what, self.class).locate
       if frame && document
         @o = frame
         begin
@@ -47,6 +47,18 @@ module Watir
     def attach_command
       @container.page_container.attach_command + ".frame(#{@how.inspect}, #{@what.inspect})".gsub('"','\'')
     end
-    
+
+    def execute_script(source)
+      document.parentWindow.eval(source.to_s)
+    rescue WIN32OLERuntimeError, NoMethodError #if eval fails we need to use execScript(source.to_s) which does not return a value, hence the workaround
+      escaped_src = source.to_s.gsub(/[\r\n']/) {|m| "\\#{m}"}
+      wrapper = "_watir_helper_div_#{Time.now.to_i}"
+      cmd = "var e = document.createElement('DIV'); e.style.display = 'none'; e.id='#{wrapper}'; e.innerHTML = eval('#{escaped_src}'); document.body.appendChild(e);"
+      document.parentWindow.execScript(cmd)
+      wrapper_obj = document.getElementById(wrapper)
+      result_value = wrapper_obj.innerHTML
+      result_value
+    end
+
   end
 end

data/lib/watir/ie-class.rb

@@ -79,7 +79,6 @@ module Watir
 
     # the OLE Internet Explorer object
     attr_accessor :ie
-
     # access to the logger object
     attr_accessor :logger
 
@@ -174,11 +173,6 @@ module Watir
       ie
     end
 
-    def create_browser_window
-      @ie = WIN32OLE.new('InternetExplorer.Application')
-    end
-    private :create_browser_window
-
     def initialize_options
       self.visible = IE.visible
       self.speed = IE.speed
@@ -290,13 +284,18 @@ module Watir
     end
 
     def self._find(how, what)
-      ieTemp = nil
+      self._find_all(how, what).first
+    end
+
+    def self._find_all(how, what)
+      ies = []
+      count = -1
       IE.each do |ie|
         window = ie.ie
 
         case how
         when :url
-          ieTemp = window if (what.matches(window.locationURL))
+          ies << window if (what.matches(window.locationURL))
         when :title
           # normal windows explorer shells do not have document
           # note window.document will fail for "new" browsers
@@ -305,33 +304,27 @@ module Watir
             title = window.document.title
           rescue WIN32OLERuntimeError
           end
-          ieTemp = window if what.matches(title)
+          ies << window if what.matches(title)
         when :hwnd
           begin
-            ieTemp = window if what == window.HWND
+            ies << window if what == window.HWND
           rescue WIN32OLERuntimeError
           end
+        when :index
+          count += 1
+          if count == what
+            ies << window
+            break
+          end
+        when nil
+          ies << window
         else
           raise ArgumentError
         end
-      end
-      return ieTemp
-    end
+      end      
 
-    def attach_browser_window how, what
-      log "Seeking Window with #{how}: #{what}"
-      ieTemp = nil
-      begin
-        Watir::until_with_timeout do
-          ieTemp = IE._find how, what
-        end
-      rescue Watir::Wait::TimeoutError
-        raise NoMatchingWindowFoundException,
-        "Unable to locate a window with #{how} of #{what}"
-      end
-      @ie = ieTemp
+      ies
     end
-    private :attach_browser_window
 
     # Return the current window handle
     def hwnd
@@ -387,6 +380,7 @@ module Watir
     # Navigate to the specified URL.
     #  * url - string - the URL to navigate to
     def goto(url)
+      url = "http://" + url unless url =~ %r{://} || url == "about:blank"
       @ie.navigate(url)
       wait
       return @down_load_time
@@ -419,9 +413,9 @@ module Watir
 
     # Execute the given JavaScript string
     def execute_script(source)
-      escaped_src = source.to_s.gsub(/[\r\n']/) {|m| "\\#{m}"}
-      document.parentWindow.eval(escaped_src)
+      document.parentWindow.eval(source.to_s)
     rescue WIN32OLERuntimeError, NoMethodError #if eval fails we need to use execScript(source.to_s) which does not return a value, hence the workaround
+      escaped_src = source.to_s.gsub(/[\r\n']/) {|m| "\\#{m}"}
       wrapper = "_watir_helper_div_#{rand(100000)}"
       cmd = "var e = document.createElement('DIV'); e.id='#{wrapper}'; e.innerHTML = eval('#{escaped_src}'); document.body.appendChild(e);"
       document.parentWindow.execScript(cmd)
@@ -523,6 +517,16 @@ module Watir
       return @ie.LocationURL
     end
 
+    def window(how={}, &blk)
+      win = Window.new(self, how, &blk)
+      win.use &blk if blk
+      win
+    end
+
+    def windows(how={}, &blk)
+      self.class._find_all(how.keys.first, how.values.first).map {|ie| Window.new(self, how, IE.bind(ie), &blk)}
+    end
+
     #
     # Synchronization
     #
@@ -754,13 +758,33 @@ module Watir
       document.focus
     end
 
-
     # Functions written for using xpath for getting the elements.
     def xmlparser_document_object
-    	if @xml_parser_doc == nil
-    		create_xml_parser_doc
-    	end
-    	return @xml_parser_doc
+      @xml_parser_doc ||= create_xml_parser_doc
+    end
+
+    def attach_command
+      "Watir::IE.attach(:hwnd, #{hwnd})"
+    end
+
+    private
+
+    def create_browser_window
+      @ie = WIN32OLE.new('InternetExplorer.Application')
+    end
+
+    def attach_browser_window how, what
+      log "Seeking Window with #{how}: #{what}"
+      ieTemp = nil
+      begin
+        Watir::until_with_timeout do
+          ieTemp = IE._find how, what
+        end
+      rescue Watir::Wait::TimeoutError
+        raise NoMatchingWindowFoundException,
+        "Unable to locate a window with #{how} of #{what}"
+      end
+      @ie = ieTemp
     end
 
     # Create the Nokogiri object if it is nil. This method is private so can be called only
@@ -771,10 +795,9 @@ module Watir
         htmlSource ="<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<HTML>\n"
         htmlSource = html_source(document.body,htmlSource," ")
         htmlSource += "\n</HTML>\n"
-				# Angrez: Resolving Jira issue WTR-114
-				htmlSource = htmlSource.gsub(/&nbsp;/, '&#160;')
+        # Angrez: Resolving Jira issue WTR-114
+        htmlSource = htmlSource.gsub(/&nbsp;/, '&#160;')
         begin
-         #@xml_parser_doc = Nokogiri::HTML::Document.new(htmlSource)
           @xml_parser_doc = Nokogiri.parse(htmlSource)
         rescue => e
           output_xml_parser_doc("error.xml", htmlSource)
@@ -782,14 +805,12 @@ module Watir
         end
       end
     end
-    private :create_xml_parser_doc
 
     def output_xml_parser_doc(name, text)
       file = File.open(name,"w")
       file.print(text)
       file.close
     end
-    private :output_xml_parser_doc
 
     #Function Tokenizes the tag line and returns array of tokens.
     #Token could be either tagName or "=" or attribute name or attribute value
@@ -840,7 +861,6 @@ module Watir
       end
       return tokens
     end
-    private :tokenize_tagline
 
     # This function get and clean all the attributes of the tag.
     def all_tag_attributes(outerHtml)
@@ -881,7 +901,6 @@ module Watir
       #puts tagLine
       return tagLine
     end
-    private :all_tag_attributes
 
     # This function is used to escape the characters that are not valid XML data.
     def xml_escape(str)
@@ -891,7 +910,6 @@ module Watir
       str = str.gsub(/"/, '&quot;')
       str
     end
-    private :xml_escape
 
     # Returns HTML Source
     # Traverse the DOM tree rooted at body element
@@ -921,7 +939,6 @@ module Watir
           htmlString += xml_escape(element_text)
           return htmlString
         end
-        #puts tagName
         #Skip comment and script tag
         if tagName =~ /^!/ || tagName== "script" || tagName =="style"
           return htmlString
@@ -953,78 +970,26 @@ module Watir
       end
       return htmlString
     end
-    private :html_source
-
-    # execute css selector and return an array of (ole object) elements
-    def elements_by_css(selector)
-      xmlparser_document_object # Needed to ensure Nokogiri has been loaded
-      xpath = Nokogiri::CSS.xpath_for(selector)[0]
-      elements_by_xpath(xpath)
-    end
-
-    # return the first (ole object) element that matches the css selector
-    def element_by_css(selector)
-      temp = elements_by_css(selector)
-      return temp[0] if temp
-    end
-
-    # return the first element that matches the xpath
-    def element_by_xpath(xpath)
-      temp = elements_by_xpath(xpath)
-      temp = temp[0] if temp
-      return temp
-    end
-
-    # execute xpath and return an array of elements
-    def elements_by_xpath(xpath)
-      doc = xmlparser_document_object
-      modifiedXpath = ""
-      selectedElements = Array.new
-
-      # strip any trailing slash from the xpath expression (as used in watir unit tests)
-      xpath.chop! unless (/\/$/ =~ xpath).nil?
-
-      doc.xpath(xpath).each do |element|
-        modifiedXpath = element.path
-        temp = element_by_absolute_xpath(modifiedXpath) # temp = a DOM/COM element
-        selectedElements << temp if temp != nil
-      end
-      #puts selectedElements.length
-      if selectedElements.length == 0
-        return nil
-      else
-        return selectedElements
-      end
-    end
 
     # Method that iterates over IE DOM object and get the elements for the given
     # xpath.
     def element_by_absolute_xpath(xpath)
       curElem = nil
+      xpath = xpath.scan(/^.*\/body\[?\d*\]?\/(.*)/).flatten.first
+      return unless xpath
 
-      #puts "Hello; Given xpath is : #{xpath}"
-      doc = document
-      curElem = doc.getElementsByTagName("body").item(0)
-      xpath =~ /^.*\/body\[?\d*\]?\/(.*)/
-      xpath = $1
-
-      if xpath == nil
-        puts "Function Requires absolute XPath."
-        return
-      end
-
-      arr = xpath.split(/\//)
+      arr = xpath.split("/")
       return nil if arr.length == 0
 
-      lastTagName = arr[arr.length-1].to_s.upcase
+      doc = document
+      curElem = doc.getElementsByTagName("body").item(0)
+      lastTagName = arr.last.to_s.upcase
 
       # lastTagName is like tagName[number] or just tagName. For the first case we need to
       # separate tagName and number.
-      lastTagName =~ /(\w*)\[?\d*\]?/
-      lastTagName = $1
-      #puts lastTagName
+      lastTagName = lastTagName.scan(/(\w*)\[?\d*\]?/).flatten.first
 
-      for element in arr do
+      arr.each do |element|
         element =~ /(\w*)\[?(\d*)\]?/
         tagname = $1
         tagname = tagname.upcase
@@ -1036,51 +1001,58 @@ module Watir
           index = 0
         end
 
-        #puts "#{element} #{tagname} #{index}"
-        allElemns = curElem.childnodes
-        if allElemns == nil || allElemns.length == 0
-          puts "#{element} is null"
-          next # Go to next element
-        end
+        allElemns = tagname == "FRAME" ? [curElem] : curElem.childnodes
+        next if allElemns == nil || allElemns.length == 0
 
-        #puts "Current element is : #{curElem.tagName}"
         allElemns.each do |child|
-          gotIt = false
           begin
             curTag = child.tagName
-            curTag = EMPTY_TAG_NAME if curTag == ""
+            curTag = EMPTY_TAG_NAME if curTag.empty?
           rescue
             next
           end
-          #puts child.tagName
+
           if curTag == tagname
-            index-=1
+            index -= 1
             if index < 0
               curElem = child
               break
             end
           end
         end
-
-      #puts "Node selected at index #{index.to_s} : #{curElem.tagName}"
-      end
-      begin
-        if curElem.tagName == lastTagName
-          #puts curElem.tagName
-          return curElem
-        else
-          return nil
-        end
-      rescue
-        return nil
       end
+
+      curElem.tagName == lastTagName ? curElem : nil rescue nil
     end
-    private :element_by_absolute_xpath
 
-    def attach_command
-      "Watir::IE.attach(:hwnd, #{hwnd})"
+    # execute css selector and return an array of (ole object) elements
+    def elements_by_css(selector)
+      xmlparser_document_object # Needed to ensure Nokogiri has been loaded
+      xpath = Nokogiri::CSS.xpath_for(selector)[0]
+      elements_by_xpath(xpath)
     end
 
+    # return the first (ole object) element that matches the css selector
+    def element_by_css(selector)
+      elements_by_css(selector)[0]
+    end
+
+    # return the first element that matches the xpath
+    def element_by_xpath(xpath)
+      elements_by_xpath(xpath)[0]
+    end
+
+    # execute xpath and return an array of elements
+    def elements_by_xpath(xpath)
+      doc = xmlparser_document_object
+
+      # strip any trailing slash from the xpath expression (as used in watir unit tests)
+      xpath.chop! if xpath =~ /\/$/
+
+      doc.xpath(xpath).reduce([]) do |memo, element|
+        memo << element_by_absolute_xpath(element.path)
+      end.compact
+    end
 
   end # class IE
 end