watir 1.5.2 → 1.5.3

data/watir/popup.rb

@@ -0,0 +1,30 @@
+module Watir
+  # POPUP object
+  class PopUp
+    def initialize(container)
+      @container = container
+      @page_container = container.page_container
+    end
+    
+    def button(caption)
+      return JSButton.new(@container.getIE.hwnd, caption)
+    end
+  end
+  
+  class JSButton
+    def initialize(hWnd, caption)
+      @hWnd = hWnd
+      @caption = caption
+    end
+    
+    def startClicker(waitTime=3)
+      clicker = WinClicker.new
+      clicker.clickJSDialog_Thread
+      # clickerThread = Thread.new(@caption) {
+      #   sleep waitTime
+      #   puts "After the wait time in startClicker"
+      #   clickWindowsButton_hwnd(hwnd, buttonCaption)
+      #}
+    end
+  end
+end

data/watir/table.rb

@@ -0,0 +1,356 @@
+module Watir
+
+  # This class is used for dealing with tables.
+  # Normally a user would not need to create this object as it is returned by the Watir::Container#table method
+  #
+  # many of the methods available to this object are inherited from the Element class
+  #
+  class Table < Element
+    include Container
+    
+    # Returns the table object containing anElement
+    #   * container  - an instance of an IE object
+    #   * anElement  - a Watir object (TextField, Button, etc.)
+    def Table.create_from_element(container, anElement)
+      anElement.locate if defined?(anElement.locate)
+      o = anElement.ole_object.parentElement
+      o = o.parentElement until o.tagName == 'TABLE'
+      new container, :ole_object, o 
+    end
+    
+    # Returns an initialized instance of a table object
+    #   * container      - the container
+    #   * how         - symbol - how we access the table
+    #   * what         - what we use to access the table - id, name index etc
+    def initialize(container, how, what)
+      set_container container
+      @how = how
+      @what = what
+      super nil
+    end
+    
+    def locate
+      if @how == :xpath
+        @o = @container.element_by_xpath(@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)
+      
+      if set_or_clear == :set
+        begin
+          @original_border = @o.border.to_i
+          if @o.border.to_i==1
+            @o.border = 2
+          else
+            @o.border = 1
+          end
+        rescue
+          @original_border = nil
+        end
+      else
+        begin
+          @o.border= @original_border unless @original_border == nil
+          @original_border = nil
+        rescue
+          # we could be here for a number of reasons...
+        ensure
+          @original_border = nil
+        end
+      end
+      super
+    end
+    
+    # this method is used to populate the properties in the to_s method
+    def table_string_creator
+      n = []
+      n <<   "rows:".ljust(TO_S_SIZE) + self.row_count.to_s
+      n <<   "cols:".ljust(TO_S_SIZE) + self.column_count.to_s
+      return n
+    end
+    private :table_string_creator
+    
+    # returns the properties of the object in a string
+    # raises an ObjectNotFound exception if the object cannot be found
+    def to_s
+      assert_exists
+      r = string_creator
+      r += table_string_creator
+      return r.join("\n")
+    end
+    
+    # iterates through the rows in the table. Yields a TableRow object
+    def each
+      assert_exists
+      1.upto(@o.getElementsByTagName("TR").length) { |i| yield TableRow.new(@container, :ole_object, row(i))    }
+    end
+    
+    # Returns a row in the table
+    #   * index         - the index of the row
+    def [](index)
+      assert_exists
+      return TableRow.new(@container, :ole_object, row(index))
+    end
+    
+    # This method returns the number of rows in the table.
+    # Raises an UnknownObjectException if the table doesnt exist.
+    def row_count
+      assert_exists
+      #return table_body.children.length
+      return @o.getElementsByTagName("TR").length
+    end
+    
+    # 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)
+      assert_exists
+      row(index).cells.length
+    end
+    
+    # This method returns the table as a 2 dimensional array. Dont expect too much if there are nested tables, colspan etc.
+    # Raises an UnknownObjectException if the table doesn't exist.
+    # http://www.w3.org/TR/html4/struct/tables.html
+    def to_a
+      assert_exists
+      y = []
+      table_rows = @o.getElementsByTagName("TR")
+      for row in table_rows
+        x = []
+        for td in row.getElementsbyTagName("TD")
+          x << td.innerText.strip
+        end
+        y << x
+      end
+      return y
+    end
+    
+    def table_body(index=1)
+      return @o.getElementsByTagName('TBODY')[index]
+    end
+    private :table_body
+    
+    # returns a watir object
+    def body(how, what)
+      return TableBody.new(@container, how, what, self)
+    end
+    
+    # returns a watir object
+    def bodies
+      assert_exists
+      return TableBodies.new(@container, @o)
+    end
+    
+    # returns an ole object
+    def row(index)
+      return @o.invoke("rows")[(index-1).to_s]
+    end
+    private :row
+    
+    # Returns an array containing all the text values in the specified column
+    # Raises an UnknownCellException if the specified column does not exist in every
+    # Raises an UnknownObjectException if the table doesn't exist.
+    # row of the table
+    #   * columnnumber  - column index to extract values from
+    def column_values(columnnumber)
+
+      return(1..row_count).collect {|idx| self[idx][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 {|idx| self[rownumber][idx].text}
+    end
+    
+  end
+  
+  # this class is a collection of the table body objects that exist in the table
+  # it wouldnt normally be created by a user, but gets returned by the bodies method of the Table object
+  # many of the methods available to this object are inherited from the Element class
+  #
+  class TableBodies < Element
+    def initialize(container, parent_table)
+      set_container container
+      @o = parent_table     # in this case, @o is the parent table
+    end
+    
+    # returns the number of TableBodies that exist in the table
+    def length
+      assert_exists
+      return @o.tBodies.length
+    end
+    
+    # returns the n'th Body as a Watir TableBody object
+    def []n
+      assert_exists
+      return TableBody.new(@container, :ole_object, ole_table_body_at_index(n))
+    end
+    
+    # returns an ole table body
+    def ole_table_body_at_index(n)
+      return @o.tBodies[(n-1).to_s]
+    end
+    
+    # iterates through each of the TableBodies in the Table. Yields a TableBody object
+    def each
+      1.upto(@o.tBodies.length) { |i| yield TableBody.new(@container, :ole_object, ole_table_body_at_index(i)) }
+    end
+    
+  end
+  
+  # this class is a table body
+  class TableBody < Element
+    def locate
+      @o = nil
+      if @how == :ole_object
+        @o = @what     # in this case, @o is the table body
+      elsif @how == :index
+        @o = @parent_table.bodies.ole_table_body_at_index(@what)
+      end
+      @rows = []
+      if @o
+        @o.rows.each do |oo|
+          @rows << TableRow.new(@container, :ole_object, oo)
+        end
+      end
+    end
+    
+    def initialize(container, how, what, parent_table=nil)
+      set_container container
+      @how = how
+      @what = what
+      @parent_table = parent_table
+      super nil
+    end
+    
+    # returns the specified row as a TableRow object
+    def [](n)
+      assert_exists
+      return @rows[n - 1]
+    end
+    
+    # iterates through all the rows in the table body
+    def each
+      locate
+      0.upto(@rows.length - 1) { |i| yield @rows[i] }
+    end
+    
+    # returns the number of rows in this table body.
+    def length
+      return @rows.length
+    end
+  end
+  
+  
+  # this class is a table row
+  class TableRow < Element
+    
+    def locate
+      @o = nil
+      if @how == :ole_object
+        @o = @what
+      elsif @how == :xpath
+        @o = @container.element_by_xpath(@what)
+      else
+        @o = @container.locate_tagged_element("TR", @how, @what)
+      end
+      if @o # cant call the assert_exists here, as an exists? method call will fail
+        @cells = []
+        @o.cells.each do |oo|
+          @cells << TableCell.new(@container, :ole_object, oo)
+        end
+      end
+    end
+    
+    # Returns an initialized instance of a table row
+    #   * o  - the object contained in the row
+    #   * container  - an instance of an IE object
+    #   * how          - symbol - how we access the row
+    #   * what         - what we use to access the row - id, index etc. If how is :ole_object then what is a Internet Explorer Raw Row
+    def initialize(container, how, what)
+      set_container container
+      @how = how
+      @what = what
+      super nil
+    end
+    
+    # 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] }
+    end
+    
+    # Returns an element from the row as a TableCell object
+    def [](index)
+      assert_exists
+      raise UnknownCellException, "Unable to locate a cell at index #{index}" if @cells.length < index
+      return @cells[(index - 1)]
+    end
+    
+    # defaults all missing methods to the array of elements, to be able to
+    # use the row as an array
+    #        def method_missing(aSymbol, *args)
+    #            return @o.send(aSymbol, *args)
+    #        end
+    
+    def column_count
+      locate
+      @cells.length
+    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 == :ole_object
+        @o = @what
+      else
+        @o = @container.locate_tagged_element("TD", @how, @what)
+      end
+    end
+    
+    # Returns an initialized instance of a table cell
+    #   * container  - an  IE object
+    #   * how        - symbol - how we access the cell
+    #   * what       - what we use to access the cell - id, name index etc
+    def initialize(container, how, what)
+      set_container container
+      @how = how
+      @what = what
+      super nil
+    end
+    
+    def ole_inner_elements
+      locate
+      return @o.all
+    end
+    private :ole_inner_elements
+    
+    def document
+      locate
+      return @o
+    end
+    
+    alias to_s text
+    
+    def colspan
+      locate
+      @o.colSpan
+    end
+    
+  end
+  
+end

data/watir/win32.rb

@@ -0,0 +1,29 @@
+module Watir
+  module Win32
+    # this will find the IEDialog.dll file in its build location
+    @@iedialog_file = (File.expand_path(File.dirname(__FILE__) + '/..') + "/watir/IEDialog/Release/IEDialog.dll").gsub('/', '\\')
+
+    GetUnknown = Win32API.new(@@iedialog_file, 'GetUnknown', ['l', 'p'], 'v')    
+    User32 = DL.dlopen('user32')
+    FindWindowEx = User32['FindWindowEx', 'LLLpp']    
+    # method for this found in wet-winobj/wet/winobjects/WinUtils.rb
+    GetWindow = User32['GetWindow', 'ILL']
+    
+    ## GetWindows Constants
+    GW_HWNDFIRST = 0
+    GW_HWNDLAST = 1
+    GW_HWNDNEXT = 2
+    GW_HWNDPREV = 3
+    GW_OWNER = 4
+    GW_CHILD = 5
+    GW_ENABLEDPOPUP = 6
+    GW_MAX = 6
+
+    IsWindow = User32['IsWindow', 'II']
+    # Does the window with the specified window handle (hwnd) exist?
+    def self.window_exists? hwnd
+      rtn, junk = IsWindow[hwnd]
+      rtn == 1
+    end
+  end
+end  

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: watir
 version: !ruby/object:Gem::Version 
-  version: 1.5.2
-date: 2007-09-03 00:00:00 -05:00
+  version: 1.5.3
+date: 2007-10-22 00:00:00 -05:00
 summary: Automated testing tool for web applications.
 require_paths: 
 - .
@@ -31,24 +31,42 @@ authors:
 files: 
 - watir.rb
 - watir/assertions.rb
+- watir/bonus-elements.rb
 - watir/camel_case.rb
 - watir/clickJSDialog.rb
 - watir/close_all.rb
+- watir/collections.rb
+- watir/container.rb
 - watir/cookiemanager.rb
 - watir/datahandler.rb
 - watir/dialog.rb
-- watir/elements.rb
+- watir/element.rb
+- watir/element_collections.rb
 - watir/exceptions.rb
+- watir/form.rb
+- watir/frame.rb
 - watir/ie-process.rb
+- watir/ie.rb
+- watir/image.rb
+- watir/input_elements.rb
 - watir/irb-history.rb
+- watir/link.rb
+- watir/locator.rb
+- watir/logger.rb
+- watir/modal_dialog.rb
+- watir/non_control_elements.rb
+- watir/page-container.rb
+- watir/popup.rb
 - watir/process.rb
 - watir/screen_capture.rb
 - watir/setFileDialog.rb
+- watir/table.rb
 - watir/testcase.rb
 - watir/testUnitAddons.rb
 - watir/utils.rb
 - watir/waiter.rb
 - watir/watir_simple.rb
+- watir/win32.rb
 - watir/win32ole.rb
 - watir/winClicker.rb
 - watir/WindowHelper.rb