jekyll-assets 2.4.0 → 3.0.0

data/lib/jekyll/assets/url.rb

@@ -0,0 +1,23 @@
+# Frozen-string-literal: true
+# Copyright: 2012 - 2017 - MIT License
+# Encoding: utf-8
+
+module Jekyll
+  module Assets
+    # --
+    # Inherits from and overrides some of Sprockets asset,
+    #   this way we can have some external assets that do not
+    #   break the way we work or the way Sprockets works.
+    # --
+    class Url < Sprockets::Asset
+      alias hexdigest id
+      alias digest_path filename
+      alias url filename
+      alias digest id
+
+      def integrity
+        nil
+      end
+    end
+  end
+end

data/lib/jekyll/assets/utils.rb

@@ -0,0 +1,348 @@
+# Frozen-string-literal: true
+# Copyright: 2012 - 2017 - MIT License
+# Encoding: utf-8
+
+module Jekyll
+  module Assets
+    module Utils
+      def raw_precompiles
+        asset_config[:raw_precompile].each_with_object([]) do |v, a|
+          if v.is_a?(Hash)
+            dst, src = in_dest_dir.join(v[:dst]).tap(&:mkdir_p), v[:src]
+            glob_paths(src).each do |sv|
+              a << {
+                src: sv,
+                full_dst: dst.join(sv.basename),
+                dst: dst,
+              }
+            end
+          else
+            src = glob_paths(v).first
+
+            next unless src
+            dst = in_dest_dir(strip_paths(src))
+            dst.parent.mkdir_p
+
+            a << {
+              src: src,
+              full_dst: dst,
+              dst: dst,
+            }
+          end
+        end
+      end
+
+      # --
+      def find_assets_by_glob(glob)
+        glob_paths(glob).map do |v|
+          find_asset!(v.to_s)
+        end
+      end
+
+      # --
+      def glob_paths(glob)
+        out = []
+
+        paths.each do |sv|
+          sv = Pathutil.new(sv)
+
+          if sv.directory?
+            out.concat(sv.glob(glob).to_a)
+          end
+        end
+
+        out
+      end
+
+      # --
+      def url_asset(url, type:)
+        name = File.basename(url)
+        old_ = Env.old_sprockets?
+
+        Url.new(*[old_ ? self : nil, {
+          name: name,
+          filename: url,
+          content_type: type,
+          load_path: File.dirname(url),
+          id: Digest::SHA256.hexdigest(url),
+          logical_path: name,
+          metadata: {},
+          source: "",
+          uri: url,
+        }].compact)
+      end
+
+      # --
+      # @param [String] url
+      # @return [Sprockets::Asset]
+      # Wraps around an external url and so it can be wrapped into
+      #  the rest of Jekyll-Assets with little trouble.
+      # --
+      def external_asset(url, args:)
+        if args[:asset]&.key?(:type)
+          url_asset(url, {
+            type: args[:asset][:type],
+          })
+
+        else
+          _, type = Sprockets.match_path_extname(url, Sprockets.mime_exts)
+          logger.debug "no type for #{url}, assuming image/*" unless type
+          url_asset(url, {
+            type: type || "image/jpeg",
+          })
+        end
+      end
+
+      # --
+      # @param [String,Sprockets::Asset] url
+      # Tells you if a url... or asset is external.
+      # @return [nil,true,false]
+      # --
+      def external?(args)
+        return true  if args.is_a?(Url)
+        return false if args.is_a?(Sprockets::Asset)
+        return args =~ %r!^(https?:)?//! if args.is_a?(String)
+        return args[:external] if args.key?(:external)
+        args[:argv1] !~ %r!^(?\!(https?:)?//)!
+      end
+
+      # --
+      # @param [String,Hash<>,Array<>] obj the liquid to parse.
+      # Parses the Liquid that's being passed, with Jekyll's context.
+      # rubocop:disable Lint/LiteralAsCondition
+      # @return [String]
+      # --
+      def parse_liquid(obj, ctx:)
+        case true
+        when obj.is_a?(Hash) || obj.is_a?(Liquid::Tag::Parser)
+          obj.each_key.with_object(obj) do |k, o|
+            if o[k].is_a?(String)
+              then o[k] = parse_liquid(o[k], {
+                ctx: ctx,
+              })
+            end
+          end
+        when obj.is_a?(Array)
+          obj.map do |v|
+            if v.is_a?(String)
+              then v = parse_liquid(v, {
+                ctx: ctx,
+              })
+            end
+
+            v
+          end
+        else
+          ctx.registers[:site].liquid_renderer.file("(asset:var)")
+            .parse(obj).render!(ctx)
+        end
+      end
+
+      # --
+      # @param [String] path the path to strip.
+      # Strips most source paths from the given path path.
+      # rubocop:enable Lint/LiteralAsCondition
+      # @return [String]
+      # --
+      def strip_paths(path)
+        paths.map do |v|
+          if path.start_with?(v)
+            return path.sub(v + "/", "")
+          end
+        end
+
+        path
+      end
+
+      # --
+      # Lands your path inside of the cache directory.
+      # @note configurable with `caching: { path: "dir_name"` }
+      # @return [String]
+      # --
+      def in_cache_dir(*paths)
+        path = Pathutil.pwd.join(strip_slashes(asset_config[:caching][:path]))
+        Pathutil.new(paths.reduce(path.to_s) do |b, p|
+          Jekyll.sanitized_path(b, p)
+        end)
+      end
+
+      # --
+      # @note this is configurable with `:destination`
+      # Lands your path inside of the destination directory.
+      # @param [Array<String>] paths the paths.
+      # @return [String]
+      # --
+      def in_dest_dir(*paths)
+        destination = strip_slashes(asset_config[:destination])
+
+        paths.unshift(destination)
+        paths = paths.flatten.compact
+        Pathutil.new(jekyll
+          .in_dest_dir(*paths))
+      end
+
+      # --
+      # @param [String] the path.
+      # @note this should only be used for *urls*
+      # rubocop:disable Metrics/CyclomaticComplexity
+      # rubocop:disable Metrics/PerceivedComplexity
+      # rubocop:disable Metrics/AbcSize
+      # Builds a url path for HTML.
+      # @return [String]
+      # --
+      def prefix_url(user_path = nil)
+        dest = strip_slashes(asset_config[:destination])
+        cdn = make_https(strip_slashes(asset_config[:cdn][:url]))
+        base = strip_slashes(jekyll.config["baseurl"])
+        cfg = asset_config
+
+        path = []
+        path << cdn  if Jekyll.production? && cdn
+        path << base if Jekyll.dev? || !cdn || (cdn && cfg[:cdn][:baseurl])
+        path << dest if Jekyll.dev? || !cdn || (cdn && cfg[:cdn][:destination])
+        path << user_path unless user_path.nil? || user_path == ""
+
+        path = File.join(path.flatten.compact)
+        return path if cdn && Jekyll.production?
+        "/" + path
+      end
+
+      # --
+      # param [String] the content type
+      # Strips the secondary content from type.
+      # rubocop:enable Metrics/PerceivedComplexity
+      # rubocop:enable Metrics/CyclomaticComplexity
+      # rubocop:enable Metrics/AbcSize
+      # @return [String]
+      # --
+      module_function
+      def strip_secondary_content_type(str)
+        str = str.split("/")
+        raise ArgumentError, "#{str.join('/')} is invalid." if str.size > 2
+        File.join(str[0], str[1].rpartition(%r!\+!).last)
+      end
+
+      # --
+      # @param [String] path the path.
+      # Strip the start and end slashes in a path.
+      # @return [String]
+      # --
+      module_function
+      def strip_slashes(path)
+        return if path.nil? || path == ""
+        path.gsub(%r!^/|/$!, "")
+      end
+
+      # --
+      # @param [String] url the url.
+      # Make a url a proper url, and an https url.
+      # @return [String]
+      # --
+      module_function
+      def make_https(url)
+        return if url.nil? || url == ""
+        url.gsub(%r!(https?:)?//!,
+          "https://")
+      end
+
+      # --
+      # Get all the manifest files.
+      # @note this includes dynamic keys, like SourceMaps.
+      # rubocop:disable Metrics/AbcSize
+      # @return [Array<String>]
+      # --
+      module_function
+      def manifest_files(env)
+        manifest = env.manifest.data.values_at(*Manifest.keep_keys).map(&:to_a)
+        out = manifest.flatten.each_with_object([]) do |v, a|
+          path = Pathutil.new(env.in_dest_dir(v))
+          a << path.to_s + ".gz" if path.exist? && !env.skip_gzip?
+          a << path.to_s if path.exist?
+          v = Pathutil.new(v)
+
+          next if v.dirname == "."
+          v.dirname.descend.each do |vv|
+            vv = env.in_dest_dir(vv)
+            unless a.include?(vv)
+              a << vv
+            end
+          end
+        end
+
+        out
+      end
+
+      # --
+      # rubocop:enable Metrics/AbcSize
+      # Either require the file or keep moving along.
+      # @yield a block of code if the require works out.
+      # @param [String] file the file to require.
+      # @return [nil]
+      # --
+      module_function
+      def try_require(file)
+        require file
+        if block_given?
+          yield
+        end
+      rescue LoadError
+        Logger.debug "Unable to load file `#{file}'"
+      end
+
+      # --
+      # @yield a blockof code if the require works out.
+      # Either require exec.js, and the file or move along.
+      # @param [String] file the file to require.
+      # @return [nil]
+      # --
+      module_function
+      def javascript?
+        require "execjs"
+        if block_given?
+          yield
+        end
+      rescue ExecJS::RuntimeUnavailable
+        nil
+      end
+
+      # --
+      # @param [Jekyll::Site] site
+      # @param [Hash<Symbol,Object>] payload
+      # Try to replicate and run hooks the Jekyll would normally run.
+      # rubocop:disable Metrics/LineLength
+      # @return nil
+      # --
+      def run_liquid_hooks(payload, site)
+        Hook.trigger(:liquid, :pre_render) { |h| h.call(payload, site) }
+        post, page, doc = get_liquid_obj(payload, site)
+
+        # I would assume most people set in :pre_render logically?
+        Jekyll::Hooks.trigger(:posts, :pre_render, post, payload) if post
+        Jekyll::Hooks.trigger(:documents, :pre_render, post || doc, payload) if post || doc
+        Jekyll::Hooks.trigger(:pages, :pre_render, page, payload) if page
+      end
+
+      # --
+      # @param [Jekyll::Site] site
+      # @param [Hash<Symbol,Object>] payload
+      # Discovers the Jekyll object, corresponding to the type.
+      # @note this allows us to trigger hooks that Jekyll would trigger.
+      # @return [Jekyll::Document, Jekyll::Page]
+      # rubocop:disable Layout/ExtraSpacing
+      # --
+      def get_liquid_obj(payload, site)
+        path = payload["path"]
+
+        post = site.posts.docs.find { |v| v.relative_path == path }
+        docs = site. documents.find { |v| v.relative_path == path } unless post
+        page = site.     pages.find { |v| v.relative_path == path } unless docs
+
+        [
+          post,
+          page,
+          docs,
+        ]
+      end
+    end
+  end
+end

data/lib/jekyll/assets/version.rb

@@ -1,9 +1,9 @@
 # Frozen-string-literal: true
-# Copyright: 2012 - 2016 - MIT License
+# Copyright: 2012 - 2017 - MIT License
 # Encoding: utf-8
 
 module Jekyll
   module Assets
-    VERSION="2.4.0"
+    VERSION = "3.0.0"
   end
 end

data/lib/jekyll/assets/writer.rb

@@ -0,0 +1,36 @@
+# Frozen-string-literal: true
+# Copyright: 2012 - 2017 - MIT License
+# Encoding: utf-8
+
+unless Jekyll::Assets::Env.old_sprockets?
+  require "sprockets/exporters/base"
+
+  module Sprockets
+    module Exporters
+      class FileExporter < Exporters::Base
+        def skip?(logger)
+          dest = environment.in_dest_dir + "/"
+          out, pth = nil, target.sub(dest, "")
+
+          if File.exist?(target)
+            logger.debug "Skips #{pth}" do
+              out = true
+            end
+          else
+            logger.debug "Write #{pth}" do
+              out = false
+            end
+          end
+
+          out
+        end
+
+        def call
+          write target do |f|
+            f.write asset.source
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-assets
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Jordon Bedwell
@@ -10,42 +10,50 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-29 00:00:00.000000000 Z
+date: 2017-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: execjs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
-  name: sprockets
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
-    - - "<"
+        version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: fastimage
   requirement: !ruby/object:Gem::Requirement
@@ -67,95 +75,101 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: jekyll
+  name: sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "~>"
+        version: '3.3'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 4.1.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "~>"
+        version: '3.3'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 4.1.beta
 - !ruby/object:Gem::Dependency
-  name: pathutil
+  name: liquid-tag-parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: extras
+  name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '3.5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '3.5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: concurrent-ruby
+  name: jekyll-sanity
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: pathutil
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :development
+        version: '0.16'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0.16'
 - !ruby/object:Gem::Dependency
-  name: luna-rspec-formatters
+  name: extras
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
-  type: :development
+        version: '0.2'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -170,10 +184,10 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
-description: |2
-      A Jekyll plugin, that allows you to write javascript/css assets in
-      other languages such as CoffeeScript, Sass, Less and ERB, concatenate
-      them, respecting dependencies, minify and many more.
+description: |
+  A drop-in Jekyll Plugin that provides an asset pipeline for JavaScript,
+  CSS, SASS, SCSS.  Based around Sprockets (from Rails) and just as powereful
+  it provides everything you need to manage assets in Jekyll.
 email:
 - jordon@envygeeks.io
 - ixti@member.fsf.org
@@ -186,49 +200,56 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- lib/jekyll-assets.rb
 - lib/jekyll/assets.rb
-- lib/jekyll/assets/addons/autoprefixer.rb
-- lib/jekyll/assets/addons/bootstrap.rb
-- lib/jekyll/assets/addons/fontawesome.rb
-- lib/jekyll/assets/addons/javascript.rb
-- lib/jekyll/assets/cached.rb
 - lib/jekyll/assets/config.rb
+- lib/jekyll/assets/context.rb
+- lib/jekyll/assets/default.rb
+- lib/jekyll/assets/drop.rb
 - lib/jekyll/assets/env.rb
-- lib/jekyll/assets/helpers.rb
+- lib/jekyll/assets/extensible.rb
+- lib/jekyll/assets/filters.rb
 - lib/jekyll/assets/hook.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/jekyll/drops.rb
-- lib/jekyll/assets/hooks/jekyll/setup.rb
-- lib/jekyll/assets/hooks/jekyll/write.rb
-- lib/jekyll/assets/hooks/logger.rb
-- lib/jekyll/assets/hooks/sources.rb
-- lib/jekyll/assets/hooks/sprockets.rb
-- lib/jekyll/assets/hooks/version.rb
-- lib/jekyll/assets/liquid/context.rb
-- lib/jekyll/assets/liquid/drop.rb
-- lib/jekyll/assets/liquid/filters.rb
-- 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
+- lib/jekyll/assets/html.rb
 - lib/jekyll/assets/logger.rb
 - lib/jekyll/assets/manifest.rb
-- lib/jekyll/assets/patches/jekyll/cleaner.rb
-- lib/jekyll/assets/patches/jekyll/site.rb
-- lib/jekyll/assets/patches/kernel.rb
-- lib/jekyll/assets/patches/sprockets/asset.rb
-- lib/jekyll/assets/processors/less.rb
-- lib/jekyll/assets/processors/liquid.rb
-- lib/jekyll/assets/proxies/image_optim.rb
-- lib/jekyll/assets/proxies/magick.rb
+- lib/jekyll/assets/map.rb
+- lib/jekyll/assets/map/css.rb
+- lib/jekyll/assets/map/javascript.rb
+- lib/jekyll/assets/map/writer.rb
+- lib/jekyll/assets/patches/cached_env.rb
+- lib/jekyll/assets/patches/functions.rb
+- lib/jekyll/assets/patches/obsolete_files.rb
+- lib/jekyll/assets/patches/sprockets.rb
+- lib/jekyll/assets/patches/sprockets_data_uri.rb
+- lib/jekyll/assets/plugins.rb
+- lib/jekyll/assets/plugins/bootstrap.rb
+- lib/jekyll/assets/plugins/font-awesome.rb
+- lib/jekyll/assets/plugins/frontmatter.rb
+- lib/jekyll/assets/plugins/html/audio.rb
+- lib/jekyll/assets/plugins/html/css.rb
+- lib/jekyll/assets/plugins/html/defaults/audio.rb
+- lib/jekyll/assets/plugins/html/defaults/css.rb
+- lib/jekyll/assets/plugins/html/defaults/img.rb
+- lib/jekyll/assets/plugins/html/defaults/js.rb
+- lib/jekyll/assets/plugins/html/defaults/vid.rb
+- lib/jekyll/assets/plugins/html/img.rb
+- lib/jekyll/assets/plugins/html/js.rb
+- lib/jekyll/assets/plugins/html/pic.rb
+- lib/jekyll/assets/plugins/html/svg.rb
+- lib/jekyll/assets/plugins/html/vid.rb
+- lib/jekyll/assets/plugins/liquid.rb
+- lib/jekyll/assets/plugins/magick.rb
+- lib/jekyll/assets/plugins/optim.rb
+- lib/jekyll/assets/plugins/prefixer.rb
+- lib/jekyll/assets/plugins/proxy/magick.rb
+- lib/jekyll/assets/plugins/proxy/optim.rb
+- lib/jekyll/assets/plugins/searcher.rb
+- lib/jekyll/assets/proxy.rb
+- lib/jekyll/assets/tag.rb
+- lib/jekyll/assets/url.rb
+- lib/jekyll/assets/utils.rb
 - lib/jekyll/assets/version.rb
+- lib/jekyll/assets/writer.rb
 homepage: http://github.com/jekyll/jekyll-assets/
 licenses:
 - MIT