celerity 0.0.6 → 0.0.7

data/lib/celerity/elements/file_field.rb

@@ -1,5 +1,5 @@
 module Celerity
-  
+
   #
   # For fields that accept file uploads
   #
@@ -10,16 +10,20 @@ module Celerity
 
     #
     # Set the file field to the given path
-    # 
+    #
 
     def set(path)
       assert_exists
       path = path.to_s
-      @container.update_page @object.setValueAttribute(path)
+
+      @object.setValueAttribute path
+
       unless @object.getContentType
         @object.setContentType(Celerity::Util.content_type_for(path))
       end
+
+      path
     end
-    
+
   end # FileField
 end # Celerity

data/lib/celerity/elements/form.rb

@@ -1,20 +1,22 @@
 module Celerity
   class Form < Element
     include Container
-    
+
     TAGS = [Identifier.new('form')]
-    
+
     # HTML 4.01 Transitional DTD
     ATTRIBUTES = BASE_ATTRIBUTES | [:action, :method, :enctype, :accept, :name, :onsubmit, :onreset, :target, :'accept-charset']
     DEFAULT_HOW = :name
 
     #
     # Submits the form.
-    # 
-    
+    #
+    # This method should be avoided - invoke the user interface element that triggers the submit instead.
+    #
+
     def submit
       assert_exists
-      @container.update_page @object.submit(nil)
+      @object.submit(nil)
     end
 
   end # Form

data/lib/celerity/elements/frame.rb

@@ -1,6 +1,8 @@
 module Celerity
   class Frame < Element
     include Container
+    include XpathSupport
+
     attr_accessor :page
 
     TAGS = [Identifier.new('frame'), Identifier.new('iframe')]
@@ -10,7 +12,7 @@ module Celerity
     #
     # Override the default locate to handle frame and inline frames.
     # @api private
-    # 
+    #
 
     def locate
       super
@@ -22,7 +24,7 @@ module Celerity
         end
       end
     end
-    
+
     #
     # Override assert_exists to raise UnknownFrameException (for Watir compatibility)
     # @api private
@@ -64,7 +66,7 @@ module Celerity
       meth = selector_to_attribute(meth)
       if self.class::ATTRIBUTES.include?(meth)
         assert_exists
-        @inline_frame_object.getAttributeValue(meth.to_s)
+        @inline_frame_object.getAttribute(meth.to_s)
       else
         Log.warn "Element\#method_missing calling super with #{meth.inspect}"
         super
@@ -72,4 +74,4 @@ module Celerity
     end
 
   end # Frame
-end # Celerity
+end # Celerity

data/lib/celerity/elements/image.rb

@@ -4,7 +4,7 @@ module Celerity
     include ClickableElement
 
     TAGS = [ Identifier.new('img') ]
-    
+
     ATTRIBUTES = BASE_ATTRIBUTES | [:src, :alt, :longdesc, :name, :height, :width, :usemap, :ismap, :align, :border, :hspace, :vspace]
     DEFAULT_HOW = :src
 
@@ -19,13 +19,13 @@ module Celerity
     end
 
     #
-    # returns the filesize of the image
+    # returns the file size of the image in bytes
     #
 
     def file_size
       assert_exists
       web_response = @object.getWebResponse(true)
-      web_response.getResponseBody.length
+      web_response.getContentAsBytes.length
     end
 
     #
@@ -71,6 +71,6 @@ module Celerity
       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

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

data/lib/celerity/elements/link.rb

@@ -7,16 +7,16 @@ module Celerity
                                     :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')
+      href = @object.getAttribute('href')
 
       unless href.empty? || URI.parse(href).absolute?
         href = URI.join(browser.url, href).to_s
@@ -25,6 +25,6 @@ module Celerity
       href
     end
 
-    
+
   end # Link
 end # Celerity

data/lib/celerity/elements/meta.rb

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

data/lib/celerity/elements/non_control_elements.rb

@@ -1,9 +1,9 @@
 module Celerity
-  
+
   #
   # Superclass for for Span, Pre, Div, H1, ...
   #
-  
+
   class NonControlElement < Element
     include Exception
     include ClickableElement
@@ -90,7 +90,7 @@ module Celerity
   class Span < NonControlElement
     TAGS = [ Identifier.new('span') ]
   end
-  
+
   class Strong < NonControlElement
     TAGS = [ Identifier.new('strong') ]
   end

data/lib/celerity/elements/option.rb

@@ -1,5 +1,5 @@
 module Celerity
-  
+
   #
   # Represents an option in a select list.
   #
@@ -8,25 +8,25 @@ module Celerity
     include ClickableElement
     include DisabledElement
 
-    TAGS = [ Identifier.new('option')]
+    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")
+      @object.getLabelAttribute
     end
   end
 end

data/lib/celerity/elements/radio_check.rb

@@ -1,16 +1,16 @@
 module Celerity
-  
+
   #
   # Common superclass for radios and check boxes.
   #
-  
+
   class RadioCheckCommon < InputElement
     DEFAULT_HOW = :name
-    
+
     #
-    # Can optionally take a value parameter as a third arg, so we override initialize 
+    # Can optionally take a value parameter as a third arg, so we override initialize
     #
-    
+
     def initialize(container, type, *args)
       @type = type
       case args.size
@@ -22,12 +22,12 @@ module Celerity
         super(container, *args)
       end
     end
-    
+
     #
     # returns true if the element is checked
     # @return [true, false]
     #
-    
+
     def set?
       assert_exists
       @object.isChecked
@@ -37,7 +37,7 @@ module Celerity
     #
     # Unset this element.
     #
-    
+
     def clear
       set(false)
     end
@@ -46,14 +46,14 @@ module Celerity
   #
   # This class is the representation of a radio button.
   #
-  
+
   class Radio < RadioCheckCommon
     TAGS = [Identifier.new('input', :type => %w[radio])]
-    
+
     #
     # @api private
     #
-    
+
     def initialize(container, *args)
       super(container, %w[radio], *args)
     end
@@ -67,26 +67,26 @@ module Celerity
     #   radio.set(false)
     #   radio.set?        #=> false
     #
-    
+
     def set(value = true)
       assert_exists
       assert_enabled
-      @container.update_page(value ? @object.click : @object.setChecked(value))
+      value ? @object.click : @object.setChecked(value)
     end
 
   end
-  
+
   #
   # This class is the representation of a check box.
   #
-  
+
   class CheckBox < RadioCheckCommon
     TAGS = [Identifier.new('input', :type => %w[checkbox])]
 
     #
     # @api private
     #
-    
+
     def initialize(container, *args)
       super(container, %w[checkbox], *args)
     end
@@ -100,14 +100,14 @@ module Celerity
     #   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)
+        @object.click
       end
     end
   end

data/lib/celerity/elements/select_list.rb

@@ -6,25 +6,27 @@ module Celerity
     #
     # @return [Array<String>] An array of strings representing the text value of the select list's options.
     #
-    
+
     def options
       assert_exists
-      @object.getOptions.map { |e| e.asText }
+      @object.getOptions.map do |e|
+        e.asText.empty? ? e.getLabelAttribute : e.asText
+      end
     end
-    
+
     #
     # @return [Array<String>] An array of strings representing the text value of the currently selected options.
     #
-    
+
     def selected_options
       assert_exists
-      @object.getSelectedOptions.map { |e| e.asText }
+      @object.getSelectedOptions.map { |e| e.asText.empty? ? e.getLabelAttribute : e.asText }
     end
-    
+
     #
     # Clear all selected options
     #
-    
+
     def clear
       # assert_exists called by SelectList#type here
       # TODO: should update page for each option changed?
@@ -32,39 +34,62 @@ module Celerity
     end
 
     #
-    # Select the option(s) matching the given value.
+    # Select the option(s) whose text or label matches the given string.
     # If several options match the value given, all will be selected.
     #
     # @param [String, Regexp] value A value.
     # @raise [Celerity::Exception::NoValueFoundException] if the value does not exist.
-    # @return [String, nil] The option selected. If multiple options match, returns the first match
-    # 
+    # @return [String] The option selected. If multiple options match, returns the first match
     #
-    
+    #
+
     def select(value)
       assert_exists
-      raise NoValueFoundException, "unknown option with value #{value.inspect} for select_list #{@conditions.inspect}" unless include?(value)
-      
+
       selected = nil
-      @object.getOptions.select { |e| matches?(e.asText, value) }.each do |option|
+      @object.getOptions.select do |option|
+        next unless matches_option?(option, value)
+
         selected ||= option.asText
-        @container.update_page option.click
+        option.click
+      end
+
+      unless selected
+        raise NoValueFoundException, "unknown option with value #{value.inspect} for select_list #{@conditions.inspect}"
       end
-      
+
       selected
     end
     alias_method :set, :select
 
+    #
+    # Selects the option(s) whose value attribute matches the given string.
+    # @param [String, Regexp] value A value.
+    # @raise [Celerity::Exception::NoValueFoundException] if the value does not exist.
+    # @return [String] The option selected. If multiple options match, returns the first match
+    #
+
+    def select_value(value)
+      assert_exists
+      selected = @object.getOptions.map { |e| e.click if matches?(e.getValueAttribute, value) }.compact.first
+
+      unless selected
+        raise NoValueFoundException, "unknown option with value #{value.inspect} for select_list #{@conditions.inspect}"
+      end
+
+      selected.asText
+    end
+
     #
     # Returns true if the select list has one or more options matching the given value.
     #
     # @param [String, Regexp] value A value.
     # @return [true, false]
     #
-    
+
     def include?(value)
       assert_exists
-      !!@object.getOptions.find { |e| matches?(e.asText, value) }
+      !!@object.getOptions.find { |e| matches_option?(e, value) }
     end
 
     #
@@ -74,11 +99,11 @@ module Celerity
     # @raise [Celerity::Exception::UnknownObjectException] if the value does not exist.
     # @return [true, false]
     #
-    
+
     def selected?(value)
       assert_exists
       raise UnknownObjectException, "unknown option with value #{value.inspect} for select_list #{@conditions.inspect}" unless include?(value)
-      !!@object.getOptions.find { |e| matches?(e.asText, value) && e.isSelected }
+      !!@object.getOptions.find { |e| matches_option?(e, value) && e.isSelected }
     end
 
     #
@@ -86,12 +111,11 @@ module Celerity
     # defined, otherwise 'select-one'.
     #
     # @return [String]
-    # TODO: Move to watir_compatibility or delete it 2008-05-23 Alexander
     #
-    
+
     def type
       assert_exists
-      'select-' + (@object.isAttributeDefined('multiple') ? 'multiple' : 'one')
+      'select-' + (@object.hasAttribute('multiple') ? 'multiple' : 'one')
     end
 
     #
@@ -103,10 +127,16 @@ module Celerity
 
     def value
       assert_exists
-      if (optn = @object.getSelectedOptions.to_a.first)
-        optn.getValueAttribute
+      if (option = @object.getSelectedOptions.to_a.first)
+        option.getValueAttribute
       end
     end
 
+    private
+
+    def matches_option?(option, value)
+      matches?(option.asText, value) || (option.hasAttribute("label") && matches?(option.getLabelAttribute, value))
+    end
+
   end # SelectList
 end # Celerity