middleman-simple-thumbnailer 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd519ff05ce42574ccbb38196f5e9aab016a5480
-  data.tar.gz: 370e59f6edc7cc712a854d2329e2a7dfb27c6809
+  metadata.gz: a737cfbd8c307195f1b5c65a166b55537726c298
+  data.tar.gz: b8cca78be777777673ca21d7505c9c9754dbec8f
 SHA512:
-  metadata.gz: 33f3cb656564ffe0ad37bb9ce6a2b30e46cf452deb0a02ab4cccb712066ee39c68caf40e82c6e0194398f033ed55b128288c9507d8a225a2f86c3887e55bfec0
-  data.tar.gz: 4566366ccfe96aa497dffedf64f471eab950dc1acd72d1a00310e9b9c8cbb7ef40b3cbba90296df86660cf5fe877015de99db403fa4b0d118b36c17700007a96
+  metadata.gz: 0be2674631c601c265582e77870cd45850d99d07226cb4089a51dcb9b5294153c4c029009d9509fb3ce5d68020bac631d6b0ff9d301b9ba877eebb6091625358
+  data.tar.gz: 883e8dd54a831943e2352f78b931b6938d634e9e1618c2f042a24f4b69cddf1c26b694e6bc0668f7971c4185bf8b87072dca159c0ea5221947d22710b224bd92

data/.travis.yml

@@ -6,8 +6,6 @@ rvm:
   - ruby-head
   - 2.3.1
   - 2.2.4
-  - 2.1
-  - 2.0
 matrix:
   allow_failures:
     - rvm: ruby-head

data/README.md

@@ -23,6 +23,17 @@ And modify your `image_tag`'s by adding `resize_to` parameter:
 = image_tag image, resize_to: '50x50', class: 'thumbnail'
 ```
 
+You can also use the `image_path` helper the same way in place where you need only the path of the resized image:
+```
+<picture>
+  <source srcset="<%= image_path "original.jpg", resize_to: 1200 %>" media="(min-width: 900px)">
+  <%= image_tag "original.jpg", resize_to: "400%", class: 'the-image-class' %>
+</picture>
+``` 
+
+This extension use ImageMagick (via mini_magick) to resize the images.
+The `resize_to` format is therefore the one defined ny ImageMagick. The documentation can be found [there](http://www.imagemagick.org/script/command-line-processing.php#geometry).
+
 Build/Development modes
 -----
   During development thumbnails will be created on fly and presented as a base64 strings.

data/features/generate_image_thumbnails_image_path.feature

@@ -0,0 +1,34 @@
+Feature: Generate image thumbnails with image path
+
+  Scenario: Preserve default image_path behaviour if no resize_to param is given
+    Given the Server is running at "basic-app-image-path"
+    When I go to "/page-with-untouched-image.html"
+    Then I should see '<img src="/images/original.jpg" alt="Original" />'
+    And I should see '<source srcset="/images/original.jpg" media="(min-width: 900px)">'
+
+  Scenario: Preserve default image_path behaviour after build if no resize_to param was given
+    Given a fixture app "basic-app-image-path"
+    And a successfully built app at "basic-app-image-path"
+    When I cd to "build"
+    Then the file "page-with-untouched-image.html" should contain '<img src="/images/original.jpg" alt="Original" />'
+    And the file "page-with-untouched-image.html" should contain '<source srcset="/images/original.jpg" media="(min-width: 900px)">'
+
+  Scenario: Generate base64 thumbnail of image with resize_to param given
+    Given the Server is running at "basic-app-image-path"
+    When I go to "/page-with-images-to-resize.html"
+    Then I should see base64ed thumbnails and srcset of the images
+
+  Scenario: After build server resized images
+    Given a fixture app "basic-app-image-path"
+    And a successfully built app at "basic-app-image-path"
+    When I cd to "build"
+    Then the following images should exist:
+      | filename                    | dimensions |
+      | images/original.10x10gt.jpg | 10x5       |
+      | images/original.5x5.jpg     |  5x2       |
+      | images/original.20x20.jpg   | 20x9       |
+      | images/original.15x15.jpg   | 15x7       |
+    And the file "page-with-images-to-resize.html" should contain '<img src="/images/original.10x10gt.jpg" class="image-resized-to10x10" alt="Original.10x10gt" />'
+    And the file "page-with-images-to-resize.html" should contain '<source srcset="/images/original.20x20.jpg" media="(min-width: 900px)">'
+    And the file "page-with-images-to-resize.html" should contain '<img src="/images/original.5x5.jpg" class="image-resized-to5x5" alt="Original.5x5" />'
+    And the file "page-with-images-to-resize.html" should contain '<source srcset="/images/original.15x15.jpg" media="(min-width: 900px)">'

data/features/support/image_thumbnails_steps.rb

@@ -1,4 +1,17 @@
 require 'base64'
+def calculate_resized_image_b64(resize_str)
+  base_image = MiniMagick::Image.open(File.expand_path("../../fixtures/basic-app/source/images/original.jpg", __dir__))
+  base_image.resize(resize_str)
+  Base64.strict_encode64(base_image.to_blob)
+end
+
+image10x10 = "<img src=\"data:image/jpeg;base64,"+calculate_resized_image_b64("10x10>")+"\" class=\"image-resized-to10x10\" />"
+
+image5x5 = "<img src=\"data:image/jpeg;base64,"+calculate_resized_image_b64("5x5")+"\" class=\"image-resized-to5x5\" />"
+
+srcset20x20 = "<source srcset=\"data:image/jpeg;base64,"+calculate_resized_image_b64("20x20")+"\" media=\"(min-width: 900px)\">"
+
+srcset15x15 = "<source srcset=\"data:image/jpeg;base64,"+calculate_resized_image_b64("15x15")+"\" media=\"(min-width: 900px)\">"
 
 Given(/^there is no cache directory yet$/) do
   if directory? MiddlemanSimpleThumbnailer::Extension.config.cache_dir
@@ -7,12 +20,19 @@ Given(/^there is no cache directory yet$/) do
 end
 
 Then(/^I should see base64ed thumbnails of the images$/) do
-  image10x10 = "<img src=\"data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD/4gxYSUNDX1BST0ZJTEUAAQEAAAxITGlu\nbwIQAABtbnRyUkdCIFhZWiAHzgACAAkABgAxAABhY3NwTVNGVAAAAABJRUMg\nc1JHQgAAAAAAAAAAAAAAAQAA9tYAAQAAAADTLUhQICAAAAAAAAAAAAAAAAAA\nAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABFjcHJ0AAABUAAA\nADNkZXNjAAABhAAAAGx3dHB0AAAB8AAAABRia3B0AAACBAAAABRyWFlaAAAC\nGAAAABRnWFlaAAACLAAAABRiWFlaAAACQAAAABRkbW5kAAACVAAAAHBkbWRk\nAAACxAAAAIh2dWVkAAADTAAAAIZ2aWV3AAAD1AAAACRsdW1pAAAD+AAAABRt\nZWFzAAAEDAAAACR0ZWNoAAAEMAAAAAxyVFJDAAAEPAAACAxnVFJDAAAEPAAA\nCAxiVFJDAAAEPAAACAx0ZXh0AAAAAENvcHlyaWdodCAoYykgMTk5OCBIZXds\nZXR0LVBhY2thcmQgQ29tcGFueQAAZGVzYwAAAAAAAAASc1JHQiBJRUM2MTk2\nNi0yLjEAAAAAAAAAAAAAABJzUkdCIElFQzYxOTY2LTIuMQAAAAAAAAAAAAAA\nAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWFlaIAAA\nAAAAAPNRAAEAAAABFsxYWVogAAAAAAAAAAAAAAAAAAAAAFhZWiAAAAAAAABv\nogAAOPUAAAOQWFlaIAAAAAAAAGKZAAC3hQAAGNpYWVogAAAAAAAAJKAAAA+E\nAAC2z2Rlc2MAAAAAAAAAFklFQyBodHRwOi8vd3d3LmllYy5jaAAAAAAAAAAA\nAAAAFklFQyBodHRwOi8vd3d3LmllYy5jaAAAAAAAAAAAAAAAAAAAAAAAAAAA\nAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABkZXNjAAAAAAAAAC5JRUMgNjE5\nNjYtMi4xIERlZmF1bHQgUkdCIGNvbG91ciBzcGFjZSAtIHNSR0IAAAAAAAAA\nAAAAAC5JRUMgNjE5NjYtMi4xIERlZmF1bHQgUkdCIGNvbG91ciBzcGFjZSAt\nIHNSR0IAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZGVzYwAAAAAAAAAsUmVmZXJl\nbmNlIFZpZXdpbmcgQ29uZGl0aW9uIGluIElFQzYxOTY2LTIuMQAAAAAAAAAA\nAAAALFJlZmVyZW5jZSBWaWV3aW5nIENvbmRpdGlvbiBpbiBJRUM2MTk2Ni0y\nLjEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHZpZXcAAAAAABOk/gAUXy4A\nEM8UAAPtzAAEEwsAA1yeAAAAAVhZWiAAAAAAAEwJVgBQAAAAVx/nbWVhcwAA\nAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAo8AAAACc2lnIAAAAABDUlQgY3Vy\ndgAAAAAAAAQAAAAABQAKAA8AFAAZAB4AIwAoAC0AMgA3ADsAQABFAEoATwBU\nAFkAXgBjAGgAbQByAHcAfACBAIYAiwCQAJUAmgCfAKQAqQCuALIAtwC8AMEA\nxgDLANAA1QDbAOAA5QDrAPAA9gD7AQEBBwENARMBGQEfASUBKwEyATgBPgFF\nAUwBUgFZAWABZwFuAXUBfAGDAYsBkgGaAaEBqQGxAbkBwQHJAdEB2QHhAekB\n8gH6AgMCDAIUAh0CJgIvAjgCQQJLAlQCXQJnAnECegKEAo4CmAKiAqwCtgLB\nAssC1QLgAusC9QMAAwsDFgMhAy0DOANDA08DWgNmA3IDfgOKA5YDogOuA7oD\nxwPTA+AD7AP5BAYEEwQgBC0EOwRIBFUEYwRxBH4EjASaBKgEtgTEBNME4QTw\nBP4FDQUcBSsFOgVJBVgFZwV3BYYFlgWmBbUFxQXVBeUF9gYGBhYGJwY3BkgG\nWQZqBnsGjAadBq8GwAbRBuMG9QcHBxkHKwc9B08HYQd0B4YHmQesB78H0gfl\nB/gICwgfCDIIRghaCG4IggiWCKoIvgjSCOcI+wkQCSUJOglPCWQJeQmPCaQJ\nugnPCeUJ+woRCicKPQpUCmoKgQqYCq4KxQrcCvMLCwsiCzkLUQtpC4ALmAuw\nC8gL4Qv5DBIMKgxDDFwMdQyODKcMwAzZDPMNDQ0mDUANWg10DY4NqQ3DDd4N\n+A4TDi4OSQ5kDn8Omw62DtIO7g8JDyUPQQ9eD3oPlg+zD88P7BAJECYQQxBh\nEH4QmxC5ENcQ9RETETERTxFtEYwRqhHJEegSBxImEkUSZBKEEqMSwxLjEwMT\nIxNDE2MTgxOkE8UT5RQGFCcUSRRqFIsUrRTOFPAVEhU0FVYVeBWbFb0V4BYD\nFiYWSRZsFo8WshbWFvoXHRdBF2UXiReuF9IX9xgbGEAYZRiKGK8Y1Rj6GSAZ\nRRlrGZEZtxndGgQaKhpRGncanhrFGuwbFBs7G2MbihuyG9ocAhwqHFIcexyj\nHMwc9R0eHUcdcB2ZHcMd7B4WHkAeah6UHr4e6R8THz4faR+UH78f6iAVIEEg\nbCCYIMQg8CEcIUghdSGhIc4h+yInIlUigiKvIt0jCiM4I2YjlCPCI/AkHyRN\nJHwkqyTaJQklOCVoJZclxyX3JicmVyaHJrcm6CcYJ0kneierJ9woDSg/KHEo\noijUKQYpOClrKZ0p0CoCKjUqaCqbKs8rAis2K2krnSvRLAUsOSxuLKIs1y0M\nLUEtdi2rLeEuFi5MLoIuty7uLyQvWi+RL8cv/jA1MGwwpDDbMRIxSjGCMbox\n8jIqMmMymzLUMw0zRjN/M7gz8TQrNGU0njTYNRM1TTWHNcI1/TY3NnI2rjbp\nNyQ3YDecN9c4FDhQOIw4yDkFOUI5fzm8Ofk6Njp0OrI67zstO2s7qjvoPCc8\nZTykPOM9Ij1hPaE94D4gPmA+oD7gPyE/YT+iP+JAI0BkQKZA50EpQWpBrEHu\nQjBCckK1QvdDOkN9Q8BEA0RHRIpEzkUSRVVFmkXeRiJGZ0arRvBHNUd7R8BI\nBUhLSJFI10kdSWNJqUnwSjdKfUrESwxLU0uaS+JMKkxyTLpNAk1KTZNN3E4l\nTm5Ot08AT0lPk0/dUCdQcVC7UQZRUFGbUeZSMVJ8UsdTE1NfU6pT9lRCVI9U\n21UoVXVVwlYPVlxWqVb3V0RXklfgWC9YfVjLWRpZaVm4WgdaVlqmWvVbRVuV\nW+VcNVyGXNZdJ114XcleGl5sXr1fD19hX7NgBWBXYKpg/GFPYaJh9WJJYpxi\n8GNDY5dj62RAZJRk6WU9ZZJl52Y9ZpJm6Gc9Z5Nn6Wg/aJZo7GlDaZpp8WpI\nap9q92tPa6dr/2xXbK9tCG1gbbluEm5rbsRvHm94b9FwK3CGcOBxOnGVcfBy\nS3KmcwFzXXO4dBR0cHTMdSh1hXXhdj52m3b4d1Z3s3gReG54zHkqeYl553pG\neqV7BHtje8J8IXyBfOF9QX2hfgF+Yn7CfyN/hH/lgEeAqIEKgWuBzYIwgpKC\n9INXg7qEHYSAhOOFR4Wrhg6GcobXhzuHn4gEiGmIzokziZmJ/opkisqLMIuW\ni/yMY4zKjTGNmI3/jmaOzo82j56QBpBukNaRP5GokhGSepLjk02TtpQglIqU\n9JVflcmWNJaflwqXdZfgmEyYuJkkmZCZ/JpomtWbQpuvnByciZz3nWSd0p5A\nnq6fHZ+Ln/qgaaDYoUehtqImopajBqN2o+akVqTHpTilqaYapoum/adup+Co\nUqjEqTepqaocqo+rAqt1q+msXKzQrUStuK4trqGvFq+LsACwdbDqsWCx1rJL\nssKzOLOutCW0nLUTtYq2AbZ5tvC3aLfguFm40blKucK6O7q1uy67p7whvJu9\nFb2Pvgq+hL7/v3q/9cBwwOzBZ8Hjwl/C28NYw9TEUcTOxUvFyMZGxsPHQce/\nyD3IvMk6ybnKOMq3yzbLtsw1zLXNNc21zjbOts83z7jQOdC60TzRvtI/0sHT\nRNPG1EnUy9VO1dHWVdbY11zX4Nhk2OjZbNnx2nba+9uA3AXcit0Q3ZbeHN6i\n3ynfr+A24L3hROHM4lPi2+Nj4+vkc+T85YTmDeaW5x/nqegy6LzpRunQ6lvq\n5etw6/vshu0R7ZzuKO6070DvzPBY8OXxcvH/8ozzGfOn9DT0wvVQ9d72bfb7\n94r4Gfio+Tj5x/pX+uf7d/wH/Jj9Kf26/kv+3P9t////2wBDAAgFBgcGBQgH\nBgcJCAgJDBMMDAsLDBgREg4THBgdHRsYGxofIywlHyEqIRobJjQnKi4vMTIx\nHiU2OjYwOiwwMTD/2wBDAQgJCQwKDBcMDBcwIBsgMDAwMDAwMDAwMDAwMDAw\nMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDD/wAARCAAFAAoD\nAREAAhEBAxEB/8QAFQABAQAAAAAAAAAAAAAAAAAAAwf/xAAeEAABBAEFAAAA\nAAAAAAAAAAACAAEDEQQSISIyYf/EABYBAQEBAAAAAAAAAAAAAAAAAAACA//E\nABcRAQEBAQAAAAAAAAAAAAAAAAAxARH/2gAMAwEAAhEDEQA/AJDhyDCBCIMd\nFXN78W0icBJmyjIQ6Q2d26p0f//Z\n\" class=\"image-resized-to10x10\" />"
-  image5x5 = "<img src=\"data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD/4gxYSUNDX1BST0ZJTEUAAQEAAAxITGlu\nbwIQAABtbnRyUkdCIFhZWiAHzgACAAkABgAxAABhY3NwTVNGVAAAAABJRUMg\nc1JHQgAAAAAAAAAAAAAAAQAA9tYAAQAAAADTLUhQICAAAAAAAAAAAAAAAAAA\nAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABFjcHJ0AAABUAAA\nADNkZXNjAAABhAAAAGx3dHB0AAAB8AAAABRia3B0AAACBAAAABRyWFlaAAAC\nGAAAABRnWFlaAAACLAAAABRiWFlaAAACQAAAABRkbW5kAAACVAAAAHBkbWRk\nAAACxAAAAIh2dWVkAAADTAAAAIZ2aWV3AAAD1AAAACRsdW1pAAAD+AAAABRt\nZWFzAAAEDAAAACR0ZWNoAAAEMAAAAAxyVFJDAAAEPAAACAxnVFJDAAAEPAAA\nCAxiVFJDAAAEPAAACAx0ZXh0AAAAAENvcHlyaWdodCAoYykgMTk5OCBIZXds\nZXR0LVBhY2thcmQgQ29tcGFueQAAZGVzYwAAAAAAAAASc1JHQiBJRUM2MTk2\nNi0yLjEAAAAAAAAAAAAAABJzUkdCIElFQzYxOTY2LTIuMQAAAAAAAAAAAAAA\nAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWFlaIAAA\nAAAAAPNRAAEAAAABFsxYWVogAAAAAAAAAAAAAAAAAAAAAFhZWiAAAAAAAABv\nogAAOPUAAAOQWFlaIAAAAAAAAGKZAAC3hQAAGNpYWVogAAAAAAAAJKAAAA+E\nAAC2z2Rlc2MAAAAAAAAAFklFQyBodHRwOi8vd3d3LmllYy5jaAAAAAAAAAAA\nAAAAFklFQyBodHRwOi8vd3d3LmllYy5jaAAAAAAAAAAAAAAAAAAAAAAAAAAA\nAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABkZXNjAAAAAAAAAC5JRUMgNjE5\nNjYtMi4xIERlZmF1bHQgUkdCIGNvbG91ciBzcGFjZSAtIHNSR0IAAAAAAAAA\nAAAAAC5JRUMgNjE5NjYtMi4xIERlZmF1bHQgUkdCIGNvbG91ciBzcGFjZSAt\nIHNSR0IAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZGVzYwAAAAAAAAAsUmVmZXJl\nbmNlIFZpZXdpbmcgQ29uZGl0aW9uIGluIElFQzYxOTY2LTIuMQAAAAAAAAAA\nAAAALFJlZmVyZW5jZSBWaWV3aW5nIENvbmRpdGlvbiBpbiBJRUM2MTk2Ni0y\nLjEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHZpZXcAAAAAABOk/gAUXy4A\nEM8UAAPtzAAEEwsAA1yeAAAAAVhZWiAAAAAAAEwJVgBQAAAAVx/nbWVhcwAA\nAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAo8AAAACc2lnIAAAAABDUlQgY3Vy\ndgAAAAAAAAQAAAAABQAKAA8AFAAZAB4AIwAoAC0AMgA3ADsAQABFAEoATwBU\nAFkAXgBjAGgAbQByAHcAfACBAIYAiwCQAJUAmgCfAKQAqQCuALIAtwC8AMEA\nxgDLANAA1QDbAOAA5QDrAPAA9gD7AQEBBwENARMBGQEfASUBKwEyATgBPgFF\nAUwBUgFZAWABZwFuAXUBfAGDAYsBkgGaAaEBqQGxAbkBwQHJAdEB2QHhAekB\n8gH6AgMCDAIUAh0CJgIvAjgCQQJLAlQCXQJnAnECegKEAo4CmAKiAqwCtgLB\nAssC1QLgAusC9QMAAwsDFgMhAy0DOANDA08DWgNmA3IDfgOKA5YDogOuA7oD\nxwPTA+AD7AP5BAYEEwQgBC0EOwRIBFUEYwRxBH4EjASaBKgEtgTEBNME4QTw\nBP4FDQUcBSsFOgVJBVgFZwV3BYYFlgWmBbUFxQXVBeUF9gYGBhYGJwY3BkgG\nWQZqBnsGjAadBq8GwAbRBuMG9QcHBxkHKwc9B08HYQd0B4YHmQesB78H0gfl\nB/gICwgfCDIIRghaCG4IggiWCKoIvgjSCOcI+wkQCSUJOglPCWQJeQmPCaQJ\nugnPCeUJ+woRCicKPQpUCmoKgQqYCq4KxQrcCvMLCwsiCzkLUQtpC4ALmAuw\nC8gL4Qv5DBIMKgxDDFwMdQyODKcMwAzZDPMNDQ0mDUANWg10DY4NqQ3DDd4N\n+A4TDi4OSQ5kDn8Omw62DtIO7g8JDyUPQQ9eD3oPlg+zD88P7BAJECYQQxBh\nEH4QmxC5ENcQ9RETETERTxFtEYwRqhHJEegSBxImEkUSZBKEEqMSwxLjEwMT\nIxNDE2MTgxOkE8UT5RQGFCcUSRRqFIsUrRTOFPAVEhU0FVYVeBWbFb0V4BYD\nFiYWSRZsFo8WshbWFvoXHRdBF2UXiReuF9IX9xgbGEAYZRiKGK8Y1Rj6GSAZ\nRRlrGZEZtxndGgQaKhpRGncanhrFGuwbFBs7G2MbihuyG9ocAhwqHFIcexyj\nHMwc9R0eHUcdcB2ZHcMd7B4WHkAeah6UHr4e6R8THz4faR+UH78f6iAVIEEg\nbCCYIMQg8CEcIUghdSGhIc4h+yInIlUigiKvIt0jCiM4I2YjlCPCI/AkHyRN\nJHwkqyTaJQklOCVoJZclxyX3JicmVyaHJrcm6CcYJ0kneierJ9woDSg/KHEo\noijUKQYpOClrKZ0p0CoCKjUqaCqbKs8rAis2K2krnSvRLAUsOSxuLKIs1y0M\nLUEtdi2rLeEuFi5MLoIuty7uLyQvWi+RL8cv/jA1MGwwpDDbMRIxSjGCMbox\n8jIqMmMymzLUMw0zRjN/M7gz8TQrNGU0njTYNRM1TTWHNcI1/TY3NnI2rjbp\nNyQ3YDecN9c4FDhQOIw4yDkFOUI5fzm8Ofk6Njp0OrI67zstO2s7qjvoPCc8\nZTykPOM9Ij1hPaE94D4gPmA+oD7gPyE/YT+iP+JAI0BkQKZA50EpQWpBrEHu\nQjBCckK1QvdDOkN9Q8BEA0RHRIpEzkUSRVVFmkXeRiJGZ0arRvBHNUd7R8BI\nBUhLSJFI10kdSWNJqUnwSjdKfUrESwxLU0uaS+JMKkxyTLpNAk1KTZNN3E4l\nTm5Ot08AT0lPk0/dUCdQcVC7UQZRUFGbUeZSMVJ8UsdTE1NfU6pT9lRCVI9U\n21UoVXVVwlYPVlxWqVb3V0RXklfgWC9YfVjLWRpZaVm4WgdaVlqmWvVbRVuV\nW+VcNVyGXNZdJ114XcleGl5sXr1fD19hX7NgBWBXYKpg/GFPYaJh9WJJYpxi\n8GNDY5dj62RAZJRk6WU9ZZJl52Y9ZpJm6Gc9Z5Nn6Wg/aJZo7GlDaZpp8WpI\nap9q92tPa6dr/2xXbK9tCG1gbbluEm5rbsRvHm94b9FwK3CGcOBxOnGVcfBy\nS3KmcwFzXXO4dBR0cHTMdSh1hXXhdj52m3b4d1Z3s3gReG54zHkqeYl553pG\neqV7BHtje8J8IXyBfOF9QX2hfgF+Yn7CfyN/hH/lgEeAqIEKgWuBzYIwgpKC\n9INXg7qEHYSAhOOFR4Wrhg6GcobXhzuHn4gEiGmIzokziZmJ/opkisqLMIuW\ni/yMY4zKjTGNmI3/jmaOzo82j56QBpBukNaRP5GokhGSepLjk02TtpQglIqU\n9JVflcmWNJaflwqXdZfgmEyYuJkkmZCZ/JpomtWbQpuvnByciZz3nWSd0p5A\nnq6fHZ+Ln/qgaaDYoUehtqImopajBqN2o+akVqTHpTilqaYapoum/adup+Co\nUqjEqTepqaocqo+rAqt1q+msXKzQrUStuK4trqGvFq+LsACwdbDqsWCx1rJL\nssKzOLOutCW0nLUTtYq2AbZ5tvC3aLfguFm40blKucK6O7q1uy67p7whvJu9\nFb2Pvgq+hL7/v3q/9cBwwOzBZ8Hjwl/C28NYw9TEUcTOxUvFyMZGxsPHQce/\nyD3IvMk6ybnKOMq3yzbLtsw1zLXNNc21zjbOts83z7jQOdC60TzRvtI/0sHT\nRNPG1EnUy9VO1dHWVdbY11zX4Nhk2OjZbNnx2nba+9uA3AXcit0Q3ZbeHN6i\n3ynfr+A24L3hROHM4lPi2+Nj4+vkc+T85YTmDeaW5x/nqegy6LzpRunQ6lvq\n5etw6/vshu0R7ZzuKO6070DvzPBY8OXxcvH/8ozzGfOn9DT0wvVQ9d72bfb7\n94r4Gfio+Tj5x/pX+uf7d/wH/Jj9Kf26/kv+3P9t////2wBDAAgFBgcGBQgH\nBgcJCAgJDBMMDAsLDBgREg4THBgdHRsYGxofIywlHyEqIRobJjQnKi4vMTIx\nHiU2OjYwOiwwMTD/2wBDAQgJCQwKDBcMDBcwIBsgMDAwMDAwMDAwMDAwMDAw\nMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDD/wAARCAACAAUD\nAREAAhEBAxEB/8QAFAABAAAAAAAAAAAAAAAAAAAAB//EABkQAQACAwAAAAAA\nAAAAAAAAAAECAwARMf/EABUBAQEAAAAAAAAAAAAAAAAAAAID/8QAFREBAQAA\nAAAAAAAAAAAAAAAAAAH/2gAMAwEAAhEDEQA/ACFkxoqIqGnmWov/2Q==\n\" class=\"image-resized-to5x5\" />"
   step %Q{I should see '#{image10x10}'}
   step %Q{I should see '#{image5x5}'}
 end
 
+
+Then(/^I should see base64ed thumbnails and srcset of the images$/) do
+  step %Q{I should see '#{image10x10}'}
+  step %Q{I should see '#{image5x5}'}
+  step %Q{I should see '#{srcset20x20}'}
+  step %Q{I should see '#{srcset15x15}'}
+end
+
+
 Then(/^the cache directory should exist (?:at "([^"]+)" )?with the following files$/) do |cache_dir, files|
   cache_dir ||= MiddlemanSimpleThumbnailer::Extension.config.cache_dir
   check_directory_presence([cache_dir], true)
@@ -20,14 +40,30 @@ Then(/^the cache directory should exist (?:at "([^"]+)" )?with the following fil
   files.raw.map{|file_row| file_row[0]}.each { |f| expect(f).to be_existing_file }
 end
 
+Then(/^I should see base64ed data of the cached thumbnails with image path$/) do
+  # data that won't ever be generated by resizing an actual image
+  cached_10x10_data = "foo"
+  cached_5x5_data   = "bar"
+  cached_15x15_data = "hello"
+  cached_20x20_data = "world"
+  cachedimage10x10 = "<img src=\"data:image/jpeg;base64,#{Base64.strict_encode64(cached_10x10_data)}\" class=\"image-resized-to10x10\" />"
+  cachedimage5x5 = "<img src=\"data:image/jpeg;base64,#{Base64.strict_encode64(cached_5x5_data)}\" class=\"image-resized-to5x5\" />"
+  cachedsrcset20x20 = "<source srcset=\"data:image/jpeg;base64,#{Base64.strict_encode64(cached_20x20_data)}\" media=\"(min-width: 900px)\">"
+  cachedsrcset15x15 = "<source srcset=\"data:image/jpeg;base64,#{Base64.strict_encode64(cached_15x15_data)}\" media=\"(min-width: 900px)\">"
+  step %Q{I should see '#{cachedimage10x10}'}
+  step %Q{I should see '#{cachedimage5x5}'}
+  step %Q{I should see '#{cachedsrcset20x20}'}
+  step %Q{I should see '#{cachedsrcset15x15}'}
+end
+
 Then(/^I should see base64ed data of the cached thumbnails$/) do
   # data that won't ever be generated by resizing an actual image
   cached_10x10_data = "foo"
   cached_5x5_data   = "bar"
-  image10x10 = "<img src=\"data:image/jpeg;base64,#{Base64.encode64(cached_10x10_data)}\" class=\"image-resized-to10x10\" />"
-  image5x5 = "<img src=\"data:image/jpeg;base64,#{Base64.encode64(cached_5x5_data)}\" class=\"image-resized-to5x5\" />"
-  step %Q{I should see '#{image10x10}'}
-  step %Q{I should see '#{image5x5}'}
+  cachedimage10x10 = "<img src=\"data:image/jpeg;base64,#{Base64.strict_encode64(cached_10x10_data)}\" class=\"image-resized-to10x10\" />"
+  cachedimage5x5 = "<img src=\"data:image/jpeg;base64,#{Base64.strict_encode64(cached_5x5_data)}\" class=\"image-resized-to5x5\" />"
+  step %Q{I should see '#{cachedimage10x10}'}
+  step %Q{I should see '#{cachedimage5x5}'}
 end
 
 Then(/^the following images should exist:$/) do |table|

data/fixtures/basic-app-image-path/config.rb

@@ -0,0 +1 @@
+activate :middleman_simple_thumbnailer

data/fixtures/basic-app-image-path/source/page-with-images-to-resize.html.erb

@@ -0,0 +1,16 @@
+<!doctype html>
+<html>
+  <head>
+    <title>Hello World</title>
+  </head>
+  <body>
+    <picture>
+      <source srcset="<%= image_path 'original.jpg', resize_to: '20x20' %>" media="(min-width: 900px)">
+      <%= image_tag 'original.jpg', resize_to: '10x10>', class: 'image-resized-to10x10' %>
+    </picture>
+    <picture>
+      <source srcset="<%= image_path 'original.jpg', resize_to: '15x15' %>" media="(min-width: 900px)">
+      <%= image_tag 'original.jpg', resize_to: '5x5', class: 'image-resized-to5x5' %>
+    </picture>
+  </body>
+</html>

data/fixtures/basic-app-image-path/source/page-with-untouched-image.html.erb

@@ -0,0 +1,12 @@
+<!doctype html>
+<html>
+  <head>
+    <title>Hello World</title>
+  </head>
+  <body>
+    <picture>
+      <source srcset="<%= image_path 'original.jpg' %>" media="(min-width: 900px)">
+      <%= image_tag 'original.jpg' %>
+    </picture>
+  </body>
+</html>

data/fixtures/cached-thumbnails-image-path/config.rb

@@ -0,0 +1 @@
+activate :middleman_simple_thumbnailer

data/fixtures/cached-thumbnails-image-path/source/page-with-images-to-resize.html.erb

@@ -0,0 +1,16 @@
+<!doctype html>
+<html>
+  <head>
+    <title>Hello World</title>
+  </head>
+  <body>
+    <picture>
+      <source srcset="<%= image_path 'original.jpg', resize_to: '20x20>'%>" media="(min-width: 900px)">
+      <%= image_tag 'original.jpg', resize_to: '10x10', class: 'image-resized-to10x10' %>
+    </picture>
+    <picture>
+      <source srcset="<%= image_path 'original.jpg', resize_to: '15x15>'%>" media="(min-width: 900px)">
+      <%= image_tag 'original.jpg', resize_to: '5x5', class: 'image-resized-to5x5' %>
+    </picture>
+  </body>
+</html>

data/lib/middleman-simple-thumbnailer/extension.rb

@@ -35,16 +35,24 @@ module MiddlemanSimpleThumbnailer
     helpers do
 
       def image_tag(path, options={})
+        if (resize_to = options.delete(:resize_to))
+          super(image_path(path, resize_to: resize_to), options)
+        else
+          super(path, options)
+        end
+      end
+
+      def image_path(path, options={})
         resize_to = options.delete(:resize_to)
-        return super(path, options) unless resize_to
+        return super(path) unless resize_to
 
         image = MiddlemanSimpleThumbnailer::Image.new(path, resize_to, app)
         if app.development?
-          super("data:#{image.mime_type};base64,#{image.base64_data}", options)
+          super("data:#{image.mime_type};base64,#{image.base64_data}")
         else
           ext = app.extensions[:middleman_simple_thumbnailer]
           ext.store_resized_image(path, resize_to)
-          super(image.resized_img_path, options)
+          super(image.resized_img_path)
         end
       end
 

data/lib/middleman-simple-thumbnailer/image.rb

@@ -27,12 +27,16 @@ module MiddlemanSimpleThumbnailer
         resize!
         save_cached_thumbnail
       end
-      Base64.encode64(File.read(cached_resized_img_abs_path))
+      Base64.strict_encode64(File.read(cached_resized_img_abs_path))
     end
 
     def save!
-      resize!
-      image.write(resized_img_abs_path)
+      unless cached_thumbnail_available?
+        resize!
+        save_cached_thumbnail
+      end
+
+      FileUtils.copy_file(cached_resized_img_abs_path, resized_img_abs_path)
     end
 
     def self.options=(options)

data/lib/middleman-simple-thumbnailer/version.rb

@@ -1,3 +1,3 @@
 module MiddlemanSimpleThumbnailer
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-simple-thumbnailer
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Jakub Niewczas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-04 00:00:00.000000000 Z
+date: 2016-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -124,12 +124,24 @@ files:
 - Rakefile
 - features/caching_thumbnails_in_development.feature
 - features/generate_image_thumbnails.feature
+- features/generate_image_thumbnails_image_path.feature
 - features/support/env.rb
 - features/support/image_thumbnails_steps.rb
+- fixtures/basic-app-image-path/config.rb
+- fixtures/basic-app-image-path/source/images/original.jpg
+- fixtures/basic-app-image-path/source/page-with-images-to-resize.html.erb
+- fixtures/basic-app-image-path/source/page-with-untouched-image.html.erb
 - fixtures/basic-app/config.rb
 - fixtures/basic-app/source/images/original.jpg
 - fixtures/basic-app/source/page-with-images-to-resize.html.erb
 - fixtures/basic-app/source/page-with-untouched-image.html.erb
+- fixtures/cached-thumbnails-image-path/config.rb
+- fixtures/cached-thumbnails-image-path/source/images/original.jpg
+- fixtures/cached-thumbnails-image-path/source/page-with-images-to-resize.html.erb
+- fixtures/cached-thumbnails-image-path/tmp/simple-thumbnailer-cache/images/original.10x10.eb4e78fd2554225b2.jpg
+- fixtures/cached-thumbnails-image-path/tmp/simple-thumbnailer-cache/images/original.15x15.eb4e78fd2554225b2.jpg
+- fixtures/cached-thumbnails-image-path/tmp/simple-thumbnailer-cache/images/original.20x20.eb4e78fd2554225b2.jpg
+- fixtures/cached-thumbnails-image-path/tmp/simple-thumbnailer-cache/images/original.5x5.eb4e78fd2554225b2.jpg
 - fixtures/cached-thumbnails/config.rb
 - fixtures/cached-thumbnails/source/images/original.jpg
 - fixtures/cached-thumbnails/source/page-with-images-to-resize.html.erb
@@ -172,12 +184,24 @@ summary: Middleman extension that allows you to create image thumbnails by provi
 test_files:
 - features/caching_thumbnails_in_development.feature
 - features/generate_image_thumbnails.feature
+- features/generate_image_thumbnails_image_path.feature
 - features/support/env.rb
 - features/support/image_thumbnails_steps.rb
+- fixtures/basic-app-image-path/config.rb
+- fixtures/basic-app-image-path/source/images/original.jpg
+- fixtures/basic-app-image-path/source/page-with-images-to-resize.html.erb
+- fixtures/basic-app-image-path/source/page-with-untouched-image.html.erb
 - fixtures/basic-app/config.rb
 - fixtures/basic-app/source/images/original.jpg
 - fixtures/basic-app/source/page-with-images-to-resize.html.erb
 - fixtures/basic-app/source/page-with-untouched-image.html.erb
+- fixtures/cached-thumbnails-image-path/config.rb
+- fixtures/cached-thumbnails-image-path/source/images/original.jpg
+- fixtures/cached-thumbnails-image-path/source/page-with-images-to-resize.html.erb
+- fixtures/cached-thumbnails-image-path/tmp/simple-thumbnailer-cache/images/original.10x10.eb4e78fd2554225b2.jpg
+- fixtures/cached-thumbnails-image-path/tmp/simple-thumbnailer-cache/images/original.15x15.eb4e78fd2554225b2.jpg
+- fixtures/cached-thumbnails-image-path/tmp/simple-thumbnailer-cache/images/original.20x20.eb4e78fd2554225b2.jpg
+- fixtures/cached-thumbnails-image-path/tmp/simple-thumbnailer-cache/images/original.5x5.eb4e78fd2554225b2.jpg
 - fixtures/cached-thumbnails/config.rb
 - fixtures/cached-thumbnails/source/images/original.jpg
 - fixtures/cached-thumbnails/source/page-with-images-to-resize.html.erb