Ticket #2448: simple-format-html-options.patch

actionpack/test/template/text_helper_test.rb

@@ -268 +268 @@
-    assert_equal(%w{Specialized Fuji Giant}, @cycles)
-  end
-
+  def test_simple_format_one_para_with_html_options
+    assert_equal %q(<p class="test">this is the text</p>),
+        simple_format("this is the text", :class => 'test')
+  end
+
+  def test_simple_format_two_paras_with_html_options
+    assert_equal %Q(<p class="test">para 1</p>\n\n<p class="test">para 2</p>),
+        simple_format("para 1\n\npara 2", :class => 'test')
+  end
-end

actionpack/lib/action_view/helpers/text_helper.rb

@@ -118 +118 @@
-      # Returns +text+ transformed into HTML using very simple formatting rules
-      # Surrounds paragraphs with <tt>&lt;p&gt;</tt> tags, and converts line breaks into <tt>&lt;br /&gt;</tt>
-      # Two consecutive newlines(<tt>\n\n</tt>) are considered as a paragraph, one newline (<tt>\n</tt>) is
-
-
+
+
+
+
+
-        text.gsub!(/(\r\n|\n|\r)/, "\n") # lets make them newlines crossplatform
-        text.gsub!(/\n\n+/, "\n\n") # zap dupes
-'</p>\0<p>'
+"</p>\\0#{tag('p', html_options, true)}"
-        text.gsub!(/([^\n])(\n)([^\n])/, '\1\2<br />\3') # turn single newline into <br />
-        
-
+, html_options
-      end
-
-      # Turns all urls and email addresses into clickable links. The +link+ parameter can limit what should be linked.