watir 1.9.2 → 2.0.0.rc2

data/lib/watir/locator.rb

@@ -16,6 +16,8 @@ module Watir
           how = :value
         when :method
           how = :form_method
+        when :value
+          what = what.is_a?(Regexp) ? what : what.to_s
         end
 
         @specifiers[how] = what
@@ -23,41 +25,59 @@ module Watir
     end
 
     def match_with_specifiers?(element)
-      @specifiers.each do |how, what|
-        next if how == :index
-        return false unless match? element, how, what
+      @specifiers.all? {|how, what| how == :index || match?(element, how, what)}
+    end
+
+    def set_specifier(how, what=nil)
+      specifiers = what ? {how => what} : how
+      @specifiers = {:index => Watir::Browser.base_index} # default if not specified
+      normalize_specifiers! specifiers
+    end
+
+    def locate_by_xpath_css_ole
+      if @specifiers[:xpath]
+        return @container.element_by_xpath(@specifiers[:xpath])
+      elsif @specifiers[:css]
+        return @container.element_by_css(@specifiers[:css])
+      elsif @specifiers[:ole_object]
+        return @specifiers[:ole_object]
       end
-      return true
     end
   end
 
   class TaggedElementLocator < Locator
-    def initialize(container, tag)
+    def initialize(container, tag, klass)
       @container = container
       @tag = tag
-    end
-
-    def set_specifier(how, what)
-      if how.class == Hash and what.nil?
-        specifiers = how
-      else
-        specifiers = {how => what}
-      end
-
-      @specifiers = {:index => 1} # default if not specified
-      normalize_specifiers! specifiers
+      @klass = klass || Element
     end
 
     def each_element tag
-      @container.document.getElementsByTagName(tag).each do |ole_element|
-        yield Element.new(ole_element)
+      @container.document.getElementsByTagName(tag).each do |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 unless @klass == TableRow
+        end
+        yield element
       end
     end
 
-    def locate
-      count = 0
-      each_element(@tag) do |element|
+    def each
+      each_element(@tag) do |element| 
         next unless match_with_specifiers?(element)
+        yield element          
+      end 
+      nil
+    end    
+
+    def locate
+      return locate_by_xpath_css_ole if @specifiers[:xpath] || @specifiers[:css] || @specifiers[:ole_object]
+
+      count = Watir::Browser.base_index - 1
+      each do |element|
         count += 1
         return element.ole_object if count == @specifiers[:index]
       end # elements
@@ -75,7 +95,7 @@ module Watir
       when 0
         what.matches method.call
       when 1
-       	method.call(what)
+        method.call(what)
       else
         raise MissingWayOfFindingObjectException,
           "#{how} is an unknown way of finding a <#{@tag}> element (#{what})"
@@ -85,38 +105,56 @@ module Watir
   end
 
   class FrameLocator < TaggedElementLocator
-    attr_accessor :tag
-
     def initialize(container)
       @container = container
+      @tags = Frame::TAG
     end
 
     def each_element tag
       frames = @container.document.frames
       i = 0
-      @container.document.getElementsByTagName(tag).each do |frame|
-        element = Element.new(frame)
-        document = frames.item(i)
-        yield element, document
+      @container.document.getElementsByTagName(tag).each do |ole_object|
+        frame = Frame.new(@container, @specifiers, nil)
+        frame.ole_object = ole_object
+        frame.document = frames.item(i)
+        def frame.locate; @o; end
+        yield frame
         i += 1
       end
     end
 
+    def each
+      @tags.each do |tag|
+        each_element(tag) do |element| 
+          next unless match_with_specifiers?(element)
+          yield element          
+        end 
+      end
+      nil
+    end        
+
     def locate
-      count = 0
-      each_element(@tag) do |element, document|
-        next unless match_with_specifiers?(element)
+      return locate_by_xpath_css_ole if @specifiers[:xpath] || @specifiers[:css] || @specifiers[:ole_object]      
+
+      count = Watir::Browser.base_index - 1
+      each do |frame|
         count += 1
-        return element.ole_object, document if count == @specifiers[:index]
-      end # elements
-      nil
+        return frame.ole_object, frame.document if count == @specifiers[:index]
+      end
     end
   end
 
   class FormLocator < TaggedElementLocator
+    def initialize(container)
+      super(container, 'FORM', Form)
+    end
+
     def each_element(tag)
       @container.document.forms.each do |form|
-        yield FormElement.new(form)
+        form_element = Form.new(@container, @specifiers, nil)
+        form_element.ole_object = form
+        def form_element.locate; @o; end
+        yield form_element
       end
     end
   end
@@ -125,48 +163,45 @@ module Watir
 
     attr_accessor :document, :element, :elements, :klass
 
-    def initialize container, types
+    def initialize container, types, klass
       @container = container
       @types = types
       @elements = nil
-      @klass = Element
+      @klass = klass || Element
     end
-    
-    def specifier= arg
-      how, what, value = arg
 
-      if how.class == Hash and what.nil?
-        specifiers = how
-      else
-        specifiers = {how => what}
-      end
-
-      @specifiers = {:index => 1} # default if not specified
-      if value
-        @specifiers[:value] = value.is_a?(Regexp) ? value : value.to_s
-      end
-
-      normalize_specifiers! specifiers
-    end
-
-    def locate
-      count = 0
+    def each_element
       @elements.each do |object|
         if @klass == Element
           element = Element.new(object)
         else
           element = @klass.new(@container, @specifiers, nil)
           element.ole_object = object
-          def element.locate; @o; end
+          def element.locate; @o; end          
         end
+        yield element
+      end
+      nil
+    end    
 
-        next unless @types.include?(element.type) && match_with_specifiers?(element)
-        
+    def locate
+      return locate_by_xpath_css_ole if @specifiers[:xpath] || @specifiers[:css] || @specifiers[:ole_object]
+
+      count = Watir::Browser.base_index - 1
+      each do |element|
         count += 1
-        return object if count == @specifiers[:index]
+        return element.ole_object if count == @specifiers[:index]
       end
-      nil
     end
+
+    def each
+      each_element do |element| 
+        next unless @types.include?(element.type) && match_with_specifiers?(element)
+        yield element
+      end 
+      nil
+    end    
+    
     # return true if the element matches the provided how and what
     def match? element, how, what
       begin
@@ -191,7 +226,7 @@ module Watir
 
       the_id = @specifiers[:id]
       if the_id && the_id.class == String &&
-          @specifiers[:index] == 1 && @specifiers.length == 2
+          @specifiers[:index] == Watir::Browser.base_index && @specifiers.length == 2
         @element = @document.getElementById(the_id) rescue nil
         # Return if our fast match really HAS a matching :id
         return true if @element && @element.invoke('id') == the_id && @types.include?(@element.getAttribute('type'))
@@ -209,17 +244,7 @@ module Watir
   # get all the elements by forcing @tag to be '*'
   class ElementLocator < TaggedElementLocator
     def initialize(container)
-      @container = container
+      super(container, "*", Element)
     end
-    
-    def each
-      count = 0
-      each_element('*') do |element| 
-        next unless match_with_specifiers?(element)
-        yield element          
-      end 
-      nil
-    end
-    
   end  
 end    

data/lib/watir/modal_dialog.rb

@@ -76,5 +76,11 @@ module Watir
       return @modal.exists?
     end
     alias :exist? :exists?
+
+    Watir::Container.module_eval do
+      def modal_dialog(*args)
+        ModalDialog.new(self)
+      end
+    end
   end
-end
+end

data/lib/watir/non_control_elements.rb

@@ -6,28 +6,8 @@ module Watir
   # many of the methods available to this object are inherited from the Element class
   #
   class NonControlElement < Element
-
-    def self.inherited subclass
-      class_name = Watir::Util.demodulize(subclass.to_s)
-      method_name = Watir::Util.underscore(class_name)
-      Watir::Container.module_eval <<-RUBY
-        def #{method_name}(how, what=nil)
-          return #{class_name}.new(self, how, what)
-        end
-      RUBY
-    end
     include Watir::Exception
 
-    def locate
-      if @how == :xpath
-        @o = @container.element_by_xpath(@what)
-      elsif @how == :css
-        @o = @container.element_by_css(@what)
-      else
-        @o = @container.locate_tagged_element(self.class::TAG, @how, @what)
-      end
-    end
-
     def initialize(container, how, what)
       set_container container
       @how = how
@@ -54,38 +34,8 @@ module Watir
     end
   end
 
-
-  class Pre < NonControlElement
-    TAG = 'PRE'
-  end
-
-  class P < NonControlElement
-    TAG = 'P'
-  end
-
-  # this class is used to deal with Div tags in the html page. http://msdn.microsoft.com/workshop/author/dhtml/reference/objects/div.asp?frame=true
-  # It would not normally be created by users
-  class Div < NonControlElement
-    TAG = 'DIV'
-  end
-
-  # this class is used to deal with Span tags in the html page. It would not normally be created by users
-  class Span < NonControlElement
-    TAG = 'SPAN'
-  end
-
-  class Map < NonControlElement
-    TAG = 'MAP'
-  end
-
-  class Area < NonControlElement
-    TAG = 'AREA'
-  end
-
   # Accesses Label element on the html page - http://msdn.microsoft.com/workshop/author/dhtml/reference/objects/label.asp?frame=true
   class Label < NonControlElement
-    TAG = 'LABEL'
-
     # this method is used to populate the properties in the to_s method
     def label_string_creator
       n = []
@@ -105,44 +55,10 @@ module Watir
     end
   end
 
-  class Li < NonControlElement
-    TAG = 'LI'
-  end
-  class Ul < NonControlElement
-    TAG = 'UL'
-  end
-  class H1 < NonControlElement
-    TAG = 'H1'
-  end
-  class H2 < NonControlElement
-    TAG = 'H2'
-  end
-  class H3 < NonControlElement
-    TAG = 'H3'
-  end
-  class H4 < NonControlElement
-    TAG = 'H4'
-  end
-  class H5 < NonControlElement
-    TAG = 'H5'
+  %w[pre p div span map area li ul h1 h2 h3 h4 h5 h6 dl dt dd strong em].each do |elem|
+    module_eval %Q{
+      class #{elem.capitalize} < NonControlElement; end
+    }
   end
-  class H6 < NonControlElement
-    TAG = 'H6'
-  end
-  class Dl < NonControlElement
-    TAG = 'DL'
-  end
-  class Dt < NonControlElement
-    TAG = 'DT'
-  end
-  class Dd < NonControlElement
-    TAG = 'DD'
-  end
-  class Strong < NonControlElement
-    TAG = 'STRONG'
-  end
-  class Em < NonControlElement
-    TAG = 'EM'
-  end
-
+  
 end

data/lib/watir/table.rb

@@ -7,7 +7,7 @@ module Watir
   #
   class Table < Element
     include Container
-    
+
     # Returns the table object containing the element
     #   * container  - an instance of an IE object
     #   * anElement  - a Watir object (TextField, Button, etc.)
@@ -29,18 +29,6 @@ module Watir
       super nil
     end
     
-    def locate
-      if @how == :xpath
-        @o = @container.element_by_xpath(@what)
-      elsif @how == :css
-        @o = @container.element_by_css(@what)
-      elsif @how == :ole_object
-        @o = @what
-      else
-        @o = @container.locate_tagged_element('TABLE', @how, @what)
-      end
-    end
-    
     # override the highlight method, as if the tables rows are set to have a background color,
     # this will override the table background color, and the normal flash method won't work
     def highlight(set_or_clear)
@@ -89,7 +77,7 @@ module Watir
     # iterates through the rows in the table. Yields a TableRow object
     def each
       assert_exists
-      1.upto(@o.rows.length) do |i| 
+      0.upto(@o.rows.length - 1) do |i| 
         yield TableRow.new(@container, :ole_object, _row(i))
       end
     end
@@ -117,7 +105,7 @@ module Watir
     # This method returns the number of columns in a row of the table.
     # Raises an UnknownObjectException if the table doesn't exist.
     #   * index         - the index of the row
-    def column_count(index=1)
+    def column_count(index=0)
       assert_exists
       _row(index).cells.length
     end
@@ -135,7 +123,7 @@ module Watir
       y
     end
     
-    def table_body(index=1)
+    def table_body(index=0)
       return @o.getElementsByTagName('TBODY')[index]
     end
     private :table_body
@@ -153,7 +141,7 @@ module Watir
     
     # returns an ole object
     def _row(index)
-      return @o.invoke("rows").item(index - 1)
+      return @o.invoke("rows").item(index)
     end
     private :_row
     
@@ -163,14 +151,14 @@ module Watir
     # row of the table
     #   * columnnumber  - column index to extract values from
     def column_values(columnnumber)
-      return (1..row_count).collect {|i| self[i][columnnumber].text}
+      return (0..row_count - 1).collect {|i| self[i][columnnumber].text}
     end
     
     # Returns an array containing all the text values in the specified row
     # Raises an UnknownObjectException if the table doesn't exist.
     #   * rownumber  - row index to extract values from
     def row_values(rownumber)
-      return (1..column_count(rownumber)).collect {|i| self[rownumber][i].text}
+      return (0..column_count(rownumber) - 1).collect {|i| self[rownumber][i].text}
     end
     
   end
@@ -199,12 +187,12 @@ module Watir
     
     # returns an ole table body
     def ole_table_body_at_index(n)
-      return @o.tBodies.item(n-1)
+      return @o.tBodies.item(n)
     end
     
     # iterates through each of the TableBodies in the Table. Yields a TableBody object
     def each
-      1.upto(@o.tBodies.length) do |i| 
+      0.upto(@o.tBodies.length - 1) do |i| 
         yield TableBody.new(@container, :ole_object, ole_table_body_at_index(i))
       end
     end
@@ -239,13 +227,13 @@ module Watir
     # returns the specified row as a TableRow object
     def [](n)
       assert_exists
-      return @rows[n - 1]
+      return @rows[n]
     end
     
     # iterates through all the rows in the table body
     def each
       locate
-      0.upto(@rows.length - 1) { |i| yield @rows[i] }
+      0.upto(length - 1) { |i| yield @rows[i] }
     end
     
     # returns the number of rows in this table body.
@@ -255,18 +243,10 @@ module Watir
   end
     
   class TableRow < Element
+    TAG = "TR"
     
     def locate
-      @o = nil
-      if @how == :ole_object
-        @o = @what
-      elsif @how == :xpath
-        @o = @container.element_by_xpath(@what)
-      elsif @how == :css
-        @o = @container.element_by_css(@what)
-      else
-        @o = @container.locate_tagged_element("TR", @how, @what)
-      end
+      super
       if @o # cant call the assert_exists here, as an exists? method call will fail
         @cells = []
         @o.cells.each do |oo|
@@ -290,16 +270,16 @@ module Watir
     # this method iterates through each of the cells in the row. Yields a TableCell object
     def each
       locate
-      0.upto(@cells.length-1) { |i| yield @cells[i] }
+      0.upto(@cells.length - 1) { |i| yield @cells[i] }
     end
     
     # Returns an element from the row as a TableCell object
     def [](index)
       assert_exists
-      if @cells.length < index
+      if @cells.length <= index
         raise UnknownCellException, "Unable to locate a cell at index #{index}" 
       end
-      return @cells[(index - 1)]
+      return @cells[index]
     end
     
     # defaults all missing methods to the array of elements, to be able to
@@ -349,24 +329,28 @@ module Watir
         return inner_table?(cell, parent_element)
       end
     end
+
+    Watir::Container.module_eval do
+      def row(how={}, what=nil)
+        TableRow.new(self, how, what)
+      end
+
+      alias_method :tr, :row
+
+      def rows(how={}, what=nil)
+        TableRows.new(self, how, what)
+      end
+
+      alias_method :trs, :rows
+    end
   end
   
   # this class is a table cell - when called via the Table object
   class TableCell < Element
     include Watir::Exception
     include Container
-    
-    def locate
-      if @how == :xpath
-        @o = @container.element_by_xpath(@what)
-      elsif @how == :css
-        @o = @container.element_by_css(@what)
-      elsif @how == :ole_object
-        @o = @what
-      else
-        @o = @container.locate_tagged_element("TD", @how, @what)
-      end
-    end
+
+    TAG = "TD"
     
     # Returns an initialized instance of a table cell
     #   * container  - an  IE object
@@ -397,6 +381,19 @@ module Watir
       @o.colSpan
     end
     
+    Watir::Container.module_eval do
+      def cell(how={}, what=nil)
+        TableCell.new(self, how, what)
+      end
+
+      alias_method :td, :cell
+
+      def cells(how={}, what=nil)
+        TableCells.new(self, how, what)
+      end
+
+      alias_method :tds, :cells
+    end
   end
   
-end
+end