jekyll-webp-resize 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e9dff223f4761869e7f5402374348a5e827837d
-  data.tar.gz: 35c2334fb968df5c8ef1149057e07673c8025525
+  metadata.gz: 3e29312d6b9c70ffe5a5c804d7cedb9a90192430
+  data.tar.gz: 5c61ee26c770716fb9a273330d2998aca7b3ff20
 SHA512:
-  metadata.gz: b65563476de4a21ecedea13cf14ad690b2284ea8328344e49571fb4bb302ebb900b733ca74346473e88ef9117b7e763c37762625d152e865c18cde39239615ad
-  data.tar.gz: ac5fe30d7ad575b259f7cf3f10bbd7d3d9d93f19d2303bd27e46986e2496e6baaca44c9b56d97795fcbb650d906e7c97fcb2533a5cb56fd6a925a14cbfc8700c
+  metadata.gz: 6ff5e320e9fae957dce08b6e68b729ea987d5b3f03961d4d600123be5c3ba2a94b284dc9a9488fc635b53e2eda6ec1875f290e188cd03cbd61d44ee145e8c670
+  data.tar.gz: f2ca6c8ab116dc68db4ea08e5d5dfe485b633d6e7f84fa9d48ca4f9c339f1028f35e0f57ab01090488437a4fc6734bb2e79e8d11b5bb92b8f4192a7a4bab5710

data/jekyll-webp-resize.gemspec

@@ -23,5 +23,6 @@ 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'
+  spec.add_runtime_dependency "fastimage", '~> 2.1'
+  # spec.add_runtime_dependency "rmagick", "~> 2.16"
 end

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

@@ -1,6 +1,6 @@
 module Jekyll
   module Webp
-    VERSION = "1.0.5"
+    VERSION = "1.0.6"
     # 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

@@ -4,6 +4,26 @@ require 'fastimage'
 module Jekyll
   module Webp
     class WebpExec
+      def self.run_cmd(cmd)
+        # Execute the command
+        exit_code = 0
+        error = ""
+        output = ""
+        Open3.popen3(cmd) do |stdin, stdout, stderr, wait_thr|
+          stdin.close # we don't pass any input to the process
+          output = stdout.gets
+          error = stderr.gets
+          exit_code = wait_thr.value
+        end
+
+        if exit_code != 0
+          Jekyll.logger.error("WebP:","command returned #{exit_code} with error #{error}")
+        end
+
+        # Return any captured return value
+        return [output, error]
+      end
+
       # Runs the WebP executable for the given input parameters
       # the function detects the OS platform and architecture automatically
       def self.run(input_file, output_file, flags, size)
@@ -36,23 +56,18 @@ module Jekyll
         end
         cmd += "-o \"#{output_file}\""
 
-        # Execute the command
-        exit_code = 0
-        error = ""
-        output = ""
-        Open3.popen3(cmd) do |stdin, stdout, stderr, wait_thr|
-          stdin.close # we don't pass any input to the process
-          output = stdout.gets
-          error = stderr.gets
-          exit_code = wait_thr.value
-        end
-
-        if exit_code != 0
-          Jekyll.logger.error("WebP:","cwebp returned #{exit_code} with error #{error}")
+        run_cmd(cmd)
+        extension = File.extname(output_file)
+        basename = File.basename(output_file, extension)
+        path = File.dirname(output_file)
+        new_output_file = path + "/" + basename + ".jpg"
+        cmd = "convert \"#{input_file}\" -quality 92% "
+        if size != 0
+          cmd += "-resize \"#{size.to_s}>\" "
         end
-
-        # Return any captured return value
-        return [output, error]
+        cmd += " #{new_output_file}"
+        Jekyll.logger.info(cmd)
+        run_cmd(cmd)
       end #function run
 
       # Returns the correct executable name depending on the OS platform and OS architecture

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

@@ -91,6 +91,10 @@ module Jekyll
                                                   site.dest,
                                                   File.join(imgdir, prefix),
                                                   File.basename(output))
+                site.static_files << WebpFile.new(site,
+                                                  site.dest,
+                                                  File.join(imgdir, prefix),
+                                                  File.basename(output).sub("webp", "jpg"))
               end
             end
           end # dir.foreach

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-webp-resize
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Sverrir Sigmundarson
@@ -80,7 +80,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements: