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

Merge pull request #520 from bhollis/image_sizes

Browse source 
Make :automatic_image_sizes work for absolute image paths
This commit is contained in:
Thomas Reynolds 2012-07-09 08:14:29 -07:00
parent 6dad42bc77 4c5b614fe2
commit d52e555dcd
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
middleman-more/lib/middleman-more/extensions/automatic_image_sizes.rb
View file

@ -32,19 +32,19 @@ module Middleman
def image_tag(path, params={}) def image_tag(path, params={})
if !params.has_key?(:width) && !params.has_key?(:height) && !path.include?("://") if !params.has_key?(:width) && !params.has_key?(:height) && !path.include?("://")
params[:alt] ||= "" params[:alt] ||= ""
http_prefix = http_images_path rescue images_dir
begin real_path = path
real_path = File.join(source, images_dir, path) real_path = File.join(images_dir, real_path) unless real_path =~ %r{^/}
full_path = File.expand_path(real_path, root) full_path = File.join(source_dir, real_path)
http_prefix = http_images_path rescue images_dir
if File.exists? full_path if File.exists? full_path
dimensions = ::FastImage.size(full_path, :raise_on_failure => true) begin
params[:width] = dimensions[0] width, height = ::FastImage.size(full_path, :raise_on_failure => true)
params[:height] = dimensions[1] params[:width] = width
end params[:height] = height
rescue rescue
# $stderr.puts params.inspect warn "Couldn't determine dimensions for image #{path}: #{$!.message}"
end
end end
end end