Fix oEmbed endpoint when only one of maxwidth/maxheight given

asciinema · Jun 16, 2015 · 7254b1d · 7254b1d
1 parent 939137c
commit 7254b1d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/app/controllers/oembed_controller.rb b/app/controllers/oembed_controller.rb
@@ -25,11 +25,12 @@ def show
   def oembed_response(asciicast)
     asciicast_image_generator.generate(asciicast) if asciicast.image_stale?
 
-    width, height = asciicast.image_width, asciicast.image_height
-
-    if params[:maxwidth]
-      width, height = size_smaller_than(width, height, params[:maxwidth], params[:maxheight])
-    end
+    width, height = size_smaller_than(
+      asciicast.image_width,
+      asciicast.image_height,
+      params[:maxwidth] || asciicast.image_width,
+      params[:maxheight] || asciicast.image_height
+    )
 
     oembed = {
       type: 'rich',

diff --git a/spec/api/oembed_spec.rb b/spec/api/oembed_spec.rb
@@ -14,4 +14,9 @@
     expect(response.status).to eq(200)
   end
 
+  it "responds with status 200 when only maxwidth given" do
+    get "/oembed?url=http://localhost:3000/a/#{asciicast.id}&format=json&maxwidth=500"
+    expect(response.status).to eq(200)
+  end
+
 end