From 006c37a8e7086af8226f251ee8769393f83e8e23 Mon Sep 17 00:00:00 2001
From: Chris Wanstrath <chris@ozmm.org>
Date: Tue, 1 Mar 2011 10:10:07 -0800
Subject: [PATCH] Ensure strings are not enumerated in Ruby 1.8

---
 lib/mustache/generator.rb | 2 +-
 test/mustache_test.rb     | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/mustache/generator.rb b/lib/mustache/generator.rb
index b572bd83..0c88d48c 100644
--- a/lib/mustache/generator.rb
+++ b/lib/mustache/generator.rb
@@ -105,7 +105,7 @@ def on_section(name, content, raw)
           Mustache::Template.new(v.call(#{raw.inspect}).to_s).render(ctx.dup)
         else
           # Shortcut when passed non-array
-          v = [v] if v.respond_to?(:has_key?) || !v.respond_to?(:map) || v.is_a?(Struct)
+          v = [v] unless v.is_a?(Array) || defined?(Enumerator) && v.is_a?(Enumerator)
 
           v.map { |h| ctx.push(h); r = #{code}; ctx.pop; r }.join
         end
diff --git a/test/mustache_test.rb b/test/mustache_test.rb
index ad83729b..290add48 100644
--- a/test/mustache_test.rb
+++ b/test/mustache_test.rb
@@ -57,6 +57,15 @@ def test_single_line_sections
     assert_equal %Q'<p class="flash-notice" style="display: none;">', instance.render
   end
 
+  def test_strings_as_sections_do_not_enumerate
+    instance = Mustache.new
+    instance[:contact] = "Call 1-888-FLOWERS\nAsk for Johnson."
+    instance.template = "{{#contact}}<div id='contact'>{{contact}}</div>{{/contact}}"
+
+    assert_equal "<div id='contact'>Call 1-888-FLOWERS\nAsk for Johnson.</div>",
+                 instance.render
+  end
+
   def test_sassy_single_line_sections
     instance = Mustache.new
     instance[:full_time] = true