sstephenson-sprockets 0.5.0 → 0.9.0

data/bin/sprocketize

@@ -51,4 +51,4 @@ end
 
 secretary = Sprockets::Secretary.new(options)
 secretary.install_assets if options[:asset_root]
-print secretary.output_file
+print secretary.concatenation

data/lib/sprockets/{output_file.rb → concatenation.rb}

@@ -1,5 +1,5 @@
 module Sprockets
-  class OutputFile
+  class Concatenation
     attr_reader :source_lines
     
     def initialize

data/lib/sprockets/preprocessor.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

data/lib/sprockets/secretary.rb

@@ -10,6 +10,10 @@ module Sprockets
     attr_reader :environment, :preprocessor
     
     def initialize(options = {})
+      reset!(options)
+    end
+
+    def reset!(options = @options)
       @options = DEFAULT_OPTIONS.merge(options)
       @environment  = Sprockets::Environment.new(@options[:root])
       @preprocessor = Sprockets::Preprocessor.new(@environment)
@@ -42,8 +46,8 @@ module Sprockets
       end
     end
     
-    def output_file
-      preprocessor.output_file
+    def concatenation
+      preprocessor.concatenation
     end
     
     def install_assets
@@ -54,6 +58,10 @@ module Sprockets
       end
     end
     
+    def source_last_modified
+      preprocessor.source_files.map { |s| s.mtime }.max
+    end
+    
     protected
       def expand_paths(paths, options = {})
         if options.has_key?(:expand_paths) ? options[:expand_paths] : @options[:expand_paths]

data/lib/sprockets/version.rb

@@ -1,7 +1,7 @@
 module Sprockets
   module Version
     MAJOR  = 0
-    MINOR  = 5
+    MINOR  = 9
     TINY   = 0
 
     STRING = [MAJOR, MINOR, TINY].join(".")

data/lib/sprockets.rb

@@ -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"

data/test/test_concatenation.rb

@@ -0,0 +1,28 @@
+require "test_helper"
+
+class ConcatenationTest < Test::Unit::TestCase
+  def setup
+    @concatenation = Sprockets::Concatenation.new
+    @environment = environment_for_fixtures
+  end
+  
+  def test_record
+    assert_equal [], @concatenation.source_lines
+    assert_equal "hello\n", @concatenation.record(source_line("hello\n")).to_s
+    assert_equal "world\n", @concatenation.record(source_line("world\n")).to_s
+    assert_equal ["hello\n", "world\n"], @concatenation.source_lines.map { |source_line| source_line.to_s }
+  end
+  
+  def test_to_s
+    @concatenation.record(source_line("hello\n"))
+    @concatenation.record(source_line("world\n"))
+    assert_equal "hello\nworld\n", @concatenation.to_s
+  end
+  
+  def test_save_to
+    filename = File.join(FIXTURES_PATH, "output.js")
+    @concatenation.save_to(filename)
+    assert_equal @concatenation.to_s, IO.read(filename)
+    File.unlink(filename)
+  end
+end

data/test/test_preprocessor.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($/)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sstephenson-sprockets
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Sam Stephenson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-30 00:00:00 -08:00
+date: 2009-02-09 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -29,7 +29,7 @@ files:
 - lib/sprockets/preprocessor.rb
 - lib/sprockets/source_file.rb
 - lib/sprockets/error.rb
-- lib/sprockets/output_file.rb
+- lib/sprockets/concatenation.rb
 - lib/sprockets/secretary.rb
 - lib/sprockets/environment.rb
 - lib/sprockets/version.rb
@@ -39,7 +39,7 @@ files:
 - test/test_secretary.rb
 - test/test_source_line.rb
 - test/test_source_file.rb
-- test/test_output_file.rb
+- test/test_concatenation.rb
 - test/fixtures
 - test/fixtures/src
 - test/fixtures/src/foo

data/test/test_output_file.rb

@@ -1,28 +0,0 @@
-require "test_helper"
-
-class OutputFileTest < Test::Unit::TestCase
-  def setup
-    @output_file = Sprockets::OutputFile.new
-    @environment = environment_for_fixtures
-  end
-  
-  def test_record
-    assert_equal [], @output_file.source_lines
-    assert_equal "hello\n", @output_file.record(source_line("hello\n")).to_s
-    assert_equal "world\n", @output_file.record(source_line("world\n")).to_s
-    assert_equal ["hello\n", "world\n"], @output_file.source_lines.map { |source_line| source_line.to_s }
-  end
-  
-  def test_to_s
-    @output_file.record(source_line("hello\n"))
-    @output_file.record(source_line("world\n"))
-    assert_equal "hello\nworld\n", @output_file.to_s
-  end
-  
-  def test_save_to
-    filename = File.join(FIXTURES_PATH, "output.js")
-    @output_file.save_to(filename)
-    assert_equal @output_file.to_s, IO.read(filename)
-    File.unlink(filename)
-  end
-end