Merge pull request #203 from phoet/strip_carriage_return

handle carriage return in strip_newline, closes #126

lib/liquid/standardfilters.rb

@@ -69,7 +69,7 @@ module Liquid
 
     # Remove all newlines from the string
     def strip_newlines(input)
-      input.to_s.gsub(/\n/, '')
+      input.to_s.gsub(/\r?\n/, '')
     end
 
 

test/liquid/standard_filter_test.rb

@@ -140,6 +140,7 @@ class StandardFiltersTest < Test::Unit::TestCase
 
   def test_strip_newlines
     assert_template_result 'abc', "{{ source | strip_newlines }}", 'source' => "a\nb\nc"
+    assert_template_result 'abc', "{{ source | strip_newlines }}", 'source' => "a\r\nb\nc"
   end
 
   def test_newlines_to_br