sprockets 0.9.1 → 1.0.0

data/lib/sprockets/source_line.rb

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

data/lib/sprockets/version.rb

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

data/test/test_secretary.rb

@@ -3,7 +3,7 @@ require "test_helper"
 class SecretaryTest < Test::Unit::TestCase
   def test_load_locations_are_not_expanded_when_expand_paths_is_false
     secretary = Sprockets::Secretary.new(:root => FIXTURES_PATH)
-    secretary.add_load_locations("src/**/", :expand_paths => false)
+    secretary.add_load_location("src/**/", :expand_paths => false)
     
     assert_equal [File.join(FIXTURES_PATH, "src/**"), FIXTURES_PATH], 
                  secretary.environment.load_path.map { |pathname| pathname.absolute_location }
@@ -11,7 +11,7 @@ class SecretaryTest < Test::Unit::TestCase
   
   def test_load_locations_are_expanded_when_expand_paths_is_true
     secretary = Sprockets::Secretary.new(:root => FIXTURES_PATH)
-    secretary.add_load_locations("src/**/", :expand_paths => true)
+    secretary.add_load_location("src/**/", :expand_paths => true)
     
     assert_equal [File.join(FIXTURES_PATH, "src", "foo"), File.join(FIXTURES_PATH, "src"), FIXTURES_PATH],
                  secretary.environment.load_path.map { |pathname| pathname.absolute_location }
@@ -20,13 +20,13 @@ class SecretaryTest < Test::Unit::TestCase
   def test_source_files_are_not_expanded_when_expand_paths_is_false
     secretary = Sprockets::Secretary.new(:root => FIXTURES_PATH)
     assert_raises(Sprockets::LoadError) do
-      secretary.add_source_files("src/f*.js", :expand_paths => false)
+      secretary.add_source_file("src/f*.js", :expand_paths => false)
     end
   end
   
   def test_source_files_are_expanded_when_expand_paths_is_true
     secretary = Sprockets::Secretary.new(:root => FIXTURES_PATH)
-    secretary.add_source_files("src/f*.js", :expand_paths => true)
+    secretary.add_source_file("src/f*.js", :expand_paths => true)
     
     assert_equal [File.join(FIXTURES_PATH, "src", "foo.js")],
                  secretary.preprocessor.source_files.map { |source_file| source_file.pathname.absolute_location }
@@ -35,7 +35,7 @@ class SecretaryTest < Test::Unit::TestCase
   def test_install_assets_into_empty_directory
     with_temporary_directory do |temp|
       secretary = Sprockets::Secretary.new(:root => FIXTURES_PATH, :asset_root => temp)
-      secretary.add_source_files("src/script_with_assets.js")
+      secretary.add_source_file("src/script_with_assets.js")
 
       assert_equal [], Dir[File.join(temp, "**", "*")]
       secretary.install_assets
@@ -50,7 +50,7 @@ class SecretaryTest < Test::Unit::TestCase
     with_temporary_directory do |temp|
       temp = File.join(temp, "assets")
       secretary = Sprockets::Secretary.new(:root => FIXTURES_PATH, :asset_root => temp)
-      secretary.add_source_files("src/script_with_assets.js")
+      secretary.add_source_file("src/script_with_assets.js")
 
       assert_equal [], Dir[File.join(temp, "**", "*")]
       secretary.install_assets
@@ -64,7 +64,7 @@ class SecretaryTest < Test::Unit::TestCase
   def test_install_assets_into_subdirectories_that_already_exist
     with_temporary_directory do |temp|
       secretary = Sprockets::Secretary.new(:root => FIXTURES_PATH, :asset_root => temp)
-      secretary.add_source_files("src/script_with_assets.js")
+      secretary.add_source_file("src/script_with_assets.js")
 
       FileUtils.mkdir_p(File.join(temp, "images", "script_with_assets"))
       assert_equal paths_relative_to(temp, "images", "images/script_with_assets"), Dir[File.join(temp, "**", "*")]

data/test/test_source_file.rb

@@ -1,5 +1,6 @@
 require "test_helper"
 require "enumerator"
+Enumerator = Enumerable::Enumerator unless defined?(Enumerator) # for 1.9.1 compatibility
 
 class SourceFileTest < Test::Unit::TestCase
   def setup
@@ -7,7 +8,7 @@ class SourceFileTest < Test::Unit::TestCase
   end
   
   def test_each_source_line
-    source_file_lines = Enumerable::Enumerator.new(source_file("src/foo/bar.js"), :each_source_line).to_a
+    source_file_lines = Enumerator.new(source_file("src/foo/bar.js"), :each_source_line).to_a
     assert_equal content_of_fixture("src/foo/bar.js"), source_file_lines.map { |line| line.line }.join
     assert_equal 4, source_file_lines.length
   end

data/test/test_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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sprockets
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
+  version: 1.0.0
 platform: ruby
 authors: 
 - Sam Stephenson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-16 00:00:00 -06:00
+date: 2009-02-17 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -67,7 +67,7 @@ files:
 - test/test_source_file.rb
 - test/test_source_line.rb
 has_rdoc: false
-homepage: http://github.com/sstephenson/sprockets
+homepage: http://getsprockets.org/
 post_install_message: 
 rdoc_options: []