Modify Visitors::Dot's API to use collectors

3 files changed, 9 insertions, 7 deletions

diff --git a/lib/arel/tree_manager.rb b/lib/arel/tree_manager.rb
index 87887800d0..8bff97af78 100644
--- a/lib/arel/tree_manager.rb
+++ b/lib/arel/tree_manager.rb
@@ -15,7 +15,9 @@ module Arel
     end
 
     def to_dot
-      Visitors::Dot.new.accept @ast
+      collector = Arel::Collectors::PlainString.new
+      collector = Visitors::Dot.new.accept @ast, collector
+      collector.value
     end
 
     def visitor
diff --git a/lib/arel/visitors/dot.rb b/lib/arel/visitors/dot.rb
index ba35223ac9..d96cf7a6a0 100644
--- a/lib/arel/visitors/dot.rb
+++ b/lib/arel/visitors/dot.rb
@@ -22,9 +22,9 @@ module Arel
         @seen       = {}
       end
 
-      def accept object
+      def accept object, collector
         visit object
-        to_dot
+        collector << to_dot
       end
 
       private
diff --git a/test/visitors/test_dot.rb b/test/visitors/test_dot.rb
index ee7fc7886c..7763350f5c 100644
--- a/test/visitors/test_dot.rb
+++ b/test/visitors/test_dot.rb
@@ -17,13 +17,13 @@ module Arel
       ].each do |klass|
         define_method("test_#{klass.name.gsub('::', '_')}") do
           op = klass.new(:a, "z")
-          @visitor.accept op
+          @visitor.accept op, Collectors::PlainString.new
         end
       end
 
       def test_named_function
         func = Nodes::NamedFunction.new 'omg', 'omg'
-        @visitor.accept func
+        @visitor.accept func, Collectors::PlainString.new
       end
 
       # unary ops
@@ -41,7 +41,7 @@ module Arel
       ].each do |klass|
         define_method("test_#{klass.name.gsub('::', '_')}") do
           op = klass.new(:a)
-          @visitor.accept op
+          @visitor.accept op, Collectors::PlainString.new
         end
       end
 
@@ -68,7 +68,7 @@ module Arel
       ].each do |klass|
         define_method("test_#{klass.name.gsub('::', '_')}") do
           binary = klass.new(:a, :b)
-          @visitor.accept binary
+          @visitor.accept binary, Collectors::PlainString.new
         end
       end
     end