jarib-celerity 0.0.6.7 → 0.0.6.8

data/lib/celerity/element_locator.rb

@@ -2,8 +2,8 @@ module Celerity
 
   #
   # Used internally to locate elements on the page.
-  # 
-  
+  #
+
   class ElementLocator
     include Celerity::Exception
     attr_accessor :idents
@@ -35,8 +35,6 @@ module Celerity
             raise ArgumentError, "expected an HtmlUnit::Html::HtmlElement subclass, got #{what.inspect}:#{what.class}"
           end
           return what
-        when :id
-          return find_by_id(what)
         when :xpath
           return find_by_xpath(what)
         when :label
@@ -49,7 +47,9 @@ module Celerity
           how = :text
         end
 
-        if @attributes.include?(how = how.to_sym)
+        if how == :id && conditions.size == 1
+          return find_by_id(what)
+        elsif @attributes.include?(how = how.to_sym)
           attributes[how] << what
         elsif how == :index
           index = what.to_i - INDEX_OFFSET
@@ -106,12 +106,12 @@ module Celerity
       find_by_id obj.getForAttribute
     end
 
-    def elements_by_idents(idents = nil)
-      get_by_idents(:select, idents || @idents)
+    def elements_by_idents(idents = @idents)
+      get_by_idents(:select, idents)
     end
 
-    def element_by_idents(idents = nil)
-      get_by_idents(:find, idents || @idents)
+    def element_by_idents(idents = @idents)
+      get_by_idents(:find, idents)
     end
 
     private

data/lib/celerity/elements/button.rb

@@ -1,15 +1,15 @@
 module Celerity
-  
+
   #
   # Input: Button
   #
   # Class representing button elements
   #
-  
+
   class Button < InputElement
     TAGS = [ Identifier.new('button'),
              Identifier.new('input', :type => %w[submit reset image button]) ]
-             
+
     # Attribute list is a little weird due to this class covering both <button>
     # and <input type="submit|reset|image|button" />
     ATTRIBUTES = BASE_ATTRIBUTES | [:type, :disabled, :tabindex, :accesskey, :onfocus, :onblur] | [:src, :usemap, :ismap]
@@ -18,19 +18,19 @@ module Celerity
     #
     # @api private
     #
-    
+
     def locate
-      # We want the :value attribute to point to the inner HTML for <button> elements, 
-      # and to the value attribute for <input type="button"> elements. 
-      
+      # We want the :value attribute to point to the inner HTML for <button> elements,
+      # and to the value attribute for <input type="button"> elements.
+
       if (val = @conditions[:value])
         button_ident      = Identifier.new('button')
         button_ident.text = val
         input_ident       = Identifier.new('input', :type => %w[submit reset image button], :value => [val])
-        
+
         locator        = ElementLocator.new(@container, self.class)
         locator.idents = [button_ident, input_ident]
-        
+
         conditions = @conditions.dup
         conditions.delete(:value)
         @object = locator.find_by_conditions(conditions)

data/lib/celerity/elements/file_field.rb

@@ -1,5 +1,5 @@
 module Celerity
-  
+
   #
   # For fields that accept file uploads
   #
@@ -10,7 +10,7 @@ module Celerity
 
     #
     # Set the file field to the given path
-    # 
+    #
 
     def set(path)
       assert_exists
@@ -20,6 +20,6 @@ module Celerity
         @object.setContentType(Celerity::Util.content_type_for(path))
       end
     end
-    
+
   end # FileField
 end # Celerity

data/lib/celerity/elements/form.rb

@@ -1,19 +1,19 @@
 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)

data/lib/celerity/elements/frame.rb

@@ -10,7 +10,7 @@ module Celerity
     #
     # Override the default locate to handle frame and inline frames.
     # @api private
-    # 
+    #
 
     def locate
       super
@@ -22,7 +22,7 @@ module Celerity
         end
       end
     end
-    
+
     #
     # Override assert_exists to raise UnknownFrameException (for Watir compatibility)
     # @api private

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
 
@@ -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,12 +7,12 @@ 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
@@ -25,6 +25,6 @@ module Celerity
       href
     end
 
-    
+
   end # Link
 end # Celerity

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.
   #
@@ -14,15 +14,15 @@ module Celerity
 
     alias_method :select, :click
 
-    # 
+    #
     # Is this option selected?
-    # 
-    
+    #
+
     def selected?
       assert_exists
       @object.isSelected
     end
-    
+
     def label
       # overrides Container#label
       assert_exists

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,7 +67,7 @@ module Celerity
     #   radio.set(false)
     #   radio.set?        #=> false
     #
-    
+
     def set(value = true)
       assert_exists
       assert_enabled
@@ -75,18 +75,18 @@ module Celerity
     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,7 +100,7 @@ module Celerity
     #   checkbox.set(false)
     #   checkbox.set?         #=> false
     #
-    
+
     def set(value = true)
       assert_exists
       assert_enabled

data/lib/celerity/elements/select_list.rb

@@ -6,27 +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 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.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?
@@ -40,21 +40,21 @@ module Celerity
     # @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
-    # 
     #
-    
+    #
+
     def select(value)
       assert_exists
       raise NoValueFoundException, "unknown option with value #{value.inspect} for select_list #{@conditions.inspect}" unless include?(value)
-      
+
       selected = nil
       matching = @object.getOptions.select do |option|
         next unless matches_option?(option, value)
-        
+
         selected ||= option.asText
         @container.update_page option.click
       end
-      
+
       selected
     end
     alias_method :set, :select
@@ -65,7 +65,7 @@ module Celerity
     # @param [String, Regexp] value A value.
     # @return [true, false]
     #
-    
+
     def include?(value)
       assert_exists
       !!@object.getOptions.find { |e| matches_option?(e, value) }
@@ -78,7 +78,7 @@ 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)
@@ -91,7 +91,7 @@ module Celerity
     #
     # @return [String]
     #
-    
+
     def type
       assert_exists
       'select-' + (@object.hasAttribute('multiple') ? 'multiple' : 'one')
@@ -110,12 +110,12 @@ module Celerity
         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