watir/non_control_elements.rb in watir-1.5.4 vs watir/non_control_elements.rb in watir-1.5.5

@@ -1,15 +1,22 @@
+require 'active_support'    
 module Watir
   
   # this class contains items that are common between the span, div, and pre objects
   # it would not normally be used directly
   #
   # many of the methods available to this object are inherited from the Element class
   #
   class NonControlElement < Element
+    def self.inherited subclass
+      class_name = subclass.to_s.demodulize
+      method_name = class_name.underscore
+      Watir::Container.module_eval "def #{method_name}(how, what=nil)
+      return #{class_name}.new(self, how, what); end"
+    end
     include Watir::Exception
-    
+        
     def locate
       if @how == :xpath
         @o = @container.element_by_xpath(@what)
       else
         @o = @container.locate_tagged_element(self.class::TAG, @how, @what)
@@ -39,10 +46,11 @@
       r = string_creator
       r += span_div_string_creator
       return r.join("\n")
     end
   end
+
   
   class Pre < NonControlElement
     TAG = 'PRE'
   end
   
@@ -59,10 +67,18 @@
   # this class is used to deal with Span tags in the html page. It would not normally be created by users
   class Span < NonControlElement
     TAG = 'SPAN'
   end
   
+  class Map < NonControlElement
+    TAG = 'MAP'
+  end
+
+  class Area < NonControlElement
+    TAG = 'AREA'
+  end
+
   # Accesses Label element on the html page - http://msdn.microsoft.com/workshop/author/dhtml/reference/objects/label.asp?frame=true
   class Label < NonControlElement
     TAG = 'LABEL'
     
     # this method is used to populate the properties in the to_s method
@@ -85,7 +101,28 @@
   end
   
   class Li < NonControlElement
     TAG = 'LI'
   end  
-  
+  class Ul < NonControlElement
+    TAG = 'UL'
+  end
+  class H1 < NonControlElement
+    TAG = 'H1'
+  end
+  class H2 < NonControlElement
+    TAG = 'H2'
+  end
+  class H3 < NonControlElement
+    TAG = 'H3'
+  end
+  class H4 < NonControlElement
+    TAG = 'H4'
+  end
+  class H5 < NonControlElement
+    TAG = 'H5'
+  end
+  class H6 < NonControlElement
+    TAG = 'H6'
+  end
+
 end
\ No newline at end of file