jekyll-brotli 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30fe005662022fcb3fc0e15c3b8c6e6d3ca7bb4050ef1ab98044840bbc74b4c8
-  data.tar.gz: 3ae490ae5b18d874f42447a103c9735c8f2dd0d950015697f5ae9f38e0053c02
+  metadata.gz: c01d2370e43402384f97385984ba919730c8b35957ba7eca72d29c3d0806dd1a
+  data.tar.gz: 66cff3b96e22a3bc0b20a60872c6f97d67bd335e0b427352b014bb0f581d5e3b
 SHA512:
-  metadata.gz: b1a404deb1999f4600f50ad54cf4d16910e6caa9442d11fb32248ef46e9db8cd63f0cc626e45057791afae42f96aea93e02deed8a6203de1353adbadee641064
-  data.tar.gz: 5d2f3f39333970454c33fe7dc62a88aa989305342f3f0e183f751522b5379eea1d8637dabdd4c7db795778da2c50b4f99a835c02e92352f86679b721333b69b6
+  metadata.gz: 1913dccb152cf9e6877fb70107af32bd078c19baf9ef2f947a727c8b2b4215430dd8ad9246baaa8162a35636d06703bc29ccfc182578d12c5eb85585376ae09e
+  data.tar.gz: 63e03d5ee66bfa73444917abafefcb9f3bd01344502b1f5769d5bf65843c8692769eb4b069d05d4cd53452917749ddb0d4d7ff7dd2db652ebbbd4483b89d5804

data/CHANGELOG.md

@@ -1,10 +1,14 @@
 # Changelog
 
-## Ongoing [☰](https://github.com/philnash/jekyll-brotli/compare/v2.0.0...master)
+## Ongoing [☰](https://github.com/philnash/jekyll-brotli/compare/v2.2.0...master)
 
-...
+## 2.2.0 (2019-12-31) [☰](https://github.com/philnash/jekyll-brotli/compare/v2.1.0...v2.2.0)
 
-## 2.1.0 (2018-11-24) [☰](https://github.com/philnash/jekyll-brotli/compare/v2.0.0...v2.1.0)
+### Changed
+
+- - Doesn't regenerate files that haven't changed in incremental builds (thanks [@fauno](https://github.com/fauno))
+
+## 2.1.0 (2019-08-26) [☰](https://github.com/philnash/jekyll-brotli/compare/v2.0.0...v2.1.0)
 
 ### Changed
 

data/lib/jekyll/brotli.rb

@@ -19,6 +19,12 @@ Jekyll::Hooks.register :site, :post_write do |site|
   Jekyll::Brotli::Compressor.compress_site(site) if Jekyll.env == 'production'
 end
 
+Jekyll::Hooks.register :clean, :on_obsolete do |obsolete|
+  obsolete.delete_if do |path|
+    path.end_with? '.br'
+  end
+end
+
 begin
   require 'jekyll-assets'
 

data/lib/jekyll/brotli/compressor.rb

@@ -25,6 +25,8 @@ module Jekyll
       # @return void
       def self.compress_site(site)
         site.each_site_file do |file|
+          next unless regenerate? file.destination(site.dest), site
+
           compress_file(
             file.destination(site.dest),
             compressable_extensions(site)
@@ -47,8 +49,12 @@ module Jekyll
       # @return void
       def self.compress_directory(dir, site)
         extensions = compressable_extensions(site).join(',')
-        files = Dir.glob(dir + "**/*{#{extensions}}")
-        files.each { |file| compress_file(file, compressable_extensions(site)) }
+        files = Dir.glob(dir + "/**/*{#{extensions}}")
+        files.each do |file|
+          next unless regenerate? file, site
+
+          compress_file(file, compressable_extensions(site))
+        end
       end
 
       ##
@@ -67,8 +73,11 @@ module Jekyll
       # @return void
       def self.compress_file(file_name, extensions)
         return unless extensions.include?(File.extname(file_name))
-        compressed = "#{file_name}.br"
+        compressed = compressed(file_name)
         contents = ::Brotli.deflate(File.read(file_name), quality: 11)
+
+        Jekyll.logger.debug "Brotli: #{compressed}"
+
         File.open(compressed, "w+") do |file|
           file << contents
         end
@@ -77,9 +86,23 @@ module Jekyll
 
       private
 
+      def self.compressed(file_name)
+        "#{file_name}.br"
+      end
+
       def self.compressable_extensions(site)
         site.config['brotli'] && site.config['brotli']['extensions'] || Jekyll::Brotli::DEFAULT_CONFIG['extensions']
       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)
+        compressed = compressed(file)
+
+        return true unless File.exist? compressed
+
+        File.mtime(file) > File.mtime(compressed)
+      end
     end
   end
-end
+end

data/lib/jekyll/brotli/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module Brotli
-    VERSION = "2.1.0"
+    VERSION = "2.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-brotli
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Phil Nash
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-26 00:00:00.000000000 Z
+date: 2019-12-30 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 brotli compressed assets and files for your Jekyll site at build