jekyll-assets 3.0.6 → 3.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d245aff52390866323d9c7bf20d14fe63c28a0a95ae7fe535f3c6df506e7f7a5
-  data.tar.gz: 85d98b9f5543ea588fd5acf51d801ad98be4fa8e5b2998b6b5a279f3fdcddd46
+  metadata.gz: b782c8280d7d3a50234be8ed6923a652fd4fc64a9d48a73c0a6149ba488233ad
+  data.tar.gz: c3ee8170a33b679ff744325d5a2edde5fb28185cb54ebf8b804e24990a1dd4a1
 SHA512:
-  metadata.gz: 92544fcdb40ca56d6b76a77e11faa199e7f2da477d597658673e504136a30ac54198dcddda36682803c6dc95ea1ded0193fbb82105210a297523e8b230ddcc00
-  data.tar.gz: 074e304b51a467c634c80acb05c600b698ba426e27a75f5794fb71af8968bda65979619ef1e8286c8fd543c8e4180d5ca04a4d8f434e5905451abfdfb44b0661
+  metadata.gz: 988839d356b82ff5487241eda8889fbb7cdcfc510f58369b41af37af503500099e1bd359a3f4909e13388804140294474c026080e2340bd3352c825ffb238276
+  data.tar.gz: e4e3b85799a51f19575f1532c93f4871f47eea6121ae05b20dab5f2d3c0b79a3f04ca5b76b17d29d7959fc1fb24ce8a21d9eb2ba0b7c3bc9f60ccb8d30c71f28

data/README.md

@@ -5,6 +5,8 @@
 ![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)
 
+***Looking for information on what's changed? See https://envygeeks.io/2017/11/21/jekyll-assets-3-released***
+
 # Jekyll Assets
 
 Jekyll Assets is a drop in [asset pipeline](http://guides.rubyonrails.org/asset_pipeline.html) that uses [Sprockets](https://github.com/rails/sprockets) to build specifically for Jekyll. It utilizes [Sprockets](https://github.com/rails/sprockets), and [Jekyll](https://jekyllrb.com) to try and achieve a clean, and extensible assets platform that supports plugins, caching, converting your assets. It even supports proxying of said assets in a way that does not interfere with either [Sprockets](https://github.com/rails/sprockets), or [Jekyll](https://jekyllrb.com), or your own source.  By default you can add Jekyll Assets to your Gemfile, as a plugin, and have it act as a drop-in replacement for Jekyll's basic SASS processors, with you only having to add it to your Gemfile, and updating your `<img>`, and `<link>`.

data/lib/jekyll/assets.rb

@@ -17,6 +17,7 @@ def require_all(*globs)
   end }
 end
 
+# --
 require_relative "assets/env"
 Jekyll::Hooks.register :site, :post_read, priority: 99 do |o|
   unless o.sprockets
@@ -30,6 +31,6 @@ end
 #   stuff block and be done just incase something else relies
 #   on our stuff to do their stuff.  Such as reloaders.
 # --
-Jekyll::Hooks.register :site, :post_render, priority: 99 do |o|
+Jekyll::Hooks.register :site, :post_write, priority: 99 do |o|
   o&.sprockets&.write_all
 end

data/lib/jekyll/assets/default.rb

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

data/lib/jekyll/assets/drop.rb

@@ -11,7 +11,7 @@ module Jekyll
     class Drop < Liquid::Drop
       extend Forwardable::Extended
       def initialize(path, jekyll:)
-        @path = path
+        @path = path.to_s
         @sprockets = jekyll.sprockets
         @jekyll = jekyll
         @asset = nil

data/lib/jekyll/assets/extensible.rb

@@ -41,6 +41,20 @@ module Jekyll
         }
       end
 
+      # --
+      def self.internal!
+        if name.start_with?("Jekyll::Assets")
+          requirements[:internal] = true
+        end
+      end
+
+      # --
+      def self.internal?
+        requirements[
+          :internal
+        ]
+      end
+
       # --
       # @note a type is a "content type"
       # Allows you to use types to determine if this class fits.
@@ -73,7 +87,8 @@ module Jekyll
       #   can limit your surface for an extensible plugin.  For
       #   example if you only work for
       # --
-      [%i(arg_keys args), %i(content_types types)].each do |(k, v)|
+      m = [%i(content_types types), %i(arg_keys args)]
+      m.each do |(k, v)|
         instance_eval <<-RUBY
           def self.#{k}(*a)
             requirements[:#{v}].concat(a)

data/lib/jekyll/assets/plugins/html/defaults/audio.rb

@@ -9,6 +9,7 @@ module Jekyll
     class Default
       class Audio < Default
         content_types %r!^audio/[a-zA-Z0-9\-_]+$!
+        internal!
 
         # --
         def set_src

data/lib/jekyll/assets/plugins/html/defaults/component.rb

@@ -9,6 +9,7 @@ module Jekyll
     class Default
       class Component < Default
         content_types "text/html"
+        internal!
 
         # --
         def set_href

data/lib/jekyll/assets/plugins/html/defaults/css.rb

@@ -8,8 +8,9 @@ module Jekyll
   module Assets
     class Default
       class CSS < Default
-        static rel: "stylesheet", type: "text/css"
         content_types "text/css"
+        static rel: "stylesheet", type: "text/css"
+        internal!
 
         # --
         def set_href

data/lib/jekyll/assets/plugins/html/defaults/favicon.rb

@@ -9,6 +9,7 @@ module Jekyll
     class Default
       class Favicon < Default
         content_types "image/x-icon"
+        internal!
 
         # --
         def set_rel

data/lib/jekyll/assets/plugins/html/defaults/img.rb

@@ -8,7 +8,8 @@ module Jekyll
   module Assets
     class Default
       class Img < Default
-        content_types %r!^image/(?\!x-icon$)[a-zA-Z0-9\-_+]+$!
+        content_types %r!^image/(?\!x-icon$)[a-zA-Z0-9\-_\+]+$!
+        internal!
 
         # --
         def set_src

data/lib/jekyll/assets/plugins/html/defaults/js.rb

@@ -8,8 +8,9 @@ module Jekyll
   module Assets
     class Default
       class JS < Default
-        content_types "application/javascript"
         static type: "text/javascript"
+        content_types "application/javascript"
+        internal!
 
         # --
         def set_src

data/lib/jekyll/assets/plugins/html/defaults/vid.rb

@@ -9,6 +9,7 @@ module Jekyll
     class Default
       class Video < Default
         content_types %r!^video/.*$!
+        internal!
 
         # --
         def set_src

data/lib/jekyll/assets/plugins/html/img.rb

@@ -9,7 +9,7 @@ module Jekyll
   module Assets
     class HTML
       class IMG < HTML
-        content_types %r!^image/(?\!x-icon$)[a-zA-Z0-9\-_+]+$!
+        content_types %r!^image/(?\!x-icon$)[a-zA-Z0-9\-_\+]+$!
 
         # --
         def run

data/lib/jekyll/assets/proxy.rb

@@ -82,8 +82,7 @@ module Jekyll
       end
 
       def self.digest(args)
-        Digest::SHA256.hexdigest(args.instance_variable_get(
-          :@raw))[0, 6]
+        Digest::SHA256.hexdigest(args.to_h.inspect)[0, 6]
       end
 
       # --

data/lib/jekyll/assets/tag.rb

@@ -80,7 +80,6 @@ module Jekyll
       # --
       rescue Sprockets::FileNotFound => e
         e_not_found(e, {
-          args: args,
           ctx: ctx,
         })
       # --

data/lib/jekyll/assets/version.rb

@@ -4,6 +4,6 @@
 
 module Jekyll
   module Assets
-    VERSION = "3.0.6"
+    VERSION = "3.0.7"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-assets
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 3.0.7
 platform: ruby
 authors:
 - Jordon Bedwell
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-12 00:00:00.000000000 Z
+date: 2018-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -225,7 +225,6 @@ files:
 - lib/jekyll/assets/patches/site.rb
 - lib/jekyll/assets/plugins.rb
 - lib/jekyll/assets/plugins/bootstrap.rb
-- lib/jekyll/assets/plugins/closure_comments.rb
 - lib/jekyll/assets/plugins/font-awesome.rb
 - lib/jekyll/assets/plugins/frontmatter.rb
 - lib/jekyll/assets/plugins/html/audio.rb

data/lib/jekyll/assets/plugins/closure_comments.rb

@@ -1,32 +0,0 @@
-# Frozen-string-literal: true
-# Copyright: 2012 - 2018 - MIT License
-# Encoding: utf-8
-
-module Jekyll
-  module Assets
-    module Plugins
-      module ClosureComments
-        def self.call(input)
-          theregex = %r!/\*(\W+@alternat(e|ive)\W+)\*/!
-          input[:data].gsub!(theregex, "/*!\\1*/")
-        end
-      end
-
-      # --
-      %w(text/css text/scss text/sass).each do |v|
-        Sprockets.register_preprocessor v, ClosureComments
-      end
-    end
-  end
-end
-
-# --
-Jekyll::Assets::Hook.register :asset, :before_write do |v|
-  theregex = %r!/\*\!(\W+@alternat(e|ive)\W+)\*/;?!
-
-  if v.content_type == "text/css"
-    src = v.to_s.gsub(theregex, "/*\\1*/")
-    v.metadata[:digest] = Sprockets::DigestUtils.digest(src)
-    v.instance_variable_set(:@source, src)
-  end
-end