fixes for :text style printing and embedding raw content

baccigalupi · Apr 18, 2011 · 76aa858 · 76aa858
1 parent ba954b8
commit 76aa858
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 11 deletions.
diff --git a/lib/renderers/text.rb b/lib/renderers/text.rb
@@ -19,18 +19,20 @@ def render
       str
     end
 
-    def line_end
-      [:pretty, :text].include?(style) ? "\n" : ''
+    def escaped_content
+      if escape
+        str = ERB::Util.h(content)
+        if style == :pretty
+          str = str.wrap(Garterbelt.wrap_length, :indent => indent)
+        end
+        str
+      else
+        content
+      end
     end
 
     def template
-      str = escape ? ERB::Util.h(content) : content
-
-      if style == :pretty 
-        "#{str.wrap(Garterbelt.wrap_length, :indent => indent)}#{line_end}" 
-      else 
-        "#{str}#{line_end}"
-      end
+      "#{escaped_content}#{line_end}"
     end
   end
 end
diff --git a/spec/integration/expectations/render_styles/pretty_with_embeds.html b/spec/integration/expectations/render_styles/pretty_with_embeds.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+  <head>
+    <script type="text/javascript">
+alert("foo");
+alert("bar");
+var foo = 'foo';
+    </script>
+    <style type="text/css">
+body { background-color: blue;}
+p { background-color: white;}
+    </style>
+  </head>
+  <body>
+    <p>
+      Style me up!
+    </p>
+  </body>
+</html>
diff --git a/spec/integration/expectations/unescaping_view.html b/spec/integration/expectations/unescaping_view.html
@@ -1,2 +1,3 @@
-You should check out my rad new site:<br> <a class="user_generated_link"
-href="http://foo.com">http://foo.com</a><br> It will blow your mind!
+You should check out my rad new site:<br>
+<a class="user_generated_link" href="http://foo.com">http://foo.com</a><br>
+It will blow your mind!
diff --git a/spec/integration/integration_spec.rb b/spec/integration/integration_spec.rb
@@ -74,5 +74,9 @@ def file(name)
     it 'does text only' do
       ViewWithContentTags.new.render(:style => :text).should == file("render_styles/text")
     end
+
+    it 'styles do not screw up text line breaks, especially with raw text embeds' do
+      PrettyWithEmbeds.new.render.should == file('render_styles/pretty_with_embeds')
+    end
   end
 end
diff --git a/spec/integration/templates/pretty_with_embeds.rb b/spec/integration/templates/pretty_with_embeds.rb
@@ -0,0 +1,25 @@
+class PrettyWithEmbeds < Garterbelt::Page
+  def head
+    script 'type' => 'text/javascript' do
+      [
+        'alert("foo");',
+        "alert(\"bar\");\nvar foo = 'foo';"
+      ].each do |js|
+        raw_text js
+      end
+    end
+
+    style 'type' => 'text/css' do
+      [
+        "body { background-color: blue;}",
+        "p { background-color: white;}"
+      ].each do |css|
+        raw_text css
+      end
+    end
+  end
+
+  def body
+    p "Style me up!"
+  end
+end