jekyll-assets 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6232e0cf35a9ec33f5b9ac89ae3b851d5a011746
-  data.tar.gz: 9e40e80f28270152944ee1280fe19d0091718df4
+  metadata.gz: 6a9af72c69bf187c13262a1c40b58438cc756986
+  data.tar.gz: 26f6fb75cbc6dd8f708dcbcee9e073a6537acd32
 SHA512:
-  metadata.gz: 3b4ab0c20304eaf4675be53a0ef3971e279bc89da76131fd60a428cc9ba8df17970e94e0f65bd9c0954bb3f29d5179ecab87372e69dddf837cd3f054b5f757fb
-  data.tar.gz: 009df087377720ca2f8cb321bfadaca59051bd0543a323c2b0dcc1d62c807d84992680ba9caa0e35d660731577ed3f7b08482c91dee1dcc390c013912302336e
+  metadata.gz: 7d890e1af9866a98ea85418e0a0ab9bb161f665f8a305d7cc940a837adaf4b29ff5b3beceb585abce36de678b4a38419ecb3c4461f964006e9f4ac70468402f7
+  data.tar.gz: 6cde01d5b5df8579c015d88d874426e79a65c5e4ac12cb514558ddfaf41da975bd3619df93b65e67b399ec62477c981520f096422093418e41d48118102efb6a

data/README.md

@@ -250,9 +250,9 @@ end
 
 * CSS Auto Prefixer - add "autoprefixer-rails" to your Gemfile.
 * ES6 Transpiler (through Babel) - add "sprockets-es6" to your Gemfile.
+* Bootstrap - add "bootstrap-sass" to your Gemfile, and `@import 'boostrap-sprockets'; @import 'bootstrap'`
+* Font Awesome - add "font-awesome-sass" to your Gemfile, and `@import 'font-awesome-sprockets'; @import 'font-awesome'`
 * Image Magick - add "mini_magick" to your Gemfile, only works with `img`, `image`.
-* Bootstrap - add "bootstrap-sass" to your Gemfile and "@import 'bootstrap'"
-* Font Awesome - add "font-awesome-sass" to your Gemfile.
 * LESS - add "less" to your Gemfile
 
 ***Please note that some of these (if not all) have trouble with Rhino --

data/lib/jekyll/assets.rb

@@ -1,24 +1,20 @@
-# ----------------------------------------------------------------------------
 # Frozen-string-literal: true
 # Copyright: 2012 - 2016 - MIT License
 # Encoding: utf-8
-# ----------------------------------------------------------------------------
 
 require "sprockets"
 require "extras/all"
 require "pathutil"
 require "jekyll"
 
-require_relative "assets/env"
-require_relative "assets/version"
-require_relative "assets/patches"
-require_relative "assets/config"
-require_relative "assets/cached"
-require_relative "assets/hook"
-require_relative "assets/logger"
-require_relative "assets/hooks"
-require_relative "assets/liquid"
-require_relative "assets/addons"
-require_relative "assets/processors"
-require_relative "assets/manifest"
-require_relative "assets/proxies"
+requires = [ :liquid,
+  :patches, "", :hooks, :addons,
+  :proxies, :processors
+]
+
+requires.each do |part|
+  Pathutil.new(File.expand_path("../", __FILE__)).join("assets", part.to_s)
+    .glob("{*,**/*}.rb").map(&method(
+      :require
+    ))
+end

data/lib/jekyll/assets/addons/bootstrap.rb

@@ -4,4 +4,6 @@
 # Encoding: utf-8
 # ----------------------------------------------------------------------------
 
-try_require "bootstrap-sass"
+try_require "bootstrap-sass" do
+  Bootstrap.load!
+end

data/lib/jekyll/assets/addons/fontawesome.rb

@@ -4,4 +4,6 @@
 # Encoding: utf-8
 # ----------------------------------------------------------------------------
 
-try_require "font-awesome-sass"
+try_require "font-awesome-sass" do
+  FontAwesome::Sass.load!
+end

data/lib/jekyll/assets/env.rb

@@ -20,8 +20,8 @@ module Jekyll
         def init(jekyll)
           new(jekyll)
           jekyll.sprockets.excludes.map(&jekyll.config["exclude"].method(:<<))
-          jekyll.config["keep_files"] |= jekyll.sprockets.asset_config["prefix"] \
-            .gsub(/\A\//, "").to_a
+          jekyll.config["keep_files"] |= jekyll.sprockets.asset_config["prefix"].gsub(/\A\//, "").to_a
+          jekyll.config["exclude"].uniq!
         end
       end
 
@@ -208,7 +208,8 @@ module Jekyll
 
       def write_all
         assets = all_assets.partition { |v| v.is_a?(Liquid::Tag::ProxiedAsset) }
-        manifest.compile(assets.last.map(&:logical_path))
+        writeable_assets = assets.last.map(&:dependencies).push(assets.last).reduce(&:|)
+        manifest.compile(writeable_assets.map(&:logical_path))
 
         assets.first.map do |asset|
           asset.write_to(jekyll.in_dest_dir(File.join(asset_config["prefix"],

data/lib/jekyll/assets/helpers.rb

@@ -0,0 +1,74 @@
+module Jekyll
+  module Assets
+    module Helpers
+      extend Forwardable::Extended
+      rb_delegate :manifest, {
+        :to => :parent
+      }
+
+      # --
+      # @param [String] path the path you wish to resolve.
+      # Find the path to the asset.
+      # --
+      def asset_path(path, opts = {})
+        return path if Pathname.new(path).absolute?
+        asset = manifest.find(path).first
+
+        if asset
+          parent.used.add(asset)
+          parent.prefix_path(
+            parent.digest?? asset.digest_path : asset.logical_path
+          )
+        else
+          path
+        end
+      end
+
+      # --
+      # @param [String] path the path you wish to resolve.
+      # Pull the asset path and wrap it in url().
+      # --
+      def asset_url(path, opts = {})
+        "url(#{asset_path(
+          path, opts
+        )})"
+      end
+
+      # --
+      # Get access to the actual asset environment.
+      # @return [Jekyll::Assets::Env]
+      # --
+      def parent
+        environment.is_a?(Cached) ? environment.parent : environment
+      end
+
+      # --
+      # Creates font_url, font_path, image_path, image_url,
+      # img_path, and img_url for your pleasure.
+      # --
+      %W(font image img).each do |key|
+        define_method "#{key}_path" do |*args|
+          asset_path(
+            *args
+          )
+        end
+
+        #
+
+        define_method "#{key}_url" do |*args|
+          asset_url(
+            *args
+          )
+        end
+      end
+    end
+  end
+end
+
+#
+
+module Sprockets
+  class Context
+    prepend Jekyll::Assets::Helpers
+  end
+end

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

@@ -33,6 +33,12 @@ module Jekyll
 
         # --------------------------------------------------------------------
 
+        def integrity
+          return asset.integrity
+        end
+
+        # --------------------------------------------------------------------
+
         def width
           if image?
             dimensions.first

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

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

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

@@ -35,6 +35,14 @@ module Jekyll
 
           # ------------------------------------------------------------------
 
+          def integrity
+            Sprockets::DigestUtils.integrity_uri(
+              digest
+            )
+          end
+
+          # ------------------------------------------------------------------
+
           def cached?
             @_cached
           end
@@ -63,7 +71,9 @@ module Jekyll
           # ------------------------------------------------------------------
 
           def digest
-            Digest::SHA2.hexdigest(args.proxies.to_s)
+            Digest::SHA2.hexdigest(
+              args.proxies.to_s
+            )
           end
 
           # ------------------------------------------------------------------

data/lib/jekyll/assets/processors/less.rb

@@ -34,10 +34,10 @@ module Jekyll
         # --------------------------------------------------------------------
 
         def self.patch_tree(tree, context)
-          Sprockets::Helpers.instance_methods.reject { |v| v=~ /^(path_to_|assets_environment$)/ }.each do |m|
+          Helpers.instance_methods.each do |m|
             tree.functions[m.to_s.tr("_", "-")] = tree.functions[m.to_s] = lambda do |*args|
               args.last.tap do |o|
-                o[:quote] = "" # We handle that ourselves, fuck that.
+                o[:quote] = ""
                 o[:value] = context.send(m, args.last.toCSS().gsub(
                   /^"|"$/, ""
                 ))

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

@@ -10,7 +10,7 @@ module Jekyll
         # --------------------------------------------------------------------
 
         def self.call(context, jekyll = context[:environment].jekyll)
-          if context[:environment].parent.asset_config["features"]["liquid"] || \
+          if context[:environment].parent.asset_config["features"]["liquid"] ||
               File.extname(context[:filename]) == ".liquid"
 
             payload_ = jekyll.site_payload

data/lib/jekyll/assets/version.rb

@@ -6,6 +6,6 @@
 
 module Jekyll
   module Assets
-    VERSION="2.2.0"
+    VERSION="2.2.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-assets
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Jordon Bedwell
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-29 00:00:00.000000000 Z
+date: 2016-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -26,20 +26,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.3'
-- !ruby/object:Gem::Dependency
-  name: sprockets-helpers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: fastimage
   requirement: !ruby/object:Gem::Requirement
@@ -168,7 +154,6 @@ files:
 - Rakefile
 - lib/jekyll-assets.rb
 - lib/jekyll/assets.rb
-- lib/jekyll/assets/addons.rb
 - lib/jekyll/assets/addons/autoprefixer.rb
 - lib/jekyll/assets/addons/bootstrap.rb
 - lib/jekyll/assets/addons/fontawesome.rb
@@ -177,13 +162,12 @@ files:
 - lib/jekyll/assets/cached.rb
 - lib/jekyll/assets/config.rb
 - lib/jekyll/assets/env.rb
+- lib/jekyll/assets/helpers.rb
 - lib/jekyll/assets/hook.rb
-- lib/jekyll/assets/hooks.rb
 - lib/jekyll/assets/hooks/cache.rb
 - lib/jekyll/assets/hooks/compression.rb
 - lib/jekyll/assets/hooks/config.rb
 - lib/jekyll/assets/hooks/erb.rb
-- lib/jekyll/assets/hooks/helpers.rb
 - lib/jekyll/assets/hooks/jekyll/drops.rb
 - lib/jekyll/assets/hooks/jekyll/setup.rb
 - lib/jekyll/assets/hooks/jekyll/write.rb
@@ -191,7 +175,6 @@ files:
 - lib/jekyll/assets/hooks/sources.rb
 - lib/jekyll/assets/hooks/sprockets.rb
 - lib/jekyll/assets/hooks/version.rb
-- lib/jekyll/assets/liquid.rb
 - lib/jekyll/assets/liquid/drop.rb
 - lib/jekyll/assets/liquid/filters.rb
 - lib/jekyll/assets/liquid/tag.rb
@@ -202,15 +185,11 @@ files:
 - lib/jekyll/assets/liquid/tag/proxies.rb
 - lib/jekyll/assets/logger.rb
 - lib/jekyll/assets/manifest.rb
-- lib/jekyll/assets/patches.rb
 - lib/jekyll/assets/patches/jekyll/site.rb
 - lib/jekyll/assets/patches/kernel.rb
 - lib/jekyll/assets/patches/sprockets/asset.rb
-- lib/jekyll/assets/patches/sprockets/helpers.rb
-- lib/jekyll/assets/processors.rb
 - lib/jekyll/assets/processors/less.rb
 - lib/jekyll/assets/processors/liquid.rb
-- lib/jekyll/assets/proxies.rb
 - lib/jekyll/assets/proxies/magick.rb
 - lib/jekyll/assets/version.rb
 homepage: http://github.com/jekyll/jekyll-assets/

data/lib/jekyll/assets/addons.rb

@@ -1,5 +0,0 @@
-require_relative "addons/less"
-require_relative "addons/bootstrap"
-require_relative "addons/autoprefixer"
-require_relative "addons/fontawesome"
-require_relative "addons/javascript"

data/lib/jekyll/assets/hooks.rb

@@ -1,18 +0,0 @@
-# ----------------------------------------------------------------------------
-# Frozen-string-literal: true
-# Copyright: 2012 - 2016 - MIT License
-# Encoding: utf-8
-# ----------------------------------------------------------------------------
-
-require_relative "hooks/jekyll/drops"
-require_relative "hooks/jekyll/setup"
-require_relative "hooks/jekyll/write"
-require_relative "hooks/compression"
-require_relative "hooks/config"
-require_relative "hooks/helpers"
-require_relative "hooks/logger"
-require_relative "hooks/sources"
-require_relative "hooks/sprockets"
-require_relative "hooks/version"
-require_relative "hooks/cache"
-require_relative "hooks/erb"

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

@@ -1,13 +0,0 @@
-# ----------------------------------------------------------------------------
-# Frozen-string-literal: true
-# Copyright: 2012 - 2016 - MIT License
-# Encoding: utf-8
-# ----------------------------------------------------------------------------
-
-Jekyll::Assets::Hook.register :env, :init do
-  Sprockets::Helpers.configure do |config|
-    config.manifest = manifest
-    config.prefix = prefix_path
-    config.digest = digest?
-  end
-end

data/lib/jekyll/assets/liquid.rb

@@ -1,15 +0,0 @@
-# ----------------------------------------------------------------------------
-# Frozen-string-literal: true
-# Copyright: 2012 - 2016 - MIT License
-# Encoding: utf-8
-# ----------------------------------------------------------------------------
-
-module Jekyll
-  module Assets
-    module Liquid
-      require_relative "liquid/drop"
-      require_relative "liquid/filters"
-      require_relative "liquid/tag"
-    end
-  end
-end

data/lib/jekyll/assets/patches.rb

@@ -1,10 +0,0 @@
-# ----------------------------------------------------------------------------
-# Frozen-string-literal: true
-# Copyright: 2012 - 2016 - MIT License
-# Encoding: utf-8
-# ----------------------------------------------------------------------------
-
-require_relative "patches/sprockets/asset"
-require_relative "patches/sprockets/helpers"
-require_relative "patches/jekyll/site"
-require_relative "patches/kernel"

data/lib/jekyll/assets/patches/sprockets/helpers.rb

@@ -1,31 +0,0 @@
-# ----------------------------------------------------------------------------
-# Frozen-string-literal: true
-# Copyright: 2012 - 2016 - MIT License
-# Encoding: utf-8
-# ----------------------------------------------------------------------------
-
-require "sprockets/helpers"
-Sprockets::Helpers.instance_methods.reject { |v| v=~ /^(path_to_|assets_environment$)/ }.each do |m|
-  Sprockets::Helpers.send(:define_method, m.to_s.gsub(/_path$/, "_url")) do |*args|
-    %Q(url("#{send(m, *args)}"))
-  end
-end
-
-module Sprockets
-  module Helpers
-    alias_method :_old_ap, :asset_path
-
-    def rcache
-      return @resolver_cache ||= {
-        #
-      }
-    end
-
-    def asset_path(asset, h = {})
-      return unless out = _old_ap(asset)
-      path = environment.find_asset(resolve_without_compat(asset))
-      environment.parent.used.add(path)
-    out
-    end
-  end
-end

data/lib/jekyll/assets/processors.rb

@@ -1 +0,0 @@
-require_relative "processors/liquid"

data/lib/jekyll/assets/proxies.rb

@@ -1 +0,0 @@
-require_relative "proxies/magick"