From a24b9c3bd313ffc86b5510ffef72df26fdf0d965 Mon Sep 17 00:00:00 2001 From: William Howard Date: Sat, 15 Dec 2012 02:50:59 -0500 Subject: [PATCH] remove trailing linefeed from wordwrap filter --- lib/cadenza/filters/standard_filters.rb | 2 +- spec/filters/standard_filters_spec.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/cadenza/filters/standard_filters.rb b/lib/cadenza/filters/standard_filters.rb index 2e60305..1ef4ce9 100644 --- a/lib/cadenza/filters/standard_filters.rb +++ b/lib/cadenza/filters/standard_filters.rb @@ -107,7 +107,7 @@ define_filter :wordwrap do |input, params| length = params[0] linefeed = params[1] || "\n" - input.gsub(/(.{1,#{length}})(\s+|\Z)/, "\\1#{linefeed}") + input.gsub(/(.{1,#{length}})(\s+|\Z)/, "\\1\n").strip.gsub(/\n/, linefeed) end # returns the string or array reversed diff --git a/spec/filters/standard_filters_spec.rb b/spec/filters/standard_filters_spec.rb index b0ce947..9441115 100644 --- a/spec/filters/standard_filters_spec.rb +++ b/spec/filters/standard_filters_spec.rb @@ -142,13 +142,13 @@ it "should return the string with the words wrapped at the given column" do wrapped = subject.evaluate_filter(:wordwrap, "This text is not too short to be wrapped.", [20]) - wrapped.should == "This text is not too\nshort to be wrapped.\n" + wrapped.should == "This text is not too\nshort to be wrapped." end it "should allow specifying the character(s) used for line endings" do wrapped = subject.evaluate_filter(:wordwrap, "This text is not too short to be wrapped.", [20, "
"]) - wrapped.should == "This text is not too
short to be wrapped.
" + wrapped.should == "This text is not too
short to be wrapped." end end