refactor CookedPostProcessor & specs

This commit is contained in:
Régis Hanol
2013-07-08 01:39:08 +02:00
parent c6c8246399
commit ac7253a938
6 changed files with 313 additions and 277 deletions

View File

@ -1,5 +1,5 @@
# Post processing that we can do after a post has already been cooked.
# For example, inserting the onebox content, or image sizes.
# For example, inserting the onebox content, or image sizes/thumbnails.
require_dependency 'oneboxer'
@ -21,43 +21,31 @@ class CookedPostProcessor
end
def post_process_images
images = @doc.css("img") - @doc.css(".onebox-result img") - @doc.css(".quote img")
images = extract_images
return if images.blank?
images.each do |img|
# keep track of the original src
src = img['src']
# make sure the src is absolute (when working with locally uploaded files)
img['src'] = Discourse.base_url_no_prefix + img['src'] if img['src'] =~ /^\/[^\/]/
if src.present?
# make sure the img has both width and height attributes
if img['src'].present?
# keep track of the original src
src = img['src']
# make sure the src is absolute (when working with locally uploaded files)
img['src'] = relative_to_absolute(src)
# make sure the img has proper width and height attributes
update_dimensions!(img)
# retrieve the associated upload, if any
upload = get_upload_from_url(img['src'])
if upload.present?
if upload = Upload.get_from_url(img['src'])
# update reverse index
associate_to_post upload
# create a thumbnail
upload.create_thumbnail!
# optimize image
img['src'] = optimize_image(img)
# lightbox treatment
convert_to_link!(img, upload)
else
convert_to_link!(img)
associate_to_post(upload)
end
# lightbox treatment
convert_to_link!(img, upload)
# mark the post as dirty whenever the src has changed
@dirty |= src != img['src']
end
end
# Extract the first image from the first post and use it as the 'topic image'
if @post.post_number == 1
img = images.first
@post.topic.update_column :image_url, img['src'] if img['src'].present?
end
extract_topic_image(images)
end
def post_process_oneboxes
@ -71,28 +59,31 @@ class CookedPostProcessor
@dirty |= result.changed?
end
def extract_images
# do not extract images inside a onebox or a quote
@doc.css("img") - @doc.css(".onebox-result img") - @doc.css(".quote img")
end
def relative_to_absolute(src)
if src =~ /\A\/[^\/]/
Discourse.base_url_no_prefix + src
else
src
end
end
def update_dimensions!(img)
return if img['width'].present? && img['height'].present?
w, h = get_size_from_image_sizes(img['src'], @opts[:image_sizes]) || image_dimensions(img['src'])
if w && h
img['width'] = w.to_s
img['height'] = h.to_s
img['width'] = w
img['height'] = h
@dirty = true
end
end
def get_upload_from_url(url)
if Upload.has_been_uploaded?(url)
if m = LocalStore.uploaded_regex.match(url)
Upload.where(id: m[:upload_id]).first
elsif Upload.is_on_s3?(url)
Upload.where(url: url).first
end
end
end
def associate_to_post(upload)
return if PostUpload.where(post_id: @post.id, upload_id: upload.id).count > 0
PostUpload.create({ post_id: @post.id, upload_id: upload.id })
@ -100,10 +91,10 @@ class CookedPostProcessor
# do not care if it's already associated
end
def optimize_image(img)
return img["src"]
def optimize_image!(img)
# TODO
# 1) optimize using image_optim
# 2) .png vs. .jpg
# 2) .png vs. .jpg (> 1.5x)
end
def convert_to_link!(img, upload=nil)
@ -113,42 +104,59 @@ class CookedPostProcessor
width, height = img["width"].to_i, img["height"].to_i
original_width, original_height = get_size(src)
return unless original_width.to_i > width && original_height.to_i > height
return if original_width < SiteSetting.max_image_width
return if original_width.to_i <= width && original_height.to_i <= height
return if original_width.to_i <= SiteSetting.max_image_width
return if is_a_hyperlink(img)
if upload
# create a thumbnail
upload.create_thumbnail!
# optimize image
# TODO: optimize_image!(img)
end
add_lightbox!(img, original_width, original_height, upload)
@dirty = true
end
def is_a_hyperlink(img)
parent = img.parent
while parent
return if parent.name == "a"
break unless parent.respond_to? :parent
parent = parent.parent
end
end
# not a hyperlink so we can apply
img['src'] = upload.thumbnail_url if (upload && upload.thumbnail_url.present?)
def add_lightbox!(img, original_width, original_height, upload=nil)
# first, create a div to hold our lightbox
lightbox = Nokogiri::XML::Node.new "div", @doc
img.add_next_sibling lightbox
lightbox.add_child img
lightbox = Nokogiri::XML::Node.new("div", @doc)
img.add_next_sibling(lightbox)
lightbox.add_child(img)
# then, the link to our larger image
a = Nokogiri::XML::Node.new "a", @doc
a = Nokogiri::XML::Node.new("a", @doc)
img.add_next_sibling(a)
a["href"] = src
a["href"] = img['src']
a["class"] = "lightbox"
a.add_child(img)
# then, some overlay informations
meta = Nokogiri::XML::Node.new "div", @doc
meta["class"] = "meta"
img.add_next_sibling meta
filename = get_filename(upload, src)
# replace the image by its thumbnail
img['src'] = upload.thumbnail_url if upload && upload.has_thumbnail?
# then, some overlay informations
meta = Nokogiri::XML::Node.new("div", @doc)
meta["class"] = "meta"
img.add_next_sibling(meta)
filename = get_filename(upload, img['src'])
informations = "#{original_width}x#{original_height}"
informations << " | #{number_to_human_size(upload.filesize)}" if upload
meta.add_child create_span_node("filename", filename)
meta.add_child create_span_node("informations", informations)
meta.add_child create_span_node("expand")
@dirty = true
end
def get_filename(upload, src)
@ -158,12 +166,19 @@ class CookedPostProcessor
end
def create_span_node(klass, content=nil)
span = Nokogiri::XML::Node.new "span", @doc
span = Nokogiri::XML::Node.new("span", @doc)
span.content = content if content
span['class'] = klass
span
end
def extract_topic_image(images)
if @post.post_number == 1
img = images.first
@post.topic.update_column :image_url, img['src'] if img['src'].present?
end
end
def get_size_from_image_sizes(src, image_sizes)
if image_sizes.present?
if dim = image_sizes[src]
@ -180,8 +195,8 @@ class CookedPostProcessor
def get_size(url)
# make sure s3 urls have a scheme (otherwise, FastImage will fail)
url = "http:" + url if Upload.is_on_s3? (url)
return unless is_valid_image_uri? url
url = "http:" + url if Upload.is_on_s3?(url)
return unless is_valid_image_uri?(url)
# we can *always* crawl our own images
return unless SiteSetting.crawl_images? || Upload.has_been_uploaded?(url)
@size_cache[url] ||= FastImage.size(url)