Ensure thumbnail image size is known before generating oEmbed response

private-asciicasts
Marcin Kulik 10 years ago
parent 871745cc6c
commit 04004c490d

@ -6,14 +6,13 @@ class OembedController < ApplicationController
if url.path =~ %r{^/a/(\d+)$}
id = $1
asciicast = AsciicastDecorator.new(Asciicast.find(id))
oembed = oembed_response(asciicast)
respond_to do |format|
format.json do
render json: oembed
render json: oembed_response(asciicast)
end
format.xml do
render xml: oembed.to_xml(root: 'oembed')
render xml: oembed_response(asciicast).to_xml(root: 'oembed')
end
end
else
@ -24,6 +23,8 @@ class OembedController < ApplicationController
private
def oembed_response(asciicast)
asciicast_image_generator.generate(asciicast) if asciicast.image_stale?
width, height = asciicast.image_width, asciicast.image_height
if params[:maxwidth]
@ -67,4 +68,8 @@ class OembedController < ApplicationController
end
end
def asciicast_image_generator
AsciicastImageGenerator.new(self)
end
end

Loading…
Cancel
Save