celerity 0.0.4 → 0.0.6

data/lib/celerity/elements/image.rb

@@ -1,63 +1,76 @@
-module Celerity
-  
-  class Image < Element
-    include ClickableElement
-    include DisabledElement
-    
-    TAGS = [ Identifier.new('img') ]
-    ATTRIBUTES = BASE_ATTRIBUTES | [:src, :alt, :longdesc, :name, :height, :width, :usemap, :ismap, :align, :border, :hspace, :vspace]
-    DEFAULT_HOW = :src
-    
-    # returns the file created date of the image
-    def file_created_date
-      assert_exists
-      web_response = @object.getWebResponse(true)      
-      Time.parse(web_response.getResponseHeaderValue("Last-Modified").to_s)    
-    end
-    
-    # returns the filesize of the image
-    def file_size
-      assert_exists
-      web_response = @object.getWebResponse(true)      
-      web_response.getResponseBody.length  
-    end
-    
-    # returns the width in pixels of the image, as a string
-    def width
-      assert_exists
-      @object.getWidth
-    end
-    
-    # returns the height in pixels of the image, as a string
-    def height
-      assert_exists
-      @object.getHeight
-    end
-     
-    # returns true if the image is loaded   
-    def loaded?
-      assert_exists
-      begin 
-        @object.getImageReader
-        true
-      rescue
-        false
-      end
-    end
-    
-    def click
-      assert_exists
-      @container.update_page(@object.click)
-    end 
-    
-    # Saves the image to the given file
-    def save(filename)
-      assert_exists
-      image_reader = @object.getImageReader
-      file = java.io.File.new(filename)
-      buffered_image = image_reader.read(0);
-      javax.imageio.ImageIO.write(buffered_image, image_reader.getFormatName(), file);
-    end
-  end
-
-end
+module Celerity
+
+  class Image < Element
+    include ClickableElement
+
+    TAGS = [ Identifier.new('img') ]
+    
+    ATTRIBUTES = BASE_ATTRIBUTES | [:src, :alt, :longdesc, :name, :height, :width, :usemap, :ismap, :align, :border, :hspace, :vspace]
+    DEFAULT_HOW = :src
+
+    #
+    # returns the file created date of the image
+    #
+
+    def file_created_date
+      assert_exists
+      web_response = @object.getWebResponse(true)
+      Time.parse(web_response.getResponseHeaderValue("Last-Modified").to_s)
+    end
+
+    #
+    # returns the filesize of the image
+    #
+
+    def file_size
+      assert_exists
+      web_response = @object.getWebResponse(true)
+      web_response.getResponseBody.length
+    end
+
+    #
+    # returns the width in pixels of the image, as a string
+    #
+
+    def width
+      assert_exists
+      @object.getWidth
+    end
+
+    #
+    # returns the height in pixels of the image, as a string
+    #
+
+    def height
+      assert_exists
+      @object.getHeight
+    end
+
+    #
+    # returns true if the image is loaded
+    #
+
+    def loaded?
+      assert_exists
+      begin
+        @object.getImageReader
+        true
+      rescue
+        false
+      end
+    end
+
+    #
+    # Saves the image to the given file
+    #
+
+    def save(filename)
+      assert_exists
+      image_reader = @object.getImageReader
+      file = java.io.File.new(filename)
+      buffered_image = image_reader.read(0);
+      javax.imageio.ImageIO.write(buffered_image, image_reader.getFormatName(), file);
+    end
+    
+  end # Image
+end # Celerity

data/lib/celerity/elements/label.rb

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

data/lib/celerity/elements/link.rb

@@ -1,18 +1,30 @@
-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
-    
-    # clicks the link
-    def click
-      assert_exists
-      @container.update_page @object.click
-    end
-    
-  end
-  
-end
+module Celerity
+  class Link < Element
+    include ClickableElement
+
+    TAGS = [ Identifier.new('a') ]
+    ATTRIBUTES = BASE_ATTRIBUTES | [:charset, :type, :name, :href, :hreflang,
+                                    :target, :rel, :rev, :accesskey, :shape,
+                                    :coords, :tabindex, :onfocus, :onblur]
+    DEFAULT_HOW = :href
+    
+    #
+    # Returns the absolute URL for this link (Celerity-specific)
+    # 
+    # (Watir/IE does this for href(), but we don't want that.)
+    # 
+
+    def absolute_url
+      assert_exists
+      href = @object.getAttributeValue('href')
+
+      unless href.empty? || URI.parse(href).absolute?
+        href = URI.join(browser.url, href).to_s
+      end
+
+      href
+    end
+
+    
+  end # Link
+end # Celerity

data/lib/celerity/elements/meta.rb

@@ -0,0 +1,6 @@
+module Celerity
+  class Meta < Element
+    ATTRIBUTES = [:name, :id, :'http-equiv', :content, :scheme] | HTML_401_TRANSITIONAL[:i18n]
+    TAGS = [ Identifier.new('meta') ]
+  end
+end

data/lib/celerity/{non_control_elements.rb → elements/non_control_elements.rb}

@@ -1,76 +1,106 @@
-module Celerity
-  
-  # this class contains items that are common between the span, div, and pre objects
-  # it would not normally be used directly
-  #
-  # many of the methods available to this object are inherited from the Element class
-  #
-  class NonControlElement < Element
-    include Exception
-    ATTRIBUTES = BASE_ATTRIBUTES
-    DEFAULT_HOW = :id
-
-    # Can't use ClickableElement as it does assert_enabled - maybe we don't need the module after all?
-    def click
-      assert_exists
-      @container.update_page(@object.click)
-    end
-  end
-    
-  class Pre < NonControlElement
-    TAGS = [ Identifier.new('pre')] 
-  end
-  
-  class P < NonControlElement
-    TAGS = [ Identifier.new('p') ]
-  end
-  
-  class Div < NonControlElement
-    TAGS = [ Identifier.new('div')] 
-  end
-  
-  class Span < NonControlElement
-    TAGS = [ Identifier.new('span') ]
-  end
-  
-  class Ul < NonControlElement
-    TAGS = [ Identifier.new('ul') ]
-  end
-  
-  class Ol < NonControlElement
-    TAGS = [ Identifier.new('ol') ]
-  end
-
-  class Li < NonControlElement
-    TAGS = [ Identifier.new('li') ]
-  end
-    
-  class Map < NonControlElement
-    TAGS = [ Identifier.new('map') ]
-  end
-
-  class Area < NonControlElement
-    ATTRIBUTES = ATTRIBUTES | [:shape, :coords, :href, :nohref, :alt, :tabindex, :accesskey, :onfocus, :onblur]
-    TAGS = [ Identifier.new('area') ]
-  end
-  
-  class H1 < NonControlElement
-    TAGS = [ Identifier.new('h1') ]
-  end
-  class H2 < NonControlElement
-    TAGS = [ Identifier.new('h2') ]
-  end
-  class H3 < NonControlElement
-    TAGS = [ Identifier.new('h3') ]
-  end
-  class H4 < NonControlElement
-    TAGS = [ Identifier.new('h4') ]
-  end
-  class H5 < NonControlElement
-    TAGS = [ Identifier.new('h5') ]
-  end
-  class H6 < NonControlElement
-    TAGS = [ Identifier.new('h6') ]
-  end
-  
-end
+module Celerity
+  
+  #
+  # Superclass for for Span, Pre, Div, H1, ...
+  #
+  
+  class NonControlElement < Element
+    include Exception
+    include ClickableElement
+
+    ATTRIBUTES = BASE_ATTRIBUTES
+    DEFAULT_HOW = :id
+  end
+
+  #
+  #--
+  #  classes ordered alphabetically
+  #++
+  #
+
+  class Area < NonControlElement
+    ATTRIBUTES = ATTRIBUTES | [:shape, :coords, :href, :nohref, :alt, :tabindex, :accesskey, :onfocus, :onblur]
+    TAGS = [ Identifier.new('area') ]
+  end
+
+  class Dd < NonControlElement
+    TAGS = [ Identifier.new('dd')]
+  end
+
+  class Div < NonControlElement
+    TAGS = [ Identifier.new('div')]
+  end
+
+  class Dl < NonControlElement
+    TAGS = [ Identifier.new('dl')]
+  end
+
+  class Dt < NonControlElement
+    TAGS = [ Identifier.new('dt')]
+  end
+
+  class Em < NonControlElement
+    TAGS = [ Identifier.new('em')]
+  end
+
+  class H1 < NonControlElement
+    TAGS = [ Identifier.new('h1') ]
+  end
+
+  class H2 < NonControlElement
+    TAGS = [ Identifier.new('h2') ]
+  end
+
+  class H3 < NonControlElement
+    TAGS = [ Identifier.new('h3') ]
+  end
+
+  class H4 < NonControlElement
+    TAGS = [ Identifier.new('h4') ]
+  end
+
+  class H5 < NonControlElement
+    TAGS = [ Identifier.new('h5') ]
+  end
+
+  class H6 < NonControlElement
+    TAGS = [ Identifier.new('h6') ]
+  end
+
+  class Li < NonControlElement
+    TAGS = [ Identifier.new('li') ]
+  end
+
+  class Map < NonControlElement
+    TAGS = [ Identifier.new('map') ]
+  end
+
+  class Ol < NonControlElement
+    TAGS = [ Identifier.new('ol') ]
+  end
+
+  class P < NonControlElement
+    TAGS = [ Identifier.new('p') ]
+  end
+
+  class Pre < NonControlElement
+    TAGS = [ Identifier.new('pre')]
+  end
+
+  class Span < NonControlElement
+    TAGS = [ Identifier.new('span') ]
+  end
+  
+  class Strong < NonControlElement
+    TAGS = [ Identifier.new('strong') ]
+  end
+
+  # class Title < NonControlElement
+  #   TAGS = [ Identifier.new('title') ]
+  # end
+
+  class Ul < NonControlElement
+    TAGS = [ Identifier.new('ul') ]
+  end
+
+end

data/lib/celerity/elements/option.rb

@@ -1,18 +1,32 @@
 module Celerity
-  # Represents a select list option.
+  
+  #
+  # Represents an option in a select list.
+  #
+
   class Option < Element
     include ClickableElement
     include DisabledElement
-    
+
     TAGS = [ Identifier.new('option')]
     ATTRIBUTES = BASE_ATTRIBUTES | [:selected, :disabled, :label, :value]
     DEFAULT_HOW = :text
 
     alias_method :select, :click
 
+    # 
+    # Is this option selected?
+    # 
+    
     def selected?
       assert_exists
       @object.isSelected
     end
+    
+    def label
+      # overrides Container#label
+      assert_exists
+      @object.getAttribute("label")
+    end
   end
 end

data/lib/celerity/elements/radio_check.rb

@@ -1,10 +1,16 @@
 module Celerity
+  
+  #
   # Common superclass for radios and check boxes.
+  #
+  
   class RadioCheckCommon < InputElement
     DEFAULT_HOW = :name
-
-    # these can optionally take a value parameter as a third arg, so needs
-    # to be special-handled.
+    
+    #
+    # Can optionally take a value parameter as a third arg, so we override initialize 
+    #
+    
     def initialize(container, type, *args)
       @type = type
       case args.size
@@ -17,33 +23,51 @@ module Celerity
       end
     end
     
+    #
     # returns true if the element is checked
+    # @return [true, false]
+    #
+    
     def set?
       assert_exists
       @object.isChecked
     end
     alias_method :checked?, :set?
+
+    #
+    # Unset this element.
+    #
     
     def clear
       set(false)
     end
   end
+
+  #
+  # This class is the representation of a radio button.
+  #
   
-  # This class is the celerity representation of a radio button.
   class Radio < RadioCheckCommon
-    TAGS = [Identifier.new('input', :type => %w(radio))]
-
+    TAGS = [Identifier.new('input', :type => %w[radio])]
+    
+    #
+    # @api private
+    #
+    
     def initialize(container, *args)
-      super(container, ['radio'], *args)
+      super(container, %w[radio], *args)
     end
 
-    # Sets the radio button. 
     #
-    #   radio.set? # => false
-    #   radio.set  
-    #   radio.set? # => true
+    # Set the radio button to the given value.
+    #
+    #   radio.set?        #=> false
+    #   radio.set
+    #   radio.set?        #=> true
     #   radio.set(false)
-    #   radio.set? # => false
+    #   radio.set?        #=> false
+    #
+    
     def set(value = true)
       assert_exists
       assert_enabled
@@ -52,24 +76,35 @@ module Celerity
 
   end
   
-  # This class is the celerity representation of a check box.
+  #
+  # This class is the representation of a check box.
+  #
+  
   class CheckBox < RadioCheckCommon
-    TAGS = [Identifier.new('input', :type => %w(checkbox))]
+    TAGS = [Identifier.new('input', :type => %w[checkbox])]
 
+    #
+    # @api private
+    #
+    
     def initialize(container, *args)
-      super(container, ['checkbox'], *args)
+      super(container, %w[checkbox], *args)
     end
 
-    # Sets the checkbox button. 
     #
-    #   checkbox.set? # => false
-    #   checkbox.set  
-    #   checkbox.set? # => true
+    # Set the checkbox to the given value.
+    #
+    #   checkbox.set?         #=> false
+    #   checkbox.set
+    #   checkbox.set?         #=> true
     #   checkbox.set(false)
-    #   checkbox.set? # => false
+    #   checkbox.set?         #=> false
+    #
+    
     def set(value = true)
       assert_exists
       assert_enabled
+
       if (value && !set?) || (!value && set?)
         Log.debug(@object.inspect)
         @container.update_page(@object.click)