Namespace locators in Webrat::Locators

lib/webrat/core/locators/area_locator.rb

@@ -1,6 +1,9 @@
 require "webrat/core/locators/locator"
 
-class AreaLocator < Locator
+module Webrat
+  module Locators
+    
+    class AreaLocator < Locator
   
       def locate
         @scope.area_by_element(area_element)
@@ -21,4 +24,7 @@ class AreaLocator < Locator
         Webrat::XML.css_search(@scope.dom, "area")
       end
   
+    end
+    
+  end
 end

lib/webrat/core/locators/button_locator.rb

@@ -1,6 +1,9 @@
 require "webrat/core/locators/locator"
 
-class ButtonLocator < Locator
+module Webrat
+  module Locators
+    
+    class ButtonLocator < Locator
   
       def locate
         @scope.field_by_element(button_element)
@@ -34,7 +37,10 @@ class ButtonLocator < Locator
       end
   
       def button_elements
-    Webrat::XML.xpath_search(@scope.dom, *Webrat::ButtonField.xpath_search)
+        Webrat::XML.xpath_search(@scope.dom, *ButtonField.xpath_search)
       end
   
+    end
+    
+  end
 end

lib/webrat/core/locators/field_by_id_locator.rb

@@ -1,6 +1,9 @@
 require "webrat/core/locators/locator"
 
-class FieldByIdLocator < Locator
+module Webrat
+  module Locators
+    
+    class FieldByIdLocator < Locator
   
       def locate
         @scope.field_by_element(field_element)
@@ -17,7 +20,10 @@ class FieldByIdLocator < Locator
       end
   
       def field_elements
-    Webrat::XML.xpath_search(@scope.dom, *Webrat::Field.xpath_search)
+        Webrat::XML.xpath_search(@scope.dom, *Field.xpath_search)
       end
   
+    end
+    
+  end
 end

lib/webrat/core/locators/field_named_locator.rb

@@ -1,6 +1,9 @@
 require "webrat/core/locators/locator"
 
-class FieldNamedLocator < Locator
+module Webrat
+  module Locators
+    
+    class FieldNamedLocator < Locator
   
       def locate
         @scope.field_by_element(field_element)
@@ -24,4 +27,7 @@ class FieldNamedLocator < Locator
         end
       end
   
+    end
+    
+  end
 end

lib/webrat/core/locators/link_locator.rb

@@ -1,6 +1,9 @@
 require "webrat/core/locators/locator"
 
-class LinkLocator < Locator
+module Webrat
+  module Locators
+    
+    class LinkLocator < Locator
   
       def locate
         @scope.link_by_element(link_element)
@@ -38,7 +41,7 @@ class LinkLocator < Locator
       end
   
       def link_elements
-    Webrat::XML.css_search(@scope.dom, *Webrat::Link.css_search)
+        Webrat::XML.css_search(@scope.dom, *Link.css_search)
       end
   
       def replace_nbsp(str)
@@ -49,4 +52,7 @@ class LinkLocator < Locator
         str.gsub('&#xA0;',' ').gsub('&nbsp;', ' ')
       end
   
+    end
+    
+  end
 end

lib/webrat/core/locators/locator.rb

@@ -1,4 +1,7 @@
-class Locator
+module Webrat
+  module Locators
+  
+    class Locator
   
       def initialize(scope, value, *field_types)
         @scope = scope
@@ -6,4 +9,7 @@ class Locator
         @field_types = field_types
       end
   
+    end
+    
+  end
 end