Merge pull request #32 from activeadmin/30-flatten-infinite-recursion

[30] Prevent infinite recursion

Author: seanlinsley

Rakefile

@@ -5,3 +5,14 @@ require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
+
+task :console do
+  require 'irb'
+  require 'irb/completion'
+
+  require 'pry'
+  require 'arbre'
+
+  ARGV.clear
+  IRB.start
+end

lib/arbre/element.rb

@@ -1,4 +1,5 @@
 require 'arbre/element/builder_methods'
+require 'arbre/element/proxy'
 require 'arbre/element_collection'
 
 module Arbre
@@ -147,11 +148,11 @@ def +(element)
       else
         element = Arbre::HTML::TextNode.from_string(element)
       end
-      ElementCollection.new([self]) + element
+      to_ary + element
     end
 
     def to_ary
-      ElementCollection.new [self]
+      ElementCollection.new [Proxy.new(self)]
     end
     alias_method :to_a, :to_ary
 

lib/arbre/element/proxy.rb

@@ -0,0 +1,28 @@
+module Arbre
+  class Element
+    class Proxy < BasicObject
+      undef_method :==
+      undef_method :equal?
+
+      def initialize(element)
+        @element = element
+      end
+
+      def respond_to?(method, include_all = false)
+        if method.to_s == 'to_ary'
+          false
+        else
+          super || @element.respond_to?(method, include_all)
+        end
+      end
+
+      def method_missing(method, *args, &block)
+        if method.to_s == 'to_ary'
+          super
+        else
+          @element.__send__ method, *args, &block
+        end
+      end
+    end
+  end
+end

spec/arbre/unit/element_spec.rb

@@ -65,6 +65,12 @@ def helper_method
 
   end
 
+  it "to_a.flatten should not infinitely recurse" do
+    Timeout.timeout(1) do
+      element.to_a.flatten
+    end
+  end
+
   describe "adding a child" do
 
     let(:child){ Arbre::Element.new }