Syntax fix for screenshot variants in ActiveStorage

app/views/json/package.json.jbuilder

@@ -1,7 +1,7 @@
 json.package @p.name
 
 json.screenshots @p.screenshots do |s|
-  json.small_image_url "https://#{request.host_with_port}#{s.image.variant(resize_to_limit: "160x120", timestamp: false)}"
+  json.small_image_url "https://#{request.host_with_port}#{s.image.variant(resize_to_limit: [160,120], timestamp: false)}"
-  json.large_image_url "https://#{request.host_with_port}#{s.image.variant(resize_to_limit: "800x600", timestamp: false)}"
+  json.large_image_url "https://#{request.host_with_port}#{s.image.variant(resize_to_limit: [800,600], timestamp: false)}"
   json.version s.version
 end

app/views/json/screenshots.json.jbuilder

@@ -4,7 +4,7 @@ json.cache! ['json_screenshots'], expires_in: 1.hour do
     json.extract! s, :version
     json.extract! p, :maintainer, :name, :section, :maintainer_email, :homepage, :description
     json.url package_url(p.name, protocol: 'https')
-    json.small_image_url "https://#{request.host_with_port}#{s.image.variant(resize_to_limit: "160x120")}"
+    json.small_image_url "https://#{request.host_with_port}#{s.image.variant(resize_to_limit: [160,120])}"
-    json.large_image_url "https://#{request.host_with_port}#{s.image.variant(resize_to_limit: "800x600")}"
+    json.large_image_url "https://#{request.host_with_port}#{s.image.variant(resize_to_limit: [800,600])}"
   end
 end

app/views/my/uploads.slim

@@ -16,8 +16,8 @@
         - @current_users_screenshots.each do |screenshot|
           .column
 
-            a.black.fancybox href=rails_representation_url(screenshot.image.variant(resize_to_limit: "800x600", timestamp: false))
+            a.black.fancybox href=rails_representation_url(screenshot.image.variant(resize_to_limit: [800,600], timestamp: false))
               div.grid-thumbnail
-                = image_tag(screenshot.image.variant(resize_to_limit: "160x120"), alt: screenshot.caption, class: 'thumbnail')
+                = image_tag(screenshot.image.variant(resize_to_limit: [160,120]), alt: screenshot.caption, class: 'thumbnail')
               div
                 = screenshot.description

app/views/packages/_grid_thumbnail.slim

@@ -4,7 +4,7 @@ a.black href=package_path(name: pkg.name)
     - if pkg.screenshots_approved.any?
       // TODO: smarter selection of the most useful screenshot instead of taking the first one
       - screenshot = pkg.screenshots.first
-      = image_tag(screenshot.image.variant(resize_to_limit: "160x120"), alt: screenshot.caption, class: 'thumbnail')
+      = image_tag(screenshot.image.variant(resize_to_limit: [160,120]), alt: screenshot.caption, class: 'thumbnail')
     - else
       img.screenshot.thumbnail src="/images/dummy/no-screenshots-upload-one.svg"
   div

app/views/packages/upload.slim

@@ -25,20 +25,12 @@ h1 = "Upload screenshots for #{@package.name}"
               = fa_stacked_icon "upload", base: "circle-thin"
               '  Start upload
 
-    p
+    - if @package.screenshots.any?
-      - if @package.screenshots.any?
+      p Just for your information - these screenshots have already been uploaded:
-        ' Just for your information - these screenshots have already been uploaded.
 
-        .small-up-1.medium-up-3.large-up-4.grid-thumbnails
+      - @package.screenshots.all.each do |ss|
-          - @package.screenshots.all.each do |ss|
+        a.black.fancybox href=rails_representation_url(ss.image.variant(resize_to_limit: [800,600])) rel='fancybox-thumb' title=ss.caption
-            .column
+          = image_tag(ss.image.variant(resize_to_limit: [160,120]), alt: ss.caption, class: 'thumbnail')
-              a.black.fancybox href=rails_representation_url(ss.image.variant(resize_to_limit: "800x600")) rel='fancybox-thumb' title=ss.caption
-                = image_tag(ss.image.variant(resize_to_limit: "160x120"), alt: ss.caption, class: 'thumbnail')
-            // = render partial: 'packages/grid_thumbnail', locals: { pkg: pkg }
-
-      //- else
-      //  ' There are no screenshots yet for #{@package.name}. Your upload will
-      //  ' be the first.
 
 
   .small-5.cell.bigpanel

app/views/welcome/home.slim

@@ -30,7 +30,7 @@
       h2 Newest upload
       .thumb-height
         a href=package_path(@newest_upload.package.name)
-          = image_tag(@newest_upload.image.variant(resize_to_limit: "160x120"), alt: @newest_upload.caption)
+          = image_tag(@newest_upload.image.variant(resize_to_limit: [160,120]), alt: @newest_upload.caption)
       p
         strong
           =@newest_upload.package.name
@@ -41,7 +41,7 @@
       .thumb-height
         - if @most_popular_package
           a href=package_path(@most_popular_package.name)
-            = image_tag(@most_popular_package.screenshots.first.image.variant(resize_to_limit: "160x120"))
+            = image_tag(@most_popular_package.screenshots.first.image.variant(resize_to_limit: [160,120]))
         - else
           'No uploaded screenshots yet.
       p