jekyll-assets 3.0.7 → 3.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b782c8280d7d3a50234be8ed6923a652fd4fc64a9d48a73c0a6149ba488233ad
-  data.tar.gz: c3ee8170a33b679ff744325d5a2edde5fb28185cb54ebf8b804e24990a1dd4a1
+  metadata.gz: 639668c433fd9e421070ad3440a0f5122302ac2cbccb63044ad82114bab51e36
+  data.tar.gz: 9fc98306dff4d217d4d0e09a32aa0a35f858125029b39e62b75eab6a7ed661b4
 SHA512:
-  metadata.gz: 988839d356b82ff5487241eda8889fbb7cdcfc510f58369b41af37af503500099e1bd359a3f4909e13388804140294474c026080e2340bd3352c825ffb238276
-  data.tar.gz: e4e3b85799a51f19575f1532c93f4871f47eea6121ae05b20dab5f2d3c0b79a3f04ca5b76b17d29d7959fc1fb24ce8a21d9eb2ba0b7c3bc9f60ccb8d30c71f28
+  metadata.gz: 1ff42694cde71c8521ef7f03e2f2fdf8cebb9513257f2ee9a18c0c61b55d5656c217ebbef80b30f068995f63f4fe7fea482dd1698b9188bf49c7dc654e4d202b
+  data.tar.gz: dd946a1a0015b3397e860e98133dc692f43d9e9bfd35ce7c15001b396e6c0cf1a6164bc5d58a54d259662ad288be7386f391200a7a6014033738f1dc86859c94

data/Gemfile

@@ -20,7 +20,7 @@ group :development do
   group :test do
     gem "simplecov", require: false
     gem "luna-rspec-formatters", require: false
-    gem "rubocop", require: false
+    gem "rubocop", "0.52", require: false
   end
 end
 
@@ -39,4 +39,5 @@ group :optionals do
   gem "babel-transpiler", require: false
   gem "bootstrap", require: false
   gem "sassc", require: false
+  gem "crass", require: false
 end

data/README.md

@@ -1,7 +1,7 @@
 [![Code Climate](https://img.shields.io/codeclimate/maintainability/envygeeks/jekyll-assets.svg?style=for-the-badge)](https://codeclimate.com/github/envygeeks/jekyll-assets/maintainability)
 [![Code Climate](https://img.shields.io/codeclimate/c/envygeeks/jekyll-assets.svg?style=for-the-badge)](https://codeclimate.com/github/envygeeks/jekyll-assets/coverage)
 [![Travis CI](https://img.shields.io/travis/envygeeks/jekyll-assets/master.svg?style=for-the-badge)](https://travis-ci.org/envygeeks/jekyll-assets)
-[![Donate](https://img.shields.io/badge/-DONATE-yellow.svg?style=for-the-badge)](https://www.paypal.com/donate/?token=2YE-4wLE2dSgtPaQqTlQgcD2BvKv_tkHUD7GJYs4OskLI0l6XFEAKpNc5rIG6-bAeMFdom)
+[![Donate](https://img.shields.io/badge/-DONATE-yellow.svg?style=for-the-badge)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=LKGZAWXLZ8ZPG)
 ![Gem Version](https://img.shields.io/gem/v/jekyll-assets.svg?style=for-the-badge)
 ![Gem DL](https://img.shields.io/gem/dt/jekyll-assets.svg?style=for-the-badge)
 
@@ -358,13 +358,14 @@ We have basic support for WebComponents when using Sprockets `~> 4.0.0.beta`, th
 
 ## Hooks
 
-| Point     | Name              | Instance | Args                |
-| --------- | ----------------- | -------- | ------------------- |
-| `:env`    | `:before_init`    | ✔        | ✗                   |
-| `:env`    | `:after_init`     | ✔        | ✗                   |
-| `:env`    | `:after_write`    | ✔        | ✗                   |
-| `:config` | `:before_merge`   | ✗        | `Config{}`          |
-| `asset`   | `:before_compile` | ✗        | `Asset`, `Manifest` |
+| Point | Name | Instance | Args |
+| ---| --- | --- | --- |
+| `:env` | `:before_init` | ✔ | ✗ |
+| `:env` | `:after_init` | ✔ | ✗ |
+| `:env` | `:after_write` | ✔ | ✗ |
+| `:config` | `:before_merge` | ✗ | `Config{}` |
+| `:asset` | `:before_compile` | ✗ | `Asset`, `Manifest` |
+| `:asset` | `:after_compression` | ✗ | input{}, output{}, type=*/* |
 
 ### Example
 
@@ -402,6 +403,13 @@ end
 ```
 
 ## Default Plugins
+### Google Closure Alternates
+```
+gem "crass"
+```
+
+Once crass is added, we will detect vendor prefixes, and add `/* @alternate */` to them, with or without compression enabled, and with protections against compression stripping.
+
 ### Font Awesome
 
 ```ruby
@@ -444,6 +452,11 @@ html {
 }
 ```
 
+```scss
+//=require _bootstrap.css
+//=require bootstrap/_reboot.css
+```
+
 ### ImageMagick
 
 ```ruby
@@ -518,3 +531,53 @@ assets:
 | ------ | -------------------------- | --------------- |
 | `@doc` | `Nokogiri:: XML::Document` | `image/svg+xml` |
 | `@doc` | `Nokogiri::HTML::Document` | `image/*`       |
+
+## Migrating from Earlier Versions
+### Configuration
+
+*Before*
+
+```yaml
+cdn: https://example.com
+```
+
+*After*
+
+```yaml
+cdn:
+  url: https://example.com
+```
+
+### Images/CSS/JS
+
+*Before*
+
+```liquid
+{% css css.css %}
+{% img image.jpg width:60 class:image %}
+{% js js.js %}
+```
+
+*After*
+
+```liquid
+{% asset css.css %}
+{% asset image.jpg width=60 class=image %}
+{% asset js.js %}
+```
+
+### Custom Tags
+
+*Before*
+
+```liquid
+<link rel="apple-touch-icon-precomposed" href="{% asset_path icon.png %}">
+<link rel="apple-touch-icon-precomposed" href="{% asset_data icon.png %}">
+```
+
+*After*
+
+```liquid
+<link rel="apple-touch-icon-precomposed" href="{% asset icon.png @path %}">
+<link rel="apple-touch-icon-precomposed" href="{% asset icon.png @data %}">
+```

data/Rakefile

@@ -1,5 +1,6 @@
 # Frozen-string-literal: true
 # Copyright: 2017 - 2018 - MIT License
+# Source: https://github.com/envygeeks/devfiles
 # Author: Jordon Bedwell
 # Encoding: utf-8
 

data/lib/jekyll-assets.rb

@@ -1,6 +1,5 @@
-# rubocop:disable Naming/FileName
-# Copyright: 2012 - 2018 - MIT License
 # Frozen-string-literal: true
+# Copyright: 2012 - 2018 - MIT License
 # Encoding: utf-8
 
 require_relative "jekyll/assets"

data/lib/jekyll/assets/compressors/sassc.rb

@@ -0,0 +1,32 @@
+# Frozen-string-literal: true
+# Copyright: 2017 - 2018 - MIT License
+# Author: Jordon Bedwell
+# Encoding: utf-8
+
+if defined?(Sprockets::SasscCompressor)
+  module Jekyll
+    module Assets
+      module Compressors
+        class SassC < Sprockets::SasscCompressor
+          def call(input)
+            out = super(input)
+            Hook.trigger :asset, :after_compression do |h|
+              h.call(input, out, "text/css")
+            end
+            out
+          end
+        end
+
+        # --
+        Sprockets.register_compressor "text/css", :assets_sassc, SassC
+        Hook.register :env, :after_init, priority: 3 do |e|
+          e.css_compressor = nil
+          next unless e.asset_config[:compression]
+          Utils.activate("sassc") do
+            e.css_compressor = :assets_sassc
+          end
+        end
+      end
+    end
+  end
+end

data/lib/jekyll/assets/compressors/scss.rb

@@ -0,0 +1,30 @@
+# Frozen-string-literal: true
+# Copyright: 2017 - 2018 - MIT License
+# Author: Jordon Bedwell
+# Encoding: utf-8
+
+module Jekyll
+  module Assets
+    module Compressors
+      class Scss < Sprockets::SassCompressor
+        def call(input)
+          out = super(input)
+          Hook.trigger :asset, :after_compression do |h|
+            h.call(input, out, "text/css")
+          end
+          out
+        end
+      end
+
+      # --
+      Sprockets.register_compressor "text/css", :assets_scss, Scss
+      Hook.register :env, :after_init, priority: 3 do |e|
+        next if Utils.activate("sassc") && !Utils.old_sprockets?
+
+        e.css_compressor = nil
+        next unless e.asset_config[:compression]
+        e.css_compressor = :assets_scss
+      end
+    end
+  end
+end

data/lib/jekyll/assets/compressors/uglify.rb

@@ -0,0 +1,30 @@
+# Frozen-string-literal: true
+# Copyright: 2017 - 2018 - MIT License
+# Author: Jordon Bedwell
+# Encoding: utf-8
+
+module Jekyll
+  module Assets
+    module Compressors
+      class Uglify < Sprockets::UglifierCompressor
+        def call(input)
+          out = super(input)
+          Hook.trigger :asset, :after_compression do |h|
+            h.call(input, out, "application/javascript")
+          end
+          out
+        end
+      end
+
+      # rubocop:disable Metrics/LineLength
+      Sprockets.register_compressor "application/javascript", :assets_uglify, Uglify
+      Hook.register :env, :after_init, priority: 3 do |e|
+        e.js_compressor = nil
+        next unless e.asset_config[:compression]
+        if Utils.javascript?
+          e.js_compressor = :assets_uglify
+        end
+      end
+    end
+  end
+end

data/lib/jekyll/assets/config.rb

@@ -24,7 +24,7 @@ module Jekyll
         compressors: {
           uglifier: {
             comments: false,
-            harmony:   true,
+            harmony: Utils.new_uglifier?,
           },
         },
 

data/lib/jekyll/assets/default.rb

@@ -24,9 +24,8 @@ module Jekyll
           })
         end
 
-        rtn = rtn.sort_by(&:internal?)
         ida = HashWithIndifferentAccess.new
-        rtn.each_with_object(ida) do |v, h|
+        rtn.sort { |v| v.internal? ? 1 : - 1 }.each_with_object(ida) do |v, h|
           h.deep_merge!(v.static)
         end
       end

data/lib/jekyll/assets/env.rb

@@ -21,6 +21,7 @@ require_relative "logger"
 require_relative "hook"
 require_relative "tag"
 require_relative "url"
+require_all "compressors/*"
 
 module Jekyll
   module Assets
@@ -34,12 +35,6 @@ module Jekyll
       attr_reader :asset_config
       attr_reader :jekyll
 
-      # --
-      rb_delegate :old?, to: :"self.class"
-      rb_delegate :old_sprockets?, {
-        to: :"self.class",
-      }
-
       # --
       def initialize(jekyll = nil)
         @asset_config = Config.new(jekyll.config["assets"] ||= {})
@@ -57,7 +52,6 @@ module Jekyll
         @cache = nil
 
         setup_sources!
-        enable_compression!
         ignore_caches!
         setup_drops!
         precompile!
@@ -140,18 +134,6 @@ module Jekyll
         end
       end
 
-      # --
-      def self.old_sprockets?
-        @old_sprockets ||= begin
-          Gem::Version.new(Sprockets::VERSION) < Gem::Version.new("4.0.beta")
-        end
-      end
-
-      # --
-      class << self
-        alias old? old_sprockets?
-      end
-
       # --
       def write_all
         remove_old_assets unless asset_config[:digest]
@@ -176,18 +158,6 @@ module Jekyll
         jekyll.config["exclude"].uniq!
       end
 
-      # --
-      private
-      def enable_compression!
-        self.js_compressor, self.css_compressor = nil, nil
-
-        return unless asset_config[:compression]
-        config = asset_config[:compressors][:uglifier].symbolize_keys
-        self. js_compressor = Sprockets::UglifierCompressor.new(config)
-        Utils.activate("sassc") { self.css_compressor = :scssc } unless old?
-        self.css_compressor ||= :scss
-      end
-
       # --
       def copy_raw!
         raw_precompiles.each do |v|
@@ -238,13 +208,6 @@ module Jekyll
       require_all "plugins/html/*"
       require_relative "context"
 
-      require_relative "map" unless old_sprockets?
-      Hook.register :env, :after_init, priority: 3 do
-        unless old?
-          Map.register_on(self)
-        end
-      end
-
       # --
       # @see https://github.com/rails/sprockets/pull/523
       # Registers a few MimeTypes since I don't think

data/lib/jekyll/assets/extensible.rb

@@ -35,6 +35,7 @@ module Jekyll
       # --
       def self.requirements
         @requirements ||= {
+          internal: false,
           args: [], types: [
             #
           ]

data/lib/jekyll/assets/hook.rb

@@ -11,6 +11,21 @@ module Jekyll
         end
       end
 
+      # --
+      class Point
+        attr_accessor :block, :priority
+
+        # --
+        # A hook point only holds data for later, it
+        # really serves no other purpose for now, other
+        # than to make live easier for handling hooks
+        # and their sorting, later in stream.
+        # --
+        def initialize(priority, &block)
+          @priority, @block = priority, block
+        end
+      end
+
       # --
       class << self
         attr_reader :points
@@ -19,71 +34,26 @@ module Jekyll
       # --
       @points = {
         env: {
-          before_init: {
-            1 => [],
-            2 => [],
-            3 => [],
-          },
-
-          after_init: {
-            1 => [],
-            2 => [],
-            3 => [],
-          },
-
-          after_write: {
-            1 => [],
-            2 => [],
-            3 => [],
-          },
+          before_init: [],
+          after_init: [],
+          after_write: [],
         },
 
         config: {
-          before_merge: {
-            1 => [],
-            2 => [],
-            3 => [],
-          },
+          before_merge: [],
         },
 
         asset: {
-          before_compile: {
-            1 => [],
-            2 => [],
-            3 => [],
-          },
-
-          before_read: {
-            1 => [],
-            2 => [],
-            3 => [],
-          },
-
-          after_read: {
-            1 => [],
-            2 => [],
-            3 => [],
-          },
-
-          before_write: {
-            1 => [],
-            2 => [],
-            3 => [],
-          },
-
-          after_write: {
-            1 => [],
-            2 => [],
-            3 => [],
-          },
+          before_compile: [],
+          before_read: [],
+          after_read: [],
+          after_compression: [],
+          before_write: [],
+          after_write: [],
         },
 
         liquid: {
-          before_render: {
-            1 => [],
-            2 => [],
-            3 => [],
-          },
+          before_render: [],
         },
       }
 
@@ -97,16 +67,7 @@ module Jekyll
         raise ArgumentError, "only give 2 points" if point.count > 2
 
         @points[point[0]] ||= {}
-        @points[point[0]][point[1]] ||= {
-          #
-        }
-
-        1.upto(3).each do |i|
-          @points[point[0]][point[1]][i] ||= [
-            #
-          ]
-        end
-
+        @points[point[0]][point[1]] ||= {}
         @points
       end
 
@@ -118,11 +79,8 @@ module Jekyll
       # --
       def self.get_point(*point)
         check_point(*point)
-
         @points[point[0]][point[1]]
-          .each_with_object([]) do |(_, v), a|
-            a.concat(v)
-          end
+          .sort_by(&:priority)
       end
 
       # --
@@ -139,7 +97,7 @@ module Jekyll
           "through #{point.first}"
 
         hooks.map do |v|
-          block.call(v)
+          block.call(v.block)
         end
       end
 
@@ -150,17 +108,12 @@ module Jekyll
       # @note this is what plugins should use.
       # @return [nil]
       # --
-      def self.register(*point, priority: 2, &block)
-        if priority > 3
-          raise ArgumentError,
-            "priority must be between 1 and 3"
-        end
-
+      def self.register(*point, priority: 48, &block)
         check_point(*point)
+        point_ = Point.new(priority, &block)
         out = @points[point[0]]
         out = out[point[1]]
-        out = out[priority]
-        out << block
+        out << point_
       end
 
       # --