Labyricorn/liquid
1
0
Fork 0
mirror of https://github.com/Shopify/liquid.git synced 2026-09-12 23:40:45 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #203 from phoet/strip_carriage_return

Browse Source 
handle carriage return in strip_newline, closes #126
This commit is contained in:
Florian Weingarten
2013-06-13 12:54:17 -07:00
parent 437e9201de fd263bba0f
commit 4c2e2f8a24
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/liquid/standardfilters.rb
+1 -1
View File
@@ -69,7 +69,7 @@ module Liquid
# Remove all newlines from the string # Remove all newlines from the string
def strip_newlines(input) def strip_newlines(input)
input.to_s.gsub(/\n/, '') input.to_s.gsub(/\r?\n/, '')
end end
test/liquid/standard_filter_test.rb
+1
View File
@@ -140,6 +140,7 @@ class StandardFiltersTest < Test::Unit::TestCase
def test_strip_newlines def test_strip_newlines
assert_template_result 'abc', "{{ source | strip_newlines }}", 'source' => "a\nb\nc" assert_template_result 'abc', "{{ source | strip_newlines }}", 'source' => "a\nb\nc"
assert_template_result 'abc', "{{ source | strip_newlines }}", 'source' => "a\r\nb\nc"
end end
def test_newlines_to_br def test_newlines_to_br