deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Minor cache_buster cleanup

Browse source
This commit is contained in:
Thomas Reynolds 2012-04-26 16:02:06 -07:00
parent 4a49388d64
commit 2297100d9e
1 changed files with 53 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

108
middleman-more/lib/middleman-more/extensions/cache_buster.rb
View file

@ -1,73 +1,71 @@
# Extension namespace # Extension namespace
module Middleman::Extensions module Middleman
module Extensions
# The Cache Buster extension # The Cache Buster extension
module CacheBuster module CacheBuster
# Setup extension # Setup extension
class << self class << self
# Once registered # Once registered
def registered(app) def registered(app)
# Add instance methods to context # Add instance methods to context
app.send :include, InstanceMethods app.send :include, InstanceMethods
# After compass is setup, make it use the registered cache buster # After compass is setup, make it use the registered cache buster
app.compass_config do |config| app.compass_config do |config|
config.asset_cache_buster do |path, real_path| config.asset_cache_buster do |path, real_path|
real_path = real_path.path if real_path.is_a? File real_path = real_path.path if real_path.is_a? File
real_path = real_path.gsub(File.join(root, build_dir), source) real_path = real_path.gsub(File.join(root, build_dir), source)
if File.readable?(real_path) if File.readable?(real_path)
File.mtime(real_path).strftime("%s") File.mtime(real_path).strftime("%s")
else else
$stderr.puts "WARNING: '#{File.basename(path)}' was not found (or cannot be read) in #{File.dirname(real_path)}" $stderr.puts "WARNING: '#{File.basename(path)}' was not found (or cannot be read) in #{File.dirname(real_path)}"
end
end end
end end
end end
alias :included :registered
end end
alias :included :registered
end
# Cache buster instance methods # Cache buster instance methods
module InstanceMethods module InstanceMethods
# asset_url override if we're using cache busting # asset_url override if we're using cache busting
# @param [String] path # @param [String] path
# @param [String] prefix # @param [String] prefix
def asset_url(path, prefix="") def asset_url(path, prefix="")
http_path = super http_path = super
if http_path.include?("://") || !%w(.css .png .jpg .jpeg .svg .svgz .js .gif).include?(File.extname(http_path)) if http_path.include?("://") || !%w(.css .png .jpg .jpeg .svg .svgz .js .gif).include?(File.extname(http_path))
http_path http_path
else else
begin if respond_to?(:http_images_path) && prefix == http_images_path
prefix = images_dir if prefix == http_images_path prefix = images_dir
rescue
end
real_path_static = File.join(prefix, path)
if build?
real_path_dynamic = File.join(build_dir, prefix, path)
real_path_dynamic = File.expand_path(real_path_dynamic, root)
http_path << "?" + File.mtime(real_path_dynamic).strftime("%s") if File.readable?(real_path_dynamic)
elsif resource = sitemap.find_resource_by_path(real_path_static)
if !resource.template?
http_path << "?" + File.mtime(resource.source_file).strftime("%s")
else
# It's a template, possible with partials. We can't really know when
# it's updated, so generate fresh cache buster every time durin
# developement
http_path << "?" + Time.now.strftime("%s")
end end
end
real_path_static = File.join(prefix, path)
http_path if build?
real_path_dynamic = File.join(build_dir, prefix, path)
real_path_dynamic = File.expand_path(real_path_dynamic, root)
http_path << "?" + File.mtime(real_path_dynamic).strftime("%s") if File.readable?(real_path_dynamic)
elsif resource = sitemap.find_resource_by_path(real_path_static)
if !resource.template?
http_path << "?" + File.mtime(resource.source_file).strftime("%s")
else
# It's a template, possible with partials. We can't really
# know when it's updated, so generate fresh cache buster every
# time during developement
http_path << "?" + Time.now.strftime("%s")
end
end
http_path
end
end end
end end
end end
end end
end
# Register the extension
# register :cache_buster, CacheBuster
end