jekyll-zopfli 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bf1c26f0d54b5d5ae1168ddef0f4b2dc09377b15dbf44bdec2c4348931ded5a
-  data.tar.gz: 805cb2c1623856635697dadd413de1d0b9c77a39375aefac88b9176f84d3ea7e
+  metadata.gz: 77a932d1c765327ad80c8acb0b7ffe107bd5b90b5937f48693ed8579a8fd816f
+  data.tar.gz: d1b62939ee22db47dbaec6c23ab6561b4cb138223c87f8bb8d11d288ffcac116
 SHA512:
-  metadata.gz: d1a01caa7da984a2855e300ece77fb473130657f874d327d4d35497a69cf3b1f1c6360a5df8b535aed4a51003aed022dfb30763f1b960d9945b796a76aa47ad3
-  data.tar.gz: 1b48d8e7f514bcb52dc0e6ca883196a6228a1ce5f64dd2a76d5a42a678287ab4d6a86dd3f195ee9accd652c4a159e1a40d9f5446d254c95400a57d973d19d4f9
+  metadata.gz: 0d6b369cb4341a67c837aa99b8cbe0a3ee28881ffe2afde2a6d70651293bb9b366a37d2d0e3a376a0eb4af0bb9470ff7ebde1b4d1ff46f3cdf913d2d7b961473
+  data.tar.gz: 419182038aa67dcd245e035687ea3a016280f3aca5b3c0c590ba957229759df795bb75a606ef9cd72afb63f355839b89aed6a40d2962d034f4ec21b210577937

data/.gitignore

@@ -7,7 +7,6 @@
 /spec/reports/
 /tmp/
 Gemfile.lock
-spec
 
 # rspec failure tracking
 .rspec_status

data/CHANGELOG.md

@@ -1,12 +1,29 @@
 # Changelog
 
-## 1.1.0 / 2018-01-03
+## Ongoing [☰](https://github.com/philnash/jekyll-gzip/compare/v1.1.0...master)
+
+...
+
+## 2.0.0 (2018-11-24) [☰](https://github.com/philnash/jekyll-zopfli/compare/v1.1.0...v2.0.0)
+
+### Added
+
+* Hooks into Jekyll::Assets if available
+* Adds frozen string literal comment
+
+### Changed
+
+* Uses built in `Jekyll.env` instead of `ENV["JEKYLL_ENV"]`
+* Changes `Jekyll::Zopfli::Compressor` to a module and implements a `compress_directory` method
+* Moves Jekyll::Zopfli::ZIPPABLE_EXTENSIONS into plugin config that can overwritten in the site config
+
+## 1.1.0 (2018-01-03) [☰](https://github.com/philnash/jekyll-zopfli/compare/v1.0.0...v1.1.0)
 
 ### Changed
 
 * Only run the post write hook when the environment variable `JEKYLL_ENV` is `production`
 
-## 1.0.0 / 2018-01-02
+## 1.0.0 (2018-01-02) [☰](https://github.com/philnash/jekyll-zopfli/commits/v1.0.0)
 
 ### Added
 

data/README.md

@@ -2,7 +2,11 @@
 
 Generate gzipped assets and files for your Jekyll site at build time using [Zopfli](https://github.com/google/zopfli) compression.
 
-[![Build Status](https://travis-ci.org/philnash/jekyll-zopfli.svg?branch=master)](https://travis-ci.org/philnash/jekyll-zopfli)
+[![Gem Version](https://badge.fury.io/rb/jekyll-zopfli.svg)](https://rubygems.org/gems/jekyll-zopfli) [![Build Status](https://travis-ci.org/philnash/jekyll-zopfli.svg?branch=master)](https://travis-ci.org/philnash/jekyll-zopfli) [![Maintainability](https://api.codeclimate.com/v1/badges/177f76759bc3b996e9e2/maintainability)](https://codeclimate.com/github/philnash/jekyll-zopfli/maintainability) [![Inline docs](https://inch-ci.org/github/philnash/jekyll-zopfli.svg?branch=master)](https://inch-ci.org/github/philnash/jekyll-zopfli)
+
+[API docs](http://www.rubydoc.info/gems/jekyll-zopfli/) | [GitHub repo](https://github.com/philnash/jekyll-zopfli)
+
+## Why?
 
 Performance in web applications is important. You know that, which is why you have created a static site using Jekyll. But you want a bit more performance. You're serving your assets and files gzipped, but you're making your webserver do it?
 
@@ -14,12 +18,18 @@ Why not just generate those gzip files at build time? And with Google's Zopfli a
 
 Zopfli is a much slower algorithm than Zlib, so this will likely significantly slow down your site build. If you still want to generate gzip files at build time with a faster build time and Zlib's compression level, check out [`Jekyll::Gzip`](https://github.com/philnash/jekyll-gzip).
 
+### Want even more compression?
+
+Zopfli is about the best compression we can get out of the gzip format, but there's more! [Brotli](https://en.wikipedia.org/wiki/Brotli) is a relatively new compression format that is now [supported by many browsers](https://caniuse.com/#search=brotli) and can produce even smaller files. You can use brotli compression alongside gzip in your Sinatra app with [`Jekyll::Brotli`](http://github.com/philnash/jekyll-brotli).
+
 ## Installation
 
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'jekyll-zopfli'
+group :jekyll_plugins do
+  gem 'jekyll-zopfli'
+end
 ```
 
 And then execute:
@@ -28,11 +38,55 @@ And then execute:
 bundle install
 ```
 
+Then add the plugin to the `plugins` key in your `_config.yml`
+
+```yml
+plugins:
+  - jekyll-zopfli
+```
+
 ## Usage
 
-Once you have the gem installed, run `JEKYLL_ENV=production bundle exec jekyll build`. In your destination directory (`_site` by default) you will find gzipped files.
+Once you have the gem installed, build your Jekyll site in production mode. On Mac/Linux you can run
+
+```bash
+JEKYLL_ENV=production bundle exec jekyll build
+```
+
+On Windows, set the `JEKYLL_ENV` environment variable to `"production"`. Check out [this blog post on setting environment variables on Windows](https://www.twilio.com/blog/2017/01/how-to-set-environment-variables.html). Then run:
+
+```bash
+bundle exec jekyll build
+```
+
+In your destination directory (`_site` by default) you will find gzipped versions of all your text files.
+
+`Jekyll::Zopfli` only runs when the environment variable `JEKYLL_ENV` is set to `production` as dealing with gzipping files is unnecessary in development mode and just slows down the site build.
+
+### Configuration
+
+By default, `Jekyll::Zopfli` will compress all files with the following extensions:
+
+- '.html'
+- '.css'
+- '.js'
+- '.txt'
+- '.ttf'
+- '.atom'
+- '.stl'
+- '.xml'
+- '.svg'
+- '.eot'
+
+You can supply your own extensions by adding a `zopfli` key to your site's `_config.yml` listing the extensions that you want to compress. For example to only compress HTML, CSS and JavaScript files, add the following to `_config.yml`:
 
-Due to the time it takes to generate zopfli files, this plugin only works when the `JEKYLL_ENV` environment variable is set to `production`.
+```yml
+zopfli:
+  extensions:
+    - '.html'
+    - '.css'
+    - '.js
+```
 
 ### Serving pre-compiled gzip files
 
@@ -48,9 +102,20 @@ gzip_static on;
 
 The `ngx_http_gzip_static_module` module is not built by default, so you may need to enable using the `--with-http_gzip_static_module` configuration parameter.
 
+#### Apache
+
+In either a `<Directory>` section in your Apache config or in an `.htaccess` file, add the following:
+
+```
+AddEncoding gzip .gz
+RewriteCond %{HTTP:Accept-encoding} gzip
+RewriteCond %{REQUEST_FILENAME}.gz -f
+RewriteRule ^(.*)$ $1.gz [QSA,L]
+```
+
 #### Other web servers
 
-TODO: instructions for other web servers like Apache, HAProxy, etc.
+TODO: instructions for other web servers like HAProxy, h2o etc.
 
 Do you know how to do this for a different server? Please open a [pull request](https://github.com/philnash/jekyll-zopfli/pulls) or an [issue](https://github.com/philnash/jekyll-zopfli/issues) with the details!
 

data/lib/jekyll-zopfli.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require "jekyll/zopfli"

data/lib/jekyll/zopfli.rb

@@ -1,13 +1,34 @@
-require "jekyll/zopfli/version"
-require "jekyll/zopfli/compressor"
+# frozen_string_literal: true
+
+require 'jekyll/zopfli/version'
+require 'jekyll/zopfli/config'
+require 'jekyll/zopfli/compressor'
+require 'pathname'
 
 module Jekyll
   module Zopfli
   end
 end
 
+Jekyll::Hooks.register :site, :after_init do |site|
+  config = site.config['zopfli'] || {}
+  site.config['zopfli'] = Jekyll::Zopfli::DEFAULT_CONFIG.merge(config) || {}
+end
+
 Jekyll::Hooks.register :site, :post_write do |site|
-  if ENV["JEKYLL_ENV"] == "production"
-    Jekyll::Zopfli::Compressor.new(site).compress
+  Jekyll::Zopfli::Compressor.compress_site(site) if Jekyll.env == 'production'
+end
+
+begin
+  require 'jekyll-assets'
+
+  Jekyll::Assets::Hook.register :env, :after_write do |env|
+    if Jekyll.env == 'production'
+      path = Pathname.new("#{env.jekyll.config['destination']}#{env.prefix_url}")
+      Jekyll::Zopfli::Compressor.compress_directory(path, env.jekyll)
+    end
   end
+rescue LoadError
+  # The Jekyll site doesn't use Jekyll::Assets, so no need to compress those
+  # files.
 end

data/lib/jekyll/zopfli/compressor.rb

@@ -1,29 +1,69 @@
-require "zopfli"
+# frozen_string_literal: true
+
+require 'jekyll/zopfli/config'
+require 'zopfli'
 
 module Jekyll
+  ##
+  # The main namespace for +Jekyll::Zopfli+. Includes the +Compressor+ module
+  # which is used to map over files, either using an instance of +Jekyll::Site+
+  # or a directory path, and compress them using Zopfli.
   module Zopfli
-    class Compressor
-      ZIPPABLE_EXTENSIONS = [
-        '.html',
-        '.css',
-        '.js',
-        '.txt',
-        '.ttf',
-        '.atom',
-        '.stl',
-        '.xml',
-        '.svg',
-        '.eot'
-      ]
-
-      attr_reader :site
+    ##
+    # The module that does the compressing using Zopfli.
+    module Compressor
+      ##
+      # Takes an instance of +Jekyll::Site+ and maps over the site files
+      # compressing them in the destination directory.
+      # @example
+      #     site = Jekyll::Site.new(site_config)
+      #     Jekyll::Zopfli::Compressor.compress_site(site)
+      #
+      # @param site [Jekyll::Site] A Jekyll::Site object that has generated its
+      #   site files ready for compression.
+      #
+      # @return void
+      def self.compress_site(site)
+        site.each_site_file do |file|
+          compress_file(file.destination(site.dest), zippable_extensions(site))
+        end
+      end
 
-      def initialize(site)
-        @site = site
+      ##
+      # Takes a directory path and maps over the files within compressing them
+      # in place.
+      #
+      # @example
+      #     Jekyll::Zopfli::Compressor.compress_directory("~/blog/_site", site)
+      #
+      # @param dir [Pathname, String] The path to a directory of files ready for
+      #   compression.
+      # @param site [Jekyll::Site] An instance of the `Jekyll::Site` used for
+      #   config.
+      #
+      # @return void
+      def self.compress_directory(dir, site)
+        extensions = zippable_extensions(site).join(',')
+        files = Dir.glob(dir + "**/*{#{extensions}}")
+        files.each { |file| compress_file(file, zippable_extensions(site)) }
       end
 
-      def compress_file(file_name)
-        return unless ZIPPABLE_EXTENSIONS.include?(File.extname(file_name))
+      ##
+      # Takes a file name and an array of extensions. If the file name extension
+      # matches one of the extensions in the array then the file is loaded and
+      # compressed using Zopfli, outputting the gzipped file under the name of
+      # the original file with an extra .gz extension.
+      #
+      # @example
+      #     Jekyll::Zopfli::Compressor.compress_file("~/blog/_site/index.html", ['.html')
+      #
+      # @param file_name [String] The file name of the file we want to compress
+      # @param extensions [Array<String>] The extensions of files that will be
+      #    compressed.
+      #
+      # @return void
+      def self.compress_file(file_name, extensions)
+        return unless extensions.include?(File.extname(file_name))
         zipped = "#{file_name}.gz"
         contents = ::Zopfli.deflate(File.read(file_name), format: :gzip)
         File.open(zipped, "w+") do |file|
@@ -32,11 +72,11 @@ module Jekyll
         File.utime(File.atime(file_name), File.mtime(file_name), zipped)
       end
 
-      def compress
-        site.each_site_file do |file|
-          compress_file(file.destination(site.dest))
-        end
+      private
+
+      def self.zippable_extensions(site)
+        site.config['zopfli'] && site.config['zopfli']['extensions'] || Jekyll::Zopfli::DEFAULT_CONFIG['extensions']
       end
     end
   end
-end 
+end

data/lib/jekyll/zopfli/config.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Jekyll
+  module Zopfli
+    DEFAULT_CONFIG = {
+      'extensions' => [
+        '.html',
+        '.css',
+        '.js',
+        '.txt',
+        '.ttf',
+        '.atom',
+        '.stl',
+        '.xml',
+        '.svg',
+        '.eot'
+      ].freeze
+    }.freeze
+  end
+end

data/lib/jekyll/zopfli/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Jekyll
   module Zopfli
-    VERSION = "1.1.0"
+    VERSION = "2.0.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-zopfli
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Phil Nash
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-02 00:00:00.000000000 Z
+date: 2018-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -117,6 +117,7 @@ files:
 - lib/jekyll-zopfli.rb
 - lib/jekyll/zopfli.rb
 - lib/jekyll/zopfli/compressor.rb
+- lib/jekyll/zopfli/config.rb
 - lib/jekyll/zopfli/version.rb
 homepage: https://github.com/philnash/jekyll-zopfli
 licenses:
@@ -138,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Generate gzipped assets and files for your Jekyll site at build time using