lib/cgi_request.rb @@ -1,2 +1,3 @@ # Include hook code here +require File.dirname(__FILE__) + '/lib/cgi_request' require File.dirname(__FILE__) + '/lib/asset_tag_helper' init.rb @@ -13,11 +13,10 @@ module ActionView alias_method_chain(:stylesheet_link_tag, :holly) def holly_asset_tags(sources, asset_type) - @holly_logger ||= Holly::Logger.new sources = sources.map { |s| Holly.resolve_source(s.to_s, asset_type) } files = Holly::Asset::Collection.new(*sources).files - files.delete_if { |f| @holly_logger.rendered?(f.source) } - @holly_logger.log(*files.map { |f| f.source}) + files.delete_if { |f| request.holly_logger.rendered?(f.source) } + request.holly_logger.log(*files.map { |f| f.source}) files.map { |file| __send__("#{file.asset_tag_method}_without_holly", file.source) }.join("\n") lib/asset_tag_helper.rb fc560991602f8c57bb0e8c2307abcbfa7e51ab43 James Coglan jcoglan@googlemail.com http://github.com/jcoglan/holly/commit/fcb257542e27a68b26d66013653ac9b096072e5d fcb257542e27a68b26d66013653ac9b096072e5d 2008-01-06T11:02:08-08:00 2008-01-06T11:02:08-08:00 Made holly_logger a property of ActionController::CgiRequest to make sure it's created on a per-request basis. 0cdbd448c43cfdf3c4e4376350ece612c9fc352c James Coglan jcoglan@googlemail.com