middleman-simple-thumbnailer 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a737cfbd8c307195f1b5c65a166b55537726c298
-  data.tar.gz: b8cca78be777777673ca21d7505c9c9754dbec8f
+  metadata.gz: c5f9fba464c6115cd6443277d404334f4362f9b8
+  data.tar.gz: 7e667fae2a59f05459919daed248e6c9ea440238
 SHA512:
-  metadata.gz: 0be2674631c601c265582e77870cd45850d99d07226cb4089a51dcb9b5294153c4c029009d9509fb3ce5d68020bac631d6b0ff9d301b9ba877eebb6091625358
-  data.tar.gz: 883e8dd54a831943e2352f78b931b6938d634e9e1618c2f042a24f4b69cddf1c26b694e6bc0668f7971c4185bf8b87072dca159c0ea5221947d22710b224bd92
+  metadata.gz: 8f06323a24426b629c6c6a786f1d2eba8fd6a6ec1fbd387b783427dfd95efa507ee1f7f66ee803d9674fe16eb057fdbb160fa771998cad5e2566b56473cc0976
+  data.tar.gz: 49ad31bf2a908ff68167e39f4789c1695fab81793895a44a34ccb1ad9d7738ba791e0035c7a9c8ab97ce0250bb6bea667b8b68a53f4f5f29b9fed25c69d624a2

data/README.md

@@ -34,11 +34,19 @@ You can also use the `image_path` helper the same way in place where you need on
 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).
 
+Known limitation
+----------------
+
+In this current implementation, this extension is unable to update the [sitemap](https://middlemanapp.com/advanced/sitemap/). Some extensions (like [middleman-s3_sync](https://github.com/fredjean/middleman-s3_sync)) uses the content of the sitemap to do their work. Therefore, the generated resized images will not be seen by such extensions, even if they are corectly generated.
+
+This issue [#13](https://github.com/kubenstein/middleman-simple-thumbnailer/issues/13) has been opened to describe the problem and discuss the possible solutions to this limitation.
+
 Build/Development modes
 -----
   During development thumbnails will be created on fly and presented as a base64 strings.
   During build thumbnails will be created as normal files and stored in same dir as their originals.
+  
 
 LICENSE
 -----
-MIT
+MIT

data/features/caching_thumbnails_in_development.feature

@@ -6,7 +6,7 @@ Feature: Caching thumbnails in development
     When I go to "/page-with-images-to-resize.html"
     Then the cache directory should exist with the following files
       | images/original.10x10gt.eb4e78fd2554225b2.jpg |
-      | images/original.5x5.eb4e78fd2554225b2.jpg   |
+      | images/original.5x5.eb4e78fd2554225b2.jpg     |
 
   Scenario: Cached thumbnails are used, if present
     Given the Server is running at "cached-thumbnails"

data/features/generate_image_thumbnails_relative_assets.feature

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

data/features/support/image_thumbnails_steps.rb

@@ -35,9 +35,9 @@ 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)
+  expect(cache_dir).to be_an_existing_directory
   cd cache_dir
-  files.raw.map{|file_row| file_row[0]}.each { |f| expect(f).to be_existing_file }
+  files.raw.map{|file_row| file_row[0]}.each { |f| expect(f).to be_an_existing_file }
 end
 
 Then(/^I should see base64ed data of the cached thumbnails with image path$/) do
@@ -68,7 +68,7 @@ end
 
 Then(/^the following images should exist:$/) do |table|
   table.hashes.each do |row|
-    in_current_dir do
+    cd('.')  do
       image = MiniMagick::Image.open(row["filename"])
       expect(image.dimensions).to eq row["dimensions"].split("x").map(&:to_i)
     end

data/fixtures/basic-app-relative-assets/config.rb

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

data/fixtures/basic-app-relative-assets/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-relative-assets/source/page-with-untouched-image.html.erb

@@ -0,0 +1,9 @@
+<!doctype html>
+<html>
+  <head>
+    <title>Hello World</title>
+  </head>
+  <body>
+    <%= image_tag 'original.jpg' %>
+  </body>
+</html>

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

@@ -34,28 +34,31 @@ 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) unless resize_to
+      def resized_image_path(path, resize_to=nil)
+        return path unless resize_to
 
         image = MiddlemanSimpleThumbnailer::Image.new(path, resize_to, app)
         if app.development?
-          super("data:#{image.mime_type};base64,#{image.base64_data}")
+          "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)
+          image.resized_img_path
         end
       end
 
+      def image_tag(path, options={})
+        resize_to = options.delete(:resize_to)
+        new_path = resize_to ? resized_image_path(path, resize_to) : path
+        super(new_path, options)
+      end
+
+      def image_path(path, options={})
+        resize_to = options.delete(:resize_to)
+        new_path = resize_to ? resized_image_path(path, resize_to) : path
+        super(new_path)
+      end
+    
     end
 
   end

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

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

data/middleman-simple-thumbnailer.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'mini_magick', '~> 4'
 
   s.add_development_dependency 'middleman-cli', '~> 4'
-  s.add_development_dependency 'rake', '~> 10'
-  s.add_development_dependency 'aruba', '~>0.7.4'
-  s.add_development_dependency 'cucumber', '~> 1.3'
-  s.add_development_dependency 'capybara', '~> 2.7'
+  s.add_development_dependency 'rake', '~> 12'
+  s.add_development_dependency 'aruba', '~> 0.14.2'
+  s.add_development_dependency 'cucumber', '~> 2.4'
+  s.add_development_dependency 'capybara', '~> 2.15'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-simple-thumbnailer
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Jakub Niewczas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-28 00:00:00.000000000 Z
+date: 2017-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -58,56 +58,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '12'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.4
+        version: 0.14.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.4
+        version: 0.14.2
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.15'
 description: Middleman extension that allows you to create image thumbnails by providing
   resize_to option to image_tag helper
 email:
@@ -125,12 +125,17 @@ files:
 - features/caching_thumbnails_in_development.feature
 - features/generate_image_thumbnails.feature
 - features/generate_image_thumbnails_image_path.feature
+- features/generate_image_thumbnails_relative_assets.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-relative-assets/config.rb
+- fixtures/basic-app-relative-assets/source/images/original.jpg
+- fixtures/basic-app-relative-assets/source/page-with-images-to-resize.html.erb
+- fixtures/basic-app-relative-assets/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
@@ -176,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Middleman extension that allows you to create image thumbnails by providing
@@ -185,12 +190,17 @@ test_files:
 - features/caching_thumbnails_in_development.feature
 - features/generate_image_thumbnails.feature
 - features/generate_image_thumbnails_image_path.feature
+- features/generate_image_thumbnails_relative_assets.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-relative-assets/config.rb
+- fixtures/basic-app-relative-assets/source/images/original.jpg
+- fixtures/basic-app-relative-assets/source/page-with-images-to-resize.html.erb
+- fixtures/basic-app-relative-assets/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