jekyll-webp-resize 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c06771078704e438beb5cdabcd4d26bb95a7d6c0
-  data.tar.gz: 72b8429afd77c194d4005c58ed8ce811335a44e0
+  metadata.gz: 2e9dff223f4761869e7f5402374348a5e827837d
+  data.tar.gz: 35c2334fb968df5c8ef1149057e07673c8025525
 SHA512:
-  metadata.gz: e0c6c2eec3646d44d725ab40a3f97ecf9ebedadeebbb01e9b7c33d6ec90c35fe0e49dad53ec0f43a692257ceb52092b8d63cec68f373ee85521e94cf47218c8e
-  data.tar.gz: 134a901737fb7dfbbab44dc5610da9056dce6bc1430e7c98986c9bed959b04116f7c3da4eac31e1f91aa2a547fbbd3d1d56436e150d04debcd99f9663cdd4dca
+  metadata.gz: b65563476de4a21ecedea13cf14ad690b2284ea8328344e49571fb4bb302ebb900b733ca74346473e88ef9117b7e763c37762625d152e865c18cde39239615ad
+  data.tar.gz: ac5fe30d7ad575b259f7cf3f10bbd7d3d9d93f19d2303bd27e46986e2496e6baaca44c9b56d97795fcbb650d906e7c97fcb2533a5cb56fd6a925a14cbfc8700c

data/jekyll-webp-resize.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake", "~> 1.5"
   spec.add_development_dependency "minitest", '~> 5.4', '>= 5.4.3'
+  spec.add_development_dependency "fastimage", '~> 2.1'
 end

data/lib/jekyll-webp-resize/defaults.rb

@@ -19,6 +19,7 @@ module Jekyll
       # List of directories containing images to optimize, Nested directories will not be checked
       'img_dir'   => ["/img"],
 
+      'resize'    => [1024, 512, 256],
       # add ".gif" to the format list to generate webp for animated gifs as well
       'formats'   => [".jpeg", ".jpg", ".png", ".tiff"],
 

data/lib/jekyll-webp-resize/version.rb

@@ -1,6 +1,6 @@
 module Jekyll
   module Webp
-    VERSION = "1.0.4"
+    VERSION = "1.0.5"
     # When modifying remember to issue a new tag command in git before committing, then push the new tag
     # git tag -a v0.1.0 -m "Gem v0.1.0"
     # git push origin --tags

data/lib/jekyll-webp-resize/webpExec.rb

@@ -1,11 +1,14 @@
 require 'open3'
+require 'fastimage'
 
 module Jekyll
   module Webp
     class WebpExec
       # Runs the WebP executable for the given input parameters
       # the function detects the OS platform and architecture automatically
-      def self.run(flags, input_file, output_file)
+      def self.run(input_file, output_file, flags, size)
+        width, height = FastImage.size(input_file)
+
         # What is the path to the execs inside the gem? perhaps just bin/?
         bin_path = "bin/"
 
@@ -21,9 +24,17 @@ module Jekyll
         # Construct the full path to the executable
         full_path = File.join(gem_root, bin_path, exe_name)
 
-        Jekyll.logger.info("Webp:", "Converting #{input_file}")
+        Jekyll.logger.info("Webp:", "Generating #{output_file}")
         # Construct the full program call
-        cmd = "\"#{full_path}\" -quiet -mt #{flags} \"#{input_file}\" -o \"#{output_file}\""
+        cmd = "\"#{full_path}\" -quiet -mt #{flags} \"#{input_file}\" "
+        if size != 0
+          if width > height
+            cmd += "-resize #{size.to_s} 0 "
+          else
+            cmd += "-resize 0 #{size.to_s} "
+          end
+        end
+        cmd += "-o \"#{output_file}\""
 
         # Execute the command
         exit_code = 0

data/lib/jekyll-webp-resize/webpGenerator.rb

@@ -18,6 +18,24 @@ module Jekyll
       # This generator should be passive with regard to its execution
       priority :lowest
 
+      # Return a map {size -> filename}
+      def compute_file_resizes(output_file, resize=@config['resize'])
+        output = {0 => output_file}
+        if resize.length == 0
+          return output
+        end
+
+        for resize_entry in resize
+          dirname = File.dirname(output_file)
+          extension = File.extname(output_file)
+          basename = File.basename(output_file, extension)
+          new_output_file = dirname + "/" + basename + "-" + resize_entry.to_s + extension
+          output[resize_entry] = new_output_file
+        end
+
+        return output
+      end
+
       def generate(site)
         # Retrieve and merge the configuration from the site yml file
         @config = DEFAULT.merge(site.config['webp'] || {})
@@ -54,25 +72,27 @@ module Jekyll
             FileUtils::mkdir_p(destination_directory + prefix)
             output_full_path = File.join(destination_directory + prefix, filename)
 
-            # Keep the webp file from being cleaned by Jekyll
-            site.static_files << WebpFile.new(site,
-                                              site.dest,
-                                              File.join(imgdir, prefix),
-                                              filename)
-
-            # Check if the file already has a webp alternative?
-            # If we're force rebuilding all webp files then ignore the check
-            # also check the modified time on the files to ensure that the webp file
-            # is newer than the source file, if not then regenerate
-            next if File.file?(output_full_path) && File.mtime(output_full_path) > File.mtime(file)
-
-            if File.file?(output_full_path) && File.mtime(output_full_path) <= File.mtime(file)
-              Jekyll.logger.info("WebP:", "Change to source image file #{file} detected, regenerating WebP")
+            compute_file_resizes(output_full_path).each do |size, output|
+              # Check if the file already has a webp alternative?
+              # If we're force rebuilding all webp files then ignore the check
+              # also check the modified time on the files to ensure that the webp file
+              # is newer than the source file, if not then regenerate
+              if !File.file?(output) ||
+                 (File.mtime(output) <= File.mtime(file))
+                # Jekyll.logger.info("WebP:", "Change to image file #{file} detected, regenerating WebP")
+
+                # Generate the file
+                WebpExec.run(file, output, @config['flags'], size)
+                files_generated += 1
+              end
+              if File.file?(output)
+                # Keep the webp file from being cleaned by Jekyll
+                site.static_files << WebpFile.new(site,
+                                                  site.dest,
+                                                  File.join(imgdir, prefix),
+                                                  File.basename(output))
+              end
             end
-
-            # Generate the file
-            WebpExec.run(@config['flags'], file, output_full_path)
-            files_generated += 1
           end # dir.foreach
         end # img_dir
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-webp-resize
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Sverrir Sigmundarson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-24 00:00:00.000000000 Z
+date: 2017-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -73,6 +73,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.4.3
+- !ruby/object:Gem::Dependency
+  name: fastimage
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 description: WebP Image Generator for Jekyll 3 Sites that automatically generate WebP
   images for all images on your static site and serves them when possible.
 email: