jekyll-assets 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1beb6828d5534b96a31042623acb912c13b3e38
-  data.tar.gz: 688fabb88be88681c40954736b663d216f7ad93d
+  metadata.gz: d17d63ec62ef0f6e61326c18e9a01c02f249c1b4
+  data.tar.gz: 9c0151bbd1166ab902681c0c62786a45a76df94f
 SHA512:
-  metadata.gz: c085055cc33ff864f394b22d0f98530f8d3d71a871baf01f7dd00d8cc59151c9907e9ce1f65b46d828fb93086fd70d80df1dd80b2115cd6961aebf05e8565f29
-  data.tar.gz: 5b0f8f7cc6bb1010c23be8a2ffb15f744283c2ada9b56ed9010dd5fa7c9407ded47742117e2d8017fd6d415f8e9bd28d6e6937643563cd4ed2c388a7f9947d81
+  metadata.gz: edb70acdd15978e34169e2f16b6936ff7c54339b86520dfac287e23663d16359a5823f93caafae5a23bb7586c6bfa223b50333f20725044a39ce03fd04674ff5
+  data.tar.gz: 4a3d836bbff6292ecf631e96eb6f591b7b0b4b921b8283c569d039e971980a451f563180a59ebdfcf9fd67451a7d52512282d5c91e72108bfe3d997d40ac9840

data/README.md

@@ -69,6 +69,7 @@ assets:
 
   features:
     liquid: true | false | default: false
+    integrity: true | false | default: false
     automatic_img_size: true | false | n(fixnum): 2,4,6,8 | default: true
     automatic_img_alt : true | false | default: true
 ```
@@ -236,6 +237,14 @@ filter by way of filter arguments, take the following example:
 {{ src | img : "magick:2x magick:quality:92" }}
 ```
 
+### Jekyll Assets Multi
+
+Jekyll Assets has a special called `jekyll_asset_multi` which is meant to be used for things like the header, where it would be nice to be able to include multiple assets at once.  You can use it like so:
+
+```liquid
+{{ 'css:bundle.css "js:bundle.js async:true"' | jekyll_asset_multi }}
+```
+
 ## Hooks
 
 * `:env => [:init]`

data/lib/jekyll/assets/config.rb

@@ -28,6 +28,7 @@ module Jekyll
         },
 
         "features" => {
+          "integrity" => false,
           "automatic_img_alt"  => true,
           "automatic_img_size" => true,
           "liquid" => false

data/lib/jekyll/assets/liquid/filters.rb

@@ -11,13 +11,32 @@ module Jekyll
         ACCEPTABLE_FILTERS = [:css, :img, :asset_path, :stylesheet,
           :javascript, :style, :img, :js]
 
-        # --------------------------------------------------------------------
-
+        # --
+        # The base filters.
+        # --
         ACCEPTABLE_FILTERS.each do |val|
           define_method val do |path, args = ""|
-            Tag.send(:new, val, "#{path} #{args}", "").render(@context)
+            Tag.send(:new, val, "#{path} #{args}", "").render(
+              @context
+            )
           end
         end
+
+        # --
+        # Include multiple assets.
+        # @return [Strings]
+        # --
+        def jekyll_asset_multi(assets)
+          return Shellwords.shellsplit(assets).map { |s| s.split(":", 2) }.map do |tag, arguments|
+            Tag.send(:new, tag, arguments, "").render(
+              @context
+            )
+          end \
+
+          .join(
+            "\n"
+          )
+        end
       end
 
       #

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

@@ -52,9 +52,9 @@ module Jekyll
         # --------------------------------------------------------------------
 
         Tags = {
-          "css" => %(<link type="text/css" rel="stylesheet" href="%s" integrity="%s"%s>),
-          "js"  => %(<script type="text/javascript" src="%s" integrity="%s"%s></script>),
-          "img" => %(<img src="%s" integrity="%s"%s>)
+          "css" => %(<link type="text/css" rel="stylesheet" href="%s"%s>),
+          "js"  => %(<script type="text/javascript" src="%s"%s></script>),
+          "img" => %(<img src="%s"%s>)
         }.freeze
 
         # --------------------------------------------------------------------
@@ -127,7 +127,7 @@ module Jekyll
           return path if @tag == "asset_path"
           return asset.to_s if @tag == "asset" || @tag == "asset_source"
           data = args.key?(:data) && args[:data].key?(:uri) ? asset.data_uri : path
-          format(Tags[@tag], data, asset.integrity, args.to_html)
+          format(Tags[@tag], data, args.to_html)
         end
 
         # --------------------------------------------------------------------

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

@@ -1,15 +1,19 @@
+# Frozen-string-literal: true
+# Copyright: 2012 - 2016 - MIT License
+# Encoding: utf-8
+
 module Jekyll
   module Assets
     module Liquid
       class Tag
         module Defaults
           require_relative "defaults/image"
+          require_relative "defaults/sha"
 
-          # ------------------------------------------------------------------
+          # --
           # TODO: In 3.0 env needs to be enforced, right now it's not
           #   because it's maintain 2.0 API.
-          # ------------------------------------------------------------------
-
+          # --
           module_function
           def set_defaults_for!(tag, args, asset, env = nil)
             constants.select { |const| const_get(const).for?(tag) }.each do |const|

data/lib/jekyll/assets/liquid/tag/defaults/sha.rb

@@ -0,0 +1,52 @@
+# Frozen-string-literal: true
+# Copyright: 2012 - 2016 - MIT License
+# Encoding: utf-8
+
+module Jekyll
+  module Assets
+    module Liquid
+      class Tag
+        module Defaults
+          class Sha
+
+            # --
+            # What we plan to accept for.
+            # --
+            def self.for?(tag)
+              return tag == "css" || tag == "js"
+            end
+
+            # --
+            # Initialize a new instance.
+            # --
+            def initialize(args, asset, env)
+              @args = args
+              @asset = asset
+              @env = env
+            end
+
+            # --
+            # Run the defaults.
+            # --
+            def set!
+              set_integrity
+            end
+
+            # --
+            # Set the integrity attribute.
+            # @return [nil]
+            # --
+            def set_integrity
+              @args.args[:html] ||= {}
+              if @env.asset_config["features"]["integrity"]
+                @args.args[:html]["integrity"] = @asset.integrity
+                @args.args[:html]["crossorigin"] = "anonymous" \
+                  unless @args.args[:html]["crossorigin"]
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/jekyll/assets/version.rb

@@ -4,6 +4,6 @@
 
 module Jekyll
   module Assets
-    VERSION="2.2.3"
+    VERSION="2.2.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-assets
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - Jordon Bedwell
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-30 00:00:00.000000000 Z
+date: 2016-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -179,6 +179,7 @@ files:
 - lib/jekyll/assets/liquid/tag.rb
 - lib/jekyll/assets/liquid/tag/defaults.rb
 - lib/jekyll/assets/liquid/tag/defaults/image.rb
+- lib/jekyll/assets/liquid/tag/defaults/sha.rb
 - lib/jekyll/assets/liquid/tag/parser.rb
 - lib/jekyll/assets/liquid/tag/proxied_asset.rb
 - lib/jekyll/assets/liquid/tag/proxies.rb