sprockets 0.9.0 → 0.9.1

data/lib/sprockets.rb

@@ -3,6 +3,33 @@ $:.unshift File.dirname(__FILE__)
 require "yaml"
 require "fileutils"
 
+module Sprockets
+  class << self
+    def running_on_windows?
+      RUBY_PLATFORM =~ /(win|w)32$/
+    end
+  
+    def absolute?(location)
+      same_when_expanded?(location) || platform_absolute_path?(location)
+    end
+
+    protected
+      def same_when_expanded?(location)
+        location[0, 1] == File.expand_path(location)[0, 1]
+      end
+
+      def platform_absolute_path?(location)
+        false
+      end
+
+      if Sprockets.running_on_windows?
+        def platform_absolute_path?(location)
+          location[0, 1] == File::SEPARATOR && File.expand_path(location) =~ /[A-Za-z]:[\/\\]/
+        end
+      end
+  end
+end
+
 require "sprockets/version"
 require "sprockets/error"
 require "sprockets/environment"
@@ -12,3 +39,4 @@ require "sprockets/source_file"
 require "sprockets/concatenation"
 require "sprockets/preprocessor"
 require "sprockets/secretary"
+

data/lib/sprockets/environment.rb

@@ -22,7 +22,7 @@ module Sprockets
     end
     
     def find(location)
-      if absolute?(location) && File.exists?(location)
+      if Sprockets.absolute?(location) && File.exists?(location)
         pathname_from(location)
       else
         find_all(location).first
@@ -39,13 +39,9 @@ module Sprockets
     end
     
     protected
-      def absolute?(location)
-        location[0, 1] == File::SEPARATOR
-      end
-      
       def absolute_location_from(location)
         location = location.to_s
-        location = File.join(root.absolute_location, location) unless absolute?(location)
+        location = File.join(root.absolute_location, location) unless Sprockets.absolute?(location)
         File.expand_path(location)
       end
       

data/lib/sprockets/preprocessor.rb

@@ -42,26 +42,8 @@ module Sprockets
       end
       
       def record_source_line(source_line)
-        skip_pdoc_comments(source_line) do
-          unless source_line.comment? && strip_comments?
-            concatenation.record(source_line)
-          end
-        end
-      end
-
-      def skip_pdoc_comments(source_line)
-        yield unless strip_comments?
-
-        @commented ||= false
-
-        if source_line.begins_multiline_comment?
-          @commented = true
-        end
-
-        yield unless @commented
-
-        if source_line.closes_multiline_comment?
-          @commented = false
+        unless source_line.comment? && strip_comments?
+          concatenation.record(source_line)
         end
       end
 

data/lib/sprockets/secretary.rb

@@ -72,7 +72,7 @@ module Sprockets
       end
       
       def from_root(path)
-        if path[0, 1] == File::SEPARATOR
+        if Sprockets.absolute?(path)
           path
         else
           File.join(@options[:root], path)

data/lib/sprockets/source_file.rb

@@ -6,15 +6,37 @@ module Sprockets
       @environment = environment
       @pathname = pathname
     end
-    
-    def each_source_line
-      File.open(pathname.absolute_location) do |file|
-        file.each do |line|
-          yield SourceLine.new(self, line, file.lineno)
+
+    def source_lines
+      @lines ||= begin
+        lines = []
+
+        comments = []
+        File.open(pathname.absolute_location) do |file|
+          file.each do |line|
+            lines << line = SourceLine.new(self, line, file.lineno)
+
+            if line.begins_pdoc_comment? || comments.any?
+              comments << line
+            end
+
+            if line.ends_multiline_comment?
+              if line.ends_pdoc_comment?
+                comments.each { |l| l.comment! }
+              end
+              comments.clear
+            end
+          end
         end
+
+        lines
       end
     end
-    
+
+    def each_source_line(&block)
+      source_lines.each(&block)
+    end
+
     def find(location, kind = :file)
       pathname.parent_pathname.find(location, kind)
     end

data/lib/sprockets/source_line.rb

@@ -7,7 +7,7 @@ module Sprockets
       @line = line
       @number = number
     end
-    
+
     def comment
       @comment ||= line[/^\s*\/\/(.*)/, 1]
     end
@@ -16,11 +16,23 @@ module Sprockets
       !!comment
     end
 
+    def comment!
+      @comment = line
+    end
+
     def begins_multiline_comment?
+      line =~ /^\s*\/\*(.*)/
+    end
+
+    def begins_pdoc_comment?
       line =~ /^\s*\/\*\*(.*)/
     end
 
-    def closes_multiline_comment?
+    def ends_multiline_comment?
+      line =~ /^(.*)*\*\/\s*/
+    end
+
+    def ends_pdoc_comment?
       line =~ /^(.*)*\*\*\/\s*/
     end
 

data/lib/sprockets/version.rb

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

data/test/fixtures/double_slash_comments_that_are_not_requires_should_be_ignored_when_strip_comments_is_false.js

@@ -1,2 +1,8 @@
 // This is a double-slash comment that should appear in the resulting output file.
 /* This is a slash-star comment that should appear in the resulting output file. */
+/* This is multiline slash-star comment
+*  that should appear in the resulting
+*  output file */
+/**
+  This is not a PDoc comment that should appear in the resulting output file.
+*/

data/test/fixtures/multiline_comments_should_be_removed_by_default.js

@@ -1,4 +1,4 @@
 /**
- *  This is a slash-star comment
+ *  This is a PDoc comment
  *  that should appear in the resulting output file.
 **/

data/test/test_environment.rb

@@ -59,6 +59,6 @@ class EnvironmentTest < Test::Unit::TestCase
   
   protected
     def assert_load_path_equals(load_path_absolute_locations, environment)
-      assert load_path_absolute_locations.zip(environment.load_path).map { |location, pathname| location == pathname.absolute_location }.all?
+      assert load_path_absolute_locations.zip(environment.load_path).map { |location, pathname| File.expand_path(location) == pathname.absolute_location }.all?
     end
 end

data/test/test_helper.rb

@@ -24,7 +24,7 @@ class Test::Unit::TestCase
     end
 
     def assert_absolute_location(location, pathname)
-      assert_equal location, pathname.absolute_location
+      assert_equal File.expand_path(location), pathname.absolute_location
     end
     
     def assert_absolute_location_ends_with(location_ending, pathname)

data/test/test_preprocessor.rb

@@ -17,12 +17,18 @@ class PreprocessorTest < Test::Unit::TestCase
     require_file_for_this_test
     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. */"
+
+    assert_concatenation_contains_line "/* This is multiline slash-star comment"
+    assert_concatenation_contains_line "*  that should appear in the resulting"
+    assert_concatenation_contains_line "*  output file */"
+
+    assert_concatenation_contains_line "This is not a PDoc 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_concatenation_does_not_contain_line "/**"
-    assert_concatenation_does_not_contain_line " *  This is a slash-star comment"
+    assert_concatenation_does_not_contain_line " *  This is a PDoc comment"
     assert_concatenation_does_not_contain_line " *  that should appear in the resulting output file."
     assert_concatenation_does_not_contain_line "**/"
   end

data/test/test_secretary.rb

@@ -42,7 +42,7 @@ class SecretaryTest < Test::Unit::TestCase
       assert_equal paths_relative_to(temp, 
         "images", "images/script_with_assets", "images/script_with_assets/one.png", 
         "images/script_with_assets/two.png", "stylesheets", "stylesheets/script_with_assets.css"),
-        Dir[File.join(temp, "**", "*")]
+        Dir[File.join(temp, "**", "*")].sort
     end
   end
   
@@ -57,7 +57,7 @@ class SecretaryTest < Test::Unit::TestCase
       assert_equal paths_relative_to(temp, 
         "images", "images/script_with_assets", "images/script_with_assets/one.png", 
         "images/script_with_assets/two.png", "stylesheets", "stylesheets/script_with_assets.css"),
-        Dir[File.join(temp, "**", "*")]
+        Dir[File.join(temp, "**", "*")].sort
     end
   end
   
@@ -72,7 +72,7 @@ class SecretaryTest < Test::Unit::TestCase
       assert_equal paths_relative_to(temp, 
         "images", "images/script_with_assets", "images/script_with_assets/one.png", 
         "images/script_with_assets/two.png", "stylesheets", "stylesheets/script_with_assets.css"),
-        Dir[File.join(temp, "**", "*")]
+        Dir[File.join(temp, "**", "*")].sort
     end
   end
   

data/test/test_source_line.rb

@@ -11,13 +11,23 @@ class SourceLineTest < Test::Unit::TestCase
   end
 
   def test_line_that_begins_a_multiline_comment
-    assert !source_line(" /*").begins_multiline_comment?
+    assert source_line(" /*").begins_multiline_comment?
     assert source_line(" /**").begins_multiline_comment?
   end
 
-  def test_line_that_closes_a_multiline_comment
-    assert !source_line(" */").closes_multiline_comment?
-    assert source_line(" **/").closes_multiline_comment?
+  def test_line_that_begins_a_pdoc_comment
+    assert !source_line(" /*").begins_pdoc_comment?
+    assert source_line(" /**").begins_pdoc_comment?
+  end
+
+  def test_line_that_ends_a_multiline_comment
+    assert source_line(" */").ends_multiline_comment?
+    assert source_line(" **/").ends_multiline_comment?
+  end
+
+  def test_line_that_ends_a_pdoc_comment
+    assert !source_line(" */").ends_pdoc_comment?
+    assert source_line(" **/").ends_pdoc_comment?
   end
 
   def test_line_that_contains_but_does_not_begin_with_double_slash_should_not_be_a_comment
@@ -60,7 +70,7 @@ class SourceLineTest < Test::Unit::TestCase
     environment = environment_for_fixtures
     pathname    = Sprockets::Pathname.new(environment, "/a/b/c.js")
     source_file = Sprockets::SourceFile.new(environment, pathname)
-    assert_equal "line 25 of /a/b/c.js", source_line("hello", source_file, 25).inspect
+    assert_equal "line 25 of #{File.expand_path("/a/b/c.js")}", source_line("hello", source_file, 25).inspect
   end
   
   def test_interpolation_of_constants

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sprockets
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors: 
 - Sam Stephenson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-09 00:00:00 -06:00
+date: 2009-02-16 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -87,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: sprockets
 rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2