middleman-images 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 964a7c5425a22aaef41c52646d09bb031e96d651635667f9cc559c02138f9311
-  data.tar.gz: ec12a1b00e31d5d597dd081f9f7adfe862e034cab41945113ee11cfdf4ec6b97
+  metadata.gz: f00d10aeb0db6ab714537b15b0d07a71e034a08b45e7fc5e8dcdfa9713abdc3d
+  data.tar.gz: aa863f277ff04b872d6641275a3ca5444c888037f2d56c47ee1f3a99ee1f5098
 SHA512:
-  metadata.gz: c082d6cc1dfbe762e4c6e9c908e135a8b03d2e120bad55a73e8e67b52a4ab76e2f8c8ddcaf56f0b8b1e9f632570918f1a5f628b2c0b9842a0b71247d8668d2c5
-  data.tar.gz: afc35215b01e2b7543f00c58fd4952b0c71fa3438791e1d8e774ec43468693ee2212daf159fb69ab47e4c184e2ec2c372a37c1643241aa7e52975a43619b4614
+  metadata.gz: e89daa6f803d8687fc89477e12d5986d10187c6adccf891a819f5be58cd49a7af2000c1f606fe0ea7e76dadebf7284bffa1f0de435e3216b6a59401f4a65847a
+  data.tar.gz: 990ee4608b982912eaa3973beaaf898c9f90eb2c36556a66960c7ae9f8ce38e730e745ef1c1bf3f727b0ef1934af09434e172c76da74661a56149df1b9239471

data/.rufo

@@ -0,0 +1 @@
+includes [gemfiles/Gemfile.*[!l][!o][!c][!k]]

data/.travis.yml

@@ -1,8 +1,8 @@
 language: ruby
-
 cache: bundler
-before_script:
-  - gem install bundler:1.17.3
+before_script: gem install bundler:1.17.3
+script: bundle exec cucumber
+
 rvm:
   - 2.7
   - 2.6
@@ -23,7 +23,7 @@ jobs:
       gemfile: gemfiles/Gemfile.middleman-4.2
     - rvm: 2.7
       gemfile: gemfiles/Gemfile.middleman-4.1
-  allow_failures:
-    - gemfile: gemfiles/Gemfile.middleman-5.0-rc
-
-script: bundle exec rake test
+  include:
+    - rvm: 2.7
+      gemfile: Gemfile
+      script: bundle exec rufo -c .

data/CHANGELOG.md

@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.2.0] - 2020-08-05
+### Added
+- Support for Middleman 5 RC
+### Changed
+- We changed the way images get registered while running the Middleman server.
+  This should bring way better performance and make this Gem usable in server mode.
+
 ## [0.1.0] - 2020-02-05
 ### Added
 - Do not resize SVG or GIF files.
@@ -28,5 +35,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
 - Removed support for Ruby < 2.5
 
-[Unreleased]: https://github.com/zweitag/middleman-images/compare/v0.1.0...HEAD
+[Unreleased]: https://github.com/zweitag/middleman-images/compare/v0.2.0...HEAD
+[0.2.0]: https://github.com/zweitag/middleman-images/compare/v0.1.0...v0.2.0
 [0.1.0]: https://github.com/zweitag/middleman-images/releases/tag/v0.1.0

data/Gemfile

@@ -1,26 +1,18 @@
 # If you do not have OpenSSL installed, update
 # the following line to use "http://" instead
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in middleman-images.gemspec
 gemspec
 
-group :development do
-  gem 'middleman', '~> 4.3'
-  gem 'rake'
-  gem 'rdoc'
-  gem 'yard'
-end
+gem "middleman", "~> 4.3"
 
-group :test do
-  gem 'cucumber'
-  gem 'capybara'
-  gem 'aruba'
-  gem 'rspec'
+gem "aruba"
+gem "capybara"
+gem "cucumber"
+gem "rufo"
 
-  gem 'image_optim'
-  gem 'mini_magick'
-
-  # Version is locked to make sure asset_hash tests are not broken by updated optimizations.
-  gem 'image_optim_pack', '=0.6.0'
-end
+gem "image_optim"
+# Version is locked to make sure asset_hash tests are not broken by updated optimizations.
+gem "image_optim_pack", "=0.6.0"
+gem "mini_magick"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    middleman-images (0.1.0)
+    middleman-images (0.2.0)
       middleman-core (>= 4.1.14)
 
 GEM
@@ -125,7 +125,7 @@ GEM
     minitest (5.14.0)
     multi_json (1.14.1)
     multi_test (0.1.2)
-    nokogiri (1.10.7)
+    nokogiri (1.10.8)
       mini_portile2 (~> 2.4.0)
     padrino-helpers (0.13.3.4)
       i18n (~> 0.6, >= 0.6.7)
@@ -136,28 +136,18 @@ GEM
     parallel (1.19.1)
     progress (3.5.2)
     public_suffix (4.0.3)
-    rack (2.1.2)
+    rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rake (13.0.1)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rdoc (6.2.1)
     regexp_parser (1.6.0)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
     rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
     rspec-support (3.9.2)
+    rufo (0.12.0)
     sassc (2.2.1)
       ffi (~> 1.9)
     servolux (0.13.0)
@@ -171,7 +161,6 @@ GEM
       execjs (>= 0.3.0, < 3)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    yard (0.9.24)
 
 PLATFORMS
   ruby
@@ -185,10 +174,7 @@ DEPENDENCIES
   middleman (~> 4.3)
   middleman-images!
   mini_magick
-  rake
-  rdoc
-  rspec
-  yard
+  rufo
 
 BUNDLED WITH
    2.1.4

data/README.md

@@ -43,37 +43,34 @@ For more information check [`image_optim_pack`](https://github.com/toy/image_opt
 To activate the extension just put this into your `config.rb`:
 
 ```ruby
-configure :build do
-  activate :images
-end
+activate :images
 ```
 
-Although it is possible to activate the extension in development mode, we do
-not recommend this. Since this will radically drain the performance.
+With Middleman images activated, starting the Middleman server will take some time.
+During that time images that need procssing will get registered.
+The actual processing of the images takes place while navigating the page.
 
 Configure the extension by passing a block to `:activate`:
 
 ```ruby
-configure :build do
-  activate :images do |images|
-    # Do not include original images in the build (default: false)
-    images.ignore_original = true
-
-    # Specify another cache directory depending on your root directory (default: 'cache')
-    images.cache_dir = 'funky_cache/subdir_of_funky_cache'
-
-    # Optimize images (default: false)
-    images.optimize = true
-
-    # Provide additional options for image_optim
-    # See https://github.com/toy/image_optim for all available options
-    images.image_optim = {
-      nice: 20,
-      optipng: {
-        level: 5,
-      },
-    }
-  end
+activate :images do |images|
+  # Do not include original images in the build (default: false)
+  images.ignore_original = true
+
+  # Specify another cache directory depending on your root directory (default: 'cache')
+  images.cache_dir = 'funky_cache/subdir_of_funky_cache'
+
+  # Optimize images (default: false)
+  images.optimize = true
+
+  # Provide additional options for image_optim
+  # See https://github.com/toy/image_optim for all available options
+  images.image_optim = {
+    nice: 20,
+    optipng: {
+      level: 5,
+    },
+  }
 end
 ```
 

data/features/building.feature

@@ -31,8 +31,10 @@ Feature: Building images
       """
     And the Server is running
     And I go to "/first.html"
+    And I go to "/images/fox-opt.jpg"
     And a modification time for a file named "cache/images/fox-opt.jpg"
-    When I go to "/second.html"
+    And I go to "/second.html"
+    When I go to "/images/fox-opt.jpg"
     Then the file "cache/images/fox-opt.jpg" should exist
     Then the file "cache/images/fox-opt.jpg" should not have been updated
 

data/features/images_dir.feature

@@ -0,0 +1,33 @@
+Feature: images_dir configuration given
+
+  Scenario: Building correctly
+    Given a fixture app "image"
+    And a middleman configuration with:
+      """
+      set :images_dir, 'assets/images'
+      """
+    And our extension is enabled
+    And a template named "index.html.erb" with:
+      """
+      <%= image_tag 'fox.jpg', optimize: true, resize: 400 %>
+      """
+    When a successfully built app at "image"
+    When I cd to "build/assets/images"
+    Then a file named "fox-400-opt.jpg" should exist
+
+  Scenario: Running correctly
+    Given a fixture app "image"
+    And a middleman configuration with:
+      """
+      set :images_dir, 'assets/images'
+      """
+    And our extension is enabled
+    And a template named "index.html.erb" with:
+      """
+      <%= image_tag 'fox.jpg', optimize: true, resize: 400 %>
+      """
+    And the Server is running
+    When I go to "/index.html"
+    Then I should see '<img src="/assets/images/fox-400-opt.jpg" alt="Fox" />'
+    When I go to "/assets/images/fox-400-opt.jpg"
+    Then the status code should be "200"

data/features/proxy_resources.feature

@@ -0,0 +1,39 @@
+
+Feature: Proxy resources
+
+  Scenario: Resizing images for a proxy resource on build
+    Given a fixture app "image"
+    And a middleman configuration with:
+      """
+      activate :i18n, langs: [:en, :de], mount_at_root: false
+      """
+    And our extension is enabled
+    And a template named "localizable/index.html.erb" with:
+      """
+      <%= image_tag 'fox.jpg', resize: (I18n.locale == :en ? 400 : 500) %>
+      """
+    When a successfully built app at "image"
+    When I cd to "build/images"
+    Then a file named "fox-400.jpg" should exist
+    And a file named "fox-500.jpg" should exist
+
+  Scenario: Resizing images for a proxy resource on server
+    Given a fixture app "image"
+    And a middleman configuration with:
+      """
+      activate :i18n, langs: [:en, :de], mount_at_root: false
+      """
+    And our extension is enabled
+    And a template named "localizable/index.html.erb" with:
+      """
+      <%= image_tag 'fox.jpg', resize: (I18n.locale == :en ? 400 : 500) %>
+      """
+    And the Server is running
+    When I go to "/en/index.html"
+    Then I should see '<img src="/images/fox-400.jpg" alt="Fox" />'
+    When I go to "/images/fox-400.jpg"
+    Then the status code should be "200"
+    When I go to "/de/index.html"
+    Then I should see '<img src="/images/fox-500.jpg" alt="Fox" />'
+    When I go to "/images/fox-500.jpg"
+    Then the status code should be "200"

data/features/support/env.rb

@@ -1,4 +1,4 @@
 PROJECT_ROOT_PATH = File.dirname(File.dirname(File.dirname(__FILE__)))
-require 'middleman-core'
-require 'middleman-core/step_definitions'
-require File.join(PROJECT_ROOT_PATH, 'lib', 'middleman-images')
+require "middleman-core"
+require "middleman-core/step_definitions"
+require File.join(PROJECT_ROOT_PATH, "lib", "middleman-images")

data/features/support/middleman_images_steps.rb

@@ -1,11 +1,17 @@
-require 'mini_magick'
+require "mini_magick"
+
+Given /^a middleman configuration with:$/ do |config|
+  @middleman_config = config
+end
 
 Given /^our extension is enabled?$/ do
-  step 'our extension is enabled with:', ''
+  step "our extension is enabled with:", ""
 end
 
 Given /^our extension is enabled with:$/ do |config|
-  config = """
+  config = "" "
+    #{@middleman_config}
+
     activate :images do |config|
       config.image_optim = {
         pngout: false,
@@ -13,7 +19,7 @@ Given /^our extension is enabled with:$/ do |config|
       }
       #{config}
     end
-  """
+  " ""
   step 'a file named "config.rb" with:', config
 end
 
@@ -23,9 +29,9 @@ Then /^the dimensions should be (\d+)x(\d+)$/ do |x, y|
 end
 
 Then /^the content length should be equal to the file size of "([^\"]*)"$/ do |file|
-  expect(page.response_headers['Content-Length'].to_i).to eq File.size(expand_path(file))
+  expect(page.response_headers["Content-Length"].to_i).to eq File.size(expand_path(file))
 end
 
 Then /^the content length should be smaller than the file size of "([^\"]*)"$/ do |file|
-  expect(page.response_headers['Content-Length'].to_i).to be < File.size(expand_path(file))
+  expect(page.response_headers["Content-Length"].to_i).to be < File.size(expand_path(file))
 end

data/gemfiles/Gemfile.middleman-4.1

@@ -1,27 +1,17 @@
 # If you do not have OpenSSL installed, update
 # the following line to use "http://" instead
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in middleman-images.gemspec
-gemspec path: '..'
+gemspec path: ".."
 
+gem "middleman", "~> 4.1.0"
 
-group :development do
-  gem 'middleman', '~> 4.1.0'
-  gem 'rake'
-  gem 'rdoc'
-  gem 'yard'
-end
+gem "aruba"
+gem "capybara"
+gem "cucumber"
 
-group :test do
-  gem 'cucumber'
-  gem 'capybara'
-  gem 'aruba'
-  gem 'rspec'
-
-  gem 'image_optim'
-  gem 'mini_magick'
-
-  # Version is locked to make sure asset_hash tests are not broken by updated optimizations.
-  gem 'image_optim_pack', '=0.6.0'
-end
+gem "image_optim"
+# Version is locked to make sure asset_hash tests are not broken by updated optimizations.
+gem "image_optim_pack", "=0.6.0"
+gem "mini_magick"

data/gemfiles/Gemfile.middleman-4.1.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    middleman-images (0.1.0)
+    middleman-images (0.2.0)
       middleman-core (>= 4.1.14)
 
 GEM
@@ -142,24 +142,13 @@ GEM
     rack (2.1.2)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rake (13.0.1)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rdoc (6.2.1)
     regexp_parser (1.6.0)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
     rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
     rspec-support (3.9.2)
     sass (3.4.25)
     servolux (0.13.0)
@@ -173,7 +162,6 @@ GEM
       execjs (>= 0.3.0, < 3)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    yard (0.9.24)
 
 PLATFORMS
   ruby
@@ -187,10 +175,6 @@ DEPENDENCIES
   middleman (~> 4.1.0)
   middleman-images!
   mini_magick
-  rake
-  rdoc
-  rspec
-  yard
 
 BUNDLED WITH
    1.17.3

data/gemfiles/Gemfile.middleman-4.2

@@ -1,27 +1,17 @@
 # If you do not have OpenSSL installed, update
 # the following line to use "http://" instead
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in middleman-images.gemspec
-gemspec path: '..'
+gemspec path: ".."
 
+gem "middleman", "~> 4.2.0"
 
-group :development do
-  gem 'middleman', '~> 4.2.0'
-  gem 'rake'
-  gem 'rdoc'
-  gem 'yard'
-end
+gem "aruba"
+gem "capybara"
+gem "cucumber"
 
-group :test do
-  gem 'cucumber'
-  gem 'capybara'
-  gem 'aruba'
-  gem 'rspec'
-
-  gem 'image_optim'
-  gem 'mini_magick'
-
-  # Version is locked to make sure asset_hash tests are not broken by updated optimizations.
-  gem 'image_optim_pack', '=0.6.0'
-end
+gem "image_optim"
+# Version is locked to make sure asset_hash tests are not broken by updated optimizations.
+gem "image_optim_pack", "=0.6.0"
+gem "mini_magick"

data/gemfiles/Gemfile.middleman-4.2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    middleman-images (0.1.0)
+    middleman-images (0.2.0)
       middleman-core (>= 4.1.14)
 
 GEM
@@ -142,24 +142,13 @@ GEM
     rack (2.1.2)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rake (13.0.1)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rdoc (6.2.1)
     regexp_parser (1.6.0)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
     rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
     rspec-support (3.9.2)
     sass (3.4.25)
     servolux (0.13.0)
@@ -173,7 +162,6 @@ GEM
       execjs (>= 0.3.0, < 3)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    yard (0.9.24)
 
 PLATFORMS
   ruby
@@ -187,10 +175,6 @@ DEPENDENCIES
   middleman (~> 4.2.0)
   middleman-images!
   mini_magick
-  rake
-  rdoc
-  rspec
-  yard
 
 BUNDLED WITH
    1.17.3

data/gemfiles/Gemfile.middleman-4.3

@@ -1,27 +1,17 @@
 # If you do not have OpenSSL installed, update
 # the following line to use "http://" instead
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in middleman-images.gemspec
-gemspec path: '..'
+gemspec path: ".."
 
+gem "middleman", "~> 4.3.0"
 
-group :development do
-  gem 'middleman', '~> 4.3.0'
-  gem 'rake'
-  gem 'rdoc'
-  gem 'yard'
-end
+gem "aruba"
+gem "capybara"
+gem "cucumber"
 
-group :test do
-  gem 'cucumber'
-  gem 'capybara'
-  gem 'aruba'
-  gem 'rspec'
-
-  gem 'image_optim'
-  gem 'mini_magick'
-
-  # Version is locked to make sure asset_hash tests are not broken by updated optimizations.
-  gem 'image_optim_pack', '=0.6.0'
-end
+gem "image_optim"
+# Version is locked to make sure asset_hash tests are not broken by updated optimizations.
+gem "image_optim_pack", "=0.6.0"
+gem "mini_magick"

data/gemfiles/Gemfile.middleman-4.3.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    middleman-images (0.1.0)
+    middleman-images (0.2.0)
       middleman-core (>= 4.1.14)
 
 GEM
@@ -139,24 +139,13 @@ GEM
     rack (2.1.2)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rake (13.0.1)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rdoc (6.2.1)
     regexp_parser (1.6.0)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
     rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
     rspec-support (3.9.2)
     sassc (2.2.1)
       ffi (~> 1.9)
@@ -171,7 +160,6 @@ GEM
       execjs (>= 0.3.0, < 3)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    yard (0.9.24)
 
 PLATFORMS
   ruby
@@ -185,10 +173,6 @@ DEPENDENCIES
   middleman (~> 4.3.0)
   middleman-images!
   mini_magick
-  rake
-  rdoc
-  rspec
-  yard
 
 BUNDLED WITH
    2.1.4

data/gemfiles/Gemfile.middleman-5.0-rc

@@ -1,27 +1,17 @@
 # If you do not have OpenSSL installed, update
 # the following line to use "http://" instead
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in middleman-images.gemspec
-gemspec path: '..'
+gemspec path: ".."
 
+gem "middleman", "~> 5.0.0.rc"
 
-group :development do
-  gem 'middleman', '~> 5.0.0.rc'
-  gem 'rake'
-  gem 'rdoc'
-  gem 'yard'
-end
+gem "aruba"
+gem "capybara"
+gem "cucumber"
 
-group :test do
-  gem 'cucumber'
-  gem 'capybara'
-  gem 'aruba'
-  gem 'rspec'
-
-  gem 'image_optim'
-  gem 'mini_magick'
-
-  # Version is locked to make sure asset_hash tests are not broken by updated optimizations.
-  gem 'image_optim_pack', '=0.6.0'
-end
+gem "image_optim"
+# Version is locked to make sure asset_hash tests are not broken by updated optimizations.
+gem "image_optim_pack", "=0.6.0"
+gem "mini_magick"

data/gemfiles/Gemfile.middleman-5.0-rc.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    middleman-images (0.1.0)
+    middleman-images (0.2.0)
       middleman-core (>= 4.1.14)
 
 GEM
@@ -21,7 +21,7 @@ GEM
       ffi (~> 1.9)
       rspec-expectations (>= 2.99)
       thor (>= 0.19, < 2.0)
-    backports (3.15.0)
+    backports (3.16.1)
     builder (3.2.4)
     capybara (3.31.0)
       addressable
@@ -140,27 +140,16 @@ GEM
     rack (2.1.2)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rake (13.0.1)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rdoc (6.2.1)
     regexp_parser (1.6.0)
     rgl (0.5.6)
       lazy_priority_queue (~> 0.1.0)
       stream (~> 0.5.2)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
     rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
     rspec-support (3.9.2)
     sassc (2.2.1)
       ffi (~> 1.9)
@@ -176,7 +165,6 @@ GEM
       execjs (>= 0.3.0, < 3)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    yard (0.9.24)
 
 PLATFORMS
   ruby
@@ -190,10 +178,6 @@ DEPENDENCIES
   middleman (~> 5.0.0.rc)
   middleman-images!
   mini_magick
-  rake
-  rdoc
-  rspec
-  yard
 
 BUNDLED WITH
    2.1.4

data/lib/middleman-images/extension.rb

@@ -1,56 +1,48 @@
-require 'middleman-core'
-require 'pathname'
-require 'padrino-helpers'
+require "middleman-core"
+require "pathname"
+require "padrino-helpers"
 
 module Middleman
   module Images
     class Extension < ::Middleman::Extension
-      option :optimize, false, 'Whether to optimize images by default'
-      option :image_optim, {}, 'Default options for image_optim'
-      option :ignore_original, false, 'Whether to ignore original images in build'
-      option :cache_dir, 'cache', 'Specification of cache folder'
+      option :optimize, false, "Whether to optimize images by default"
+      option :image_optim, {}, "Default options for image_optim"
+      option :ignore_original, false, "Whether to ignore original images in build"
+      option :cache_dir, "cache", "Specification of cache folder"
 
       helpers do
-        def image_tag(url, options = {})
+        def image_tag(path, options = {})
           process_options = options.slice(:resize, :optimize)
-          options = { src: image_path(url, process_options) }.update(options.except(:resize, :optimize))
-          super
+          options = { src: image_path(path, process_options) }.update(options.except(:resize, :optimize))
+          super(path, options)
         end
 
-        def image_path(url, process_options = {})
-          url = extensions[:images].image(url, process_options)
-          super url
+        def image_path(path, process_options = {})
+          path = extensions[:images].image_path(path, process_options)
+          super(path)
         end
       end
 
-      def template_context
-        @template_context ||= app.template_context_class.new(app, {}, {})
+      def manipulate_resource_list(resources)
+        @manipulator.manipulate_resource_list(resources)
       end
 
-      def process(source, process_options)
-        destination_path(source, process_options).tap do |dest_url|
-          unless app.sitemap.find_resource_by_path(dest_url)
-            image = Image.new(app, source.source_file, dest_url, process_options.merge(cache_dir: options[:cache_dir]))
-            manipulator.add image
-            app.sitemap.register_resource_list_manipulator(:images, manipulator, 40) unless app.build?
-          end
-        end
-      end
-
-      def image(url, process_options)
-        source = app.sitemap.find_resource_by_path(absolute_image_path(url))
-        return url if source.nil?
+      def image_path(path, process_options)
+        source = app.sitemap.find_resource_by_path(absolute_path(path))
+        return path if source.nil?
 
         process_options[:image_optim] = options[:image_optim]
         process_options[:optimize] = options[:optimize] unless process_options.key?(:optimize)
 
         if process_options[:resize] || process_options[:optimize]
-          url = process(source, process_options)
+          processed_path = Pathname.new(add_processed_resource(source, process_options))
+          images_dir = Pathname.new(app.config[:images_dir])
+          path = processed_path.relative_path_from(Pathname.new(app.config[:images_dir])).to_s
         else
-          manipulator.preserve_original source
-          app.sitemap.register_resource_list_manipulator(:images, manipulator, 40) unless app.build?
+          @manipulator.preserve_original source
         end
-        url
+
+        path
       end
 
       def initialize(app, options_hash = {}, &block)
@@ -58,31 +50,25 @@ module Middleman
         @manipulator = Manipulator.new(@app, options[:ignore_original])
       end
 
-      def before_build(builder)
-        # trigger our image_tag helper
-        rack = builder.instance_variable_get(:@rack)
-
-        builder.app.logger.info "== Images: Looking for images to process"
-        builder.app.sitemap.resources.each do |resource|
-          rack.get(CGI.escape(resource.request_path)) unless resource.binary?
-        end
-        builder.app.sitemap.register_resource_list_manipulator(:images, manipulator, 40)
-      end
-
       private
 
-      attr_reader :manipulator
+      def absolute_path(path)
+        absolute_path = path.start_with?("/") || path.start_with?(app.config[:images_dir])
+        absolute_path ? path : app.config[:images_dir] + "/" + path
+      end
 
-      def destination_path(source, options)
-        destination = source.normalized_path.sub(/#{source.ext}$/, '')
-        destination += '-' + template_context.escape_html(options[:resize]) if options[:resize]
-        destination += '-opt' if options[:optimize]
-        destination + source.ext
+      def add_processed_resource(source, process_options)
+        build_processed_path(source, process_options).tap do |processed_path|
+          processed_resource = Image.new(app.sitemap, processed_path, source.source_file, process_options.merge(cache_dir: options[:cache_dir]))
+          @manipulator.add(processed_resource)
+        end
       end
 
-      def absolute_image_path(url)
-        absolute_path = url.start_with?('/') || url.start_with?(app.config[:images_dir])
-        absolute_path ? url : app.config[:images_dir] + '/' + url
+      def build_processed_path(source, process_options)
+        destination = source.normalized_path.sub(/#{source.ext}$/, "")
+        destination += "-" + CGI.escape(process_options[:resize].to_s) if process_options[:resize]
+        destination += "-opt" if process_options[:optimize]
+        destination + source.ext
       end
     end
   end

data/lib/middleman-images/image.rb

@@ -1,40 +1,56 @@
 module Middleman
   module Images
-    class Image
-      attr_reader :destination, :source
-
+    class Image < Middleman::Sitemap::Resource
       IGNORE_RESIZING = {
-        ".svg" =>  "WARNING: We did not resize %{file}. Resizing SVG files will lead to ImageMagick creating an SVG with an embedded binary image thus making the file way bigger.",
-        ".gif" =>  "WARNING: We did not resize %{file}. Resizing GIF files will remove the animation. If your GIF file is not animated, use JPG or PNG instead.",
+        ".svg" => "WARNING: We did not resize %{file}. Resizing SVG files will lead to ImageMagick creating an SVG with an embedded binary image thus making the file way bigger.",
+        ".gif" => "WARNING: We did not resize %{file}. Resizing GIF files will remove the animation. If your GIF file is not animated, use JPG or PNG instead.",
       }.freeze
 
-      def initialize(app, source, destination, options = {})
-        @app = app
-        @source = source
-        @destination = destination
-        @options = options
-        @cache = File.join(app.root, options[:cache_dir], destination).to_s
-        FileUtils.mkdir_p File.dirname(cache)
+      attr_reader :app, :original_source_file
+
+      def initialize(store, path, source, options = {})
+        @original_source_file = source
+
+        processed_source_file = File.join(store.app.root, options.delete(:cache_dir), path)
+        FileUtils.mkdir_p File.dirname(processed_source_file)
+
+        @processing_options = options
+
+        super(store, path, processed_source_file)
       end
 
       def process
-        return if File.exist?(cache) && File.mtime(source) < File.mtime(cache)
+        return if File.exist?(processed_source_file) && File.mtime(original_source_file) < File.mtime(processed_source_file)
+
+        app.logger.info "== Images: Processing #{@path}"
 
-        app.logger.info "== Images: Processing #{destination}"
-        FileUtils.copy(source, cache)
-        resize(cache, options[:resize]) unless options[:resize].nil?
-        optimize(cache, options[:image_optim]) if options[:optimize]
+        FileUtils.copy(original_source_file, processed_source_file)
+        resize(processed_source_file, @processing_options[:resize]) unless @processing_options[:resize].nil?
+        optimize(processed_source_file, @processing_options[:image_optim]) if @processing_options[:optimize]
       end
 
-      def resource
-        @resource ||= ::Middleman::Sitemap::Resource.new(app.sitemap, destination, cache)
+      # We want to process images as late as possible. Before Middleman works with our source file, it will check
+      # whether it is binary? or static_file?. That's when we need to ensure the processed source files exist.
+      def binary?
+        process
+        super
+      end
+
+      def static_file?
+        process
+        super
+      end
+
+      # The processed source file is the new source file for middleman.
+      def processed_source_file
+        source_file
       end
 
       private
 
       def resize(image_path, options)
         begin
-          require 'mini_magick'
+          require "mini_magick"
         rescue LoadError
           raise 'The gem "mini_magick" is required for image resizing. Please install "mini_magick" or remove the resize option.'
         end
@@ -47,22 +63,20 @@ module Middleman
 
         image = MiniMagick::Image.new(image_path) do |i|
           i.resize(options)
-          i.define('jpeg:preserve-settings')
+          i.define("jpeg:preserve-settings")
         end
         image.write image_path
       end
 
       def optimize(image_path, options)
         begin
-          require 'image_optim'
+          require "image_optim"
         rescue LoadError
           raise "The gem 'image_option' is required for image optimization. Please install the gem 'image_optim' or set the option optimize: false."
         end
 
         ImageOptim.new(options).optimize_image!(image_path)
       end
-
-      attr_accessor :app, :cache, :options
     end
   end
 end

data/lib/middleman-images/manipulator.rb

@@ -6,12 +6,13 @@ module Middleman
         @images = []
         @required_originals = []
         @ignore_original = ignore_original
+        @inspected_at = {}
+        @destination_paths = []
       end
 
       def add(image)
-        unless images.collect(&:destination).include? image.destination
-          images << image
-        end
+        images << image unless @destination_paths.include?(image.destination_path)
+        @destination_paths << image.destination_path
       end
 
       def preserve_original(resource)
@@ -19,28 +20,54 @@ module Middleman
       end
 
       def manipulate_resource_list(resources)
+        app.logger.info "== Images: Registering images to process. This may take a while…"
+
+        resources.each do |resource|
+          next unless inspect?(resource)
+
+          app.logger.debug "== Images: Inspecting #{resource.destination_path} for images to process."
+
+          begin
+            # We inspect templates by triggering the render method on them. This way our
+            # image_tag and image_path helpers will get called and register the images.
+            resource.render({}, {})
+          rescue => e
+            app.logger.debug e
+            app.logger.debug "== Images: There was an error inspecting #{resource.destination_path}. Images for this resource will not be processed."
+          end
+        end
+
+        app.logger.info "== Images: All images have been registered."
+
         ignore_orginal_resources(resources) if ignore_original
-        resources + processed_images
+        resources + images
       end
 
       private
 
       attr_accessor :app, :images, :ignore_original, :required_originals
 
-      def processed_images
-        images.each(&:process)
-        images.collect(&:resource)
+      def inspect?(resource)
+        return false unless resource.template?
+
+        inspected_at = @inspected_at[resource.destination_path]
+        return true if inspected_at.nil?
+
+        source_modification_time = File.mtime(resource.source_file)
+        inspected_at < source_modification_time.tap do |inspect|
+          @inspected_at[resource.destination_path] = source_modification_time if inspect
+        end
       end
 
       def ignore_orginal_resources(resources)
-        originals = images.map(&:source)
+        originals = images.map(&:original_source_file)
         unused_originals = originals - required_originals
 
         resources.each do |resource|
           if unused_originals.include? resource.source_file
             resource.ignore!
           elsif required_originals.include? resource.source_file
-            resource.ignored = false
+            resource.instance_variable_set(:@ignored, false)
           end
         end
       end

data/lib/middleman-images/version.rb

@@ -1,3 +1,3 @@
 module MiddlemanImages
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/middleman-images.gemspec

@@ -3,21 +3,25 @@ $:.push File.expand_path("../lib", __FILE__)
 require "middleman-images/version"
 
 Gem::Specification.new do |s|
-  s.name        = "middleman-images"
-  s.version     = MiddlemanImages::VERSION.dup
-  s.platform    = Gem::Platform::RUBY
-  s.licenses    = ["MIT"]
-  s.authors     = ["Ruben Grimm", "Julian Schneider"]
-  s.email       = ["ruben.grimm@zweitag.de", "julian.schneider@zweitag.de"]
-  s.homepage    = "https://www.github.com/zweitag/middleman-images"
-  s.summary     = "Resize and optimize images for Middleman"
-  s.description = "Resize and optimize images for Middleman"
+  s.name = "middleman-images"
+  s.version = MiddlemanImages::VERSION.dup
+  s.platform = Gem::Platform::RUBY
+  s.licenses = ["MIT"]
+  s.authors = ["Ruben Grimm", "Julian Schneider"]
+  s.email = ["ruben.grimm@zweitag.de", "julian.schneider@zweitag.de"]
+  s.homepage = "https://www.github.com/zweitag/middleman-images"
+  s.summary = "Resize and optimize images for Middleman"
+  s.description = "" "
+    Resize and optimize your images on the fly with Middleman. Just run middleman build
+    and all your images will get the minimizing treatment. Middleman Images currently
+    depends on mini_magick for resizing and image_optim for optimizing your images.
+  " ""
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.files = `git ls-files`.split("\n")
+  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.required_ruby_version = '>= 2.5.0'
+  s.required_ruby_version = ">= 2.5.0"
 
-  s.add_runtime_dependency("middleman-core", [">= 4.1.14"])
+  s.add_runtime_dependency("middleman-core", [">= 4.1.14", "< 5.1"])
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: middleman-images
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Ruben Grimm
 - Julian Schneider
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-05 00:00:00.000000000 Z
+date: 2020-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -18,6 +18,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.14
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -25,7 +28,13 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.14
-description: Resize and optimize images for Middleman
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+description: "\n    Resize and optimize your images on the fly with Middleman. Just
+  run middleman build\n    and all your images will get the minimizing treatment.
+  Middleman Images currently\n    depends on mini_magick for resizing and image_optim
+  for optimizing your images.\n  "
 email:
 - ruben.grimm@zweitag.de
 - julian.schneider@zweitag.de
@@ -34,21 +43,24 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rufo"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.md
-- Rakefile
 - features/building.feature
 - features/ignore_original.feature
 - features/image_path.feature
+- features/images_dir.feature
 - features/optimization.feature
+- features/proxy_resources.feature
 - features/relative_path.feature
 - features/resize.feature
 - features/support/env.rb
 - features/support/middleman_images_steps.rb
+- fixtures/image/source/assets/images/fox.jpg
 - fixtures/image/source/images/fox.jpg
 - gemfiles/Gemfile.middleman-4.1
 - gemfiles/Gemfile.middleman-4.1.lock
@@ -68,7 +80,7 @@ homepage: https://www.github.com/zweitag/middleman-images
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -83,15 +95,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Resize and optimize images for Middleman
 test_files:
 - features/building.feature
 - features/ignore_original.feature
 - features/image_path.feature
+- features/images_dir.feature
 - features/optimization.feature
+- features/proxy_resources.feature
 - features/relative_path.feature
 - features/resize.feature
 - features/support/env.rb

data/Rakefile

@@ -1,18 +0,0 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
-
-require 'cucumber/rake/task'
-
-Cucumber::Rake::Task.new(:cucumber, 'Run features that should pass') do |t|
-  t.cucumber_opts = '--color --tags ~@wip --strict'
-end
-
-Cucumber::Rake::Task.new(:cucumber_wip, 'Run work-in-progress features that should pass') do |t|
-  t.cucumber_opts = "--color --tags @wip --strict"
-end
-
-require 'rake/clean'
-
-task test: ['cucumber']
-
-task default: :test