avoid autoload, for thread safety

teamcapybara · Mar 15, 2013 · 5fbd82e · 5fbd82e
1 parent 6429e5a
commit 5fbd82e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/lib/xpath.rb b/lib/xpath.rb
@@ -1,12 +1,13 @@
 require 'nokogiri'
 
+require 'xpath/dsl'
+require 'xpath/expression'
+require 'xpath/literal'
+require 'xpath/union'
+require 'xpath/renderer'
+require 'xpath/html'
+
 module XPath
-  autoload :Expression, 'xpath/expression'
-  autoload :Literal, 'xpath/literal'
-  autoload :Union, 'xpath/union'
-  autoload :Renderer, 'xpath/renderer'
-  autoload :HTML, 'xpath/html'
-  autoload :DSL, 'xpath/dsl'
 
   extend XPath::DSL::TopLevel
   include XPath::DSL::TopLevel

diff --git a/lib/xpath/html.rb b/lib/xpath/html.rb
@@ -1,6 +1,6 @@
 module XPath
   module HTML
-    include XPath
+    include XPath::DSL::TopLevel
     extend self
 
     # Match an `a` link element.