middlemac-extras 1.0.0 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf5e2bfe3faed7c34abaf50486196b1c50cfe5f3
-  data.tar.gz: b6c58fce72a4d5a18cf65810187e4c2177f5dd51
+  metadata.gz: 47aad4c22b21d4814184a9f3d0bfbbaa7a3c1d49
+  data.tar.gz: ed424b5d4b2ac535f57580cc31b9b7413b4b5b61
 SHA512:
-  metadata.gz: 94a0b6fb575fbb78e1f29c4642d8013a6c6526860e7edccde7c29a2bbd9b5c35d321b96206be73c8797664b53a765bd0e33586fcac986e59f13cb05ad5a66404
-  data.tar.gz: 4045e6ffb9335e8190839777343b3d2f8d8cbf300bb778d231932b4ee5dc12a4814ea45b8573191e6870eefd6a378c90c2da330bd5e322bdd63d6988e294b5ef
+  metadata.gz: d78a4a8951950f779079bacc9c9d78bc6335bd6d24777864a02dd68f21ea3d0619bcddc951f090d0aa0d0a73852067ecee71ba86d9d9cdabc46ad9ff2b38855e
+  data.tar.gz: 5edc65933dec1909430c1b3b089a32725fbd6282d2d08448e4a8fb662c5b1e8ff71f8bf0b0cd502fc22670718a081b78f3c7c3230fe6dfcd1074a6c50fc66473

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 middlemac-extras change log
 ===========================
 
+- Version 1.0.5 / 2016-April-08
+
+  - Fixed the implementation of css_image_sizes so that full path is not
+    always used, as Middleman using `:relative_assets` doesn't use the full
+    path.
+
 - Version 1.0.0 / 2016-April-05
 
   - Initial Release

data/documentation_project/Gemfile

@@ -9,7 +9,7 @@ gem 'wdm', '~> 0.1.0', platforms: [:mswin, :mingw]
 gem 'tzinfo-data', platforms: [:mswin, :mingw, :jruby]
 
 # Middleman Gems
-gem 'middlemac-extras', '~> 1.0'
+gem 'middlemac-extras', '~> 1.0.5'
 gem 'middleman', '~> 4.1.6'
 gem 'middleman-syntax'
 

data/documentation_project/config.rb

@@ -58,7 +58,7 @@ helpers do
   end
 
   def product_version
-    '1.0.0'
+    '1.0.5'
   end
 
   def product_uri

data/documentation_project/source/css_image_sizes.html.md.erb

@@ -63,3 +63,37 @@ You will be tempted to add this helper to your `style.css.scss` file, maybe
 even renaming it to `style.css.scss.erb`, but this will not work due to the
 order that Middleman and SASS build output.
 {:.note}
+
+
+## Technical details
+
+This CSS will control your image sizes by specifying a maximum width and height
+for each image in the project using the `src` attribute selector and matching
+against the end of that value. For example:
+
+~~~ scss
+img[src$='icon.png'] { max-width: 256px; max-height: 256px; }
+~~~
+
+CSS matches using literal text, and so will not respect relative paths. The
+simple rule above has a high possibility of naming collisions with other files
+named `icon.png`.
+
+If you follow Middleman’s best practices and keep most or all of your images in
+the defined `:images_dir` then the possibility of naming collisions will go
+away, as this helper will deliver the `src` attribute selectors starting with
+the final component of your `:images_dir`, for example:
+
+~~~ scss
+img[src$='images/logo-small.png'] { max-width: 128px; max-height: 128px; }
+img[src$='images/blog/logo-small.png'] { max-width: 160px; max-height: 160px; }
+img[src$='icon_32x32.png'] { max-width: 32px; max-height: 32px; }
+~~~
+
+In this example, the last image – `icon_32x32.png` – is not within `:images_dir`
+and so has no directory and is subject to naming collisions.
+
+The scheme above will work whether or not Middleman is configured with
+`relative_assets` because both relative and absolute links will always contain
+that last part of the path component. The only way this might break is by
+serving HTML pages from within your `:images_dir`.

data/lib/middlemac-extras/extension.rb

@@ -250,11 +250,21 @@ class MiddlemacExtras < ::Middleman::Extension
         if FastImage.size(file)
           width = (FastImage.size(file)[0] / factor).to_i.to_s
           height = (FastImage.size(file)[1] / factor).to_i.to_s
-          @md_sizes_b << "img[src$='#{r.url}'] { max-width: #{width}px; max-height: #{height}px; }"
+          # CSS matches string literals and doesn't evaluate image paths.
+          # Assets in the image path with always bear the final path component
+          # in order to avoid collisions while working with relative_assets or
+          # not; items outside of the images_dir will use the basename only and
+          # be subject to collisions.
+          if r.url.start_with?("/#{app.config[:images_dir]}")
+            subtract = "/#{app.config[:images_dir].split('/')[0...-1].join('/')}/"
+            url = r.url.sub(subtract, '')
+            @md_sizes_b << "img[src$='#{url}'] { max-width: #{width}px; max-height: #{height}px; }"
+          else
+            @md_sizes_b << "img[src$='#{File.basename(r.url)}'] { max-width: #{width}px; max-height: #{height}px; }"
+          end
         end
       end # each
     end
-
     @md_sizes_b.join("\n")
   end
 

data/lib/middlemac-extras/version.rb

@@ -1,5 +1,5 @@
 module Middleman
     module MiddlemacExtras
-        VERSION = '1.0.0'
+        VERSION = '1.0.5'
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middlemac-extras
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.5
 platform: ruby
 authors:
 - Jim Derry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-05 00:00:00.000000000 Z
+date: 2016-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core