For html, only wrap outermost layer in pre. A stab at resolving https…

…://github.com/michaeldv/awesome_print/issues/49.

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    awesome_print (1.0.0)
+    awesome_print (1.0.2)
 
 GEM
   remote: http://rubygems.org/

lib/awesome_print/core_ext/kernel.rb

@@ -7,7 +7,8 @@ module Kernel
 
   def ai(options = {})
     ap = AwesomePrint::Inspector.new(options)
-    ap.awesome self
+    awesome = ap.awesome self
+    options[:html] ? "<pre>#{awesome}</pre>" : awesome
   end
   alias :awesome_inspect :ai
 

lib/awesome_print/formatter.rb

@@ -27,7 +27,7 @@ def format(object, type = nil)
       else
         awesome_self(object, type) # Catch all that falls back to object.inspect.
       end
-      @options[:html] ? "<pre>#{awesome}</pre>" : awesome
+      #@options[:html] ? "<pre>#{awesome}</pre>" : awesome
     end
 
     # Hook this when adding custom formatters. Check out lib/awesome_print/ext

spec/formats_spec.rb

@@ -629,13 +629,27 @@ def inspect
       markup = [ 1, :two, "three" ]
       markup.ai(:html => true).should == <<-EOS.strip
 <pre>[
-    <kbd style="color:white">[0] </kbd><pre><kbd style="color:blue">1</kbd></pre>,
-    <kbd style="color:white">[1] </kbd><pre><kbd style="color:darkcyan">:two</kbd></pre>,
-    <kbd style="color:white">[2] </kbd><pre><kbd style="color:brown">&quot;three&quot;</kbd></pre>
+    <kbd style="color:white">[0] </kbd><kbd style="color:blue">1</kbd>,
+    <kbd style="color:white">[1] </kbd><kbd style="color:darkcyan">:two</kbd>,
+    <kbd style="color:white">[2] </kbd><kbd style="color:brown">&quot;three&quot;</kbd>
 ]</pre>
 EOS
     end
 
+    it "does not try to nest <pre> tag deeper than one level" do
+      markup = [ { "hello" => "world" }, { "goodbye" => "indents" } ]
+      markup.ai(:html => true).should == <<-EOS.strip
+<pre>[
+    <kbd style="color:white">[0] </kbd>{
+        &quot;hello&quot;<kbd style="color:slategray"> =&gt; </kbd><kbd style="color:brown">&quot;world&quot;</kbd>
+    },
+    <kbd style="color:white">[1] </kbd>{
+        &quot;goodbye&quot;<kbd style="color:slategray"> =&gt; </kbd><kbd style="color:brown">&quot;indents&quot;</kbd>
+    }
+]</pre>
+    EOS
+    end
+
     it "encodes HTML entities (plain)" do
       markup = ' &<hello>'
       markup.ai(:html => true, :plain => true).should == '<pre>&quot; &amp;&lt;hello&gt;&quot;</pre>'