test/assets/packed/domready.js test/assets/src/domready.js @@ -1,6 +1,10 @@ class Packr class Minifier + def self.conditional_comments + @@conditional_comments + end + def initialize @concat = Parser.new(CONCAT).merge(DATA) @@ -17,10 +21,10 @@ class Packr @clean = DATA.union(Parser.new(CLEAN)) @whitespace = DATA.union(Parser.new(WHITESPACE)) - @conditional_comments = @comments.copy - @conditional_comments.put_at(-1, " \\3") + @@conditional_comments = @comments.copy + @@conditional_comments.put_at(-1, " \\3") @whitespace.remove_at(2) # conditional comments - @comments.remove_at(2) + @comments.remove_at(2) end def minify(script) @@ -48,7 +52,7 @@ class Packr "(COMMENT2)\\s*(REGEXP)?" => lambda do |*args| match, comment, b, regexp = args[0..3] if comment =~ /^\/\*@/ and comment =~ /@\*\/$/ - comments = @@conditional_comments.exec(comment) + # comments = Minifier.conditional_comments.exec(comment) else comment = "" end lib/packr/minifier.rb @@ -36,6 +36,11 @@ class PackrTest < Test::Unit::TestCase :source => File.read("#{dir}/src/selector.js"), :packed => File.read("#{dir}/packed/selector.js").gsub(/\r?\n?/, ''), :output => "#{dir}/test/selector.js" + }], + :conditional_comments => [{ + :source => File.read("#{dir}/src/domready.js"), + :packed => File.read("#{dir}/packed/domready.js").gsub(/\r?\n?/, ''), + :output => "#{dir}/test/domready.js" }] } end @@ -126,4 +131,10 @@ class PackrTest < Test::Unit::TestCase assert_equal expected, actual end + def test_conditional_comments + expected = @data[:conditional_comments][0][:packed] + actual = Packr.pack(@data[:conditional_comments][0][:source], :shrink_vars => true) + File.open(@data[:conditional_comments][0][:output], 'wb') { |f| f.write(actual) } + assert_equal expected, actual + end end test/test_packr.rb 62ee46e73aba9582b60eb41892d3c05af63de172 James Coglan jcoglan@googlemail.com http://github.com/jcoglan/packr/commit/4cc307ad3479c80d037da5fc26e4bc84bdc5f42a 4cc307ad3479c80d037da5fc26e4bc84bdc5f42a 2008-11-14T04:17:16-08:00 2008-11-14T04:17:16-08:00 Fixing conditional comments bug in Minifier. 5838ed3d9ba313d3c4feddbacac42ffe0e3a379e James Coglan jcoglan@googlemail.com