Remove convertible

teamcapybara · Jan 31, 2012 · a31816d · a31816d
1 parent b49c86d
commit a31816d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 18 deletions.
diff --git a/lib/xpath.rb b/lib/xpath.rb
@@ -3,7 +3,6 @@
 module XPath
   autoload :Expression, 'xpath/expression'
   autoload :Literal, 'xpath/literal'
-  autoload :Convertible, 'xpath/convertible'
   autoload :Union, 'xpath/union'
   autoload :Renderer, 'xpath/renderer'
   autoload :HTML, 'xpath/html'

diff --git a/lib/xpath/convertible.rb b/lib/xpath/convertible.rb
diff --git a/lib/xpath/expression.rb b/lib/xpath/expression.rb
@@ -2,7 +2,6 @@ module XPath
   class Expression
     attr_accessor :expression, :arguments
     include XPath::DSL::ExpressionLevel
-    include Convertible
 
     def initialize(expression, *arguments)
       @expression = expression
@@ -12,5 +11,10 @@ def initialize(expression, *arguments)
     def current
       self
     end
+
+    def to_xpath
+      Renderer.render(self)
+    end
+    alias_method :to_s, :to_xpath
   end
 end
diff --git a/lib/xpath/union.rb b/lib/xpath/union.rb
@@ -1,7 +1,6 @@
 module XPath
   class Union
     include Enumerable
-    include Convertible
 
     attr_reader :expressions
     alias_method :arguments, :expressions
@@ -21,5 +20,10 @@ def each(&block)
     def method_missing(*args)
       XPath::Union.new(*arguments.map { |e| e.send(*args) })
     end
+
+    def to_xpath
+      Renderer.render(self)
+    end
+    alias_method :to_s, :to_xpath
   end
 end