Fix textile in Interpreter

iboard · Dec 13, 2011 · c8610ec · c8610ec
1 parent 39043dd
commit c8610ec
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 1 deletion.
diff --git a/lib/content_items/interpreter.rb b/lib/content_items/interpreter.rb
@@ -22,7 +22,7 @@ def render(txt_template)
     when :markdown
       ContentItem::markdown(_text)
     when :textile
-      view_context.sanitize(view_context.textilize(_text) )
+      view_context.sanitize(textilize(_text) )
     when :simple_text
       view_context.sanitize(view_context.simple_format(_text) )
     else

diff --git a/public/404.html b/public/404.html
@@ -22,6 +22,7 @@ <h1>Opps, 404 - Content not found</h1>
       <div id='container_main'>
         <div style='text-align: center; margin: 40px; background: #FCD284;
                      border: 1px solid #ddd; padding: 30px;
+                     margin-top: 150px;
                      -moz-border-radius: 5px 5px 5px 5px; 
                      -webkit-border-radius: 5px 5px 5px 5px; 
                     '>

diff --git a/public/422.html b/public/422.html
@@ -22,6 +22,7 @@ <h1>OOPS - 422 - Changes rejected</h1>
       <div id='container_main'>
         <div style='text-align: center; margin: 40px; background: #FCD284;
                      border: 1px solid #ddd; padding: 30px;
+                     margin-top: 150px;
                      -moz-border-radius: 5px 5px 5px 5px; 
                      -webkit-border-radius: 5px 5px 5px 5px; 
                     '>

diff --git a/public/500.html b/public/500.html
@@ -24,6 +24,7 @@ <h1>OOPS - 500 - Something went wrong</h1>
                      border: 1px solid #ddd; padding: 30px;
                      -moz-border-radius: 5px 5px 5px 5px; 
                      -webkit-border-radius: 5px 5px 5px 5px; 
+                     margin-top: 150px;
                     '>
            <h1>Something went wrong.</h1>
            <p>We're notified and will care about soon.</p>

diff --git a/spec/requests/postings_spec.rb b/spec/requests/postings_spec.rb
@@ -77,6 +77,15 @@
       page.should have_content "ATTACHMENT 0 NOT FOUND"
       page.should have_content "ATTACHMENT 1 NOT FOUND"
     end
+
+    it "should not produce a hickup with textile (Bugfix)" do
+      posting = @blog.postings.create(title: "This uses textile", 
+        body: "Should render without 500", user_id: User.first.id, interpreter: :textile,
+        is_draft: false)
+      visit posting_path(posting)
+      page.should have_content "This uses textile"
+      page.should have_content "Should render without 500"
+    end
 
   end