remove trailing linefeed from wordwrap filter

whoward · Dec 15, 2012 · a24b9c3 · a24b9c3
1 parent d061a5d
commit a24b9c3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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, "<br/>"])
 
-         wrapped.should == "This text is not too<br/>short to be wrapped.<br/>"
+         wrapped.should == "This text is not too<br/>short to be wrapped."
       end
    end