@@ -46,10 +46,14 @@ class BundleFu::FileList def add_files(filenames=[]) filenames.each{|filename| - self.filelist << [ filename, (File.mtime(abs_location(filename)).to_i rescue 0) ] + self.filelist << [ extract_filename_from_url(filename), (File.mtime(abs_location(filename)).to_i rescue 0) ] } end + def extract_filename_from_url(url) + url.gsub(/^https?:\/\/[^\/]+/i, '') + end + def save_as(filename) File.open(filename, "wb") {|f| f.puts Marshal.dump(self.filelist)} end lib/bundle_fu/file_list.rb @@ -1,223 +1,228 @@ -require File.join(File.dirname(__FILE__), '../test_helper.rb') - -require "test/unit" - -# require "library_file_name" - -class BundleFuTest < Test::Unit::TestCase - def setup - @mock_view = MockView.new - BundleFu.init # resets BundleFu - end - - def teardown - purge_cache - end - - def test__bundle_js_files__should_include_js_content - @mock_view.bundle { @@content_include_all } - - assert_public_files_match("/javascripts/cache/bundle.js", "function js_1()") - end - - def test__bundle_js_files__should_use_packr - Object.send :class_eval, <<EOF - class ::Object::Packr - def initialize - end - - def pack(content, options={}) - "PACKR!" + options.inspect - end - - end -EOF - - @mock_view.bundle() { @@content_include_all } - assert_public_files_match("/javascripts/cache/bundle.js", "PACKR") - purge_cache - - @mock_view.bundle(:packr_options => {:packr_options_here => "hi_packr"}) { @@content_include_all } - assert_public_files_match("/javascripts/cache/bundle.js", "packr_options_here", "Should include packr_options") - - - Object.send :remove_const, "Packr" - - end - - def test__bundle_js_files__should_default_to_not_compressed_and_include_override_option - @mock_view.bundle() { @@content_include_all } - default_content = File.read(public_file("/javascripts/cache/bundle.js")) - purge_cache - - @mock_view.bundle(:compress => false) { @@content_include_all } - uncompressed_content = File.read(public_file("/javascripts/cache/bundle.js")) - purge_cache - - @mock_view.bundle(:compress => true) { @@content_include_all } - compressed_content = File.read(public_file("/javascripts/cache/bundle.js")) - purge_cache - - assert default_content.length == compressed_content.length, "Should default to compressed" - assert uncompressed_content.length > compressed_content.length, "Didn't compress the content. (:compress => true) #{compressed_content.length}. (:compress => false) #{uncompressed_content.length}" - end - - def test__content_remains_same__shouldnt_refresh_cache - @mock_view.bundle { @@content_include_some } - - # check to see each bundle file exists and append some text to the bottom of each file - append_to_public_files(cache_files("bundle"), "BOGUS") - - assert_public_files_match("/javascripts/cache/bundle.js", "BOGUS") - assert_public_files_match("/stylesheets/cache/bundle.css", "BOGUS") - - @mock_view.bundle { @@content_include_some } - - assert_public_files_match("/javascripts/cache/bundle.js", "BOGUS") - assert_public_files_match("/stylesheets/cache/bundle.css", "BOGUS") - end - - def test__content_changes__should_refresh_cache - @mock_view.bundle { @@content_include_some } - - # check to see each bundle file exists and append some text to the bottom of each file - append_to_public_files(cache_files("bundle"), "BOGUS") - assert_public_files_match(cache_files("bundle"), "BOGUS") - - # now, pass in some new content. Make sure that the css/js files are regenerated - @mock_view.bundle { @@content_include_all } - assert_public_files_no_match(cache_files("bundle"), "BOGUS") - assert_public_files_no_match(cache_files("bundle"), "BOGUS") - end - - def test__modified_time_differs_from_file__should_refresh_cache - @mock_view.bundle { @@content_include_some } - # we're gonna hack each of them and set all the modified times to 0 - cache_files("bundle").each{|filename| - abs_filelist_path = public_file(filename + ".filelist") - b = BundleFu::FileList.open(abs_filelist_path) - b.filelist.each{|entry| entry[1] = entry[1] - 100 } - b.save_as(abs_filelist_path) - } - - append_to_public_files(cache_files("bundle"), "BOGUS") - end - - def test__content_remains_same_but_cache_files_dont_match_whats_in_content__shouldnt_refresh_cache - # it shouldnt parse the content unless if it differed from the last request. This scenario should never exist, and if it did it would be fixed when the server reboots. - @mock_view.bundle { @@content_include_some } - abs_filelist_path = public_file("/stylesheets/cache/bundle.css.filelist") - b = BundleFu::FileList.open(abs_filelist_path) - - @mock_view.bundle { @@content_include_all } - b.save_as(abs_filelist_path) - append_to_public_files(cache_files("bundle"), "BOGUS") - - @mock_view.bundle { @@content_include_all } - assert_public_files_match(cache_files("bundle"), "BOGUS") - - end - - def test__content_differs_slightly_but_cache_files_match__shouldnt_refresh_cache - @mock_view.bundle { @@content_include_all } - append_to_public_files(cache_files("bundle"), "BOGUS") - @mock_view.bundle { @@content_include_all + " " } - assert_public_files_match(cache_files("bundle"), "BOGUS") - end - - def test__bundle__js_only__should_output_js_include_statement - @mock_view.bundle { @@content_include_some.split("\n").first } - lines = @mock_view.output.split("\n") - assert_equal(1, lines.length) - assert_match(/javascripts/, lines.first) - end - - def test__bundle__css_only__should_output_css_include_statement - @mock_view.bundle { @@content_include_some.split("\n")[2] } - lines = @mock_view.output.split("\n") - - assert_equal(1, lines.length) - assert_match(/stylesheets/, lines.first) - - end - - def test__nonexisting_file__should_use_blank_file_created_at_0_mtime -# dbg - @mock_view.bundle { %q{<script src="/javascripts/non_existing_file.js?1000" type="text/javascript"></script>} } - - assert_public_files_match(cache_files("bundle").grep(/javascripts/), "FILE READ ERROR") - - filelist = BundleFu::FileList.open(public_file("/javascripts/cache/bundle.js.filelist")) - assert_equal(0, filelist.filelist[0][1], "mtime for first file should be 0") - end - - def test__missing_cache_filelist__should_regenerate - @mock_view.bundle { @@content_include_some } - append_to_public_files(cache_files("bundle"), "BOGUS") - - # now delete the cache files - Dir[ public_file("**/*.filelist")].each{|filename| FileUtils.rm_f filename } - @mock_view.bundle { @@content_include_some } - assert_public_files_no_match(cache_files("bundle"), "BOGUS", "Should have regenerated the file, but it didn't") - end - - def test__bypass__should_generate_files_but_render_normal_output - @mock_view.bundle(:bypass => true) { @@content_include_some } - assert_public_file_exists("/stylesheets/cache/bundle.css") - assert_public_file_exists("/stylesheets/cache/bundle.css.filelist") - - assert_equal(@@content_include_some, @mock_view.output) - end - - def test__bypass_param_set__should_honor_and_store_in_session - @mock_view.params[:bundle_fu] = "false" - @mock_view.bundle { @@content_include_some } - assert_equal(@@content_include_some, @mock_view.output) - - @mock_view.params.delete(:bundle_bypass) - @mock_view.bundle { @@content_include_some } - assert_equal(@@content_include_some*2, @mock_view.output) - end - -private - - def purge_cache - # remove all fixtures named "bundle*" - Dir[ public_file("**/cache") ].each{|filename| FileUtils.rm_rf filename } - end - - def assert_public_file_exists(filename, message=nil) - assert_file_exists(public_file(filename), message) - end - - def assert_file_exists(filename, message=nil) - assert(File.exists?(filename), message || "File #{filename} expected to exist, but didnt.") - end - - def assert_public_files_match(filenames, needle, message=nil) - filenames.each{|filename| - assert_public_file_exists(filename) - assert_match(needle.to_regexp, File.read(public_file(filename)), message || "expected #{filename} to match #{needle}, but doesn't.") - } - end - - def assert_public_files_no_match(filenames, needle, message=nil) - filenames.each{ |filename| - assert_public_file_exists(filename) - assert_no_match(needle.to_regexp, File.read(public_file(filename)), message || "expected #{filename} to not match #{needle}, but does.") - } - end - - def cache_files(name) - ["/javascripts/cache/#{name}.js", "/stylesheets/cache/#{name}.css"] - end - - def append_to_public_files(filenames, content) - for filename in filenames - assert_public_file_exists(filename) - File.open(public_file(filename), "a") {|f| - f.puts(content) - } - end - end +require File.join(File.dirname(__FILE__), '../test_helper.rb') + +require "test/unit" + +# require "library_file_name" + +class BundleFuTest < Test::Unit::TestCase + def setup + @mock_view = MockView.new + BundleFu.init # resets BundleFu + end + + def teardown + purge_cache + end + + def test__bundle_js_files__should_include_js_content + @mock_view.bundle { @@content_include_all } + + assert_public_files_match("/javascripts/cache/bundle.js", "function js_1()") + end + + def test__bundle_js_files_with_asset_server_url + @mock_view.bundle { %(<script src="https://assets.server.com/javascripts/js_1.js?1000" type="text/javascript"></script>) } + assert_public_files_match("/javascripts/cache/bundle.js", "function js_1()") + end + + def test__bundle_js_files__should_use_packr + Object.send :class_eval, <<EOF + class ::Object::Packr + def initialize + end + + def pack(content, options={}) + "PACKR!" + options.inspect + end + + end +EOF + + @mock_view.bundle() { @@content_include_all } + assert_public_files_match("/javascripts/cache/bundle.js", "PACKR") + purge_cache + + @mock_view.bundle(:packr_options => {:packr_options_here => "hi_packr"}) { @@content_include_all } + assert_public_files_match("/javascripts/cache/bundle.js", "packr_options_here", "Should include packr_options") + + + Object.send :remove_const, "Packr" + + end + + def test__bundle_js_files__should_default_to_not_compressed_and_include_override_option + @mock_view.bundle() { @@content_include_all } + default_content = File.read(public_file("/javascripts/cache/bundle.js")) + purge_cache + + @mock_view.bundle(:compress => false) { @@content_include_all } + uncompressed_content = File.read(public_file("/javascripts/cache/bundle.js")) + purge_cache + + @mock_view.bundle(:compress => true) { @@content_include_all } + compressed_content = File.read(public_file("/javascripts/cache/bundle.js")) + purge_cache + + assert default_content.length == compressed_content.length, "Should default to compressed" + assert uncompressed_content.length > compressed_content.length, "Didn't compress the content. (:compress => true) #{compressed_content.length}. (:compress => false) #{uncompressed_content.length}" + end + + def test__content_remains_same__shouldnt_refresh_cache + @mock_view.bundle { @@content_include_some } + + # check to see each bundle file exists and append some text to the bottom of each file + append_to_public_files(cache_files("bundle"), "BOGUS") + + assert_public_files_match("/javascripts/cache/bundle.js", "BOGUS") + assert_public_files_match("/stylesheets/cache/bundle.css", "BOGUS") + + @mock_view.bundle { @@content_include_some } + + assert_public_files_match("/javascripts/cache/bundle.js", "BOGUS") + assert_public_files_match("/stylesheets/cache/bundle.css", "BOGUS") + end + + def test__content_changes__should_refresh_cache + @mock_view.bundle { @@content_include_some } + + # check to see each bundle file exists and append some text to the bottom of each file + append_to_public_files(cache_files("bundle"), "BOGUS") + assert_public_files_match(cache_files("bundle"), "BOGUS") + + # now, pass in some new content. Make sure that the css/js files are regenerated + @mock_view.bundle { @@content_include_all } + assert_public_files_no_match(cache_files("bundle"), "BOGUS") + assert_public_files_no_match(cache_files("bundle"), "BOGUS") + end + + def test__modified_time_differs_from_file__should_refresh_cache + @mock_view.bundle { @@content_include_some } + # we're gonna hack each of them and set all the modified times to 0 + cache_files("bundle").each{|filename| + abs_filelist_path = public_file(filename + ".filelist") + b = BundleFu::FileList.open(abs_filelist_path) + b.filelist.each{|entry| entry[1] = entry[1] - 100 } + b.save_as(abs_filelist_path) + } + + append_to_public_files(cache_files("bundle"), "BOGUS") + end + + def test__content_remains_same_but_cache_files_dont_match_whats_in_content__shouldnt_refresh_cache + # it shouldnt parse the content unless if it differed from the last request. This scenario should never exist, and if it did it would be fixed when the server reboots. + @mock_view.bundle { @@content_include_some } + abs_filelist_path = public_file("/stylesheets/cache/bundle.css.filelist") + b = BundleFu::FileList.open(abs_filelist_path) + + @mock_view.bundle { @@content_include_all } + b.save_as(abs_filelist_path) + append_to_public_files(cache_files("bundle"), "BOGUS") + + @mock_view.bundle { @@content_include_all } + assert_public_files_match(cache_files("bundle"), "BOGUS") + + end + + def test__content_differs_slightly_but_cache_files_match__shouldnt_refresh_cache + @mock_view.bundle { @@content_include_all } + append_to_public_files(cache_files("bundle"), "BOGUS") + @mock_view.bundle { @@content_include_all + " " } + assert_public_files_match(cache_files("bundle"), "BOGUS") + end + + def test__bundle__js_only__should_output_js_include_statement + @mock_view.bundle { @@content_include_some.split("\n").first } + lines = @mock_view.output.split("\n") + assert_equal(1, lines.length) + assert_match(/javascripts/, lines.first) + end + + def test__bundle__css_only__should_output_css_include_statement + @mock_view.bundle { @@content_include_some.split("\n")[2] } + lines = @mock_view.output.split("\n") + + assert_equal(1, lines.length) + assert_match(/stylesheets/, lines.first) + + end + + def test__nonexisting_file__should_use_blank_file_created_at_0_mtime +# dbg + @mock_view.bundle { %q{<script src="/javascripts/non_existing_file.js?1000" type="text/javascript"></script>} } + + assert_public_files_match(cache_files("bundle").grep(/javascripts/), "FILE READ ERROR") + + filelist = BundleFu::FileList.open(public_file("/javascripts/cache/bundle.js.filelist")) + assert_equal(0, filelist.filelist[0][1], "mtime for first file should be 0") + end + + def test__missing_cache_filelist__should_regenerate + @mock_view.bundle { @@content_include_some } + append_to_public_files(cache_files("bundle"), "BOGUS") + + # now delete the cache files + Dir[ public_file("**/*.filelist")].each{|filename| FileUtils.rm_f filename } + @mock_view.bundle { @@content_include_some } + assert_public_files_no_match(cache_files("bundle"), "BOGUS", "Should have regenerated the file, but it didn't") + end + + def test__bypass__should_generate_files_but_render_normal_output + @mock_view.bundle(:bypass => true) { @@content_include_some } + assert_public_file_exists("/stylesheets/cache/bundle.css") + assert_public_file_exists("/stylesheets/cache/bundle.css.filelist") + + assert_equal(@@content_include_some, @mock_view.output) + end + + def test__bypass_param_set__should_honor_and_store_in_session + @mock_view.params[:bundle_fu] = "false" + @mock_view.bundle { @@content_include_some } + assert_equal(@@content_include_some, @mock_view.output) + + @mock_view.params.delete(:bundle_bypass) + @mock_view.bundle { @@content_include_some } + assert_equal(@@content_include_some*2, @mock_view.output) + end + +private + + def purge_cache + # remove all fixtures named "bundle*" + Dir[ public_file("**/cache") ].each{|filename| FileUtils.rm_rf filename } + end + + def assert_public_file_exists(filename, message=nil) + assert_file_exists(public_file(filename), message) + end + + def assert_file_exists(filename, message=nil) + assert(File.exists?(filename), message || "File #{filename} expected to exist, but didnt.") + end + + def assert_public_files_match(filenames, needle, message=nil) + filenames.each{|filename| + assert_public_file_exists(filename) + assert_match(needle.to_regexp, File.read(public_file(filename)), message || "expected #{filename} to match #{needle}, but doesn't.") + } + end + + def assert_public_files_no_match(filenames, needle, message=nil) + filenames.each{ |filename| + assert_public_file_exists(filename) + assert_no_match(needle.to_regexp, File.read(public_file(filename)), message || "expected #{filename} to not match #{needle}, but does.") + } + end + + def cache_files(name) + ["/javascripts/cache/#{name}.js", "/stylesheets/cache/#{name}.css"] + end + + def append_to_public_files(filenames, content) + for filename in filenames + assert_public_file_exists(filename) + File.open(public_file(filename), "a") {|f| + f.puts(content) + } + end + end end \ No newline at end of file test/functional/bundle_fu_test.rb 01795c74ccfffcc138c726d2c8a0b62d7c4a68f3 Tim Harper timcharper@gmail.com http://github.com/timcharper/bundle-fu/commit/896d84bdda764281095f5dfd98a9d91d2ceb8a38 896d84bdda764281095f5dfd98a9d91d2ceb8a38 2008-05-18T22:20:13-07:00 2008-05-18T22:19:52-07:00 don't blow up on external asset urls https:// (Thanks, James Coglan!) 92a326d2de46ea1f3a9e69ee3d6335a9b69918b1 Tim Harper timcharper@gmail.com