watir 1.9.2 → 2.0.0.rc2

data/lib/watir/dialogs/javascript.rb

@@ -27,6 +27,13 @@ module Watir
       @window ||= ::RAutomation::Window.new(:title => @opts[:title] || /^(#{WINDOW_TITLES.join('|')})$/)
     end
 
+    Watir::Container.module_eval do
+      def javascript_dialog(opts={})
+        JavascriptDialog.new(opts)
+      end
+
+      alias_method :dialog, :javascript_dialog
+    end
   end
 end
 

data/lib/watir/element.rb

@@ -10,15 +10,35 @@ module Watir
     # number of spaces that separate the property from the value in the to_s method
     TO_S_SIZE = 14
 
+    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)
+          #{class_name}.new(self, how, what)
+        end
+
+        def #{method_name}s(how={}, what=nil)
+          #{class_name}s.new(self, how, what)
+        end         
+      RUBY
+    end
+
     # ole_object - the ole object for the element being wrapped
     def initialize(ole_object)
       @o = ole_object
       @original_color = nil
     end
 
+    def locate
+      return if [Element, TableBodies].include? self.class
+      tag = self.class.constants.include?("TAG") ? self.class::TAG : self.class.name.split("::").last
+      @o = @container.tagged_element_locator(tag, @how, @what).locate
+    end    
+
     # Return the ole object, allowing any methods of the DOM that Watir doesn't support to be used.
-    def ole_object # BUG: should use an attribute reader and rename the instance variable
-      return @o
+    def ole_object
+      @o
     end
 
     def ole_object=(o)
@@ -52,7 +72,7 @@ module Watir
 
     public
     def assert_exists
-      locate if respond_to?(:locate)
+      locate
       unless ole_object
         raise UnknownObjectException.new(
                 Watir::Exception.message_for_unable_to_locate(@how, @what))
@@ -371,7 +391,7 @@ module Watir
     # Returns whether this element actually exists.
     def exists?
       begin
-        locate if defined?(locate)
+        locate
       rescue WIN32OLERuntimeError, UnknownObjectException
         @o = nil
       end

data/lib/watir/element_collections.rb

@@ -6,48 +6,40 @@ module Watir
     
     # Super class for all the iteractor classes
     #   * container - an instance of an IE object
-    def initialize(container)
+    def initialize(container, how, what)
+      if how == :index || (how.is_a?(Hash) && how[:index])
+        _how = what ? "#{how.inspect}, #{what.inspect}" : "#{how.inspect}"
+        raise Exception::MissingWayOfFindingObjectException,
+                    "#{self.class} does not support attribute :index in #{_how}"
+      end
+
       @container = container
+      @how = how
+      @what = what
+      @length = length
       @page_container = container.page_container
-      @length = length # defined by subclasses
-      
-      # set up the items we want to display when the show method is used
-      set_show_items
-    end
-    
-    private
-    def set_show_items
-      @show_attributes = AttributeLengthPairs.new("id", 20)
-      @show_attributes.add("name", 20)
     end
     
-    public
-    def get_length_of_input_objects(object_type)
-      object_types =
-      if object_type.kind_of? Array
-        object_type
-      else
-        [object_type]
-      end
-      
-      length = 0
-      objects = @container.document.getElementsByTagName("INPUT")
-      if objects.length > 0
-        objects.each do |o|
-          length += 1 if object_types.include?(o.invoke("type").downcase)
-        end
-      end
-      return length
+    def length
+      count = 0
+      each {|element| count += 1 }
+      count
     end
-    
+
+    alias_method :size, :length
+
     # iterate through each of the elements in the collection in turn
     def each
-      0.upto(@length-1) { |i| yield iterator_object(i) }
+      @container.tagged_element_locator(element_tag, @how, @what, element_class).each {|element| yield element}
     end
     
     # allows access to a specific item in the collection
     def [](n)
-      return iterator_object(n-1)
+      unless n.between?(0, length - 1)
+        raise Exception::MissingWayOfFindingObjectException,
+          "Can't find #{element_tag.downcase} with :index #{n} from #{self.class} with size of #{length}"
+      end
+      return iterator_object(n)
     end
 
     def first
@@ -58,29 +50,6 @@ module Watir
       iterator_object(length - 1)
     end
 
-    # this method is the way to show the objects, normally used from irb
-    def show
-      s = "index".ljust(6)
-      @show_attributes.each do |attribute_length_pair|
-        s += attribute_length_pair.attribute.ljust(attribute_length_pair.length)
-      end
-      
-      index = 1
-      self.each do |o|
-        s += "\n"
-        s += index.to_s.ljust(6)
-        @show_attributes.each do |attribute_length_pair|
-          begin
-            s += eval('o.ole_object.invoke("#{attribute_length_pair.attribute}")').to_s.ljust(attribute_length_pair.length)
-          rescue => e
-            s += " ".ljust(attribute_length_pair.length)
-          end
-        end
-        index += 1
-      end
-      puts s
-    end
-    
     def to_s
       map { |e| e.to_s }.join("\n")
     end
@@ -89,10 +58,19 @@ module Watir
       '#<%s:0x%x length=%s container=%s>' % [self.class, hash*2, @length.inspect, @container.inspect]
     end
 
-    # this method creates an object of the correct type that the iterators use
     private
+
     def iterator_object(i)
-      element_class.new(@container, :index, i + 1)
+      count = 0
+      each {|e| return e if count == i; count += 1}
+    end
+    
+    def element_class
+      Watir.const_get self.class.name.split("::").last.chop
+    end
+
+    def element_tag
+      element_class.constants.include?("TAG") ? element_class::TAG : element_class.name.split("::").last
     end
   end
-end
+end

data/lib/watir/form.rb

@@ -1,8 +1,16 @@
 module Watir
 
-  # Forms
+  class Form < Element
+    #   * 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
+    def initialize(container, how, what)
+      set_container container
+      @how = how
+      @what = what
+      copy_test_config container
+    end
 
-  class FormElement < Element
     def_wrap_guard :action
 
     def name
@@ -22,38 +30,10 @@ module Watir
       else
         super(arg)
       end
-    end
-  end
-  
-  #   Form Factory object
-  class Form < FormElement
-    include Container
-    
-    attr_accessor :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
-    def initialize(container, how, what)
-      set_container container
-      @how = how
-      @what = what
-      copy_test_config container
-    end
+    end    
 
     def locate
-      log "Get form how is #{@how}  what is #{@what} "
-
-      # Get form using xpath.
-      if @how == :xpath
-        @o = @container.element_by_xpath(@what)
-      elsif @how == :css
-        @o = @container.element_by_css(@what)
-      else
-        locator = FormLocator.new(@container, 'FORM')
-        locator.set_specifier(@how, @what)
-        @o = locator.locate
-      end
+      @o = @container.locator_for(FormLocator, @how, @what).locate
     end
 
     # Submit the data -- equivalent to pressing Enter or Return to submit a form.
@@ -119,4 +99,4 @@ module Watir
     
   end # class Form
   
-end
+end

data/lib/watir/frame.rb

@@ -1,35 +1,22 @@
 module Watir
   class Frame < Element
     include PageContainer
+    TAG = ['FRAME', 'IFRAME']
+
+    attr_accessor :document
 
     # Find the frame denoted by how and what in the container and return its ole_object
     def locate
-      @o = nil
-      if @how == :xpath
-        @o = @container.element_by_xpath(@what)
-      elsif @how == :css
-        @o = @container.element_by_css(@what)
-      else      
-        locator = FrameLocator.new(@container)
-        locator.set_specifier(@how, @what)
-        ['FRAME', 'IFRAME'].each do |frame_tag|
-          locator.tag = frame_tag
-          located_frame, document = locator.locate
-          unless (located_frame.nil? && document.nil?)
-            @o = located_frame
-            begin
-              @document = document.document
-            rescue WIN32OLERuntimeError => e
-              if e.message =~ /Access is denied/
-                # This frame's content is not directly accessible but let the
-                # user continue so they can access the frame properties
-              else
-                raise e
-              end
-            end
-            break
-          end
-        end
+      frame, document = @container.locator_for(FrameLocator, @how, @what).locate
+      if frame && document
+        @o = frame
+        begin
+          @document = document.document
+        rescue WIN32OLERuntimeError => e
+          # This frame's content is not directly accessible but let the
+          # user continue so they can access the frame properties            
+          raise e unless e.message =~ /Access is denied/
+        end        
       end
     end
 
@@ -59,4 +46,4 @@ module Watir
     end
     
   end
-end
+end

data/lib/watir/html_element.rb

@@ -4,6 +4,8 @@
 # all share the same class.
 module Watir
   class HTMLElement < Element
+    TAG = "*"
+
     def initialize(container, how, what)
       set_container container
       @how = how
@@ -15,8 +17,14 @@ module Watir
       super nil
     end
     
-    def locate
-      @o = @container.locate_tagged_element('*', @how, @what)
+    Watir::Container.module_eval do
+      def element(how={}, what=nil)
+        HTMLElement.new(self, how, what)  
+      end
+      
+      def elements(how={}, what=nil)
+        HTMLElements.new(self, how, what)  
+      end
     end
   end
-end
+end

data/lib/watir/ie-class.rb

@@ -17,7 +17,7 @@ module Watir
     # Return the options used when creating new instances of IE.
     # BUG: this interface invites misunderstanding/misuse such as IE.options[:speed] = :zippy]
 		def self.options
-			{:speed => self.speed, :visible => self.visible, :attach_timeout => self.attach_timeout}
+			{:speed => self.speed, :visible => self.visible, :attach_timeout => self.attach_timeout, :zero_based_indexing => self.zero_based_indexing}
 	  end
     # set values for options used when creating new instances of IE.
 		def self.set_options options
@@ -49,6 +49,15 @@ module Watir
 			@@visible = x
 		end
 
+    @@zero_based_indexing = true
+    def self.zero_based_indexing= enabled
+      @@zero_based_indexing = enabled
+    end
+
+    def self.zero_based_indexing
+      @@zero_based_indexing
+    end
+
     # Used internally to determine when IE has finished loading a page
     READYSTATES = {:complete => 4}
 

data/lib/watir/image.rb

@@ -6,6 +6,8 @@ module Watir
   # many of the methods available to this object are inherited from the Element class
   #
   class Image < Element
+    TAG = "IMG"
+
     def initialize(container, how, what)
       set_container container
       @how = how
@@ -13,16 +15,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)
-      else
-        @o = @container.locate_tagged_element('IMG', @how, @what)
-      end
-    end
-    
     # this method produces the properties for an image as an array
     def image_string_creator
       n = []
@@ -131,4 +123,4 @@ module Watir
     private :fill_save_image_dialog
   end
   
-end
+end

data/lib/watir/input_elements.rb

@@ -2,7 +2,8 @@ module Watir
   
   class InputElement < Element #:nodoc:all
     def locate
-      @o = @container.locate_input_element(@how, @what, self.class::INPUT_TYPES)
+      locator_or_element = @container.input_element_locator(@how, @what, self.class::INPUT_TYPES, self.class)
+      @o = locator_or_element.is_a?(WIN32OLE) ? locator_or_element : locator_or_element.locate
     end
     def initialize(container, how, what)
       set_container container
@@ -482,14 +483,6 @@ module Watir
   #--
   # most of the methods available to this element are inherited from the Element class
   class RadioCheckCommon < InputElement
-    def locate #:nodoc:
-      @o = @container.locate_input_element(@how, @what, self.class::INPUT_TYPES, @value, self.class)
-    end
-    def initialize(container, how, what, value=nil)
-      super container, how, what
-      @value = value
-    end
-    
     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]
     end
@@ -542,7 +535,7 @@ 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
+  class Checkbox < RadioCheckCommon
     INPUT_TYPES = ["checkbox"]
     # This method checks or unchecks the checkbox.
     # With no arguments supplied it sets the checkbox.
@@ -567,6 +560,13 @@ module Watir
       set false
     end
 
+    Watir::Container.module_eval do
+      remove_method :checkboxs
+
+      def checkboxes(how={}, what=nil)
+        Checkboxes.new(self, how, what)
+      end
+    end
   end
 
-end
+end

data/lib/watir/link.rb

@@ -5,6 +5,8 @@ module Watir
   # many of the methods available to this object are inherited from the Element class
   #
   class Link < Element
+    TAG = "A"
+
     # Returns an initialized instance of a link object
     #   * container  - an instance of a container
     #   * how         - symbol - how we access the link
@@ -16,20 +18,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)
-      else
-        begin
-          @o = @container.locate_tagged_element('A', @how, @what)
-        rescue UnknownObjectException
-          @o = nil
-        end
-      end
-    end
-    
     # if an image is used as part of the link, this will return true
     def link_has_image
       assert_exists
@@ -62,6 +50,11 @@ module Watir
       r = r + link_string_creator
       return r.join("\n")
     end
+
+    Watir::Container.module_eval do
+      alias_method :a, :link
+      alias_method :as, :links
+    end
   end
   
-end
+end