jekyll-zopfli 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ede348b4764fd1471a53a10ecd1d58f21659d79762b760b58effd80aa5a26ab3
-  data.tar.gz: b7a82496a951c065a587803a44968b871723064971ec6ac8b7298c7b4a81fb9c
+  metadata.gz: 598d8766f62cc79eef124048f583dd598d191c57fc3cb37a789a80a3befc082d
+  data.tar.gz: 17fcb3e576cfc2293c3061866b5e0f967b9f0b7bd13fdfa6ce6d1ea0bd29791a
 SHA512:
-  metadata.gz: 42ab91d962c4ce463d5a269df96945cc5a2e82be848c872fb9fb57d061e4b72633d462b607a239e78e91ccbbdd91894f69ca5df5764f88ecd5a28b2b3695c454
-  data.tar.gz: e3c70b64606a4095f4b0c5e11098b76f0b37019de30ae8ecf0a99cd2ac011722a4bf7155cd29ef1e0832d325d5e233d418d40269df72ba7e1ccda293e0367ba5
+  metadata.gz: e1141cadc3376282a85943ec57ac5b881e8fb46cd7f9728e77db5aa904ff6d83cd463f151bf457562f3e0acbf12671ed51873f25bf801b5ab006f3cf8e28edb8
+  data.tar.gz: 51656771722d6a3fc4b6dc582324a4b9dbbe2fe69eceaf017f9dad7a68f750f34f8e82c2121049cf9057998e2ba73fe7d8228e3a547e904a21cea22bef15b8b1

data/CHANGELOG.md

@@ -1,9 +1,15 @@
 # Changelog
 
-## Ongoing [☰](https://github.com/philnash/jekyll-gzip/compare/v2.2.0...master)
+## Ongoing [☰](https://github.com/philnash/jekyll-gzip/compare/v2.4.0...master)
 
 ...
 
+## 2.4.0 (2019-12-31) [☰](https://github.com/philnash/jekyll-zopfli/compare/v2.3.0...v2.4.0)
+
+### Changed
+
+- Doesn't regenerate files that haven't changed in incremental builds.
+
 ## 2.3.0 (2019-10-23) [☰](https://github.com/philnash/jekyll-zopfli/compare/v2.2.0...v2.3.0)
 
 ### Changed

data/lib/jekyll/zopfli/compressor.rb

@@ -25,7 +25,13 @@ module Jekyll
       # @return void
       def self.compress_site(site)
         site.each_site_file do |file|
-          compress_file(file.destination(site.dest), extensions: zippable_extensions(site), replace_file: replace_files(site))
+          next unless regenerate? file.destination(site.dest), site
+
+          compress_file(
+            file.destination(site.dest),
+            extensions: zippable_extensions(site),
+            replace_file: replace_files(site)
+          )
         end
       end
 
@@ -45,7 +51,15 @@ module Jekyll
       def self.compress_directory(dir, site)
         extensions = zippable_extensions(site).join(',')
         files = Dir.glob(dir + "/**/*{#{extensions}}")
-        files.each { |file| compress_file(file, extensions: zippable_extensions(site), replace_file: replace_files(site)) }
+        files.each do |file|
+          next unless regenerate? file, site
+
+          compress_file(
+            file,
+            extensions: zippable_extensions(site),
+            replace_file: replace_files(site)
+          )
+        end
       end
 
       ##
@@ -67,7 +81,7 @@ module Jekyll
       def self.compress_file(file_name, extensions: [], replace_file: false)
         return unless extensions.include?(File.extname(file_name))
         zipped = replace_file ? file_name : "#{file_name}.gz"
-        contents = ::Zopfli.deflate(File.read(file_name), format: :gzip)
+        contents = ::Zopfli.deflate(File.binread(file_name), format: :gzip)
         File.open(zipped, "w+") do |file|
           file << contents
         end
@@ -84,6 +98,32 @@ module Jekyll
         replace_files = site.config.dig('zopfli', 'replace_files')
         replace_files.nil? ? Jekyll::Zopfli::DEFAULT_CONFIG['replace_files'] : replace_files
       end
+
+      def self.zipped(file_name, replace_file)
+        replace_file ? file_name : "#{file_name}.gz"
+      end
+
+      # Compresses the file if the site is built incrementally and the
+      # source was modified or the compressed file doesn't exist
+      def self.regenerate?(file, site)
+        zipped = zipped(file, replace_files(site))
+
+        # Definitely generate the file if it doesn't exist yet.
+        return true unless File.exist? zipped
+        # If we are replacing files and this file is not a gzip file, then it
+        # has been edited so we need to re-gzip it in place.
+        return !is_already_gzipped?(file) if replace_files(site)
+
+        # If the modified time of the new file is greater than the modified time
+        # of the old file, then we need to regenerate.
+        File.mtime(file) > File.mtime(zipped)
+      end
+
+      # First two bytes of a gzipped file are 1f and 8b. This tests for those
+      # bytes.
+      def self.is_already_gzipped?(file)
+        ["1f", "8b"] == File.read(file, 2).unpack("H2H2")
+      end
     end
   end
 end

data/lib/jekyll/zopfli/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module Zopfli
-    VERSION = "2.3.0"
+    VERSION = "2.4.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-zopfli
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Phil Nash
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-23 00:00:00.000000000 Z
+date: 2019-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Generate gzipped assets and files for your Jekyll site at build time using