jekyll-assets 2.1.3 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5dacc5765d3fcf62c0f1d871dde51646105e6cb7
-  data.tar.gz: 414d4de5d5cde91b570a59b1e7d19b962844691a
+  metadata.gz: 6232e0cf35a9ec33f5b9ac89ae3b851d5a011746
+  data.tar.gz: 9e40e80f28270152944ee1280fe19d0091718df4
 SHA512:
-  metadata.gz: 91271fb09be45bf58eeb762985518cc6998d127854cf331362015d5c60604315bd0bcf44d8c2218ca02f685537d3e8c8619757b4379a5fce02ef0e63c3a3abb9
-  data.tar.gz: 41572718d4cb1f640a53bf7162a1dc7f85eee18cc7c95ce7862280e62bfd293ab87bb3d39cff66e3f7a220736b52b47136cad3fb7d7484a02449ee6a80e4e26c
+  metadata.gz: 3b4ab0c20304eaf4675be53a0ef3971e279bc89da76131fd60a428cc9ba8df17970e94e0f65bd9c0954bb3f29d5179ecab87372e69dddf837cd3f054b5f757fb
+  data.tar.gz: 009df087377720ca2f8cb321bfadaca59051bd0543a323c2b0dcc1d62c807d84992680ba9caa0e35d660731577ed3f7b08482c91dee1dcc390c013912302336e

data/Gemfile

@@ -4,17 +4,21 @@ gemspec
 gem "rake"
 group :development do
   gem "therubyracer", :platforms => :mri, :require => false
+  gem "therubyrhino", :platforms => :jruby, :require => false
+  gem "stackprof", :platforms => :mri, :require => false
   gem "pry", :require => false
 end
 
 group :test do
   gem "codeclimate-test-reporter", :require => false
+  gem "rubocop", :github => "bbatsov/rubocop", :branch => :master, :require => false
+  gem "luna-rubocop-formatters", :require => false
 end
 
 gem "uglifier", :require => false
 gem "sprockets-es6", "~> 0.6", :require => false
 gem "autoprefixer-rails", "~> 6.0", :require => false
-gem "font-awesome-sass", "~> 4.4.0", :require => false
+gem "font-awesome-sass", "~> 4.4", :require => false
 gem "bootstrap-sass", "~> 3.3", :require => false
 gem "mini_magick", "~> 4.2", :require => false
-gem "compass-core", :require => false
+gem "less", "~> 2.6.0", :require => false

data/LICENSE

@@ -1,5 +1,5 @@
-Copyright (c) 2012-2013 Aleksey V Zapparov (http://ixti.net/)
-Copyright (c) 2015 Jordon Bedwell (https://envygeeks.io)
+Copyright (c) 2012 - 2015 Aleksey V Zapparov (http://ixti.net/)
+Copyright (c) 2015 - 2016 Jordon Bedwell (https://envygeeks.io)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,6 +1,6 @@
-[![](https://travis-ci.org/jekyll/jekyll-assets.png?branch=master)][travis]
-[![](https://codeclimate.com/github/jekyll/jekyll-assets/badges/coverage.svg)][coverage]
-[![](https://codeclimate.com/github/jekyll/jekyll-assets/badges/gpa.svg)][code-climate] [![](https://gemnasium.com/jekyll/jekyll-assets.svg)][gemnasium]
+[![Build Status](https://travis-ci.org/jekyll/jekyll-assets.svg?branch=master)][travis]
+[![Coverage Status](https://codeclimate.com/github/jekyll/jekyll-assets/badges/coverage.svg)][coverage]
+[![code-climate](https://codeclimate.com/github/jekyll/jekyll-assets/badges/gpa.svg)][code-climate] [![Dependencies Status](https://gemnasium.com/jekyll/jekyll-assets.svg)][gemnasium]
 
 [gemnasium]: https://gemnasium.com/jekyll/jekyll-assets
 [code-climate]: https://codeclimate.com/github/jekyll/jekyll-assets
@@ -10,16 +10,13 @@
 # Jekyll 3 Assets
 
 Jekyll 3 assets is an asset pipeline using Sprockets 3 to build especially
-for Jekyll 3.  It utilizes new features of both Sprockets and Jekyll to achieve
+for Jekyll 3. It utilizes new features of both Sprockets and Jekyll to achieve
 a clean and extensible assets platform for Jekyll.
 
 ## Using Jekyll Assets with Jekyll
 
-When you are using a Gemfile and bundler you need to do nothing special to get
-Jekyll Assets to work, it will automatically load itself and work with Jekyll
-when you bundle install and run Jekyll through bundle exec. However, when you
-have globally installed Gems (`gem install jekyll-assets`) then in your
-`_config.yml` do:
+Add `gem "jekyll-assets"` to your `Gemfile` and add `jekyll-assets`
+to your `_config.yml` like the following:
 
 ```yaml
 gems:
@@ -29,8 +26,8 @@ gems:
 ## Configuration
 
 A lot of our configuration transforms based on the `JEKYLL_ENV` variable
-set in your environment.  Such as digesting and whether or not to enable the
-CDN.  Some of them can be explicitly overridden but a few cannot right now.
+set in your environment. Such as digesting and whether or not to enable the
+CDN. Some of them can be explicitly overridden but a few cannot right now.
 You should set your `JEKYLL_ENV=development` on your development
 machine and `JEKYLL_ENV=production` when building to push.
 
@@ -38,12 +35,13 @@ machine and `JEKYLL_ENV=production` when building to push.
 assets:
   compress:
     css: false | true | default - development: false, production: true
-     js: false | true | default - development: false, production: true
+    js: false | true | default - development: false, production: true
   cache: false | directory | default: .asset-cache
   cdn: https://cdn.example.com
   skip_baseurl_with_cdn: false
-   skip_prefix_with_cdn: false
+  skip_prefix_with_cdn: false
   prefix: "/assets"
+  autowrite: true
   assets:
     - "*.png"
     - "bundle.css"
@@ -57,10 +55,22 @@ assets:
     - _assets/img
     - _assets/js
   features:
-    automatic_img_size: true | false | default: true
+    liquid: true | false | default: false
+    automatic_img_size: true | false | n(fixnum): 2,4,6,8 | default: true
     automatic_img_alt : true | false | default: true
 ```
 
+### Liquid Processing with your Jekyll context
+
+By default (whether `features.liquid` is true or false) we will process
+all files with the extension ".liquid", so if you give us ".scss.liquid"
+we will parse the liquid and then we will parse the SCSS and finally
+output your ".css" file.
+
+When `features.liquid` is set to true, we will process ***ALL*** files
+through Liquid, regardless of whether they have the ".liquid" extension.
+Use this at your own risk.
+
 ### Cache Folder
 
 If you plan to change the `cache` folder, please make sure to add that
@@ -70,8 +80,8 @@ and over again, `.` folders are not ignored by default.
 ### Sources
 
 The listed resources in the example are all defaults. It should be noted
-that we append your sources instead of replace our resources with yours.  So
-if you add "_assets/folder" then we will append that to our sources and
+that we append your sources instead of replace our resources with yours. So
+if you add `_assets/folder` then we will append that to our sources and
 both will work.
 
 ***NOTE: if you use our `_assets` base folder container as a base folder for
@@ -81,33 +91,32 @@ folder as the sole source (base folder.)***
 ### Digesting
 
 * Disable digesting by default in development.
-* Digest by default in production
+* Digest by default in production.
 
 ***You can force digesting with `digest: true` in your `_config.yml`***
 
 ### Compression
 
-* Requires sass and uglify.
+* Requires sass and uglifier.
 * Disable compression by default in development.
 * Enable by default in production.
 
-
 ### Bower Components
 
 Modify your `.bowerrc` file and add:
 
-```javascript
+```json
 {
   "directory": "_assets/bower"
 }
 ```
 
 And then add `_assets/bower` to your sources list and Sprockets will do the
-the rest for you... you can even `//= require bower_asset.js`.  We will even
+the rest for you... you can even `//= require bower_asset.js`. We will even
 compress them for you per normal if Sprockets supports it and allows us to.
 
 ***You do not need to modify your `.bowerrc` file, you can optionally just
-add it to your sources list and it will work that way too!  As long as it's in
+add it to your sources list and it will work that way too! As long as it's in
 your Jekyll folder.***
 
 ## Tags
@@ -137,7 +146,7 @@ your Jekyll folder.***
 Lets say we have `sprockets` proxies and sprockets allows you to proxy accept,
 if you send `{% img src sprockets:accept:image/gif }` then Sprockets find_asset
 will get `{ :accept => "image/gif" }` but if you try to proxy "unknown" on
-sprockets we will raise a Proxy error.  For more information then look at
+sprockets we will raise a Proxy error. For more information then look at
 `parser_spec.rb` in the spec folder because it literally lays out the ground
 rules for our tags as a specification.
 
@@ -230,18 +239,21 @@ end
 
 ***Our currently supported helpers are:***
 
+* asset_url
 * asset_path
 * image_path
 * font_path
+* image_url
+* font_url
 
 ## Addons
 
 * CSS Auto Prefixer - add "autoprefixer-rails" to your Gemfile.
 * ES6 Transpiler (through Babel) - add "sprockets-es6" to your Gemfile.
-* Image Magick - add "mini_magick"  to your Gemfile, only works with `img`, `image`.
+* Image Magick - add "mini_magick" to your Gemfile, only works with `img`, `image`.
 * Bootstrap - add "bootstrap-sass" to your Gemfile and "@import 'bootstrap'"
-* Compass - add "compass-core" to your Gemfile and "@import 'compass'"
 * 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 --
 `therubyrhino` so you would probably be best to just use Node.js or io.js at
@@ -253,6 +265,7 @@ that point rather than trying to fight it.***
 * `magick:format:<value>`
 * `magick:quality:<value>`
 * `magick:rotate:<value>`
+* `magick:gravity:<value>`
 * `magick:crop:<value>`
 * `magick:flip:<value>`
 * `magick:quadruple`, `magick:4x`
@@ -263,12 +276,6 @@ that point rather than trying to fight it.***
 * `magick:one-fourth`, `magick:1/4`
 * `magick:half`, `magick:1/2`
 
-## Plugins where did they go?
-
-They're dead, in the way that they were, use Hooks, they require less
-patching and give more flexibility to us because we can trigger them every
-time we have a new environment not just occasionally.
-
 ## Having trouble with our documentation?
 
 If you do not understand something in our documentation please feel

data/Rakefile

@@ -1,43 +1,4 @@
+require "luna/rubocop/rake/task"
 require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
 task :default => [:spec]
-
-task :analysis do
-  require "open3"
-  begin require "jekyll/utils/ansi"
-  rescue LoadError
-    require_relative "spec/support/ansi"
-  end
-
-  cmd = [
-    "docker", "run", "--rm", "--env=CODE_PATH=#{Dir.pwd}", \
-    "--volume='#{Dir.pwd}:/code'", "--volume=/var/run/docker.sock:/var/run/docker.sock", \
-    "--volume=/tmp/cc:/tmp/cc", "-i", "codeclimate/codeclimate", "analyze"
-  ]
-
-  ansi = Jekyll::Utils::Ansi
-  file = File.open(".analysis", "w+")
-  Open3.popen3(cmd.shelljoin) do |_, out, err, _|
-    while data = out.gets
-      file.write data
-      if data =~ /\A==/
-        $stdout.print ansi.yellow(data)
-
-      elsif data !~ %r!\A[0-9\-]+!
-        $stdout.puts data
-
-      else
-        h, d = data.split(":", 2)
-        $stdout.print ansi.cyan(h)
-        $stdout.print ":", d
-      end
-    end
-
-    while data = err.gets
-      file.write data
-      $stderr.print ansi.red(data)
-    end
-  end
-
-  file.close
-end

data/lib/jekyll-assets.rb

@@ -1,5 +1,7 @@
+# ----------------------------------------------------------------------------
 # Frozen-string-literal: true
-# Copyright: 2012-2015 - MIT License
+# Copyright: 2012 - 2016 - MIT License
 # Encoding: utf-8
+# ----------------------------------------------------------------------------
 
 require "jekyll/assets"

data/lib/jekyll/assets.rb

@@ -1,22 +1,24 @@
+# ----------------------------------------------------------------------------
 # Frozen-string-literal: true
-# Copyright: 2012-2015 - MIT License
+# Copyright: 2012 - 2016 - MIT License
 # Encoding: utf-8
+# ----------------------------------------------------------------------------
 
-require "tilt"
 require "sprockets"
+require "extras/all"
+require "pathutil"
 require "jekyll"
 
-module Jekyll
-  module Assets
-    require_relative "assets/version"
-    require_relative "assets/patches"
-    require_relative "assets/cached"
-    require_relative "assets/config"
-    require_relative "assets/env"
-    require_relative "assets/hook"
-    require_relative "assets/logger"
-    require_relative "assets/hooks"
-    require_relative "assets/liquid"
-    require_relative "assets/addons"
-  end
-end
+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"

data/lib/jekyll/assets/addons.rb

@@ -1,11 +1,5 @@
-# Frozen-string-literal: true
-# Copyright: 2012-2015 - MIT License
-# Encoding: utf-8
-
-require_relative "addons/compass"
+require_relative "addons/less"
 require_relative "addons/bootstrap"
 require_relative "addons/autoprefixer"
-require_relative "addons/processors/liquid"
-require_relative "addons/proxies/magick"
-require_relative "addons/font_awesome"
-require_relative "addons/js_es6"
+require_relative "addons/fontawesome"
+require_relative "addons/javascript"

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

@@ -1,9 +1,13 @@
+# ----------------------------------------------------------------------------
 # Frozen-string-literal: true
-# Copyright: 2012-2015 - MIT License
+# Copyright: 2012 - 2016 - MIT License
 # Encoding: utf-8
+# ----------------------------------------------------------------------------
 
 try_require_if_javascript "autoprefixer-rails" do
   Jekyll::Assets::Hook.register :env, :init do |env|
-    AutoprefixerRails.install(env)
+    AutoprefixerRails.install(env, env.asset_config[
+      "autoprefixer"
+    ])
   end
 end

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

@@ -1,5 +1,7 @@
+# ----------------------------------------------------------------------------
 # Frozen-string-literal: true
-# Copyright: 2012-2015 - MIT License
+# Copyright: 2012 - 2016 - MIT License
 # Encoding: utf-8
+# ----------------------------------------------------------------------------
 
 try_require "bootstrap-sass"

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

@@ -0,0 +1,7 @@
+# ----------------------------------------------------------------------------
+# Frozen-string-literal: true
+# Copyright: 2012 - 2016 - MIT License
+# Encoding: utf-8
+# ----------------------------------------------------------------------------
+
+try_require "font-awesome-sass"

data/lib/jekyll/assets/addons/{js_es6.rb → javascript.rb}

@@ -1,6 +1,8 @@
+# ----------------------------------------------------------------------------
 # Frozen-string-literal: true
-# Copyright: 2012-2015 - MIT License
+# Copyright: 2012 - 2016 - MIT License
 # Encoding: utf-8
+# ----------------------------------------------------------------------------
 
 try_require_if_javascript "sprockets/es6" do
   if ExecJS.runtime.is_a?(ExecJS::RubyRhinoRuntime)

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

@@ -0,0 +1,9 @@
+# ----------------------------------------------------------------------------
+# Frozen-string-literal: true
+# Copyright: 2012 - 2016 - MIT License
+# Encoding: utf-8
+# ----------------------------------------------------------------------------
+
+try_require_if_javascript(
+  "jekyll/assets/processors/less"
+)

data/lib/jekyll/assets/cached.rb

@@ -1,16 +1,27 @@
+# ----------------------------------------------------------------------------
 # Frozen-string-literal: true
-# Copyright: 2012-2015 - MIT License
+# Copyright: 2012 - 2016 - MIT License
 # Encoding: utf-8
+# ----------------------------------------------------------------------------
 
 module Jekyll
   module Assets
     class Cached < Sprockets::CachedEnvironment
-      attr_reader :jekyll, :parent
+      attr_reader :jekyll
+      attr_reader :parent
+
+      # ----------------------------------------------------------------------
+
       def initialize(env)
         @parent = env
         @jekyll = env.jekyll
+        @resolve_cache = {}
         super env
       end
+
+      def resolve(*args)
+        @resolve_cache[args] ||= super
+      end
     end
   end
 end

data/lib/jekyll/assets/config.rb

@@ -1,6 +1,8 @@
+# ----------------------------------------------------------------------------
 # Frozen-string-literal: true
-# Copyright: 2012-2015 - MIT License
+# Copyright: 2012 - 2016 - MIT License
 # Encoding: utf-8
+# ----------------------------------------------------------------------------
 
 module Jekyll
   module Assets
@@ -11,12 +13,15 @@ module Jekyll
         _assets/javascripts _assets/js
       ).freeze
 
+      # ----------------------------------------------------------------------
+
       Development = {
         "skip_baseurl_with_cdn" => false,
         "skip_prefix_with_cdn"  => false,
         "prefix"    => "/assets",
         "digest"    => false,
         "assets"    => [],
+        "autowrite" => true,
 
         "compress"  => {
           "css"     => false,
@@ -25,11 +30,12 @@ module Jekyll
 
         "features" => {
           "automatic_img_alt"  => true,
-          "automatic_img_size" => true
+          "automatic_img_size" => true,
+          "liquid" => false
         }
       }.freeze
 
-      #
+      # ----------------------------------------------------------------------
 
       Production = Development.merge({
         "digest"    => true,
@@ -39,25 +45,29 @@ module Jekyll
         }
       }).freeze
 
-      #
+      # ----------------------------------------------------------------------
 
-      def self.merge_sources(jekyll, config)
-        config["sources"] ||= []
-        return if config["sources"].grep(/\A\s*_assets\/?\s*\Z/).size > 0
-        sources = DefaultSources + config["sources"].to_a
+      def self.merge_sources(jekyll, config) config["sources"] ||= []
+        if !config["sources"].grep(/\A\s*_assets\/?\s*\Z/).empty?
+          return
 
-        config["sources"] = Set.new(sources.map do |val|
-          jekyll.in_source_dir(val)
-        end)
+        else
+          sources = DefaultSources + config["sources"].to_a
+          config["sources"] = Set.new(sources.map do |val|
+            jekyll.in_source_dir(val)
+          end)
+        end
       end
 
-      #
+      # ----------------------------------------------------------------------
 
       def self.defaults
-        %W(development test).include?(Jekyll.env) ? Development : Production
+        if %W(development test).include?(Jekyll.env)
+          then Development else Production
+        end
       end
 
-      #
+      # ----------------------------------------------------------------------
 
       def self.merge(new_hash, old_hash = defaults)
         old_hash.merge(new_hash) do |_, old_val, new_val|