jekyll-img-srcset 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92a18f3afa30c975e5595fb97644e09667ccb469c19fdb8ffb2641e6a6864b13
-  data.tar.gz: 2c87894a3a7f6f37a2f9757ebe6370818c6f2a1c7aa0514258557d5c8a4f21db
+  metadata.gz: 8cba8bc40ca676dbd4b2889516261954dd9ccefcc6a8d020faa49df285e4004b
+  data.tar.gz: e234e70640cba4b30dc472d1a78954066be34b2630277d1627668f88b46a1bf8
 SHA512:
-  metadata.gz: df94acc2e731136259369e950b9067ba4f2582b17a02e18709486346900c956206c24cb7b1c8cd7570367393358ae30aa78f77763e0bfedfbede2ff84345680c
-  data.tar.gz: 23acba98d8129f4f00c475b142fe5a769f565ced4362846cf21868db848218e831a24dc2b47caebffb837f6a3b2d08c8d6a74e142ad3303e8693f95a7c01ca91
+  metadata.gz: 4520a7fbef0148dcebb03a6943fa53114aaae6217dc522aec7e41e43f397be3e230c5738e4ab8bb09ae61e6ed7b3537ce350f3d12ef838a6507cf790f1afd068
+  data.tar.gz: dea03820cebd35ed1b0147ecb2e90e94562dfb188c712c56f60082904303d0b9fe712858c489d1bc4c8b5a9f5d98807fe7de33212048dc8853807f05b1e361df

data/lib/jekyll-img-srcset.rb

@@ -1,4 +1,5 @@
 require 'mini_magick'
+require 'parallel'
 
 # Resizes an image to provide different versions for multiple
 # display resolutions
@@ -14,17 +15,28 @@ require 'mini_magick'
 #       the generated widths and the original iamge width
 def resize_image(url, widths, dest, base_image_path, cache)
     src_path = File.join(base_image_path, url)
-    new_widths, w = cache.getset(src_path) do
+    src_mtime = File.new(src_path).mtime
+    if cache.key? src_path
+        _, _, modified_time = cache[src_path]
+        if src_mtime > modified_time
+            cache.delete src_path
+        end
+    end
+    # resize images if they aren't already in the cache
+    new_widths, w, modified_time = cache.getset(src_path) do
+        modified_time = File.new(src_path).mtime
         image = MiniMagick::Image.open(src_path)
         w = image.dimensions[0]
         aspect = image.dimensions[1].to_f / w
         [w, aspect] 
         new_widths = widths.select {|x| x <= w}
-        new_widths.map do |width| 
+        width_to_create = new_widths.map do |width| 
             [width, File.join(dest, base_image_path, "#{width}", url)]
-        end.select do |width, target| 
-            not File.exists? target
-        end.each do |width, target|
+        end
+        .select do |width, target| 
+            (not File.exists? target) or (File.new(target).mtime < src_mtime)
+        end
+        Parallel.each(width_to_create) do |width, target|
             image = MiniMagick::Image.open(src_path)
             image.resize "#{width}x#{width*aspect}"
             if not Dir.exists? File.dirname(target)
@@ -32,8 +44,9 @@ def resize_image(url, widths, dest, base_image_path, cache)
             end
             image.write target
         end
-        [new_widths, w]
+        [new_widths, w, modified_time]
     end
+
     return new_widths, w
 end
 
@@ -120,50 +133,50 @@ def format_svg_image(url, ident, title, baseurl, base_image_path)
     content += "/>"
 end
 
-def process_page(document, payload)
-    # see https://gist.github.com/mmistakes/77c68fbb07731a456805a7b473f47841
-    doc_ext = document.extname.tr('.', '')
-    cache = Jekyll::Cache.new("jekyll-img-srcset")
-    if payload['site']['markdown_ext'].include? doc_ext
-        content = document.content
-        base_image_path = document.site.config["base_image_path"] || "assets/images"
-        image_regex = /!\[(?<caption>.*?)?\]\((?<url>\S+?)(?<title> .+?)?\)(?<identifier>\{.+?\})?/ 
-        content = content.gsub(image_regex) do | img |
-            img = image_regex.match img
-            if (/\.(jpe?g|png)$/i =~ img["url"]).nil?
-                "#{base_image_path}/#{img[0]}"
-            elsif img["url"].start_with? "http"
-                img[0]
-            elsif img["url"].end_with? ".svg"
-                ident = parse_identifier img[:identifier]
-                format_svg_image(img["url"], ident, img["title"],
-                    document.site.baseurl)
-            else
-                if File.exists?(File.join base_image_path, img['url'])
-                    widths, original_width = resize_image(img['url'], 
-                        document.site.config["widths"],
-                        document.site.config["destination"], 
-                        base_image_path, cache)
-                    document.site.keep_files.concat(widths.map do |w|
-                        File.join(base_image_path, "#{w}", img['url'])
-                    end)
-                    ident = parse_identifier img[:identifier]
-                    format_image(ident, widths, original_width,
-                        img["url"], img["caption"], img["title"],
-                        document.site.baseurl, base_image_path)
-                else
-                    img[0]
-                end
-            end
-        end
-        # puts content
-        document.content = content
-    end
-end
+# def process_page(document, payload)
+#     # see https://gist.github.com/mmistakes/77c68fbb07731a456805a7b473f47841
+#     doc_ext = document.extname.tr('.', '')
+#     cache = Jekyll::Cache.new("jekyll-img-srcset")
+#     if payload['site']['markdown_ext'].include? doc_ext
+#         content = document.content
+#         base_image_path = document.site.config["base_image_path"] || "assets/images"
+#         image_regex = /!\[(?<caption>.*?)?\]\((?<url>\S+?)(?<title> .+?)?\)(?<identifier>\{.+?\})?/ 
+#         content = content.gsub(image_regex) do | img |
+#             img = image_regex.match img
+#             if (/\.(jpe?g|png)$/i =~ img["url"]).nil?
+#                 "#{base_image_path}/#{img[0]}"
+#             elsif img["url"].start_with? "http"
+#                 img[0]
+#             elsif img["url"].end_with? ".svg"
+#                 ident = parse_identifier img[:identifier]
+#                 format_svg_image(img["url"], ident, img["title"],
+#                     document.site.baseurl)
+#             else
+#                 if File.exists?(File.join base_image_path, img['url'])
+#                     widths, original_width = resize_image(img['url'], 
+#                         document.site.config["widths"],
+#                         document.site.config["destination"], 
+#                         base_image_path, cache)
+#                     document.site.keep_files.concat(widths.map do |w|
+#                         File.join(base_image_path, "#{w}", img['url'])
+#                     end)
+#                     ident = parse_identifier img[:identifier]
+#                     format_image(ident, widths, original_width,
+#                         img["url"], img["caption"], img["title"],
+#                         document.site.baseurl, base_image_path)
+#                 else
+#                     img[0]
+#                 end
+#             end
+#         end
+#         # puts content
+#         document.content = content
+#     end
+# end
 
-Jekyll::Hooks.register [:pages, :posts, :documents], :pre_render do |document, payload|
-    process_page(document, payload)
-end
+# Jekyll::Hooks.register [:pages, :posts, :documents], :pre_render do |document, payload|
+#     process_page(document, payload)
+# end
 
 def check_in_context(context, path)
     parts = path.split(".")
@@ -182,7 +195,7 @@ module Jekyll
     class ImgSrcsetTag < Liquid::Tag
 
       def cache
-        @@cache ||= Jekyll::Cache.new("jekyll-img-srcset")
+        @@cache ||= Jekyll::Cache.new("Jekyll::ImgSrcset")
       end
   
       def initialize(tag_name, text, tokens)
@@ -235,7 +248,4 @@ module Jekyll
     end
 end
 
-Liquid::Template.register_tag('imgsrcset', Jekyll::ImgSrcsetTag)
-  
-
-# /![(?<caption>.*?)?]\((?<url>[^\s]+?)(?<title> .+?)?\)(?<identifier>{.+?})?/
+Liquid::Template.register_tag('imgsrcset', Jekyll::ImgSrcsetTag)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-img-srcset
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Jan-Philipp Stauffert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-19 00:00:00.000000000 Z
+date: 2020-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.9'
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.19'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.19'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement