jekyll-assets 2.3.2 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fcef9566f69a9e9edd270a4436d985ca8c521ae
-  data.tar.gz: 045c46a0cc068d145889a5bf9b25c0c31cb9cdd6
+  metadata.gz: c3f85683208d7c6a5e8212c0a26d86765fc44b4d
+  data.tar.gz: ab4ab48388c30fb14de9b49884ee89f700f04948
 SHA512:
-  metadata.gz: f29503cacd1682b50de47d7833b15fc5bf8709a3578ebd9f09e3f36eb1c18d927890bd7a71e67318b201fb311c4b1ec66aacbb25606f2b3518bc07950e958b02
-  data.tar.gz: 909fe0232e4a189efb91611c45147665c6d3b42ee0608cebd0039a1b0d54db6918e5f790d92c7e2dd6e16f9262acf50f4118f91904ca389374b32bd91a7638c9
+  metadata.gz: '0619236826dae97812c7c9ad4e647b3ced92ac1eed4acf924fbe36163cb98270ef7a36aec3231b1bd21b1527efc4db31b8c14d8cedfb2bf564a49581c0d8a768'
+  data.tar.gz: a37c926b28a79d8e6be32d2067236fd63f34cb20d6bac7ff35935b8fe1387deec574cbf21254e70590db5ae37809134fdd834b5ef692335911a7879347481d52

data/Gemfile

@@ -10,7 +10,6 @@ group :development do
 end
 
 group :test do
-  gem "luna-rubocop-formatters", :require => false
   gem "codeclimate-test-reporter", :require => false
   gem "rubocop", :require => false
 end
@@ -22,4 +21,6 @@ gem "jekyll", "#{ENV["JEKYLL_VERSION"]}" if ENV["JEKYLL_VERSION"]
 gem "font-awesome-sass", "~> 4.4", :require => false
 gem "bootstrap-sass", "~> 3.3", :require => false
 gem "mini_magick", "~> 4.2", :require => false
+gem "image_optim", "~> 0.25", :require => false
+gem "image_optim_pack", "~> 0.5", :require => false
 gem "less", "~> 2.6.0", :require => false

data/README.md

@@ -1,11 +1,12 @@
-[![Build Status](https://travis-ci.org/jekyll/jekyll-assets.svg?branch=master)][travis]
-[![Coverage Status](https://codeclimate.com/github/jekyll/jekyll-assets/badges/coverage.svg)][coverage]
-[![code-climate](https://codeclimate.com/github/jekyll/jekyll-assets/badges/gpa.svg)][code-climate] [![Dependencies Status](https://gemnasium.com/jekyll/jekyll-assets.svg)][gemnasium]
-
-[gemnasium]: https://gemnasium.com/jekyll/jekyll-assets
-[code-climate]: https://codeclimate.com/github/jekyll/jekyll-assets
-[coverage]: https://codeclimate.com/github/jekyll/jekyll-assets/coverage
-[travis]: https://travis-ci.org/jekyll/jekyll-assets
+<p align=center>
+  <a href=https://goo.gl/BhrgjW>
+    <img src=https://envygeeks.io/badges/paypal-large_1.png alt=Donate>
+  </a>
+  <br>
+  <a href=https://travis-ci.org/jekyll/jekyll-assets>
+    <img src="https://travis-ci.org/jekyll/jekyll-assets.svg?branch=master" alt=Status>
+  </a>
+</p>
 
 # Jekyll Assets
 
@@ -14,18 +15,22 @@ Jekyll assets is an asset pipeline using Sprockets 3 to build specifically for J
 ## Using Jekyll Assets with Jekyll
 
 ```ruby
-group :plugins do
+# Gemfile
+group :jekyll_plugins do
   gem "jekyll-assets"
 end
 ```
 
 ```yaml
-gems:
+# _config.yml
+plugins:
   - jekyll-assets
 ```
 
 ## Configuration
 
+The configuration file is the same as Jekyll's, which is _config.yml. Use the special key "assets":
+
 ```yaml
 assets:
   compress:
@@ -156,6 +161,24 @@ Start up your local Jekyll server and if everything is correct, your site will b
 
 * ES6 `gem "sprockets-es6"`
 * Image Magick `gem "mini_magick"`
+* ImageOptim `gem "image_optim"`
+
+  ```yml
+  assets:
+    image_optim:
+      default:
+        verbose: true
+      zero_png:
+        advpng:
+          level: 0
+        optipng:
+          level: 0
+        pngout:
+          strategy: 4
+  ```
+
+  Check the [ImageOptim docs](https://github.com/toy/image_optim#configuration) to get idea about configuration options.
+
 * LESS `gem "less"`
 
 ## Bower
@@ -266,6 +289,18 @@ time we will reject all pull requests that wish to add any digested paths as
 those are dynamically created when a proxy is ran so we can never predict
 it reliably unless we proxy and that would be a performance problem.
 
+### Dynamically loading assets
+
+Using Liquid Drop `assets`, you can check whether an asset is present.
+
+```liquid
+{% if assets[page.image] %}
+  {% img '{{ page.image }}' %}
+{% else %}
+  {% img 'default.jpg' %}
+{% endif %}
+```
+
 ## ERB Support
 
 ERB Support is removed in favor of trying to get this included on Github Pages
@@ -375,6 +410,16 @@ to get an idea what `<value>` can be.
 * `magick:one-fourth`, `magick:1/4`
 * `magick:half`, `magick:1/2`
 
+### ImageOptim Proxy arguments:
+
+**NOTE: You'll need the `image_optim` gem installed for these to work**
+To install `image_optim`, add `gem "image_optim"` to your `Gemfile`
+
+See the [ImageOptim docs](https://github.com/toy/image_optim#gem-installation) to ensure proper dependencies installation.
+
+* `image_optim:default` same as `image_optim:preset:default`
+* `image_optim:preset:<name>`
+
 ## Having trouble with our documentation?
 
 If you do not understand something in our documentation please feel

data/Rakefile

@@ -1,4 +1,4 @@
-require "luna/rubocop/rake/task"
+require "rubocop/rake_task"
 require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
 task :default => [:spec]

data/lib/jekyll/assets.rb

@@ -9,12 +9,11 @@ require "jekyll"
 
 requires = [ :liquid,
   :patches, "", :hooks, :addons,
-  :proxies, :processors
-]
+  :proxies, :processors]
 
 requires.each do |part|
-  Pathutil.new(File.expand_path("../", __FILE__)).join("assets", part.to_s)
-    .glob("{*,**/*}.rb").map(&method(
+  Pathutil.new(__dir__).join('assets', part.to_s)
+    .glob('{*,**/*}.rb').map(&method(
       :require
-    ))
+))
 end

data/lib/jekyll/assets/env.rb

@@ -6,6 +6,7 @@ module Jekyll
   module Assets
     class Env < Sprockets::Environment
       attr_accessor :jekyll
+      attr_reader :cache_path
 
       class << self
 
@@ -111,8 +112,8 @@ module Jekyll
         path ? super(path) : super()
         @jekyll = jekyll
 
-        # Analagous to Jekyll::Site @source and @destination paths
-        @cache_path = asset_config.fetch("cache", ".asset-cache")
+        # TODO: In Jekyll-Assets 3 this should be fixed up to be a method.
+        @cache_path = asset_config.fetch("cache", ".asset-cache") || ".asset-cache"
         if File.exist?(cache_path_in_source_dir = jekyll.in_source_dir(@cache_path))
           @cache_path = cache_path_in_source_dir
         end
@@ -148,7 +149,7 @@ module Jekyll
       # @return [Pathname/Pathutil]
       # --
       def in_cache_dir(*paths)
-        paths.reduce(@cache_path) do |base, path|
+        paths.reduce(cache_path) do |base, path|
           Jekyll.sanitized_path(base, path)
         end
       end

data/lib/jekyll/assets/hooks/cache.rb

@@ -9,18 +9,10 @@ Jekyll::Assets::Hook.register :env, :init do
   )
 
   if cache != false && type != "memory"
-    self.cache = begin
-      Sprockets::Cache::FileStore.new(
-        jekyll.in_source_dir(
-          cache
-        )
-      )
-    end
+    self.cache = Sprockets::Cache::FileStore.new(cache_path)
 
   elsif cache && type == "memory"
-    self.cache = begin
-      Sprockets::Cache::MemoryStore.new
-    end
+    self.cache = Sprockets::Cache::MemoryStore.new
 
   else
     Jekyll.logger.info "", "Asset caching is disabled by configuration. " \

data/lib/jekyll/assets/liquid/tag/proxies.rb

@@ -24,7 +24,19 @@ module Jekyll
           # ------------------------------------------------------------------
 
           def self.add(name, tag, *args, &block)
-            add_by_class(*generate_class(name, tag, &block), *args)
+            if tag.is_a?(Array)
+              return tag.each do |v|
+                klass = generate_class(name, v, &block)
+                add_by_class(*klass,
+                  *args
+                )
+              end
+            end
+
+            klass = generate_class(name, tag, &block)
+            add_by_class(*klass,
+              *args
+            )
           end
 
           # ------------------------------------------------------------------

data/lib/jekyll/assets/proxies/image_optim.rb

@@ -0,0 +1,80 @@
+# ----------------------------------------------------------------------------
+# Frozen-string-literal: true
+# Copyright: 2017 - MIT License
+# Encoding: utf-8
+# ----------------------------------------------------------------------------
+
+try_require "image_optim" do
+  IMAGE_OPTIM_ARGS = %W(preset).freeze
+  IMAGE_OPTIM_PRESETS = %W(@default).freeze
+
+  class JekyllAssetsImageOptim
+
+    class UnknownPresetError < RuntimeError
+      def initialize(presetName)
+        "Unknown image_optim preset '#{ presetName }'"
+      end
+    end
+
+    # ------------------------------------------------------------------------
+
+    class PresetAlreadySpecifiedError < RuntimeError
+      def initialize
+        "Specifying pre-defined preset and preset-by-name at the same time is not supported"
+      end
+    end
+
+    # ------------------------------------------------------------------------
+
+    class MultiplePredefinedPresetsSpecifiedError < RuntimeError
+      def initialize
+        "Specifying multiple pre-defined presets at the same time is not supported"
+      end
+    end
+
+    # ------------------------------------------------------------------------
+
+    def initialize(asset, opts, args)
+      @asset = asset
+      @opts = opts
+      @args = args
+    end
+
+    # ------------------------------------------------------------------------
+
+    def process
+      asset_config = @asset.env.asset_config || {}
+      image_optim_config = asset_config["image_optim"] || {}
+
+      predefinedPresets = (@opts.keys - IMAGE_OPTIM_ARGS.map(&:to_sym))
+
+      raise PresetAlreadySpecifiedError if @opts.key?(:preset) && predefinedPresets.any?
+      raise MultiplePredefinedPresetsSpecifiedError if predefinedPresets.count > 1
+
+      presetName = @opts[:preset]
+      presetName = predefinedPresets.first.to_s unless presetName || !predefinedPresets.any?
+
+      if presetName != "default" && !image_optim_config.key?(presetName)
+        raise UnknownPresetError, presetName
+      end
+      config = image_optim_config[presetName] || {}
+
+      image_optim = ::ImageOptim.new(config)
+      image_optim.optimize_image!(@asset.filename)
+    end
+
+  end
+
+  Jekyll::Assets::Env.liquid_proxies.add :image_optim, [:img, :asset_path], *(IMAGE_OPTIM_ARGS + IMAGE_OPTIM_PRESETS) do
+    def initialize(asset, opts, args)
+      @imageOptim = JekyllAssetsImageOptim.new(asset, opts, args)
+    end
+
+    # ------------------------------------------------------------------------
+
+    def process
+      @imageOptim.process
+    end
+
+  end
+end

data/lib/jekyll/assets/proxies/magick.rb

@@ -5,14 +5,12 @@
 # ----------------------------------------------------------------------------
 
 try_require "mini_magick" do
-  args = %W(resize quality rotate crop flip format gravity)
-  presets = %W(@2x @4x @1/2 @1/3 @2/3 @1/4 @2/4 @3/4
+  MINI_MAGICK_ARGS = %W(resize quality rotate crop flip format gravity strip).freeze
+  MINI_MAGICK_PRESETS = %W(@2x @4x @1/2 @1/3 @2/3 @1/4 @2/4 @3/4
     @double @quadruple @half @one-third @two-thirds @one-fourth
-      @two-fourths @three-fourths)
+      @two-fourths @three-fourths).freeze
 
-  Jekyll::Assets::Env.liquid_proxies.add :magick, :img, *(args + presets) do
-    PRESETS = presets
-    ARGS = args
+  class JekyllAssetsMiniMagic
 
     class DoubleResizeError < RuntimeError
       def initialize
@@ -26,8 +24,8 @@ try_require "mini_magick" do
     # ------------------------------------------------------------------------
 
     def initialize(asset, opts, args)
-      @opts = opts
       @asset = asset
+      @opts = opts
       @args = args
     end
 
@@ -73,7 +71,7 @@ try_require "mini_magick" do
 
     private
     def preset?
-      (@opts.keys - ARGS.map(&:to_sym)).any?
+      (@opts.keys - MINI_MAGICK_ARGS.map(&:to_sym)).any?
     end
 
     # ------------------------------------------------------------------------
@@ -140,6 +138,13 @@ try_require "mini_magick" do
       end
     end
 
+    # ------------------------------------------------------------------------
+    
+    private
+    def magick_strip(_, cmd)
+    	cmd.strip
+    end
+      
     # ------------------------------------------------------------------------
     # I just want you to know, we don't even care if you do multiple
     # resizes or try to, we don't attempt to even attempt to attempt to care
@@ -171,5 +176,19 @@ try_require "mini_magick" do
     # rubocop:enable Style/ParallelAssignment
     # rubocop:enable Metrics/AbcSize
     # ------------------------------------------------------------------------
+
+  end
+
+  Jekyll::Assets::Env.liquid_proxies.add :magick, [:img, :asset_path], *(MINI_MAGICK_ARGS + MINI_MAGICK_PRESETS) do
+    def initialize(asset, opts, args)
+      @miniMagick = JekyllAssetsMiniMagic.new(asset, opts, args)
+    end
+
+    # ------------------------------------------------------------------------
+
+    def process
+      @miniMagick.process
+    end
+
   end
 end

data/lib/jekyll/assets/version.rb

@@ -4,6 +4,6 @@
 
 module Jekyll
   module Assets
-    VERSION="2.3.2"
+    VERSION="2.4.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-assets
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.4.0
 platform: ruby
 authors:
 - Jordon Bedwell
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-21 00:00:00.000000000 Z
+date: 2017-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -226,6 +226,7 @@ files:
 - lib/jekyll/assets/patches/sprockets/asset.rb
 - lib/jekyll/assets/processors/less.rb
 - lib/jekyll/assets/processors/liquid.rb
+- lib/jekyll/assets/proxies/image_optim.rb
 - lib/jekyll/assets/proxies/magick.rb
 - lib/jekyll/assets/version.rb
 homepage: http://github.com/jekyll/jekyll-assets/
@@ -248,7 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Assets for Jekyll