Include pristine image if suitable

Author: gerdint

example/img/480px-image.gif example/img/600px-image.gifexample/img/480px-image.gif renamed to example/img/600px-image.gif

@@ -70,7 +70,7 @@
                  ;; Don't resize remote images. Or should we fetch it and resize it?
                  '((div ((class "figure")) (img ((src "//somehost.com/img/file.jpg"))))))
     (when magick-available?
-      (test-equal? "Big image"
+      (test-equal? "Image bigger than maximum size"
                    (responsive-images
                     '((div ((class "figure"))
                            (img ((src "/img/1300px-image.gif") (alt "")))
@@ -80,46 +80,50 @@
                                               (current-image-default-size)))
                                 (srcset
                                  ,(string-join (map (λ (s)
-                                                      (format "/img/resized/1300px-image-~a.gif ~aw" s s))
-                                                    (current-image-sizes))
-                                               ", "))
+                                                     (format "/img/resized/1300px-image-~a.gif ~aw" s s))
+                                                   (current-image-sizes))
+                                              ", "))
                                 (sizes "(max-width: 1300px) 100vw, 1300px")
                                 (alt "")))
                           (p ((class "caption")) "some text"))))
-      (test-equal? "Medium image"
+      (test-equal? "Image smaller than biggest image but bigger than smallest size"
                    (responsive-images
                     '((div ((class "figure"))
                            (img ((src "/img/800px-image.gif") (alt "")))
                            (p ((class "caption")) "some text"))))
                    `((div ((class "figure"))
                           (img ((src ,(format "/img/resized/800px-image-~a.gif"
                                               (current-image-default-size)))
-                                (srcset ,(string-join (map (λ (s)
-                                                             (format "/img/resized/800px-image-~a.gif ~aw" s s))
-                                                           '(320 600))
-                                                      ", "))
+                                (srcset
+                                 ,(string-append
+                                   (string-join
+                                    (map (λ (s)
+                                           (format "/img/resized/800px-image-~a.gif ~aw" s s))
+                                         '(320 600))
+                                    ", ")
+                                  ", /img/800px-image.gif 800w"))
                                 (sizes "(max-width: 800px) 100vw, 800px")
                                 (alt "")))
                           (p ((class "caption")) "some text"))))
-      (test-equal? "Small image"
+      (test-equal? "Image equal to a one of the sizes specified"
                    (responsive-images
                     '((div ((class "figure"))
-                           (img ((src "/img/480px-image.gif") (alt "")))
+                           (img ((src "/img/600px-image.gif") (alt "")))
                            (p ((class "caption")) "some text"))))
                    '((div ((class "figure"))
-                          (img ((src "/img/480px-image.gif")
-                                (srcset "/img/resized/480px-image-320.gif 320w")
-                                (sizes "(max-width: 480px) 100vw, 480px")
+                          (img ((src "/img/600px-image.gif")
+                                (srcset "/img/resized/600px-image-320.gif 320w, /img/600px-image.gif 600w")
+                                (sizes "(max-width: 600px) 100vw, 600px")
                                 (alt "")))
                           (p ((class "caption")) "some text"))))
-      (test-equal? "Tiny image"
+      (test-equal? "Image smaller than smallest size"
                    (responsive-images
                     '((div ((class "figure"))
                            (img ((src "/img/1x1.gif") (alt ""))) ; Tiny image
                            (p ((class "caption")) "some text"))))
                    '((div ((class "figure"))
                           (img ((src "/img/1x1.gif")
-                                (srcset "")
+                                (srcset "/img/1x1.gif 2w")
                                 (sizes "(max-width: 2px) 100vw, 2px")
                                 (alt "")))
                           (p ((class "caption")) "some text"))))

frog/enhance-body.rkt

@@ -51,7 +51,7 @@
       (let ([out (make-temporary-file)])
         (test-eq? "resize"
                   (begin
-                    (resize-image (build-path (www/img-path) "480px-image.gif") 10 out)
+                    (resize-image (build-path (www/img-path) "600px-image.gif") 10 out)
                     (image-width out))
                   10)
         (delete-file* out)))))
@@ -62,22 +62,26 @@
   (unless (directory-exists? output-dir)
     (make-directory output-dir))
   (let* ([orig-size (image-width image-path)]
-         [sizes (filter ((curry >=) orig-size) (current-image-sizes))])
+         [sizes (filter ((curry >) orig-size) (current-image-sizes))])
+    ;; FIXME include original image if smaller or equal than max image size!
     (values (cons image-path orig-size)
-            (for/list ([width sizes])
-              (let* ([filename (file-name-from-path image-path)]
-                     [extension (get-extension filename)]
-                     [out-path
-                      (build-path
-                       output-dir
-                       (replace-extension
-                        filename
-                        (string-append "-" (number->string width) "." extension)))])
-                (unless (and (file-exists? out-path)
-                             (< (file-or-directory-modify-seconds image-path)
-                                (file-or-directory-modify-seconds out-path)))
-                  (resize-image image-path width out-path))
-                (cons out-path width))))))
+            (append (for/list ([width sizes])
+                    (let* ([filename (file-name-from-path image-path)]
+                           [extension (get-extension filename)]
+                           [out-path
+                            (build-path
+                             output-dir
+                             (replace-extension
+                              filename
+                              (string-append "-" (number->string width) "." extension)))])
+                      (unless (and (file-exists? out-path)
+                                   (< (file-or-directory-modify-seconds image-path)
+                                      (file-or-directory-modify-seconds out-path)))
+                        (resize-image image-path width out-path))
+                      (cons out-path width)))
+                  (if (< (length sizes) (length (current-image-sizes)))
+                      (list (cons image-path orig-size))
+                      '())))))
 
 (define default-image-idx
   (for/or ([v  (current-image-sizes)]