page-object 0.2.2 → 0.2.3

data/lib/page-object/elements/element.rb

@@ -41,6 +41,17 @@ module PageObject
           return how, what
         end
       end
+      
+      # @private
+      # delegate calls to driver element
+      def method_missing(*args, &block)
+        m = args.shift
+        begin
+          element.send m, *args, &block
+        rescue Exception => e
+          raise
+        end
+      end
 
       protected
 

data/lib/page-object/elements/table_cell.rb

@@ -2,6 +2,16 @@ module PageObject
   module Elements
     class TableCell < Element
 
+      protected
+
+      def self.watir_finders
+        super + [:text]
+      end
+
+      def self.selenium_finders
+        super + [:text]
+      end
+
     end
   end
 end

data/lib/page-object/platforms/selenium/page_object.rb

@@ -118,9 +118,7 @@ module PageObject
         # See PageObject::Accessors#text_field
         #
         def text_field_value_for(identifier)
-          frame_identifiers = identifier.delete(:frame)
-          identifier = add_tagname_if_needed identifier, 'input', :type => 'text'
-          how, what = Elements::TextField.selenium_identifier_for identifier
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::TextField, 'input', :type => 'text')
           switch_to_frame(frame_identifiers)
           text = @browser.find_element(how, what).attribute('value')
           @browser.switch_to.default_content
@@ -132,9 +130,7 @@ module PageObject
         # See PageObject::Accessors#text_field
         #
         def text_field_value_set(identifier, value)
-          frame_identifiers = identifier.delete(:frame)
-          identifier = add_tagname_if_needed identifier, 'input', :type => 'text'
-          how, what = Elements::TextField.selenium_identifier_for identifier
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::TextField, 'input', :type => 'text')
           switch_to_frame(frame_identifiers)
           @browser.find_element(how, what).clear
           @browser.find_element(how, what).send_keys(value)
@@ -146,9 +142,7 @@ module PageObject
         # See PageObject::Accessors#text_field
         #
         def text_field_for(identifier)
-          frame_identifiers = identifier.delete(:frame)
-          identifier = add_tagname_if_needed identifier, 'input', :type => 'text'
-          how, what = Elements::TextField.selenium_identifier_for identifier
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::TextField, 'input', :type => 'text')
           switch_to_frame(frame_identifiers)
           element = @browser.find_element(how, what)
           @browser.switch_to.default_content
@@ -160,9 +154,7 @@ module PageObject
         # See PageObject::Accessors#hidden_field
         #
         def hidden_field_value_for(identifier)
-          frame_identifiers = identifier.delete(:frame)
-          identifier = add_tagname_if_needed identifier, 'input', :type => 'hidden'
-          how, what = Elements::HiddenField.selenium_identifier_for identifier
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::HiddenField, 'input', :type => 'hidden')
           switch_to_frame(frame_identifiers)
           value = @browser.find_element(how, what).attribute('value')
           @browser.switch_to.default_content
@@ -174,9 +166,7 @@ module PageObject
         # See PageObject::Accessors#hidden_field
         #
         def hidden_field_for(identifier)
-          frame_identifiers = identifier.delete(:frame)
-          identifier = add_tagname_if_needed identifier, 'input', :type => 'hidden'
-          how, what = Elements::HiddenField.selenium_identifier_for identifier
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::HiddenField, 'input', :type => 'hidden')
           switch_to_frame(frame_identifiers)
           element = @browser.find_element(how, what)
           @browser.switch_to.default_content
@@ -188,9 +178,7 @@ module PageObject
         # See PageObject::Accessors#text_area
         #
         def text_area_value_set(identifier, value)
-          frame_identifiers = identifier.delete(:frame)
-          identifier = add_tagname_if_needed identifier, 'textarea'
-          how, what = Elements::TextArea.selenium_identifier_for identifier
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::TextArea, 'textarea')
           switch_to_frame(frame_identifiers)
           @browser.find_element(how, what).send_keys(value)
           @browser.switch_to.default_content
@@ -201,9 +189,7 @@ module PageObject
         # See PageObject::Accessors#text_area
         #
         def text_area_value_for(identifier)
-          frame_identifiers = identifier.delete(:frame)
-          identifier = add_tagname_if_needed identifier, 'textarea'
-          how, what = Elements::TextArea.selenium_identifier_for identifier
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::TextArea, 'textarea')
           switch_to_frame(frame_identifiers)
           value = @browser.find_element(how, what).attribute('value')
           @browser.switch_to.default_content
@@ -215,9 +201,7 @@ module PageObject
         # See PageObject::Accessors#text_area
         #
         def text_area_for(identifier)
-          frame_identifiers = identifier.delete(:frame)
-          identifier = add_tagname_if_needed identifier, 'textarea'
-          how, what = Elements::TextArea.selenium_identifier_for identifier
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::TextArea, 'textarea')
           switch_to_frame(frame_identifiers)
           element = @browser.find_element(how, what)
           @browser.switch_to.default_content
@@ -229,9 +213,7 @@ module PageObject
         # See PageObject::Accessors#select_list
         #
         def select_list_value_for(identifier)
-          frame_identifiers = identifier.delete(:frame)
-          identifier = add_tagname_if_needed identifier, 'select'
-          how, what = Elements::SelectList.selenium_identifier_for identifier
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::SelectList, 'select')
           switch_to_frame(frame_identifiers)
           value = @browser.find_element(how, what).attribute('value')
           @browser.switch_to.default_content
@@ -243,9 +225,7 @@ module PageObject
         # See PageObject::Accessors#select_list
         #
         def select_list_value_set(identifier, value)
-          frame_identifiers = identifier.delete(:frame)
-          identifier = add_tagname_if_needed identifier, 'select'
-          how, what = Elements::SelectList.selenium_identifier_for identifier
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::SelectList, 'select')
           switch_to_frame(frame_identifiers)
           @browser.find_element(how, what).send_keys(value)
           @browser.switch_to.default_content
@@ -256,9 +236,7 @@ module PageObject
         # See PageObject::Accessors#select_list
         #
         def select_list_for(identifier)
-          frame_identifiers = identifier.delete(:frame)
-          identifier = add_tagname_if_needed identifier, 'select'
-          how, what = Elements::SelectList.selenium_identifier_for identifier
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::SelectList, 'select')
           switch_to_frame(frame_identifiers)
           element = @browser.find_element(how, what)
           @browser.switch_to.default_content
@@ -270,9 +248,7 @@ module PageObject
         # See PageObject::Accessors#link
         #
         def click_link_for(identifier)
-          frame_identifiers = identifier.delete(:frame)
-          identifier = add_tagname_if_needed identifier, "a"
-          how, what = Elements::Link.selenium_identifier_for identifier
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::Link, 'a')
           switch_to_frame frame_identifiers
           @browser.find_element(how, what).click
           @browser.switch_to.default_content
@@ -283,9 +259,7 @@ module PageObject
         # see PageObject::Accessors#link
         #
         def link_for(identifier)
-          frame_identifiers = identifier.delete(:frame)
-          identifier = add_tagname_if_needed identifier, "a"
-          how, what = Elements::Link.selenium_identifier_for identifier
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::Link, 'a')
           switch_to_frame(frame_identifiers)
           element = @browser.find_element(how, what)
           @browser.switch_to.default_content
@@ -297,9 +271,7 @@ module PageObject
         # See PageObject::Accessors#checkbox
         #
         def check_checkbox(identifier)
-          frame_identifiers = identifier.delete(:frame)
-          identifier = add_tagname_if_needed identifier, 'input', :type => 'checkbox'
-          how, what = Elements::CheckBox.selenium_identifier_for identifier
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::CheckBox, 'input', :type => 'checkbox')
           switch_to_frame(frame_identifiers)
           @browser.find_element(how, what).click unless @browser.find_element(how, what).selected?
           @browser.switch_to.default_content
@@ -310,9 +282,7 @@ module PageObject
         # See PageObject::Accessors#checkbox
         #
         def uncheck_checkbox(identifier)
-          frame_identifiers = identifier.delete(:frame)
-          identifier = add_tagname_if_needed identifier, 'input', :type => 'checkbox'
-          how, what = Elements::CheckBox.selenium_identifier_for identifier
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::CheckBox, 'input', :type => 'checkbox')
           switch_to_frame(frame_identifiers)
           @browser.find_element(how, what).click if @browser.find_element(how, what).selected?
           @browser.switch_to.default_content
@@ -323,9 +293,7 @@ module PageObject
         # See PageObject::Accessors#checkbox
         #
         def checkbox_checked?(identifier)
-          frame_identifiers = identifier.delete(:frame)
-          identifier = add_tagname_if_needed identifier, 'input', :type => 'checkbox'
-          how, what = Elements::CheckBox.selenium_identifier_for identifier
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::CheckBox, 'input', :type => 'checkbox')
           switch_to_frame(frame_identifiers)
           value = @browser.find_element(how, what).selected?
           @browser.switch_to.default_content
@@ -337,9 +305,7 @@ module PageObject
         # See PageObject::Accessors#checkbox
         #
         def checkbox_for(identifier)
-          frame_identifiers = identifier.delete(:frame)
-          identifier = add_tagname_if_needed identifier, 'input', :type => 'checkbox'
-          how, what = Elements::CheckBox.selenium_identifier_for identifier
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::CheckBox, 'input', :type => 'checkbox')
           switch_to_frame(frame_identifiers)
           element = @browser.find_element(how, what)
           @browser.switch_to.default_content
@@ -351,9 +317,7 @@ module PageObject
         # See PageObject::Accessors#radio_button
         #
         def select_radio(identifier)
-          frame_identifiers = identifier.delete(:frame)
-          identifier = add_tagname_if_needed identifier, 'input', :type => 'radio'
-          how, what = Elements::RadioButton.selenium_identifier_for identifier
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::RadioButton, 'input', :type => 'radio')
           switch_to_frame(frame_identifiers)
           @browser.find_element(how, what).click unless @browser.find_element(how, what).selected?
           @browser.switch_to.default_content
@@ -364,9 +328,7 @@ module PageObject
         # See PageObject::Accessors#radio_button
         #
         def clear_radio(identifier)
-          frame_identifiers = identifier.delete(:frame)
-          identifier = add_tagname_if_needed identifier, 'input', :type => 'radio'
-          how, what = Elements::RadioButton.selenium_identifier_for identifier
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::RadioButton, 'input', :type => 'radio')
           switch_to_frame(frame_identifiers)
           @browser.find_element(how, what).click if @browser.find_element(how, what).selected?
           @browser.switch_to.default_content
@@ -377,9 +339,7 @@ module PageObject
         # See PageObject::Accessors#radio_button
         #
         def radio_selected?(identifier)
-          frame_identifiers = identifier.delete(:frame)
-          identifier = add_tagname_if_needed identifier, 'input', :type => 'radio'
-          how, what = Elements::RadioButton.selenium_identifier_for identifier
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::RadioButton, 'input', :type => 'radio')
           switch_to_frame(frame_identifiers)
           value = @browser.find_element(how, what).selected?
           @browser.switch_to.default_content
@@ -391,9 +351,7 @@ module PageObject
         # See PageObject::Accessors#radio_button
         #
         def radio_button_for(identifier)
-          frame_identifiers = identifier.delete(:frame)
-          identifier = add_tagname_if_needed identifier, 'input', :type => 'radio'
-          how, what = Elements::RadioButton.selenium_identifier_for identifier
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::RadioButton, 'input', :type => 'radio')
           switch_to_frame(frame_identifiers)
           element = @browser.find_element(how, what)
           @browser.switch_to.default_content
@@ -405,9 +363,7 @@ module PageObject
         # See PageObject::Accessors#div
         #
         def div_text_for(identifier)
-          frame_identifiers = identifier.delete(:frame)
-          identifier = add_tagname_if_needed identifier, 'div'
-          how, what = Elements::Div.selenium_identifier_for identifier
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::Div, 'div')
           switch_to_frame(frame_identifiers)
           value = @browser.find_element(how, what).text
           @browser.switch_to.default_content
@@ -419,9 +375,7 @@ module PageObject
         # See PageObject::Accessors#div
         #
         def div_for(identifier)
-          frame_identifiers = identifier.delete(:frame)
-          identifier = add_tagname_if_needed identifier, 'div'
-          how, what = Elements::Div.selenium_identifier_for identifier
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::Div, 'div')
           switch_to_frame(frame_identifiers)
           element = @browser.find_element(how, what)
           @browser.switch_to.default_content
@@ -433,9 +387,7 @@ module PageObject
         # See PageObject::Accessors#span
         #
         def span_text_for(identifier)
-          frame_identifiers = identifier.delete(:frame)
-          identifier = add_tagname_if_needed identifier, 'span'
-          how, what = Elements::Span.selenium_identifier_for identifier
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::Span, 'span')
           switch_to_frame(frame_identifiers)
           value = @browser.find_element(how, what).text
           @browser.switch_to.default_content
@@ -447,9 +399,7 @@ module PageObject
         # See PageObject::Accessors#span
         #
         def span_for(identifier)
-          frame_identifiers = identifier.delete(:frame)
-          identifier = add_tagname_if_needed identifier, 'span'
-          how, what = Elements::Span.selenium_identifier_for identifier
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::Span, 'span')
           switch_to_frame(frame_identifiers)
           element = @browser.find_element(how, what)
           @browser.switch_to.default_content
@@ -461,9 +411,7 @@ module PageObject
         # See PageObject::Accessors#button
         #
         def click_button_for(identifier)
-          frame_identifiers = identifier.delete(:frame)
-          identifier = add_tagname_if_needed identifier, 'input', :type => 'submit'
-          how, what = Elements::Button.selenium_identifier_for identifier
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::Button, 'input', :type => 'submit')
           switch_to_frame(frame_identifiers)
           @browser.find_element(how, what).click
           @browser.switch_to.default_content
@@ -474,9 +422,7 @@ module PageObject
         # See PageObject::Accessors#button
         #
         def button_for(identifier)
-          frame_identifiers = identifier.delete(:frame)
-          identifier = add_tagname_if_needed identifier, 'input', :type => 'submit'
-          how, what = Elements::Button.selenium_identifier_for identifier
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::Button, 'input', :type => 'submit')
           switch_to_frame(frame_identifiers)
           element = @browser.find_element(how, what)
           @browser.switch_to.default_content
@@ -488,9 +434,7 @@ module PageObject
         # See PageObject::Accessors#table
         #
         def table_for(identifier)
-          frame_identifiers = identifier.delete(:frame)
-          identifier = add_tagname_if_needed identifier, 'table'
-          how, what = Elements::Table.selenium_identifier_for identifier
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::Table, 'table')
           switch_to_frame(frame_identifiers)
           element = @browser.find_element(how, what)
           @browser.switch_to.default_content
@@ -502,9 +446,7 @@ module PageObject
         # See PageObject::Accessors#cell
         #
         def cell_text_for(identifier)
-          frame_identifiers = identifier.delete(:frame)
-          identifier = add_tagname_if_needed identifier, 'td'
-          how, what = Elements::TableCell.selenium_identifier_for identifier
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::TableCell, 'td')
           switch_to_frame(frame_identifiers)
           value = @browser.find_element(how, what).text
           @browser.switch_to.default_content
@@ -516,9 +458,7 @@ module PageObject
         # See PageObject::Accessors#cell
         #
         def cell_for(identifier)
-          frame_identifiers = identifier.delete(:frame)
-          identifier = add_tagname_if_needed identifier, 'td'
-          how, what = Elements::TableCell.selenium_identifier_for identifier
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::TableCell, 'td')
           switch_to_frame(frame_identifiers)
           element = @browser.find_element(how, what)
           @browser.switch_to.default_content
@@ -530,9 +470,7 @@ module PageObject
         # See PageObject::Accessors#image
         #
         def image_for(identifier)
-          frame_identifiers = identifier.delete(:frame)
-          identifier = add_tagname_if_needed identifier, 'img'
-          how, what = Elements::Image.selenium_identifier_for identifier
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::Image, 'img')
           switch_to_frame(frame_identifiers)
           element = @browser.find_element(how, what)
           @browser.switch_to.default_content
@@ -544,9 +482,7 @@ module PageObject
         # See PageObject::Accessors#form
         #
         def form_for(identifier)
-          frame_identifiers = identifier.delete(:frame)
-          identifier = add_tagname_if_needed identifier, 'form'
-          how, what = Elements::Form.selenium_identifier_for identifier
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::Form, 'form')
           switch_to_frame(frame_identifiers)
           element = @browser.find_element(how, what)
           @browser.switch_to.default_content
@@ -558,9 +494,7 @@ module PageObject
         # See PageObject::Accessors#list_item
         #
         def list_item_text_for(identifier)
-          frame_identifiers = identifier.delete(:frame)
-          identifier = add_tagname_if_needed identifier, 'li'
-          how, what = Elements::ListItem.selenium_identifier_for identifier
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::ListItem, 'li')
           switch_to_frame(frame_identifiers)
           value = @browser.find_element(how, what).text
           @browser.switch_to.default_content
@@ -572,9 +506,7 @@ module PageObject
         # See PageObject::Accessors#list_item
         #
         def list_item_for(identifier)
-          frame_identifiers = identifier.delete(:frame)
-          identifier = add_tagname_if_needed identifier, 'li'
-          how, what = Elements::ListItem.selenium_identifier_for identifier
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::ListItem, 'li')
           switch_to_frame(frame_identifiers)
           element = @browser.find_element(how, what)
           @browser.switch_to.default_content
@@ -586,9 +518,7 @@ module PageObject
         # See PageObject::Accessors#unordered_list
         #
         def unordered_list_for(identifier)
-          frame_identifiers = identifier.delete(:frame)
-          identifier = add_tagname_if_needed identifier, 'ul'
-          how, what = Elements::UnorderedList.selenium_identifier_for identifier
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::UnorderedList, 'ul')
           switch_to_frame(frame_identifiers)
           element = @browser.find_element(how, what)
           @browser.switch_to.default_content
@@ -600,9 +530,7 @@ module PageObject
         # See PageObject::Accessors#ordered_list
         #
         def ordered_list_for(identifier)
-          frame_identifiers = identifier.delete(:frame)
-          identifier = add_tagname_if_needed identifier, 'ol'
-          how, what = Elements::OrderedList.selenium_identifier_for identifier
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::OrderedList, 'ol')
           switch_to_frame(frame_identifiers)
           element = @browser.find_element(how, what)
           @browser.switch_to.default_content
@@ -610,6 +538,13 @@ module PageObject
         end
 
         private
+        
+        def parse_identifiers(identifier, element, tag_name=nil, additional=nil)
+          frame_identifiers = identifier.delete(:frame)
+          identifier = add_tagname_if_needed identifier, tag_name, additional if tag_name
+          how, what = element.selenium_identifier_for identifier
+          return how, what, frame_identifiers
+        end
 
         def add_tagname_if_needed identifier, tag, additional=nil
           return identifier if identifier.length < 2 and supported_identifier(identifier, tag, additional)
@@ -627,6 +562,7 @@ module PageObject
           return false if identifier[:text] and tag == 'input' and additional[:type] == 'hidden'
           return false if identifier[:href] and tag == 'a'
           return false if identifier[:text] and tag == 'div'
+          return false if identifier[:text] and tag == 'td'
           true
         end
 

data/lib/page-object/platforms/watir/page_object.rb

@@ -101,8 +101,7 @@ module PageObject
     # See PageObject::Accessors#text_field
     #
     def text_field_value_for(identifier)
-      frame_identifiers = identifier.delete(:frame)
-      identifier = Elements::TextField.watir_identifier_for identifier
+      identifier, frame_identifiers = parse_identifiers(identifier, Elements::TextField)
       @browser.instance_eval "#{nested_frames(frame_identifiers)}text_field(identifier).value"
     end
 
@@ -111,8 +110,7 @@ module PageObject
     # See PageObject::Accessors#text_field
     #
     def text_field_value_set(identifier, value)
-      frame_identifiers = identifier.delete(:frame)
-      identifier = Elements::TextField.watir_identifier_for identifier
+      identifier, frame_identifiers = parse_identifiers(identifier, Elements::TextField)
       @browser.instance_eval "#{nested_frames(frame_identifiers)}text_field(identifier).set(value)"
     end
     
@@ -121,8 +119,7 @@ module PageObject
     # See PageObject::Accessors#text_field
     #
     def text_field_for(identifier)
-      frame_identifiers = identifier.delete(:frame)
-      identifier = Elements::TextField.watir_identifier_for identifier
+      identifier, frame_identifiers = parse_identifiers(identifier, Elements::TextField)
       element = @browser.instance_eval "#{nested_frames(frame_identifiers)}text_field(identifier)"
       Elements::TextField.new(element, :platform => :watir)
     end
@@ -132,8 +129,7 @@ module PageObject
     # See PageObject::Accessors#hidden_field
     #
     def hidden_field_value_for(identifier)
-      frame_identifiers = identifier.delete(:frame)
-      identifier = Elements::HiddenField.watir_identifier_for identifier
+      identifier, frame_identifiers = parse_identifiers(identifier, Elements::HiddenField)
       @browser.instance_eval "#{nested_frames(frame_identifiers)}hidden(identifier).value"
     end
 
@@ -142,8 +138,7 @@ module PageObject
     # See PageObject::Accessors#hidden_field
     #
     def hidden_field_for(identifier)
-      frame_identifiers = identifier.delete(:frame)
-      identifier = Elements::HiddenField.watir_identifier_for identifier
+      identifier, frame_identifiers = parse_identifiers(identifier, Elements::HiddenField)
       element = @browser.instance_eval "#{nested_frames(frame_identifiers)}hidden(identifier)"
       Elements::HiddenField.new(element, :platform => :watir)
     end
@@ -153,8 +148,7 @@ module PageObject
     # See PageObject::Accessors#text_area
     #
     def text_area_value_set(identifier, value)
-      frame_identifiers = identifier.delete(:frame)
-      identifier = Elements::TextArea.watir_identifier_for identifier
+      identifier, frame_identifiers = parse_identifiers(identifier, Elements::TextArea)
       @browser.instance_eval "#{nested_frames(frame_identifiers)}textarea(identifier).send_keys(value)"
     end
 
@@ -163,8 +157,7 @@ module PageObject
     # See PageObject::Accessors#text_area
     #
     def text_area_value_for(identifier)
-      frame_identifiers = identifier.delete(:frame)
-      identifier = Elements::TextArea.watir_identifier_for identifier
+      identifier, frame_identifiers = parse_identifiers(identifier, Elements::TextArea)
       @browser.instance_eval "#{nested_frames(frame_identifiers)}textarea(identifier).value"
     end
 
@@ -173,8 +166,7 @@ module PageObject
     # See PageObject::Accessors#text_area
     #
     def text_area_for(identifier)
-      frame_identifiers = identifier.delete(:frame)
-      identifier = Elements::TextArea.watir_identifier_for identifier
+      identifier, frame_identifiers = parse_identifiers(identifier, Elements::TextArea)
       element = @browser.instance_eval "#{nested_frames(frame_identifiers)}textarea(identifier)"
       Elements::TextArea.new(element, :platform => :watir)
     end
@@ -184,8 +176,7 @@ module PageObject
     # See PageObject::Accessors#select_list
     #
     def select_list_value_for(identifier)
-      frame_identifiers = identifier.delete(:frame)
-      identifier = Elements::SelectList.watir_identifier_for identifier
+      identifier, frame_identifiers = parse_identifiers(identifier, Elements::SelectList)
       @browser.instance_eval "#{nested_frames(frame_identifiers)}select_list(identifier).value"
     end
 
@@ -194,8 +185,7 @@ module PageObject
     # See PageObject::Accessors#select_list
     #
     def select_list_value_set(identifier, value)
-      frame_identifiers = identifier.delete(:frame)
-      identifier = Elements::SelectList.watir_identifier_for identifier
+      identifier, frame_identifiers = parse_identifiers(identifier, Elements::SelectList)
       @browser.instance_eval "#{nested_frames(frame_identifiers)}select_list(identifier).select(value)"
     end
 
@@ -204,8 +194,7 @@ module PageObject
     # See PageObject::Accessors#select_list
     #
     def select_list_for(identifier)
-      frame_identifiers = identifier.delete(:frame)
-      identifier = Elements::SelectList.watir_identifier_for identifier
+      identifier, frame_identifiers = parse_identifiers(identifier, Elements::SelectList)
       element = @browser.instance_eval "#{nested_frames(frame_identifiers)}select_list(identifier)"
       Elements::SelectList.new(element, :platform => :watir)
     end
@@ -215,8 +204,7 @@ module PageObject
     # See PageObject::Accessors#link
     #
     def click_link_for(identifier)
-      frame_identifiers = identifier.delete(:frame)
-      identifier = Elements::Link.watir_identifier_for identifier
+      identifier, frame_identifiers = parse_identifiers(identifier, Elements::Link)
       @browser.instance_eval "#{nested_frames(frame_identifiers)}link(identifier).click if identifier"
     end
 
@@ -225,8 +213,7 @@ module PageObject
     # see PageObject::Accessors#link
     #
     def link_for(identifier)
-      frame_identifiers = identifier.delete(:frame)
-      identifier = Elements::Link.watir_identifier_for identifier
+      identifier, frame_identifiers = parse_identifiers(identifier, Elements::Link)
       element = @browser.instance_eval "#{nested_frames(frame_identifiers)}link(identifier)"
       Elements::Link.new(element, :platform => :watir)
     end
@@ -236,8 +223,7 @@ module PageObject
     # See PageObject::Accessors#checkbox
     #
     def check_checkbox(identifier)
-      frame_identifiers = identifier.delete(:frame)
-      identifier = Elements::CheckBox.watir_identifier_for identifier
+      identifier, frame_identifiers = parse_identifiers(identifier, Elements::CheckBox)
       @browser.instance_eval "#{nested_frames(frame_identifiers)}checkbox(identifier).set"
     end
 
@@ -246,8 +232,7 @@ module PageObject
     # See PageObject::Accessors#checkbox
     #
     def uncheck_checkbox(identifier)
-      frame_identifiers = identifier.delete(:frame)
-      identifier = Elements::CheckBox.watir_identifier_for identifier
+      identifier, frame_identifiers = parse_identifiers(identifier, Elements::CheckBox)
       @browser.instance_eval "#{nested_frames(frame_identifiers)}checkbox(identifier).clear"
     end
 
@@ -256,8 +241,7 @@ module PageObject
     # See PageObject::Accessors#checkbox
     #
     def checkbox_checked?(identifier)
-      frame_identifiers = identifier.delete(:frame)
-      identifier = Elements::CheckBox.watir_identifier_for identifier
+      identifier, frame_identifiers = parse_identifiers(identifier, Elements::CheckBox)
       @browser.instance_eval "#{nested_frames(frame_identifiers)}checkbox(identifier).set?"
     end
 
@@ -266,8 +250,7 @@ module PageObject
     # See PageObject::Accessors#checkbox
     #
     def checkbox_for(identifier)
-      frame_identifiers = identifier.delete(:frame)
-      identifier = Elements::CheckBox.watir_identifier_for identifier
+      identifier, frame_identifiers = parse_identifiers(identifier, Elements::CheckBox)
       element = @browser.instance_eval "#{nested_frames(frame_identifiers)}checkbox(identifier)"
       Elements::CheckBox.new(element, :platform => :watir)
     end
@@ -277,8 +260,7 @@ module PageObject
     # See PageObject::Accessors#radio_button
     #
     def select_radio(identifier)
-      frame_identifiers = identifier.delete(:frame)
-      identifier = Elements::RadioButton.watir_identifier_for identifier
+      identifier, frame_identifiers = parse_identifiers(identifier, Elements::RadioButton)
       @browser.instance_eval "#{nested_frames(frame_identifiers)}radio(identifier).set"
     end
 
@@ -287,8 +269,7 @@ module PageObject
     # See PageObject::Accessors#radio_button
     #
     def clear_radio(identifier)
-      frame_identifiers = identifier.delete(:frame)
-      identifier = Elements::RadioButton.watir_identifier_for identifier
+      identifier, frame_identifiers = parse_identifiers(identifier, Elements::RadioButton)
       @browser.instance_eval "#{nested_frames(frame_identifiers)}radio(identifier).clear"
     end
 
@@ -297,8 +278,7 @@ module PageObject
     # See PageObject::Accessors#radio_button
     #
     def radio_selected?(identifier)
-      frame_identifiers = identifier.delete(:frame)
-      identifier = Elements::RadioButton.watir_identifier_for identifier
+      identifier, frame_identifiers = parse_identifiers(identifier, Elements::RadioButton)
       @browser.instance_eval "#{nested_frames(frame_identifiers)}radio(identifier).set?"
     end
 
@@ -307,8 +287,7 @@ module PageObject
     # See PageObject::Accessors#radio_button
     #
     def radio_button_for(identifier)
-      frame_identifiers = identifier.delete(:frame)
-      identifier = Elements::RadioButton.watir_identifier_for identifier
+      identifier, frame_identifiers = parse_identifiers(identifier, Elements::RadioButton)
       element = @browser.instance_eval "#{nested_frames(frame_identifiers)}radio(identifier)"
       PageObject::Elements::RadioButton.new(element, :platform => :watir)
     end
@@ -318,9 +297,7 @@ module PageObject
     # See PageObject::Accessors#div
     #
     def div_text_for(identifier)
-      frame_identifiers = identifier.delete(:frame)
-      identifier = add_tagname_if_needed identifier, "div"
-      identifier = Elements::Div.watir_identifier_for identifier
+      identifier, frame_identifiers = parse_identifiers(identifier, Elements::Div, 'div')
       @browser.instance_eval "#{nested_frames(frame_identifiers)}div(identifier).text"
     end
 
@@ -329,9 +306,7 @@ module PageObject
     # See PageObject::Accessors#div
     #
     def div_for(identifier)
-      frame_identifiers = identifier.delete(:frame)
-      identifier = add_tagname_if_needed identifier, "div"
-      identifier = Elements::Div.watir_identifier_for identifier
+      identifier, frame_identifiers = parse_identifiers(identifier, Elements::Div, 'div')
       element = @browser.instance_eval "#{nested_frames(frame_identifiers)}div(identifier)"
       PageObject::Elements::Div.new(element, :platform => :watir)
     end
@@ -341,9 +316,7 @@ module PageObject
     # See PageObject::Accessors#span
     #
     def span_text_for(identifier)
-      frame_identifiers = identifier.delete(:frame)
-      identifier = add_tagname_if_needed identifier, "span"
-      identifier = Elements::Span.watir_identifier_for identifier
+      identifier, frame_identifiers = parse_identifiers(identifier, Elements::Span, 'span')
       @browser.instance_eval "#{nested_frames(frame_identifiers)}span(identifier).text"
     end
 
@@ -352,9 +325,7 @@ module PageObject
     # See PageObject::Accessors#span
     #
     def span_for(identifier)
-      frame_identifiers = identifier.delete(:frame)
-      identifier = add_tagname_if_needed identifier, "span"
-      identifier = Elements::Span.watir_identifier_for identifier
+      identifier, frame_identifiers = parse_identifiers(identifier, Elements::Span, 'span')
       element = @browser.instance_eval "#{nested_frames(frame_identifiers)}span(identifier)"
       PageObject::Elements::Span.new(element, :platform => :watir)
     end
@@ -364,8 +335,7 @@ module PageObject
     # See PageObject::Accessors#button
     #
     def click_button_for(identifier)
-      frame_identifiers = identifier.delete(:frame)
-      identifier = Elements::Button.watir_identifier_for identifier
+      identifier, frame_identifiers = parse_identifiers(identifier, Elements::Button)
       @browser.instance_eval "#{nested_frames(frame_identifiers)}button(identifier).click"
     end
 
@@ -374,8 +344,7 @@ module PageObject
     # See PageObject::Accessors#button
     #
     def button_for(identifier)
-      frame_identifiers = identifier.delete(:frame)
-      identifier = Elements::Button.watir_identifier_for identifier
+      identifier, frame_identifiers = parse_identifiers(identifier, Elements::Button)
       element = @browser.instance_eval "#{nested_frames(frame_identifiers)}button(identifier)"
       PageObject::Elements::Button.new(element, :platform => :watir)
     end
@@ -385,9 +354,7 @@ module PageObject
     # See PageObject::Accessors#table
     #
     def table_for(identifier)
-      frame_identifiers = identifier.delete(:frame)
-      identifier = add_tagname_if_needed identifier, "table"
-      identifier = Elements::Table.watir_identifier_for identifier.clone
+      identifier, frame_identifiers = parse_identifiers(identifier, Elements::Table, 'table')
       element = @browser.instance_eval "#{nested_frames(frame_identifiers)}table(identifier)"
       PageObject::Elements::Table.new(element, :platform => :watir)
     end
@@ -397,9 +364,7 @@ module PageObject
     # See PageObject::Accessors#cell
     #
     def cell_text_for(identifier)
-      frame_identifiers = identifier.delete(:frame)
-      identifier = add_tagname_if_needed identifier, "td"
-      identifier = Elements::TableCell.watir_identifier_for identifier
+      identifier, frame_identifiers = parse_identifiers(identifier, Elements::TableCell, 'td')
       @browser.instance_eval "#{nested_frames(frame_identifiers)}td(identifier).text"
     end
 
@@ -408,9 +373,7 @@ module PageObject
     # See PageObject::Accessors#cell
     #
     def cell_for(identifier)
-      frame_identifiers = identifier.delete(:frame)
-      identifier = add_tagname_if_needed identifier, "td"
-      identifier = Elements::TableCell.watir_identifier_for identifier
+      identifier, frame_identifiers = parse_identifiers(identifier, Elements::TableCell, 'td')
       element = @browser.instance_eval "#{nested_frames(frame_identifiers)}td(identifier)"
       PageObject::Elements::TableCell.new(element, :platform => :watir)
     end
@@ -420,8 +383,7 @@ module PageObject
     # See PageObject::Accessors#image
     #
     def image_for(identifier)
-      frame_identifiers = identifier.delete(:frame)
-      identifier = Elements::Image.watir_identifier_for identifier
+      identifier, frame_identifiers = parse_identifiers(identifier, Elements::Image)
       element = @browser.instance_eval "#{nested_frames(frame_identifiers)}image(identifier)"
       PageObject::Elements::Image.new(element, :platform => :watir)
     end
@@ -431,8 +393,7 @@ module PageObject
     # See PageObject::Accessors#form
     #
     def form_for(identifier)
-      frame_identifiers = identifier.delete(:frame)
-      identifier = Elements::Form.watir_identifier_for identifier
+      identifier, frame_identifiers = parse_identifiers(identifier, Elements::Form)
       element = @browser.instance_eval "#{nested_frames(frame_identifiers)}form(identifier)"
       PageObject::Elements::Form.new(element, :platform => :watir)
     end
@@ -442,9 +403,7 @@ module PageObject
     # See PageObject::Accessors#list_item
     #
     def list_item_text_for(identifier)
-      frame_identifiers = identifier.delete(:frame)
-      identifier = add_tagname_if_needed identifier, "li"
-      identifier = Elements::ListItem.watir_identifier_for identifier
+      identifier, frame_identifiers = parse_identifiers(identifier, Elements::ListItem, 'li')
       @browser.instance_eval "#{nested_frames(frame_identifiers)}li(identifier).text"
     end
 
@@ -453,9 +412,7 @@ module PageObject
     # See PageObject::Accessors#list_item
     #
     def list_item_for(identifier)
-      frame_identifiers = identifier.delete(:frame)
-      identifier = add_tagname_if_needed identifier, "li"
-      identifier = Elements::ListItem.watir_identifier_for identifier
+      identifier, frame_identifiers = parse_identifiers(identifier, Elements::ListItem, 'li')
       element = @browser.instance_eval "#{nested_frames(frame_identifiers)}li(identifier)"
       PageObject::Elements::ListItem.new(element, :platform => :watir)
     end
@@ -465,9 +422,7 @@ module PageObject
     # See PageObject::Accessors#unordered_list
     #
     def unordered_list_for(identifier)
-      frame_identifiers = identifier.delete(:frame)
-      identifier = add_tagname_if_needed identifier, "ul"
-      identifier = Elements::UnorderedList.watir_identifier_for identifier
+      identifier, frame_identifiers = parse_identifiers(identifier, Elements::UnorderedList, 'ul')
       element = @browser.instance_eval "#{nested_frames(frame_identifiers)}ul(identifier)"
       PageObject::Elements::UnorderedList.new(element, :platform => :watir)
     end
@@ -477,14 +432,19 @@ module PageObject
     # See PageObject::Accessors#ordered_list
     #
     def ordered_list_for(identifier)
-      frame_identifiers = identifier.delete(:frame)
-      identifier = add_tagname_if_needed identifier, "ol"
-      identifier = Elements::OrderedList.watir_identifier_for identifier
+      identifier, frame_identifiers = parse_identifiers(identifier, Elements::OrderedList, 'ol')
       element = @browser.instance_eval "#{nested_frames(frame_identifiers)}ol(identifier)"
       PageObject::Elements::OrderedList.new(element, :platform => :watir)
     end
 
     private
+    
+    def parse_identifiers(identifier, element, tag_name=nil)
+      frame_identifiers = identifier.delete(:frame)
+      identifier = add_tagname_if_needed identifier, tag_name if tag_name
+      identifier = element.watir_identifier_for identifier
+      return identifier, frame_identifiers
+    end
 
     def add_tagname_if_needed identifier, tag
       return identifier if identifier.length < 2 and not identifier[:name]