celerity 0.0.2 → 0.0.3

data/lib/celerity/container.rb

@@ -25,6 +25,34 @@ module Celerity
       assert_exists
       Tables.new(self)
     end
+    
+    def thead(*args)
+      assert_exists
+      TableHeader.new(self, *args)
+    end
+    def theads
+      assert_exists
+      TableHeaders.new(self)
+    end
+    
+    def tbody(*args)
+      assert_exists
+      TableBody.new(self, *args)
+    end
+    def tbodies
+      assert_exists
+      TableBodies.new(self)
+    end
+    
+    def tfoot(*args)
+      assert_exists
+      TableFooter.new(self, *args)
+    end
+    def tfoots
+      assert_exists
+      TableFooters.new(self)
+    end
+    alias_method :tfeet, :tfoots # :-)
 
     def cell(*args)
       assert_exists
@@ -88,13 +116,16 @@ module Celerity
       assert_exists
       SelectLists.new(self)
     end
+    
+    def option(*args)
+      assert_exists
+      Option.new(self, *args)
+    end
 
     def check_box(*args)
       assert_exists
       CheckBox.new(self, *args)
     end
-    alias_method :checkbox, :check_box
-    alias_method :checkBox, :check_box
 
     def checkboxes
       assert_exists
@@ -119,6 +150,24 @@ module Celerity
       assert_exists
       Links.new(self)
     end
+    
+    def ul(*args)
+      assert_exists
+      Ul.new(self, *args)
+    end
+    def uls
+      assert_exists
+      Uls.new(self)
+    end
+    
+    def ol(*args)
+      assert_exists
+      Ol.new(self, *args)
+    end
+    def ols
+      assert_exists
+      Ols.new(self)
+    end
 
     def li(*args)
       assert_exists
@@ -160,7 +209,6 @@ module Celerity
       assert_exists
       Div.new(self, *args)
     end
-
     def divs
       assert_exists
       Divs.new(self)
@@ -210,6 +258,55 @@ module Celerity
       assert_exists
       Labels.new(self)
     end
+    
+    def h1(*args)
+      assert_exists
+      H1.new(self, *args)
+    end
+    def h2(*args)
+      assert_exists
+      H2.new(self, *args)
+    end
+    def h3(*args)
+      assert_exists
+      H3.new(self, *args)
+    end
+    def h4(*args)
+      assert_exists
+      H4.new(self, *args)
+    end
+    def h5(*args)
+      assert_exists
+      H5.new(self, *args)
+    end
+    def h6(*args)
+      assert_exists
+      H6.new(self, *args)
+    end
+    def h1s
+      assert_exists
+      H1s.new(self)
+    end
+    def h2s
+      assert_exists
+      H2s.new(self)
+    end
+    def h3s
+      assert_exists
+      H3s.new(self)
+    end
+    def h4s
+      assert_exists
+      H4s.new(self)
+    end
+    def h5s
+      assert_exists
+      H5s.new(self)
+    end
+    def h6s
+      assert_exists
+      H6s.new(self)
+    end
 
     private
 

data/lib/celerity/disabled_element.rb

@@ -1,18 +1,20 @@
 module Celerity
   module DisabledElement
+    include Celerity::Exception
+    
     def enabled?
       !disabled?
     end
 
     def disabled?
-      assert_exists unless @object
+      assert_exists unless defined?(@object) && @object
       @object.isDisabled
     end
     alias_method :disabled, :disabled?
     
     def assert_enabled
       if disabled?
-        raise ObjectDisabledException, "Object #{@how.inspect} and #{@what.inspect} is disabled"
+        raise ObjectDisabledException, "Object #{identifier_string} is disabled"
       end
     end
     

data/lib/celerity/element.rb

@@ -9,10 +9,10 @@ module Celerity
     
     # HTML 4.01 Transitional DTD
     HTML_401_TRANSITIONAL = { 
-      :core        => [:class, :id, :style, :title], # Not valid in base, head, html, meta, param, script, style, and title elements.
+      :core        => [:class, :id, :style, :title],
       :cell_halign => [:align, :char, :charoff],
       :cell_valign => [:valign],
-      :i18n        => [:dir, :lang],  # Not valid in base, br, frame, frameset, hr, iframe, param, and script elements.
+      :i18n        => [:dir, :lang],
       :event       => [:onclick, :ondblclick, :onmousedown, :onmouseup, :onmouseover, :onmousemove, :onmouseout, :onkeypress, :onkeydown, :onkeyup],
       :sloppy      => [:name, :value]
     }
@@ -27,27 +27,29 @@ module Celerity
       
       case args.size
       when 2
-        @conditions = {args[0] => args[1]}
+        @conditions = { args[0] => args[1] }
       when 1
         if Hash === args.first
           @conditions = args.first
-        elsif defined?(self.class::DEFAULT_HOW)
-          @conditions = {self.class::DEFAULT_HOW => args.first}
+        elsif self.class::DEFAULT_HOW
+          @conditions = { self.class::DEFAULT_HOW => args.first }
         else
           raise ArgumentError, "wrong number of arguments (1 for 2)"
         end
+      else
+        raise ArgumentError, "wrong number of arguments (#{args.size} for 2)"
       end
     end
     
     def locate
-      @object ||= ElementLocator.new(@container.object, self.class).find_by_conditions(@conditions)
+      @object = ElementLocator.new(@container.object, self.class).find_by_conditions(@conditions)
     end
     
     def to_s
       assert_exists
       create_string(@object)
     end
-
+    
     def attribute_value(attribute)
       assert_exists
       @object.getAttribute(attribute)
@@ -117,6 +119,17 @@ module Celerity
         super
       end
     end
+    
+    def attribute_string
+      assert_exists
+      n = ''
+      iterator = @object.getAttributeEntriesIterator
+      while iterator.hasNext
+        attribute = iterator.next
+        n += "#{attribute.getName}=\"#{attribute.getHtmlValue.to_s}\" "
+      end
+      return n
+    end
 
     private
     
@@ -124,7 +137,7 @@ module Celerity
       n = []
       n << "tag:".ljust(TO_S_SIZE) + element.getTagName unless element.getTagName.empty?
       iterator = element.getAttributeEntriesIterator
-      while (iterator.hasNext)
+      while iterator.hasNext
         attribute = iterator.next
         n << "  #{attribute.getName}:".ljust(TO_S_SIZE+2) + attribute.getHtmlValue.to_s
       end

data/lib/celerity/element_collections.rb

@@ -7,13 +7,9 @@ module Celerity
     def initialize(container, how = nil, what = nil)
       @container = container
       @object = (how == :object ? what : nil)
-      @length = length # defined by subclasses
+      @length = length
     end
 
-    def element_tags
-      element_class::TAGS
-    end
-    
     def length
       if @object
         @object.length
@@ -27,13 +23,14 @@ module Celerity
     def each
       if @elements
         @elements.each { |e| yield(element_class.new(@container, :object, e)) }
+        @length
       else
         0.upto(@length - 1) { |i| yield iterator_object(i) }
       end
     end
     
     def [](n)
-      @elements ? element_class.new(@container, :object, @elements[n - 1]) : iterator_object(n-1)
+      @elements ? element_class.new(@container, :object, @elements[n - 1]) : iterator_object(n - 1)
     end
     
     def to_s
@@ -44,7 +41,7 @@ module Celerity
 
     # this method creates an object of the correct type that the iterators use
     def iterator_object(i)
-      element_class.new(@container, :index, i+1)
+      element_class.new(@container, :index, i + 1)
     end
   
   end # ElementCollections

data/lib/celerity/element_locator.rb

@@ -5,6 +5,7 @@ module Celerity
   # everything in our 'query'. 
   # Jari - 2008-05-11
   class ElementLocator
+    include Celerity::Exception
     attr_accessor :idents
     
     

data/lib/celerity/elements/button.rb

@@ -7,17 +7,21 @@ module Celerity
   class Button < InputElement
     TAGS = [ Identifier.new('button'), 
              Identifier.new('input', :type => %w(submit reset image button)) ]
+    # A little wierd attribute list due to button being both <button> and <input type="submit|reset|image|button" />
+    ATTRIBUTES = BASE_ATTRIBUTES | [:type, :disabled, :tabindex, :accesskey, :onfocus, :onblur] | [:src, :usemap, :ismap]
     DEFAULT_HOW = :value
 
     def locate
       # ugly..
-      if (val = @conditions.delete(:value))
+      if (val = @conditions[:value])
         locator = ElementLocator.new(@container.object, self.class)
         button_ident = Identifier.new('button')
         button_ident.text = val
         input_ident = Identifier.new('input', :type => %w(submit reset image button), :value => [val])
         locator.idents = [button_ident, input_ident]
-        @object = locator.find_by_conditions(@conditions)
+        conditions = @conditions.dup
+        conditions.delete(:value)
+        @object = locator.find_by_conditions(conditions)
       else
         super
       end

data/lib/celerity/elements/file_field.rb

@@ -2,10 +2,10 @@ module Celerity
   # For fields that accept file uploads
   class FileField < InputElement
     TAGS = [ Identifier.new('input', :type => %w(file)) ]
+    DEFAULT_HOW = :name
   
     def set(value)
       assert_exists
-      # TODO: trigger events?
       @object.setValueAttribute(value.to_s)
     end
   end

data/lib/celerity/elements/form.rb

@@ -8,8 +8,7 @@ module Celerity
   
     def submit
       assert_exists
-      raise NotImplementedError      
-      # waiting for HtmlUnit fix?
+      @container.update_page @object.submit(nil)
     end
 
   end  

data/lib/celerity/elements/frame.rb

@@ -4,7 +4,6 @@ module Celerity
     attr_accessor :page
     
     TAGS = [Identifier.new('frame'), Identifier.new('iframe')]
-    
     ATTRIBUTES = BASE_ATTRIBUTES | [:longdesc, :name, :src, :frameborder, :marginwidth, :marginheight, :noresize, :scrolling]
     DEFAULT_HOW = :name
     
@@ -14,8 +13,6 @@ module Celerity
         @inline_frame_object = @object.getEnclosedWindow.getFrameElement
         if (frame = @object.getEnclosedPage.getDocumentElement)
           @object = frame
-        else
-          @object = nil
         end
       end
     end

data/lib/celerity/elements/image.rb

@@ -11,6 +11,7 @@ module Celerity
     
     TAGS = [ Identifier.new('img') ]
     ATTRIBUTES = BASE_ATTRIBUTES | [:src, :alt, :longdesc, :name, :height, :width, :usemap, :ismap, :align, :border, :hspace, :vspace]
+    DEFAULT_HOW = :src
     
     # this method returns the file created date of the image
     def file_created_date
@@ -18,7 +19,6 @@ module Celerity
       web_response = @object.getWebResponse(true)      
       return Time.parse(web_response.getResponseHeaderValue("Last-Modified").to_s)    
     end
-    alias_method :fileCreatedDate, :file_created_date
     
     # this method returns the filesize of the image
     def file_size
@@ -26,7 +26,6 @@ module Celerity
       web_response = @object.getWebResponse(true)      
       return web_response.getResponseBody().length  
     end
-    alias_method :fileSize, :file_size
     
     # returns the width in pixels of the image, as a string
     def width
@@ -49,8 +48,6 @@ module Celerity
         return false
       end
     end
-    alias_method :hasLoaded?, :loaded?
-    alias_method :has_loaded?, :loaded?
     
     def save(filename)
       assert_exists

data/lib/celerity/elements/label.rb

@@ -3,6 +3,7 @@ module Celerity
   class Label < Element
     TAGS = [ Identifier.new('label') ]
     ATTRIBUTES = BASE_ATTRIBUTES | [:for, :accesskey, :onfocus, :onblur]
+    DEFAULT_HOW = :text
   end
   
 end

data/lib/celerity/elements/link.rb

@@ -1,7 +1,9 @@
 module Celerity
   class Link < Element
+    
     TAGS = [ Identifier.new('a') ]
     ATTRIBUTES = BASE_ATTRIBUTES | [:charset, :type, :name, :href, :hreflang, :target, :rel, :rev, :accesskey, :shape, :coords, :tabindex, :onfocus, :onblur]
+    DEFAULT_HOW = :href
     
     def click
       assert_exists

data/lib/celerity/elements/option.rb

@@ -5,6 +5,7 @@ module Celerity
     
     TAGS = [ Identifier.new('option')]
     ATTRIBUTES = BASE_ATTRIBUTES | [:selected, :disabled, :label, :value]
+    DEFAULT_HOW = :text
 
     alias_method :select, :click
 

data/lib/celerity/elements/radio_check.rb

@@ -6,9 +6,10 @@ module Celerity
   # most of the methods available to this element are inherited from the Element class
   #
   class RadioCheckCommon < InputElement
+    DEFAULT_HOW = :name
+    
     def initialize(container, type, *args)
       @type = type
-
       case args.size
       when 2
         super(container, args[0] => args[1])
@@ -23,10 +24,6 @@ module Celerity
       assert_exists
       @object.isChecked
     end
-    alias_method :is_set?, :set?
-    alias_method :isSet?, :set?
-    alias_method :get_state, :set?
-    alias_method :getState, :set?
     alias_method :checked?, :set?
     
     def clear
@@ -62,6 +59,7 @@ module Celerity
       assert_exists
       assert_enabled
       if (value && !set?) || (!value && set?)
+        Log.debug(@object.inspect)
         @container.update_page(@object.click)
       end
     end

data/lib/celerity/elements/select_list.rb

@@ -6,24 +6,22 @@ module Celerity
   # Normally a user would not need to create this object as it is returned by the Watir::Container#select_list method
   class SelectList < InputElement
     TAGS = [ Identifier.new('select') ]
+    DEFAULT_HOW = :name
   
     def get_all_contents
       assert_exists
       @object.getOptions.map { |e| e.asText }
     end
-    alias_method :getAllContents, :get_all_contents
   
     def get_selected_items
       assert_exists
       @object.getSelectedOptions.map { |e| e.asText }
     end
-    alias_method :getSelectedItems, :get_selected_items
   
     def clear_selection
       # assert_exists called by SelectList#type here
       @object.getSelectedOptions.each { |e| e.setSelected(false) } unless type() == 'select-one'
     end
-    alias_method :clearSelection, :clear_selection
   
     def select(value)
       assert_exists
@@ -32,7 +30,6 @@ module Celerity
         @container.update_page(option.click)
       end
     end
-    alias_method :select_value, :select
     alias_method :set, :select
   
     def include?(value)
@@ -43,11 +40,11 @@ module Celerity
   
     def selected?(value)
       assert_exists
-      # This should probably raise NoValueFoundException?
       raise UnknownObjectException, "unknown option with value #{value.inspect}" unless include?(value)
       !!@object.getOptions.find { |e| matches?(e.asText, value) && e.isSelected }
     end
 
+    # TODO: Move to watir_compatibility or delete it 2008-05-23 Alexander
     def type
       assert_exists
       'select-' + (@object.isAttributeDefined('multiple') ? 'multiple' : 'one')
@@ -59,10 +56,6 @@ module Celerity
         optn.getValueAttribute
       end
     end
-  
-    def option(attribute, value)
-      assert_exists
-      Option.new(self, attribute, value)
-    end
+
   end
 end