jekyll-assets 3.0.3 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e09e231ecd354951decf010d5f8193058bcc351e
-  data.tar.gz: f555fc1f07628cef09203f1dbb7436349830b473
+  metadata.gz: 956874eaef40060f91ee70fa12d341165a14b586
+  data.tar.gz: 2798261d1cf3db699cfa830c77eb0f8d15acecc7
 SHA512:
-  metadata.gz: a38a8ff2fea63684ddc9f5aea3631fad09aa13082e84c42898b7ea49a0bbaff92584ef78479eee76959de8735a9cdf9e511a5d46ba446d403ea594f9592cd0e8
-  data.tar.gz: b0321b53da8d9de1bab59c7224bf66d9768c2c7db12a24e84d457991b6312a905d61152457b640461570c5d38ce44a3e9232a9e03cb3028c5537158e5188b875
+  metadata.gz: 900c2f932b8abd7a5278ade5b7da07c38df283d45add5e8f17e4ba79b83200c861567ea6d2bd246ea2e0d96fc4ddecf7956efda2747ac7216a1b6cb965c1432a
+  data.tar.gz: 76db8348452356b0b275089da30d2ffa93cd5e2b24634a9ebcf5e42bb90867ef65247241fc3732dfb7efa6ed0f72564d70745ba97d5c29c09006264dc95a009f

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/coverage/github/envygeeks/jekyll-assets.svg?style=for-the-badge)](https://codeclimate.com/github/envygeeks/jekyll-assets/test_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://envygeeks.io#donate)
+[![Donate](https://img.shields.io/badge/-DONATE-yellow.svg?style=for-the-badge)](https://www.paypal.com/donate/?token=2YE-4wLE2dSgtPaQqTlQgcD2BvKv_tkHUD7GJYs4OskLI0l6XFEAKpNc5rIG6-bAeMFdom)
 ![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)
 
@@ -359,6 +359,7 @@ We have basic support for WebComponents when using Sprockets `~> 4.0.0.beta`, th
 |---|---|---|---|
 | `:env` | `:before_init` | ✔ | ✗ |
 | `:env` | `:after_init` | ✔ | ✗ |
+| `:env` | `:after_write` | ✔ | ✗ |
 | `:config` | `:before_merge` | ✗ | `Config{}` |
 | `asset` | `:before_compile` | ✗ | `Asset`, `Manifest` |
 

data/Rakefile

@@ -2,7 +2,7 @@
 # Copyright: 2012 - 2017 - MIT License
 # Encoding: utf-8
 
-task(:spec) { sh "script/test" }
-task(:test) { sh "script/test" }
-task(:rubocop) { sh "script/lint" }
-task(:lint) { sh "script/lint" }
+task(:spec) { exec "script/test" }
+task(:test) { exec "script/test" }
+task(:rubocop) { exec "script/lint" }
+task(:lint) { exec "script/lint" }

data/lib/jekyll/assets.rb

@@ -18,6 +18,7 @@ def require_all(*globs)
 end
 
 require_relative "assets/env"
-Jekyll::Hooks.register :site, :post_read do |o|
-  Jekyll::Assets::Env.new(o)
+Jekyll::Hooks.register(:site, :post_read) {  |o| Jekyll::Assets::Env.new(o) }
+Jekyll::Hooks.register :site, :post_write do |o|
+  o&.sprockets&.write_all
 end

data/lib/jekyll/assets/env.rb

@@ -28,6 +28,7 @@ module Jekyll
 
       # --
       attr_reader :manifest
+      attr_accessor :assets_to_write
       attr_reader :asset_config
       attr_reader :jekyll
 
@@ -42,6 +43,7 @@ module Jekyll
 
         super()
         @jekyll = jekyll
+        @assets_to_write = []
         @manifest = Manifest.new(self, in_dest_dir)
         @jekyll.sprockets = self
         @logger = Logger
@@ -116,6 +118,18 @@ module Jekyll
         end
       end
 
+      # --
+      def write_all
+        manifest.compile(*assets_to_write); @asset_to_write = []
+        Logger.debug "Calling hooks for env, after_write" do
+          Hook.trigger :env, :after_write do |h|
+            instance_eval(&h)
+          end
+        end
+
+        true
+      end
+
       # --
       private
       def ignore_caches!
@@ -147,8 +161,8 @@ module Jekyll
       def precompile!
         assets = asset_config[:precompile]
         assets.map do |v|
-          v !~ %r!\*! ? manifest.compile(v) : glob_paths(v).each do |sv|
-            manifest.compile(sv)
+          v !~ %r!\*! ? @assets_to_write |= [sv] : glob_paths(v).each do |sv|
+            @assets_to_write |= [sv]
           end
         end
 

data/lib/jekyll/assets/extensible.rb

@@ -15,7 +15,6 @@ module Jekyll
       def initialize(asset:, args:, ctx:)
         @args = args
         @env = ctx.registers[:site].sprockets
-        @jekyll = ctx.registers[:site]
         @jekyll = @env.jekyll
         @asset = asset
         @ctx = ctx

data/lib/jekyll/assets/hook.rb

@@ -30,6 +30,12 @@ module Jekyll
             2 => [],
             3 => [],
           },
+
+          after_write: {
+            1 => [],
+            2 => [],
+            3 => [],
+          },
         },
 
         config: {

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

@@ -9,16 +9,9 @@ module Jekyll
   module Assets
     class HTML
       class Audio < HTML
-        content_types "audio/aiff"
-        content_types "audio/basic"
-        content_types "audio/mpeg"
-        content_types "audio/midi"
-        content_types "audio/wave"
-        content_types "audio/mp4"
-        content_types "audio/ogg"
-        content_types "audio/flac"
-        content_types "audio/aac"
+        content_types %r!^audio/[a-zA-Z0-9\-_]+$!
 
+        # --
         def run
           Nokogiri::HTML::Builder.with(doc) do |d|
             d.audio("No support for audio.", args.to_h({

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

@@ -11,6 +11,7 @@ module Jekyll
       class CSS < HTML
         content_types "text/css"
 
+        # --
         def run
           Nokogiri::HTML::Builder.with(@doc) do |d|
             attr = @args.to_h(html: true, skip: HTML.skips)

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

@@ -8,15 +8,7 @@ module Jekyll
   module Assets
     class Default
       class Audio < Default
-        content_types "audio/aiff"
-        content_types "audio/basic"
-        content_types "audio/mpeg"
-        content_types "audio/midi"
-        content_types "audio/wave"
-        content_types "audio/mp4"
-        content_types "audio/ogg"
-        content_types "audio/flac"
-        content_types "audio/aac"
+        content_types %r!^audio/[a-zA-Z0-9\-_]+$!
 
         # --
         def set_src

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

@@ -10,6 +10,7 @@ module Jekyll
       class Component < Default
         content_types "text/html"
 
+        # --
         def set_href
           dpath = @asset.digest_path
           return @args[:href] = @asset.url if @asset.is_a?(Url)

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

@@ -8,16 +8,18 @@ module Jekyll
   module Assets
     class Default
       class CSS < Default
-        static rel: "stylesheet"
+        static rel: "stylesheet", type: "text/css"
         content_types "text/css"
-        static type: "text/css"
 
+        # --
         def set_href
+          return if @args[:inline]
           return @args[:href] = @asset.url if @asset.is_a?(Url)
           @args[:href] = @env.prefix_url(@asset
             .digest_path)
         end
 
+        # --
         def set_integrity
           return unless integrity?
           @args[:integrity] = @asset.integrity

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

@@ -8,15 +8,9 @@ module Jekyll
   module Assets
     class Default
       class Img < Default
-        content_types "image/bmp"
-        content_types "image/webp"
-        content_types "image/svg+xml"
-        content_types "image/jpeg"
-        content_types "image/tiff"
-        content_types "image/gif"
-        content_types "image/png"
-        content_types "image/jpg"
+        content_types %r!^image/(?\!x-icon$)[a-zA-Z0-9\-_]+$!
 
+        # --
         def set_src
           dpath = @asset.digest_path
           return @args[:src] = @asset.url if @asset.is_a?(Url)
@@ -24,6 +18,7 @@ module Jekyll
           @args[:src] = @asset.data_uri
         end
 
+        # --
         def set_integrity
           return unless integrity?
           @args[:integrity] = @asset.integrity

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

@@ -8,16 +8,18 @@ module Jekyll
   module Assets
     class Default
       class JS < Default
-        content_types "text/javascript"
         content_types "application/javascript"
         static type: "text/javascript"
 
+        # --
         def set_src
+          return if @args[:inline]
           return @args[:src] = @asset.url if @asset.is_a?(Url)
           @args[:src] = @env.prefix_url(@asset
             .digest_path)
         end
 
+        # --
         def set_integrity
           return unless integrity?
           @args[:integrity] = @asset.integrity

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

@@ -8,9 +8,7 @@ module Jekyll
   module Assets
     class Default
       class Video < Default
-        content_types "video/avi"
-        content_types "video/webm"
-        content_types "video/mp4"
+        content_types %r!^video/.*$!
 
         # --
         def set_src

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

@@ -9,14 +9,7 @@ module Jekyll
   module Assets
     class HTML
       class IMG < HTML
-        content_types "image/bmp"
-        content_types "image/webp"
-        content_types "image/svg+xml"
-        content_types "image/jpeg"
-        content_types "image/tiff"
-        content_types "image/gif"
-        content_types "image/png"
-        content_types "image/jpg"
+        content_types %r!^image/(?\!x-icon$)[a-zA-Z0-9\-_]+$!
 
         # --
         def run

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

@@ -9,9 +9,9 @@ module Jekyll
   module Assets
     class HTML
       class JS < HTML
-        content_types "application/javascript",
-          "text/javascript"
+        content_types "application/javascript"
 
+        # --
         def run
           if @asset.is_a?(Url) && @args[:inline]
             raise Tag::MixedArg, "@external", "@inline"

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

@@ -9,14 +9,7 @@ module Jekyll
   module Assets
     class HTML
       class Pic < HTML
-        content_types "image/webp"
-        content_types "image/jpeg"
-        content_types "image/tiff"
-        content_types "image/svg+xml"
-        content_types "image/bmp"
-        content_types "image/gif"
-        content_types "image/png"
-        content_types "image/jpg"
+        content_types %r!^image/(?\!x-icon$)[a-zA-Z0-9\-_]+$!
 
         # --
         # @todo this should be reworked so we don't need to use

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

@@ -9,10 +9,9 @@ module Jekyll
   module Assets
     class HTML
       class Video < HTML
-        content_types "video/avi"
-        content_types "video/webm"
-        content_types "video/mp4"
+        content_types %r!^video/.*$!
 
+        # --
         def run
           Nokogiri::HTML::Builder.with(doc) do |d|
             d.video("No support for video.", args.to_h({

data/lib/jekyll/assets/tag.rb

@@ -160,7 +160,7 @@ module Jekyll
         original = env.find_asset!(args[:argv1])
         Default.set(args, ctx: ctx, asset: original)
         out = Proxy.proxy(original, args: args, ctx: ctx)
-        env.manifest.compile(out.logical_path)
+        env.assets_to_write |= [out.logical_path]
 
         Default.set(args, {
           ctx: ctx, asset: out

data/lib/jekyll/assets/version.rb

@@ -4,6 +4,6 @@
 
 module Jekyll
   module Assets
-    VERSION = "3.0.3"
+    VERSION = "3.0.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-assets
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
 platform: ruby
 authors:
 - Jordon Bedwell
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-29 00:00:00.000000000 Z
+date: 2017-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs