Merge pull request #4 from kball/enable-appending-extension

Enable appending extension

Author: sverrirs

README.md

@@ -55,6 +55,10 @@ webp:
   # List of files or directories to exclude
   # e.g. custom or hand generated webp conversion files
   exclude: []
+
+  # append '.webp' to filename after original extension rather than replacing it.
+  # Default transforms `image.png` to `image.webp`, while changing to true transforms `image.png` to `image.png.webp`
+  append_ext: false
 ############################################################
 ```
 

lib/jekyll-webp/defaults.rb

@@ -19,7 +19,12 @@ module Webp
       # add ".gif" to the format list to generate webp for animated gifs as well
       'formats'   => [".jpeg", ".jpg", ".png", ".tiff"],
 
-      # File extensions for animated gif files 
+      # append .webp to existing extension instead of replacing it
+      # (Enables more efficient nginx rules.
+      # See http://www.lazutkin.com/blog/2014/02/23/serve-files-with-nginx-conditionally/)
+      'append_ext' => false,
+
+      # File extensions for animated gif files
       'gifs'      => [".gif"],
 
       # Set to true to always regenerate existing webp files
@@ -33,7 +38,7 @@ module Webp
       # e.g. custom or hand generated webp conversion files
       'exclude'   => [],
 
-      # List of files or directories to explicitly include 
+      # List of files or directories to explicitly include
       # e.g. single files outside of the main image directories
       'include'   => []
     }

lib/jekyll-webp/webpGenerator.rb

@@ -5,7 +5,7 @@ module Jekyll
   module Webp
 
     #
-    # A static file to hold the generated webp image after generation 
+    # A static file to hold the generated webp image after generation
     # so that Jekyll will copy it into the site output directory
     class WebpFile < StaticFile
       def write(dest)
@@ -50,22 +50,26 @@ def generate(site)
           imgdir_destination = File.join(site.dest, imgdir)
           FileUtils::mkdir_p(imgdir_destination)
           Jekyll.logger.info "WebP:","Processing #{imgdir_source}"
-          
+
           # handle only jpg, jpeg, png and gif
           for imgfile in Dir[imgdir_source + "**/*.*"]
               imgfile_relative_path = File.dirname(imgfile.sub(imgdir_source, ""))
-          
+
               # Skip empty stuff
               file_ext = File.extname(imgfile).downcase
 
               # If the file is not one of the supported formats, exit early
               next if !@config['formats'].include? file_ext
 
               # TODO: Do an exclude check
-              
+
               # Create the output file path
-              file_noext = File.basename(imgfile, file_ext)
-              outfile_filename = file_noext+ ".webp"
+              outfile_filename = if @config['append_ext']
+                File.basename(imgfile) + '.webp'
+              else
+                file_noext = File.basename(imgfile, file_ext)
+                file_noext + ".webp"
+              end
               FileUtils::mkdir_p(imgdir_destination + imgfile_relative_path)
               outfile_fullpath_webp = File.join(imgdir_destination + imgfile_relative_path, outfile_filename)
 
@@ -96,6 +100,6 @@ def generate(site)
       end #function generate
 
     end #class WebPGenerator
-    
+
   end #module Webp
 end #module Jekyll