jekyll-assets 2.1.3 → 2.2.0

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

@@ -5,8 +5,10 @@ module Jekyll
         module Defaults
           require_relative "defaults/image"
 
+          # ------------------------------------------------------------------
           # 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)

data/lib/jekyll/assets/liquid/tag/defaults/image.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
@@ -12,8 +14,10 @@ module Jekyll
               tag == "img" || tag == "image"
             end
 
+            # ----------------------------------------------------------------
             # TODO: In 3.0 env needs to be enforced if this is not changed,
             #   for now it's not enforced to maintain the 2.0 API.
+            # ----------------------------------------------------------------
 
             def initialize(args, asset, env = nil)
               @args = args
@@ -21,14 +25,16 @@ module Jekyll
               @env = env
             end
 
-            #
+            # ----------------------------------------------------------------
 
             def set!
               set_img_dimensions
               set_img_alt
             end
 
+            # ----------------------------------------------------------------
             # TODO: 3.0 - Remove the `!@env`
+            # ----------------------------------------------------------------
 
             private
             def set_img_alt
@@ -40,17 +46,31 @@ module Jekyll
               end
             end
 
+            # ----------------------------------------------------------------
             # TODO: 3.0 - Remove the `!@env`
+            # ----------------------------------------------------------------
 
             private
             def set_img_dimensions
-              if !@env || @env.asset_config["features"]["automatic_img_size"]
+              resize_image = @env.asset_config["features"]["automatic_img_size"]
+
+              if !@env || resize_image
                 dimensions = FastImage.new(@asset.filename).size
                 return unless dimensions
                 @args[:html] ||= {}
 
-                @args[:html][ "width"] ||= dimensions.first
-                @args[:html]["height"] ||= dimensions. last
+                if resize_image =~ /^\d+$/
+                  width  = (dimensions.first / resize_image.to_f).floor
+                  height = (dimensions. last / resize_image.to_f).floor
+
+                else
+                  width  = dimensions.first
+                  height = dimensions. last
+                end
+
+
+                @args[:html][ "width"] ||= width
+                @args[:html]["height"] ||= height
               end
             end
           end

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

@@ -1,6 +1,8 @@
+# ----------------------------------------------------------------------------
 # Frozen-string-literal: true
-# Copyright: 2012-2015 - MIT License
+# Copyright: 2012 - 2016 - MIT License
 # Encoding: utf-8
+# ----------------------------------------------------------------------------
 
 require_relative "proxies"
 require "forwardable"
@@ -9,6 +11,7 @@ module Jekyll
   module Assets
     module Liquid
 
+      # ----------------------------------------------------------------------
       # Examples:
       #   - {% tag value argument:value %}
       #   - {% tag value "argument:value" %}
@@ -16,6 +19,7 @@ module Jekyll
       #   - {% tag value argument:value\:with\:colon %}
       #   - {% tag value argument:"I can even escape \\: here too!" %}
       #   - {% tag value proxy:key:value %}
+      # ----------------------------------------------------------------------
 
       class Tag
         class Parser
@@ -30,13 +34,13 @@ module Jekyll
           def_delegator :@args, :[]=
           def_delegator :@args, :[]
 
-          #
+          # ------------------------------------------------------------------
 
           ACCEPT = {
             "css" => "text/css", "js" => "application/javascript"
           }
 
-          #
+          # ------------------------------------------------------------------
 
           class UnescapedColonError < StandardError
             def initialize
@@ -44,7 +48,7 @@ module Jekyll
             end
           end
 
-          #
+          # ------------------------------------------------------------------
 
           class UnknownProxyError < StandardError
             def initialize
@@ -52,7 +56,7 @@ module Jekyll
             end
           end
 
-          #
+          # ------------------------------------------------------------------
 
           def initialize(args, tag, processed: false, raw_args: nil)
             if processed && raw_args
@@ -72,23 +76,27 @@ module Jekyll
             end
           end
 
-          #
+          # ------------------------------------------------------------------
 
           def parse_liquid(context)
             return self unless context.is_a?(Object::Liquid::Context)
             liquid = context.registers[:site].liquid_renderer.file("(jekyll:assets)")
             out = parse_hash_liquid(to_h, liquid, context)
-            self.class.new(out, @tag, raw_args: @raw_args, \
-              processed: true)
+            self.class.new(out, @tag, {
+              :raw_args => @raw_args,
+              :processed => true
+            })
           end
 
+          # ------------------------------------------------------------------
+
           def to_html
             (self[:html] || {}).map do |key, val|
-              %{ #{key}="#{val}"}
+              %( #{key}="#{val}")
             end.join
           end
 
-          #
+          # ------------------------------------------------------------------
 
           def proxies
             keys = (args.keys - Proxies.base_keys - [:file, :html])
@@ -97,13 +105,13 @@ module Jekyll
             end
           end
 
-          #
+          # ------------------------------------------------------------------
 
           def proxies?
             proxies.any?
           end
 
-          #
+          # ------------------------------------------------------------------
 
           private
           def parse_hash_liquid(hash_, liquid, context)
@@ -114,7 +122,7 @@ module Jekyll
             end
           end
 
-          #
+          # ------------------------------------------------------------------
 
           private
           def parse_raw
@@ -131,17 +139,17 @@ module Jekyll
             end
           end
 
-          #
+          # ------------------------------------------------------------------
 
           private
           def parse_col(hash, key)
             key.push(key.delete_at(-1).gsub(/\\:/, ":"))
             return as_proxy hash, key if key.size == 3
-            return as_bool_or_html hash, key if key.size == 2
+            return as_bool_or_html hash, key if key.size == 2 || key.size == 1
             raise UnescapedColonError
           end
 
-          #
+          # ------------------------------------------------------------------
 
           private
           def as_bool_or_html(hash, key)
@@ -155,7 +163,7 @@ module Jekyll
             end
           end
 
-          #
+          # ------------------------------------------------------------------
 
           private
           def as_proxy(hash, key)
@@ -169,7 +177,7 @@ module Jekyll
             end
           end
 
-          #
+          # ------------------------------------------------------------------
 
           private
           def set_accept
@@ -181,7 +189,7 @@ module Jekyll
             end
           end
 
-          #
+          # ------------------------------------------------------------------
 
           private
           def from_shellwords

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

@@ -1,6 +1,8 @@
+# ----------------------------------------------------------------------------
 # Frozen-string-literal: true
-# Copyright: 2012-2015 - MIT License
+# Copyright: 2012 - 2016 - MIT License
 # Encoding: utf-8
+# ----------------------------------------------------------------------------
 
 require "forwardable"
 
@@ -12,9 +14,14 @@ module Jekyll
           attr_reader :args, :asset, :env
           extend Forwardable
 
+          # ------------------------------------------------------------------
+
           def_delegator :@asset, :liquid_tags
           def_delegator :@asset, :filename, :source_filename
           def_delegator :@asset, :content_type
+          def_delegator :@asset, :mtime
+
+          # ------------------------------------------------------------------
 
           def initialize(asset, args, env, tag)
             @env = env
@@ -26,56 +33,58 @@ module Jekyll
             proxy_file
           end
 
-          #
+          # ------------------------------------------------------------------
 
           def cached?
             @_cached
           end
 
-          #
+          # ------------------------------------------------------------------
+
+          def write_to(name)
+            FileUtils.mkdir_p File.dirname(name)
+            Sprockets::PathUtils.atomic_write(name) do |f|
+              f.write source
+            end
+          end
+
+          # ------------------------------------------------------------------
 
           def source
             File.binread(filename)
           end
 
-          #
+          # ------------------------------------------------------------------
 
           def filename
             env.in_cache_dir(digest_path)
           end
 
-          #
+          # ------------------------------------------------------------------
 
           def digest
             Digest::SHA2.hexdigest(args.proxies.to_s)
           end
 
+          # ------------------------------------------------------------------
           # We always digest a proxied asset so it's uniq based on what
           # proxies you give us, it would be ignorant to treat it otherwise,
           # we also make sure they are URL safe by digesting the args.
+          # ------------------------------------------------------------------
 
           def logical_path
             digest_path
           end
 
-          #
+          # ------------------------------------------------------------------
 
           def digest_path
             name = asset.logical_path
             ext  = File.extname(name)
-            "#{File.basename(name, ext)}-#{digest}#{ext}"
+            "#{name.chomp(ext)}-#{digest}#{ext}"
           end
 
-          #
-
-          def write_to(name)
-            FileUtils.mkdir_p File.dirname(name)
-            Sprockets::PathUtils.atomic_write(name) do |f|
-              f.write source
-            end
-          end
-
-          #
+          # ------------------------------------------------------------------
 
           private
           def proxy_file
@@ -86,13 +95,17 @@ module Jekyll
             end
           end
 
-          #
+          # ------------------------------------------------------------------
 
           private
           def cache_file
             @_cached = File.file?(filename)
-            FileUtils.cp asset.filename, filename unless @_cached
-            @_cached
+            return @_cached if @_cached
+
+            dir = File.dirname(filename)
+            FileUtils.mkdir_p dir unless dir == env.in_cache_dir
+            FileUtils.cp asset.filename, filename
+            true
           end
         end
       end

data/lib/jekyll/assets/liquid/tag/proxies.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
@@ -19,13 +21,13 @@ module Jekyll
             all
           end
 
-          #
+          # ------------------------------------------------------------------
 
           def self.add(name, tag, *args, &block)
             add_by_class(*generate_class(name, tag, &block), *args)
           end
 
-          #
+          # ------------------------------------------------------------------
 
           def self.keys
             all.select { |val| !val[:class].is_a?(Symbol) }.map do |val|
@@ -33,7 +35,7 @@ module Jekyll
             end.flatten
           end
 
-          #
+          # ------------------------------------------------------------------
 
           def self.base_keys
             all.select { |val| val[:class].is_a?(Symbol) }.map do |val|
@@ -41,13 +43,13 @@ module Jekyll
             end.flatten
           end
 
-          #
+          # ------------------------------------------------------------------
 
           def self.has?(name, tag = nil, arg = nil)
             get(name, tag, arg).any?
           end
 
-          #
+          # ------------------------------------------------------------------
 
           def self.get(name, tag = nil, arg = nil)
             if name && tag && arg then get_by_name_and_tag_and_arg(name, tag, arg)
@@ -61,7 +63,7 @@ module Jekyll
             end
           end
 
-          #
+          # ------------------------------------------------------------------
 
           def self.get_by_name_and_tag_and_arg(name, tag, arg)
             all.select do |val|
@@ -70,7 +72,7 @@ module Jekyll
             end
           end
 
-          #
+          # ------------------------------------------------------------------
 
           def self.get_by_name_and_tag(name, tag)
             all.select do |val|
@@ -79,33 +81,36 @@ module Jekyll
             end
           end
 
-          #
+          # ------------------------------------------------------------------
 
           def self.all
             @_all ||= Set.new
           end
 
-          #
+          # ------------------------------------------------------------------
 
-          private
+          private_class_method
           def self.generate_class(name, tag, &block)
             class_ = const_set(random_name, Class.new)
             class_.class_eval(&block)
             return class_, name, tag
           end
 
-          #
+          # ------------------------------------------------------------------
 
-          private
+          private_class_method
           def self.random_name
             (0...12).map { ("a".."z").to_a.values_at(rand(26)) }.join.capitalize
           end
 
+          # ------------------------------------------------------------------
           # TODO: Put in a better place.
+          # ------------------------------------------------------------------
+
           add_by_class :internal, :data, :all, ["@uri"]
-          add_by_class :internal, :sprockets, :all, [
-            "accept", "write_to"
-          ]
+          add_by_class :internal, :sprockets, :all, %W(
+            accept write_to
+          )
         end
       end
     end