druid-ts 1.1.3 → 1.1.4

data/lib/druid/assist.rb

@@ -23,7 +23,8 @@ module Druid
     # retrieve an array of hidden field elements
     #
     def text_fields_for(identifier)
-      find_elements("text_fields(identifier)", Elements::TextField, identifier)
+      elements = find_elements("text_fields(identifier)", Elements::TextField, identifier)
+      elements.select {|e| e.element.tag_name == "input"}
     end
 
     def text_field_value_for identifier
@@ -233,7 +234,7 @@ module Druid
     end
 
     def text_area_value_set identifier, value
-      process_call("textarea(identifier).send_keys(value)", Elements::TextArea, identifier, value)
+      process_call("textarea(identifier).set(value)", Elements::TextArea, identifier, value)
     end
 
     def text_area_value_for identifier
@@ -373,6 +374,13 @@ module Druid
       find_element("file_field(identifier)", Elements::FileField, identifier)
     end
 
+    #
+    # retrieve an array of file field elements
+    #
+    def file_fields_for identifier
+      find_elements("file_fields(identifier)", Elements::FileField, identifier)
+    end
+
     #
     # method to return the text for a label
     #

data/lib/druid/element_locators.rb

@@ -5,7 +5,8 @@ module Druid
     # Finds a button
     #
     # @param [Hash] identifier how we find a button.  You can use a multiple paramaters
-    #  by combining of any of the following except xpath.  The valid keys are:
+    #  by combining of any of the following except xpath. It defaults to {:index => 0}
+    #  which will find the first button. The valid keys are:
     #   * :class
     #   * :id
     #   * :index
@@ -17,7 +18,7 @@ module Druid
     #   * :alt
     #   * :css
     #
-    def button_element identifier
+    def button_element(identifier={:index => 0})
       button_for identifier.clone
     end
 
@@ -25,7 +26,8 @@ module Druid
     # Finds all buttons that match the provided identifier
     #
     # @param [Hash] identifier how we find all buttons.  You can use a multiple paramaters
-    #  by combining of any of the following except xpath.  The valid keys are:
+    #  by combining of any of the following except xpath. It defaults to an empty
+    #  hash which will find all button elements. The valid keys are:
     #   * :class
     #   * :id
     #   * :index
@@ -37,7 +39,7 @@ module Druid
     #   * :alt
     #   * :css
     #
-    def button_elements identifier
+    def button_elements(identifier={})
       buttons_for identifier.clone
     end
 
@@ -45,7 +47,8 @@ module Druid
     # Finds a text field
     #
     # @param [Hash] identifier how we find a text field. You can use a multiple parameters
-    #  by combining of any of the following except xpath. The valid keys are:
+    #  by combining of any of the following except xpath. It defaults to {:index => 0}
+    #  which will find the first text field. The valid keys are:
     #   * :class
     #   * :css
     #   * :id
@@ -56,7 +59,7 @@ module Druid
     #   * :xpath
     #   * :title
     #
-    def text_field_element identifier
+    def text_field_element(identifier={:index => 0})
       text_field_for identifier.clone
     end
 
@@ -64,7 +67,8 @@ module Druid
     # Finds all text fields that match the provided identifier
     #
     # @param [Hash] identifier how we find all text fields. You can use a multiple parameters
-    # by combining of any of the following except xpath. The valid keys are:
+    #  by combining of any of the following except xpath. It defaults to empty Hash
+    #  which will find all text field elements. The valid keys are:
     #
     #   * :class
     #   * :css
@@ -76,7 +80,7 @@ module Druid
     #   * :xpath
     #   * :title
     #
-    def text_field_elements(identifier)
+    def text_field_elements(identifier={})
       text_fields_for identifier.clone
     end
 
@@ -84,7 +88,8 @@ module Druid
     # Finds a hidden field
     #
     # @param [Hash] identifier how we find a hidden field. You can use a multiple parameters
-    #  by combining of any of the following except xpath. The valid keys are:
+    #  by combining of any of the following except xpath. It defaults to {:index => 0}
+    #  which will find the first hidden field. The valid keys are:
     #   * :class
     #   * :css
     #   * :id
@@ -95,7 +100,7 @@ module Druid
     #   * :xpath
     #   * :value
     #
-    def hidden_field_element identifier
+    def hidden_field_element(identifier={:index => 0})
       hidden_field_for identifier.clone
     end
 
@@ -103,7 +108,8 @@ module Druid
     # Finds all hidden fields that match the identifier
     #
     # @param [Hash] identifier how we find all hidden fields. You can use a multiple parameters
-    # by combining of any of the following except xpath. The valid keys are:
+    #  by combining of any of the following except xpath. It defaults to an empty Hash
+    #  which will return all hidden fields. The valid keys are:
     #
     #   * :class
     #   * :css
@@ -115,7 +121,7 @@ module Druid
     #   * :xpath
     #   * :value
     #
-    def hidden_field_elements identifier
+    def hidden_field_elements(identifier={})
       hidden_fields_for identifier.clone
     end
 
@@ -123,7 +129,8 @@ module Druid
     # Finds a text area
     #
     # @param [Hash] identifier how we find a text area. You can use a multiple parameters
-    #  by combining of any of the following except xpath. The valid keys are:
+    #  by combining of any of the following except xpath. It defaults to {:index => 0}
+    #  which will find the first text area. The valid keys are:
     #   * :class
     #   * :css
     #   * :id
@@ -132,7 +139,7 @@ module Druid
     #   * :tag_name
     #   * :xpath
     #
-    def text_area_element identifier
+    def text_area_element(identifier={:index => 0})
       text_area_for identifier.clone
     end
 
@@ -140,7 +147,8 @@ module Druid
     # Finds all text areas for the provided identifier
     #
     # @param [Hash] identifier how we find all text areas. You can use a multiple parameters
-    # by combining of any of the following except xpath. The valid keys are:
+    #   by combining of any of the following except xpath. It defaults to empty Hash
+    #   which will return all text areas. The valid keys are:
     #   * :class
     #   * :css
     #   * :id
@@ -149,7 +157,7 @@ module Druid
     #   * :tag_name
     #   * :xpath
     #
-    def text_area_elements identifier
+    def text_area_elements(identifier={})
       text_areas_for identifier.clone
     end
 
@@ -157,7 +165,8 @@ module Druid
     # Finds a select list
     #
     # @param [Hash] identifier how we find a select list. You can use a multiple parameters
-    #  by combining of any of the following except xpath. The valid keys are:
+    #  by combining of any of the following except xpath. It defaults to {:index => 0}
+    #  Which will find the first select list The valid keys are:
     #   * :class
     #   * :id
     #   * :index
@@ -166,7 +175,7 @@ module Druid
     #   * :value
     #   * :text
     #
-    def select_list_element identifier
+    def select_list_element(identifier={:index => 0})
       select_list_for identifier.clone
     end
 
@@ -174,7 +183,8 @@ module Druid
     # Finds all select lists for the provided identifier
     #
     # @param [Hash] identifier how we find all select lists. You can use a multiple paramaters
-    # by combining of any of the following except xpath. The valid keys are:
+    #   by combining of any of the following except xpath. It defaults to empty Hash
+    #   which will return all select lists. The valid keys are:
     #   * :class
     #   * :id
     #   * :index
@@ -183,7 +193,7 @@ module Druid
     #   * :value
     #   * :text
     #
-    def select_list_elements identifier
+    def select_list_elements(identifier={})
       select_lists_for identifier.clone
     end
 
@@ -191,7 +201,8 @@ module Druid
     # Finds a link
     #
     # @param [Hash] identifier how we find a link. You can use a multiple parameters
-    #  by combining of any of the following except xpath. The valid keys are:
+    #  by combining of any of the following except xpath. It defaults to {:index => 0}
+    #  which will find the first link. The valid keys are:
     #   * :class
     #   * :href
     #   * :id
@@ -203,7 +214,7 @@ module Druid
     #   * :text
     #   * :css
     #
-    def link_element identifier
+    def link_element(identifier={:index => 0})
       link_for identifier.clone
     end
 
@@ -211,7 +222,8 @@ module Druid
     # Finds all links for the provided identifier
     #
     # @param [Hash] identifier how we find all links. You can use a multiple parameters
-    # by combining of any of the following except xpath. The valid keys are:
+    #   by combining of any of the following except xpath. It defaults to empty hash
+    #   which will return all links. The valid keys are:
     #   * :class
     #   * :href
     #   * :id
@@ -223,7 +235,7 @@ module Druid
     #   * :text
     #   * :css
     #
-    def link_elements identifier
+    def link_elements(identifier={})
       links_for identifier.clone
     end
 
@@ -231,7 +243,8 @@ module Druid
     # Finds a check box
     #
     # @param [Hash] identifier how we find a check box. You can use a multiple parameters
-    #  by combining of any of the following except xpath. The valid keys are:
+    #  by combining of any of the following except xpath. It defaults to {:index => 0}
+    #  which will find the first checkbox. The valid keys are:
     #   * :class
     #   * :id
     #   * :index
@@ -239,7 +252,7 @@ module Druid
     #   * :xpath
     #   * :value
     #
-    def checkbox_element identifier
+    def checkbox_element(identifier={:index => 0})
       checkbox_for identifier.clone
     end
 
@@ -247,7 +260,8 @@ module Druid
     # Finds all checkbox elements for the provided identifier
     #
     # @param [Hash] identifier how we find a checkbox. You can use a multiple parameters
-    # by combining of any of the following except xpath. The valid keys are:
+    #  by combining of any of the following except xpath. It defaults to empty Hash
+    #  which will return all checkboxes. The valid keys are:
     #   * :class
     #   * :id
     #   * :index
@@ -255,7 +269,7 @@ module Druid
     #   * :xpath
     #   * :value
     #
-    def checkbox_elements identifier
+    def checkbox_elements(identifier={})
       checkboxes_for identifier.clone
     end
 
@@ -263,14 +277,15 @@ module Druid
     # Finds a radio button
     #
     # @param [Hash] identifier how we find a radio button. You can use a multiple parameters
-    #  by combining of any of the following except xpath. The valid keys are:
+    #  by combining of any of the following except xpath. It defaults to {:index => 0}
+    #  which will find the first radio button. The valid keys are:
     #   * :class
     #   * :id
     #   * :index
     #   * :name
     #   * :xpath
     #
-    def radio_button_element identifier
+    def radio_button_element(identifier={:index => 0})
       radio_button_for identifier.clone
     end
 
@@ -278,14 +293,15 @@ module Druid
     # Finds all radio button elements that match the provided identifier
     #
     # @param [Hash] identifier how we find a radio button. You can use a multiple parameters
-    # by combining of any of the following except xpath. The valid keys are:
+    #   by combining of any of the following except xpath. It defaults to empty Hash
+    #   which will return all radio buttons. The valid keys are:
     #   * :class
     #   * :id
     #   * :index
     #   * :name
     #   * :xpath
     #
-    def radio_button_elements identifier
+    def radio_button_elements(identifier={})
       radio_buttons_for identifier.clone
     end
 
@@ -293,7 +309,8 @@ module Druid
     # Finds a div
     #
     # @param [Hash] identifier how we find a div. You can use a multiple parameters
-    #  by combining of any of the following except xpath. The valid keys are:
+    #  by combining of any of the following except xpath. It defaults to {:index => 0}
+    #  which will find the first div. The valid keys are:
     #   * :class
     #   * :id
     #   * :index
@@ -301,7 +318,7 @@ module Druid
     #   * :xpath
     #   * :text
     #
-    def div_element identifier
+    def div_element(identifier={:index => 0})
       div_for identifier.clone
     end
 
@@ -309,7 +326,8 @@ module Druid
     # Finds all divs that match the provided identifier
     #
     # @param [Hash] identifier how we find a div. You can use a multiple parameters
-    # by combining of any of the following except xpath. The valid keys are:
+    #   by combining of any of the following except xpath. It defaults to empty Hash
+    #   which will return all divs. The valid keys are:
     #   * :class
     #   * :id
     #   * :index
@@ -317,7 +335,7 @@ module Druid
     #   * :xpath
     #   * :text
     #
-    def div_elements identifier
+    def div_elements(identifier={})
       divs_for identifier
     end
 
@@ -325,14 +343,15 @@ module Druid
     # Finds a span
     #
     # @param [Hash] identifier how we find a span. You can use a multiple parameters
-    #  by combining of any of the following except xpath. The valid keys are:
+    #  by combining of any of the following except xpath. It defaults to {:index => 0}
+    #  which will find the first span.  The valid keys are:
     #   * :class
     #   * :id
     #   * :index
     #   * :name
     #   * :xpath
     #
-    def span_element identifier
+    def span_element(identifier={:index => 0})
       span_for identifier.clone
     end
 
@@ -340,14 +359,15 @@ module Druid
     # Finds all span elements that match the provided identifier
     #
     # @param [Hash] identifier how we find a span. You can use multiple parameters
-    # by combining of any of the following except xpath. The valid keys are:
+    #   by combining of any of the following except xpath. It defaults to empty Hash
+    #   which will return all spans.  The valid keys are:
     #   * :class
     #   * :id
     #   * :index
     #   * :name
     #   * :xpath
     #
-    def span_elements identifier
+    def span_elements(identifier={})
       spans_for identifier.clone
     end
 
@@ -355,14 +375,15 @@ module Druid
     # Finds a table
     #
     # @param [Hash] identifier how we find a table. You can use a multiple parameters
-    #  by combining of any of the following except xpath. The valid keys are:
+    #   by combining of any of the following except xpath. It defaults to {:index => 0}
+    #   which will find the first table. The valid keys are:
     #   * :class
     #   * :id
     #   * :index
     #   * :name
     #   * :xpath
     #
-    def table_element identifier
+    def table_element(identifier={:index => 0})
       table_for identifier.clone
     end
 
@@ -370,14 +391,15 @@ module Druid
     # Finds all tables with match the provided identifier
     #
     # @param [Hash] identifier how we find a table. You can use a multiple parameters
-    # by combining of any of the following except xpath. The valid keys are:
+    #   by combining of any of the following except xpath. It defaults to empty Hash
+    #   which will return all tables. The valid keys are:
     #   * :class
     #   * :id
     #   * :index
     #   * :name
     #   * :xpath
     #
-    def table_elements identifier
+    def table_elements(identifier={})
       tables_for identifier.clone
     end
 
@@ -385,7 +407,8 @@ module Druid
     # Finds a table cell
     #
     # @param [Hash] identifier how we find a table cell. You can use a multiple parameters
-    #  by combining of any of the following except xpath. The valid keys are:
+    #   by combining of any of the following except xpath. It defaults to {:index => 0}
+    #   which will find the first cell. The valid keys are:
     #   * :class
     #   * :id
     #   * :index
@@ -393,7 +416,7 @@ module Druid
     #   * :xpath
     #   * :text
     #
-    def cell_element identifier
+    def cell_element(identifier={:index => 0})
       cell_for identifier.clone
     end
 
@@ -401,7 +424,8 @@ module Druid
     # Finds all table cell elements that match the provided identifier
     #
     # @param [Hash] identifier how we find a cell. You can use a multiple parameters
-    # by combining of any of the following except xpath. The valid keys are:
+    #   by combining of any of the following except xpath. It defaults to empty Hash
+    #   which will return all cells. The valid keys are:
     #   * :class
     #   * :id
     #   * :index
@@ -409,7 +433,7 @@ module Druid
     #   * :xpath
     #   * :text
     #
-    def cell_elements identifier
+    def cell_elements(identifier={})
       cells_for identifier.clone
     end
 
@@ -417,7 +441,8 @@ module Druid
     # Finds an image
     #
     # @param [Hash] identifier how we find an image. You can use a multiple parameters
-    #  by combining of any of the following except xpath. The valid keys are:
+    #   by combining of any of the following except xpath. It defaults to {:index => 0}
+    #   which will find the first image. The valid keys are:
     #   * :class
     #   * :id
     #   * :index
@@ -426,7 +451,7 @@ module Druid
     #   * :alt
     #   * :src
     #
-    def image_element identifier
+    def image_element(identifier={:index => 0})
       image_for identifier.clone
     end
 
@@ -434,7 +459,8 @@ module Druid
     # Finds all images that match the provided identifier
     #
     # @param [Hash] identifier how we find an image. You can use a multiple parameters
-    # by combining of any of the following except xpath. The valid keys are:
+    #   by combining of any of the following except xpath. It defaults to empty Hash
+    #   which will return all images. The valid keys are:
     #   * :class
     #   * :id
     #   * :index
@@ -443,7 +469,7 @@ module Druid
     #   * :alt
     #   * :src
     #
-    def image_elements identifier
+    def image_elements(identifier={})
       images_for identifier.clone
     end
 
@@ -451,14 +477,15 @@ module Druid
     # Finds a form
     #
     # @param [Hash] identifier how we find a form. You can use a multiple parameters
-    #  by combining of any of the following except xpath. The valid keys are:
+    #   by combining of any of the following except xpath. It defaults to {:index => 0}
+    #   which will find the first form. The valid keys are:
     #   * :class
     #   * :id
     #   * :index
     #   * :xpath
     #   * :action
     #
-    def form_element identifier
+    def form_element(identifier={:index => 0})
       form_for identifier.clone
     end
 
@@ -466,14 +493,15 @@ module Druid
     # Finds all forms that match the provided identifier
     #
     # @param [Hash] identifier how we find a form. You can use a multiple parameters
-    #  by combining of any of the following except xpath. The valid keys are:
+    #   by combining of any of the following except xpath. It defaults to empty Hash
+    #   which will return all forms. The valid keys are:
     #   * :class
     #   * :id
     #   * :index
     #   * :xpath
     #   * :action
     #
-    def form_elements identifier
+    def form_elements(identifier={})
       forms_for identifier.clone
     end
 
@@ -481,14 +509,15 @@ module Druid
     # Finds a list item
     #
     # @param [Hash] identifier how we find a list item. You can use a multiple parameters
-    #  by combining of any of the following except xpath. The valid keys are:
+    #   by combining of any of the following except xpath. It defaults to {:index => 0}
+    #   which will find the first list item. The valid keys are:
     #   * :class
     #   * :id
     #   * :index
     #   * :xpath
     #   * :name
     #
-    def list_item_element identifier
+    def list_item_element(identifier={:index => 0})
       list_item_for identifier.clone
     end
 
@@ -496,14 +525,15 @@ module Druid
     # Finds all list items that match the identifier
     #
     # @param [Hash] identifier how we find a list item. You can use a multiple parameters
-    #  by combining of any of the following except xpath. The valid keys are:
+    #   by combining of any of the following except xpath. It defaults to empty Hash
+    #   which will return all list items. The valid keys are:
     #   * :class
     #   * :id
     #   * :index
     #   * :xpath
     #   * :name
     #
-    def list_item_elements identifier
+    def list_item_elements(identifier={})
       list_items_for identifier.clone
     end
 
@@ -511,14 +541,15 @@ module Druid
     # Finds an ordered list
     #
     # @param [Hash] identifier how we find an ordered list. You can use a multiple parameters
-    #  by combining of any of the following except xpath. The valid keys are:
+    #   by combining of any of the following except xpath. It defaults to {:index => 0}
+    #   which will find the first ordered list. The valid keys are:
     #   * :class
     #   * :id
     #   * :index
     #   * :xpath
     #   * :name
     #
-    def ordered_list_element identifier
+    def ordered_list_element(identifier={:index => 0})
       ordered_list_for identifier.clone
     end
 
@@ -526,14 +557,15 @@ module Druid
     # Finds all ordered lists that match the provided identifier
     #
     # @param [Hash] identifier how we find an ordered list. You can use a multiple parameters
-    #  by combining of any of the following except xpath. The valid keys are:
+    #   by combining of any of the following except xpath. It defaults to empty Hash
+    #   which will return all ordered lists. The valid keys are:
     #   * :class
     #   * :id
     #   * :index
     #   * :xpath
     #   * :name
     #
-    def ordered_list_elements identifier
+    def ordered_list_elements(identifier={})
       ordered_lists_for identifier.clone
     end
 
@@ -541,14 +573,15 @@ module Druid
     # Finds an unordered list
     #
     # @param [Hash] identifier how we find an unordered list. You can use a multiple parameters
-    #  by combining of any of the following except xpath. The valid keys are:
+    #   by combining of any of the following except xpath. It defaults to {:index => 0}
+    #   which will find the first unordered list. The valid keys are:
     #   * :class
     #   * :id
     #   * :index
     #   * :xpath
     #   * :name
     #
-    def unordered_list_element identifier
+    def unordered_list_element(identifier={:index => 0})
       unordered_list_for identifier.clone
     end
 
@@ -556,14 +589,15 @@ module Druid
     # Finds all unordered lists that match the provided identifier
     #
     # @param [Hash] identifier how we find an unordered list. You can use a multiple parameters
-    #  by combining of any of the following except xpath. The valid keys are:
+    #   by combining of any of the following except xpath. It defaults to empty Hash
+    #   which will return all unordered lists. The valid keys are:
     #   * :class
     #   * :id
     #   * :index
     #   * :xpath
     #   * :name
     #
-    def unordered_list_elements identifier
+    def unordered_list_elements(identifier={})
       unordered_lists_for identifier.clone
     end
 
@@ -571,14 +605,15 @@ module Druid
     # Finds a h1
     #
     # @param [Hash] identifier how we find a h1. You can use a multiple parameters
-    #  by combining of any of the following except xpath. The valid keys are:
+    #   by combining of any of the following except xpath. It defaults to {:index => 0}
+    #   which will find the first h1. The valid keys are:
     #   * :class
     #   * :id
     #   * :index
     #   * :xpath
     #   * :name
     #
-    def h1_element identifier
+    def h1_element(identifier={:index => 0})
       h1_for identifier.clone
     end
 
@@ -587,14 +622,15 @@ module Druid
     #
     #
     # @param [Hash] identifier how we find a h1. You can use a multiple parameters
-    #  by combining of any of the following except xpath. The valid keys are:
+    #   by combining of any of the following except xpath. It defaults to empty hash
+    #   which will return all h1s. The valid keys are:
     #   * :class
     #   * :id
     #   * :index
     #   * :xpath
     #   * :name
     #
-    def h1_elements identifier
+    def h1_elements(identifier={})
       h1s_for identifier.clone
     end
 
@@ -602,14 +638,15 @@ module Druid
     # Finds a h2
     #
     # @param [Hash] identifier how we find a h2. You can use a multiple parameters
-    #  by combining of any of the following except xpath. The valid keys are:
+    #   by combining of any of the following except xpath. It defaults to {:index => 0}
+    #   which will find the first h2. The valid keys are:
     #   * :class
     #   * :id
     #   * :index
     #   * :xpath
     #   * :name
     #
-    def h2_element identifier
+    def h2_element(identifier={:index => 0})
       h2_for identifier.clone
     end
 
@@ -618,14 +655,15 @@ module Druid
     #
     #
     # @param [Hash] identifier how we find a h2. You can use a multiple parameters
-    #  by combining of any of the following except xpath. The valid keys are:
+    #   by combining of any of the following except xpath. It defaults to empty Hash
+    #   which will return all h2s. The valid keys are:
     #   * :class
     #   * :id
     #   * :index
     #   * :xpath
     #   * :name
     #
-    def h2_elements identifier
+    def h2_elements(identifier={})
       h2s_for identifier.clone
     end
 
@@ -633,14 +671,15 @@ module Druid
     # Finds a h3
     #
     # @param [Hash] identifier how we find a h3. You can use a multiple parameters
-    #  by combining of any of the following except xpath. The valid keys are:
+    #   by combining of any of the following except xpath. It defaults to {:index => 0}
+    #   which will find the first h3. The valid keys are:
     #   * :class
     #   * :id
     #   * :index
     #   * :xpath
     #   * :name
     #
-    def h3_element identifier
+    def h3_element(identifier={:index => 0})
       h3_for identifier.clone
     end
 
@@ -649,14 +688,15 @@ module Druid
     #
     #
     # @param [Hash] identifier how we find a h3. You can use a multiple parameters
-    #  by combining of any of the following except xpath. The valid keys are:
+    #   by combining of any of the following except xpath. It defaults to empty Hash
+    #   which will return all h3s. The valid keys are:
     #   * :class
     #   * :id
     #   * :index
     #   * :xpath
     #   * :name
     #
-    def h3_elements identifier
+    def h3_elements(identifier={})
       h3s_for identifier.clone
     end
 
@@ -664,14 +704,15 @@ module Druid
     # Finds a h4
     #
     # @param [Hash] identifier how we find a h4. You can use a multiple parameters
-    #  by combining of any of the following except xpath. The valid keys are:
+    #   by combining of any of the following except xpath. It defaults to {:index => 0}
+    #   which will find the first h4. The valid keys are:
     #   * :class
     #   * :id
     #   * :index
     #   * :xpath
     #   * :name
     #
-    def h4_element identifier
+    def h4_element(identifier={:index => 0})
       h4_for identifier.clone
     end
 
@@ -680,14 +721,15 @@ module Druid
     #
     #
     # @param [Hash] identifier how we find a h4. You can use a multiple parameters
-    #  by combining of any of the following except xpath. The valid keys are:
+    #   by combining of any of the following except xpath. It defaults to empty Hash
+    #   which will return all h4s. The valid keys are:
     #   * :class
     #   * :id
     #   * :index
     #   * :xpath
     #   * :name
     #
-    def h4_elements identifier
+    def h4_elements(identifier={})
       h4s_for identifier.clone
     end
 
@@ -695,14 +737,15 @@ module Druid
     # Finds a h5
     #
     # @param [Hash] identifier how we find a h5. You can use a multiple parameters
-    #  by combining of any of the following except xpath. The valid keys are:
+    #   by combining of any of the following except xpath. It defaults to {:index => 0}
+    #   which will find the first h5. The valid keys are:
     #   * :class
     #   * :id
     #   * :index
     #   * :xpath
     #   * :name
     #
-    def h5_element identifier
+    def h5_element(identifier={:index => 0})
       h5_for identifier.clone
     end
 
@@ -711,14 +754,15 @@ module Druid
     #
     #
     # @param [Hash] identifier how we find a h5. You can use a multiple parameters
-    #  by combining of any of the following except xpath. The valid keys are:
+    #   by combining of any of the following except xpath. It defaults to empty Hash
+    #   which will return all h5s.  The valid keys are:
     #   * :class
     #   * :id
     #   * :index
     #   * :xpath
     #   * :name
     #
-    def h5_elements identifier
+    def h5_elements(identifier={})
       h5s_for identifier.clone
     end
 
@@ -726,14 +770,15 @@ module Druid
     # Finds a h6
     #
     # @param [Hash] identifier how we find a h6. You can use a multiple parameters
-    #  by combining of any of the following except xpath. The valid keys are:
+    #   by combining of any of the following except xpath. It defaults to {:index => 0}
+    #   which will find the first h6. The valid keys are:
     #   * :class
     #   * :id
     #   * :index
     #   * :xpath
     #   * :name
     #
-    def h6_element identifier
+    def h6_element(identifier={:index => 0})
       h6_for identifier.clone
     end
 
@@ -742,14 +787,15 @@ module Druid
     #
     #
     # @param [Hash] identifier how we find a h6. You can use a multiple parameters
-    #  by combining of any of the following except xpath. The valid keys are:
+    #   by combining of any of the following except xpath. It defaults to empty Hash
+    #   which will return all h6s. The valid keys are:
     #   * :class
     #   * :id
     #   * :index
     #   * :xpath
     #   * :name
     #
-    def h6_elements identifier
+    def h6_elements(identifier={})
       h6s_for identifier.clone
     end
 
@@ -757,14 +803,15 @@ module Druid
     # Finds a paragraph
     #
     # @param [Hash] identifier how we find a paragraph. You can use a multiple parameters
-    #  by combining of any of the following except xpath. The valid keys are:
+    #   by combining of any of the following except xpath. It defaults to {:index => 0}
+    #   which will find the first paragraph. The valid keys are:
     #   * :class
     #   * :id
     #   * :index
     #   * :xpath
     #   * :name
     #
-    def paragraph_element identifier
+    def paragraph_element(identifier={:index => 0})
       paragraph_for identifier.clone
     end
 
@@ -772,14 +819,15 @@ module Druid
     # Finds all paragraph elements that match the provided identifier
     #
     # @param [Hash] identifier how we find a paragraph. You can use a multiple parameters
-    #  by combining of any of the following except xpath. The valid keys are:
+    #   by combining of any of the following except xpath. It defaults to empty Hash
+    #   which will return all paragraphs. The valid keys are:
     #   * :class
     #   * :id
     #   * :index
     #   * :xpath
     #   * :name
     #
-    def paragraph_elements identifier
+    def paragraph_elements(identifier={})
       paragraphs_for identifier.clone
     end
 
@@ -787,7 +835,8 @@ module Druid
     # Finds a file field
     #
     # @param [Hash] identifier how we find a file field. You can use a multiple parameters
-    #  by combining of any of the following except xpath. The valid keys are:
+    #   by combining of any of the following except xpath. It defaults to {:index => 0}
+    #   which will find the first file field. The valid keys are:
     #   * :class
     #   * :id
     #   * :index
@@ -795,15 +844,33 @@ module Druid
     #   * :name
     #   * :title
     #
-    def file_field_element identifier
+    def file_field_element(identifier={:index => 0})
       file_field_for identifier.clone
     end
 
+    #
+    # Finds all file fields that match the provided identifier
+    #
+    # @param [Hash] identifier how we find a file field. You can use a multiple parameters
+    #   by combining of any of the following except xpath. It defaults to empty Hash
+    #   which will return all file fields. The valid keys are:
+    #   * :class
+    #   * :id
+    #   * :index
+    #   * :xpath
+    #   * :name
+    #   * :title
+    #
+    def file_field_elements(identifier={})
+      file_fields_for identifier.clone
+    end
+
     #
     # Finds a label
     #
     # @param [Hash] identifier how we find a label. You can use a multiple paramaters
-    # by combining of any of the following except xpath. The valid keys are:
+    #   by combining of any of the following except xpath. It defaults to {:index => 0}
+    #   which will find the first label. The valid keys are:
     #   * :class
     #   * :id
     #   * :index
@@ -811,7 +878,7 @@ module Druid
     #   * :text
     #   * :xpath
     #
-    def label_element(identifier)
+    def label_element(identifier={:index => 0})
       label_for identifier.clone
     end
 
@@ -819,7 +886,8 @@ module Druid
     # Finds all labels that match the provided identifier
     #
     # @param [Hash] identifier how we find a label. You can use a multiple paramaters
-    # by combining of any of the following except xpath. The valid keys are:
+    #   by combining of any of the following except xpath. It defaults to empty Hash
+    #   which will return all lables. The valid keys are:
     #   * :class
     #   * :id
     #   * :index
@@ -827,8 +895,24 @@ module Druid
     #   * :text
     #   * :xpath
     #
-    def label_elements(identifier)
+    def label_elements(identifier={})
       labels_for identifier.clone
     end
+
+    #
+    # Finds an element
+    #
+    # @param [Symbol] the name of the tag for the element
+    # @param [Hash] identifier how we find an element. You can use a multiple parameters
+    #   by combining of any of the following except xpath. The valid keys are:
+    #   * :class
+    #   * :id
+    #   * :index
+    #   * :name
+    #   * :xpath
+    #
+    def element(tag, identifier={:index => 0})
+      element_for(tag, identifier.clone)
+    end
   end
 end