jekyll-image_optimizer 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ede44b92874642f51ae35e6040f96c58ad0717cf
-  data.tar.gz: b6256615bd5e2984cb727435d2b306eb6abfa61c
+  metadata.gz: 3695bb55dbb989f9f054a6441e485e8261b5aacb
+  data.tar.gz: 17c68e09b4fa2361de2a76c84ba5e227e0c1e237
 SHA512:
-  metadata.gz: 9622b082d933826853f17f24f03dd039b04a91f97ab021a89f213f4b0510e4063d4ea2b70e6c2627215b0d5f442f7ea81dc1a18da959f4837712e75d0982cde1
-  data.tar.gz: 7c6f8aa33b750b9f36d0525d75b98c9730676cb61d308c7e2965a6a90f3747994dad4f25bbc3d1320fb727b590b600d47be7ada2e3ebc33ba8769fbd0be00447
+  metadata.gz: e34e3c0a8ef34e18d9b9ac70197011ba150245fe60409e71d5901fa095d79c53c677b550e51cf7452ec935d3ed06ea9a067c8e765bbe8a47e838f0e5a1714eb2
+  data.tar.gz: a2cd559dee33fe01591e5a16ff2c7ef6be8218505e1067942a873da387dd5e93611a255f90a18e00ca055309e5529ce3e300ec7f6f894a7dffc102851ce8a217

data/lib/jekyll/image_optimizer/image_hash.rb

@@ -0,0 +1,39 @@
+class ImageHash
+  def initialize(use_hash)
+    @use_hash=use_hash
+  end
+
+  def file_search_pattern(file)
+    pos=file.rindex('/')
+    self.dir_search_pattern(file[0..pos-1], file[pos+1..-1])
+  end
+
+  def dir_search_pattern(dir, file)
+    if @use_hash
+      pos=file.rindex('.')
+      dir+'/'+file[0..pos-1]+'-*'+file[pos..-1]
+    else
+      dir+'/'+file
+    end
+  end
+
+  def name_with_hash(file)
+    pos=file.rindex('.')
+    file[0..pos-1]+'-'+Digest::MD5.file(file).hexdigest+file[pos..-1]
+  end
+
+  def with_hash(file)
+    return file unless @use_hash
+    new_file=self.name_with_hash(file)
+    File.rename(file, new_file)
+    new_file
+  end
+
+  def without_hash(file)
+    @use_hash ? file.sub(/-[0-9a-f]{32}\./, '.') : file
+  end
+
+  def hash?(file)
+    @use_hash ? file.match(/-[0-9a-f]{32}\./)!=nil : true
+  end
+end

data/lib/jekyll/image_optimizer/image_optimizer.rb

@@ -2,8 +2,8 @@ require_relative 'synchronizer.rb'
 require 'RMagick'
 
 class ImageOptimizer < Synchronizer
-  def initialize(source_path, target_path)
-    super(source_path, target_path)
+  def initialize(source_path, target_path, use_hash)
+    super(source_path, target_path, use_hash)
   end
 
   def optimize_images(geometry)

data/lib/jekyll/image_optimizer/synchronizer.rb

@@ -1,7 +1,8 @@
 class Synchronizer
-  def initialize(source_path, target_path)
+  def initialize(source_path, target_path, use_hash)
     @source_path=source_path
     @target_path=target_path
+    @hash=ImageHash.new(use_hash)
   end
 
   def create_symlink(name, param)
@@ -31,11 +32,17 @@ class Synchronizer
 
   def synchronize_file(source, target, param)
     source_time = File.mtime(source)
-    if !File.file?(target) or File.mtime(target) != source_time
+    target_found=Dir[@hash.file_search_pattern(target)]
+    target=target_found[0] unless target_found.empty?
+    if !File.file?(target) or File.mtime(target) != source_time or !@hash.hash?(target)
+      target=@hash.without_hash(target)
       target_dir=File.dirname(target)
       Dir.mkdir(target_dir) unless File.directory? target_dir
       do_synchronize_file(source, target, param)
-      File.utime(source_time, source_time, target) if File.file?(target)
+      if File.file?(target)
+        target=@hash.with_hash(target)
+        File.utime(source_time, source_time, target)
+      end
     end
   end
 
@@ -60,10 +67,13 @@ class Synchronizer
     files_and_dirs_by_length=Dir["#{target_path}/**/*"].sort_by { |dir| File.file?(dir) ? ('a'+dir) : ('b'+(1000-dir.size).to_s) }
     for target in files_and_dirs_by_length
       source=target.sub(target_path, @source_path)
+      source=@hash.without_hash(source)
       if File.directory? target
         delete_dir(target) unless Dir.exists? source
       else
-        delete_file(target) unless File.file? source
+        unless File.file? source and File.mtime(source)==File.mtime(target)
+          delete_file(target)
+        end
       end
     end
   end
@@ -77,4 +87,5 @@ class Synchronizer
     puts "deleting #{file}"
     File.delete(file)
   end
+
 end

data/lib/jekyll/image_optimizer.rb

@@ -1,10 +1,16 @@
 require_relative 'image_optimizer/image_optimizer'
+require_relative 'image_optimizer/synchronizer'
+require_relative 'image_optimizer/image_hash'
 require 'RMagick'
 
 def opt_dir(config)
   config['opt_images'] || 'img/opt'
 end
 
+def use_hash(config)
+  (config['image_hash'] || 'true')=='true'
+end
+
 module Jekyll
 
   class JekyllImageOptimizer < Generator
@@ -15,10 +21,11 @@ module Jekyll
       @opt=opt_dir(config)
       @symlink=config['images_link'] || 'images'
       @geometry=config['image_geometry'] || '800x800>'
+      @hash=use_hash(config)
     end
 
     def generate(site)
-      io=ImageOptimizer.new(@raw, @opt)
+      io=ImageOptimizer.new(@raw, @opt, @hash)
       if @geometry.is_a? Enumerable
         @geometry.each { |geom| io.optimize_images(geom) }
       else
@@ -32,7 +39,6 @@ module Jekyll
 
     def initialize(tag_name, markup, tokens)
       super
-      @markup
     end
 
     def render(context)
@@ -40,10 +46,10 @@ module Jekyll
       base_url=context['site']['baseurl']
       index=Liquid::Template.parse(@markup).render(context).to_i
       src=context['page']['image'][index]['url']
-      for dir in Dir[opt_dir(context['site'])+'*']
-        file = dir+'/'+src
-        if File.file? file
-          img=Magick::Image::read(file).first
+      hash=ImageHash.new(use_hash(context['site']))
+      for file in Dir[hash.dir_search_pattern(opt_dir(context['site'])+'*', src)]
+        if File.file? file and hash.hash? file
+          img=Magick::Image.ping(file).first
           s+=base_url+'/'+file+' '+img.columns.to_s+'w,'
         end
       end
@@ -51,6 +57,29 @@ module Jekyll
     end
   end
 
+  class SrcTag < Liquid::Tag
+
+    def initialize(tag_name, markup, tokens)
+      super
+      if markup =~ /\s*(.*?)\s+(.*?)\s*/
+        @dir = $1
+        @index = $2
+      end
+    end
+
+    def render(context)
+      base_url=context['site']['baseurl']
+      index=Liquid::Template.parse(@index).render(context).to_i
+      src=context['page']['image'][index]['url']
+      hash=ImageHash.new(use_hash(context['site']))
+      for file in Dir[hash.dir_search_pattern(opt_dir(context['site'])+@dir, src)]
+        if File.file? file and hash.hash? file
+          return base_url+'/'+file
+        end
+      end
+    end
+  end
+
   class ImageTag < Liquid::Tag
 
     def initialize(tag_name, markup, tokens)
@@ -74,4 +103,5 @@ end
 
 
 Liquid::Template.register_tag('srcset', Jekyll::SrcsetTag)
+Liquid::Template.register_tag('src', Jekyll::SrcTag)
 Liquid::Template.register_tag('image', Jekyll::ImageTag)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-image_optimizer
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Stefan Niederhauser
@@ -32,6 +32,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/jekyll/image_optimizer.rb
+- lib/jekyll/image_optimizer/image_hash.rb
 - lib/jekyll/image_optimizer/image_optimizer.rb
 - lib/jekyll/image_optimizer/synchronizer.rb
 homepage: https://github.com/nidi3/jekyll-image_optimizer