@@ -57,14 +57,26 @@ module Sprockets end def to_s(constants = source_file.environment.constants) - line.chomp.gsub(/<%=(.*?)%>/) do - constant = $1.strip - if value = constants[constant] - value - else - raise UndefinedConstantError, "couldn't find constant `#{constant}' in #{inspect}" - end - end + $/ + result = line.chomp + interpolate_constants!(result, constants) + strip_trailing_whitespace!(result) + result + $/ end + + protected + def interpolate_constants!(result, constants) + result.gsub!(/<%=(.*?)%>/) do + constant = $1.strip + if value = constants[constant] + value + else + raise UndefinedConstantError, "couldn't find constant `#{constant}' in #{inspect}" + end + end + end + + def strip_trailing_whitespace!(result) + result.gsub!(/\s+$/, "") + end end end lib/sprockets/source_line.rb @@ -82,4 +82,8 @@ class SourceLineTest < Test::Unit::TestCase source_line('<%= NONEXISTENT %>').to_s("VERSION" => "1.0") end end + + def test_to_s_should_strip_trailing_whitespace_before_adding_line_ending + assert_equal "hello();\n", source_line("hello(); \t \r\n").to_s({}) + end end test/test_source_line.rb 7fc1208e0eb1d31d5ddd579abb90fcdfea0156eb Sam Stephenson sam@37signals.com http://github.com/sstephenson/sprockets/commit/95aad141d4bb31eb8fc36d63e7c682091f06f37f 95aad141d4bb31eb8fc36d63e7c682091f06f37f 2009-02-16T10:00:23-08:00 2009-02-16T10:00:23-08:00 Trim trailing whitespace in Sprockets::SourceLine#to_s 7a49470fc756df8e0bc25a63c2968b74a8baa595 Sam Stephenson sam@37signals.com