Move Document and Element into Node file

lib/capybara.rb

@@ -35,8 +35,8 @@ module Capybara
   autoload :Session,    'capybara/session'
   autoload :XPath,      'capybara/xpath'
   autoload :Node,       'capybara/node'
-  autoload :Document,   'capybara/document'
-  autoload :Element,    'capybara/element'
+  autoload :Document,   'capybara/node'
+  autoload :Element,    'capybara/node'
   autoload :VERSION,    'capybara/version'
 
   module Driver

lib/capybara/document.rb

@@ -1,4 +0,0 @@
-module Capybara
-  class Document < Node
-  end
-end

lib/capybara/element.rb

@@ -1,12 +0,0 @@
-module Capybara
-  class Element < Node
-    # TODO: maybe we should explicitely delegate?
-    def method_missing(*args)
-      @base.send(*args)
-    end
-
-    def respond_to?(method)
-      super || @base.respond_to?(method)
-    end
-  end
-end

lib/capybara/node.rb

@@ -21,4 +21,18 @@ module Capybara
       session.driver
     end
   end
+
+  class Element < Node
+    # TODO: maybe we should explicitely delegate?
+    def method_missing(*args)
+      @base.send(*args)
+    end
+
+    def respond_to?(method)
+      super || @base.respond_to?(method)
+    end
+  end
+
+  class Document < Node
+  end
 end