lib/sprockets/concatenation.rb test/test_concatenation.rb @@ -51,4 +51,4 @@ end secretary = Sprockets::Secretary.new(options) secretary.install_assets if options[:asset_root] -print secretary.output_file +print secretary.concatenation bin/sprocketize @@ -9,6 +9,6 @@ require "sprockets/environment" require "sprockets/pathname" require "sprockets/source_line" require "sprockets/source_file" -require "sprockets/output_file" +require "sprockets/concatenation" require "sprockets/preprocessor" require "sprockets/secretary" lib/sprockets.rb @@ -1,10 +1,10 @@ module Sprockets class Preprocessor - attr_reader :environment, :output_file, :source_files, :asset_paths + attr_reader :environment, :concatenation, :source_files, :asset_paths def initialize(environment, options = {}) @environment = environment - @output_file = OutputFile.new + @concatenation = Concatenation.new @source_files = [] @asset_paths = [] @options = options @@ -44,7 +44,7 @@ module Sprockets def record_source_line(source_line) skip_pdoc_comments(source_line) do unless source_line.comment? && strip_comments? - output_file.record(source_line) + concatenation.record(source_line) end end end lib/sprockets/preprocessor.rb @@ -46,8 +46,8 @@ module Sprockets end end - def output_file - preprocessor.output_file + def concatenation + preprocessor.concatenation end def install_assets lib/sprockets/secretary.rb @@ -8,28 +8,28 @@ class PreprocessorTest < Test::Unit::TestCase def test_double_slash_comments_that_are_not_requires_should_be_removed_by_default require_file_for_this_test - assert_output_file_does_not_contain_line "// This is a double-slash comment that should not appear in the resulting output file." - assert_output_file_contains_line "/* This is a slash-star comment that should not appear in the resulting output file. */" + assert_concatenation_does_not_contain_line "// This is a double-slash comment that should not appear in the resulting output file." + assert_concatenation_contains_line "/* This is a slash-star comment that should not appear in the resulting output file. */" end def test_double_slash_comments_that_are_not_requires_should_be_ignored_when_strip_comments_is_false @preprocessor = Sprockets::Preprocessor.new(@environment, :strip_comments => false) require_file_for_this_test - assert_output_file_contains_line "// This is a double-slash comment that should appear in the resulting output file." - assert_output_file_contains_line "/* This is a slash-star comment that should appear in the resulting output file. */" + assert_concatenation_contains_line "// This is a double-slash comment that should appear in the resulting output file." + assert_concatenation_contains_line "/* This is a slash-star comment that should appear in the resulting output file. */" end def test_multiline_comments_should_be_removed_by_default require_file_for_this_test - assert_output_file_does_not_contain_line "/**" - assert_output_file_does_not_contain_line " * This is a slash-star comment" - assert_output_file_does_not_contain_line " * that should appear in the resulting output file." - assert_output_file_does_not_contain_line "**/" + assert_concatenation_does_not_contain_line "/**" + assert_concatenation_does_not_contain_line " * This is a slash-star comment" + assert_concatenation_does_not_contain_line " * that should appear in the resulting output file." + assert_concatenation_does_not_contain_line "**/" end def test_requiring_a_single_file_should_replace_the_require_comment_with_the_file_contents require_file_for_this_test - assert_output_file_contains <<-LINES + assert_concatenation_contains <<-LINES var before_require; var Foo = { }; var after_require; @@ -49,7 +49,7 @@ class PreprocessorTest < Test::Unit::TestCase def test_requiring_a_file_after_it_has_already_been_required_should_do_nothing require_file_for_this_test - assert_output_file_contains <<-LINES + assert_concatenation_contains <<-LINES var before_first_require; var Foo = { }; var after_first_require_and_before_second_require; @@ -60,16 +60,16 @@ class PreprocessorTest < Test::Unit::TestCase protected attr_reader :environment, :preprocessor - def output_file - preprocessor.output_file + def concatenation + preprocessor.concatenation end def output_text - preprocessor.output_file.to_s + preprocessor.concatenation.to_s end def source_lines_matching(line) - output_file.source_lines.select { |source_line| source_line.line.strip == line } + concatenation.source_lines.select { |source_line| source_line.line.strip == line } end def require_file(location) @@ -84,15 +84,15 @@ class PreprocessorTest < Test::Unit::TestCase caller.map { |c| c[/`(.*?)'$/, 1] }.grep(/^test_/).first[5..-1] + ".js" end - def assert_output_file_does_not_contain_line(line) + def assert_concatenation_does_not_contain_line(line) assert source_lines_matching(line).empty?, "Expected #{line.inspect} to not exist" end - def assert_output_file_contains_line(line) + def assert_concatenation_contains_line(line) assert source_lines_matching(line).any?, "Expected #{line.inspect} to exist" end - def assert_output_file_contains(indented_text) + def assert_concatenation_contains(indented_text) lines = indented_text.split($/) initial_indent = lines.first[/^\s*/].length unindented_text = lines.map { |line| line[initial_indent..-1] }.join($/) test/test_preprocessor.rb lib/sprockets/output_file.rb test/test_output_file.rb 5bb98e2f853febcd6869f573397387571eb8495d Sam Stephenson sam@37signals.com http://github.com/sstephenson/sprockets/commit/98fa228c480bf6edb0413f817a63a7025fd8dfb3 98fa228c480bf6edb0413f817a63a7025fd8dfb3 2009-02-08T09:41:25-08:00 2009-02-08T09:41:25-08:00 Change Sprockets::OutputFile to the more intention-revealing Sprockets::Concatenation. 7606abc23cf20ac7024306b338502c09e87338f2 Sam Stephenson sam@37signals.com