jekyll-assets 2.0.3 → 2.1.0

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

@@ -2,8 +2,6 @@
 # Copyright: 2012-2015 - MIT License
 # Encoding: utf-8
 
-require "forwardable"
-
 module Jekyll
   module Assets
     module Liquid
@@ -61,10 +59,9 @@ module Jekyll
           #
 
           def digest_path
-            name = asset.logical_path; ext = File.extname(name)
-            "#{File.basename(name, ext)}-#{digest}#{
-              ext
-            }"
+            name = asset.logical_path
+            ext  = File.extname(name)
+            "#{File.basename(name, ext)}-#{digest}#{ext}"
           end
 
           #
@@ -88,10 +85,9 @@ module Jekyll
 
           private
           def cache_file
-            if File.file?(filename)
-              @_cached = true else @_cached = false
-              FileUtils.cp asset.filename, filename
-            end
+            @_cached = File.file?(filename)
+            FileUtils.cp asset.filename, filename unless @_cached
+            @_cached
           end
         end
       end

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

@@ -7,18 +7,16 @@ module Jekyll
     module Liquid
       class Tag
         module Proxies
-          def self.add_by_class(_class, name, tag, *args)
-            names = [name, name.to_s, name.to_sym]
-            tags  =  [tag].flatten.map { |v| [v.to_s, v, v.to_sym] }
-            args  = [args].flatten.map { |v| [v.to_s, v, v.to_sym] }
-
+          def self.add_by_class(class_, name, tag, *args)
+            proc_ = proc { |v| [v.to_s, v, v.to_sym] }
             all << {
-              :name => names.uniq,
-              :tags => tags.flatten.uniq,
-              :args => args.flatten.uniq,
-              :class  => _class
+              :name => proc_.call(name).uniq,
+              :args => [args].flatten.map(&proc_).flatten.uniq,
+              :tags => [ tag].flatten.map(&proc_).flatten.uniq,
+              :class  => class_
             }
-          all
+
+            all
           end
 
           #
@@ -32,8 +30,7 @@ module Jekyll
           def self.keys
             all.select { |val| !val[:class].is_a?(Symbol) }.map do |val|
               val[:name]
-            end. \
-            flatten
+            end.flatten
           end
 
           #
@@ -41,8 +38,7 @@ module Jekyll
           def self.base_keys
             all.select { |val| val[:class].is_a?(Symbol) }.map do |val|
               val[:name]
-            end. \
-            flatten
+            end.flatten
           end
 
           #
@@ -54,15 +50,9 @@ module Jekyll
           #
 
           def self.get(name, tag = nil, arg = nil)
-            if name && tag && arg
-              get_by_name_and_tag_and_arg(
-                name, tag, arg
-              )
-
+            if name && tag && arg then get_by_name_and_tag_and_arg(name, tag, arg)
             elsif name && tag
-              get_by_name_and_tag(
-                name, tag
-              )
+              get_by_name_and_tag(name, tag)
 
             else
               all.select do |val|
@@ -75,10 +65,8 @@ module Jekyll
 
           def self.get_by_name_and_tag_and_arg(name, tag, arg)
             all.select do |val|
-              (val[:name].include?(name))   && \
-              (val[:tags].include?(:all)    || \
-                  val[:tags].include?(tag)) && \
-              (val[:args].include?( arg))
+              val[:name].include?(name) && (val[:tags].include?(:all) || val[:tags] \
+                .include?(tag)) && val[:args].include?(arg)
             end
           end
 
@@ -86,9 +74,8 @@ module Jekyll
 
           def self.get_by_name_and_tag(name, tag)
             all.select do |val|
-              (val[:name].include?(name))   &&
-              (val[:tags].include?(:all)    || \
-                  val[:tags].include?(tag))
+              val[:name].include?(name) && (val[:tags].include?(:all) || val[:tags] \
+                .include?(tag))
             end
           end
 
@@ -102,9 +89,9 @@ module Jekyll
 
           private
           def self.generate_class(name, tag, &block)
-            _class = const_set(random_name, Class.new)
-            _class. class_eval(&block)
-            return _class, name, tag
+            class_ = const_set(random_name, Class.new)
+            class_.class_eval(&block)
+            return class_, name, tag
           end
 
           #

data/lib/jekyll/assets/logger.rb

@@ -5,7 +5,8 @@
 module Jekyll
   module Assets
     class Logger
-      Prefix="Jekyll Assets:"
+      PREFIX = "Jekyll Assets:"
+
       def log
         @_log ||= Jekyll.logger
       end
@@ -14,33 +15,33 @@ module Jekyll
 
       def warn(msg = nil, &block)
         msg = (block_given?? block.call : msg)
-        log.warn(Prefix, msg)
+        log.warn(PREFIX, msg)
       end
 
       # Log Level: 1
 
       def error(msg = nil, &block)
         msg = (block_given?? block.call : msg)
-        log.error(Prefix, msg)
+        log.error(PREFIX, msg)
       end
 
       # Log Level: 2
 
       def info(msg = nil, &block)
         msg = (block_given?? block.call : msg)
-        log.info(Prefix, msg)
+        log.info(PREFIX, msg)
       end
 
       # Log Level: 3
 
       def debug(msg = nil, &block)
         msg = (block_given?? block.call : msg)
-        log.debug(Prefix, msg)
+        log.debug(PREFIX, msg)
       end
 
       #
 
-      def log_level=(*a)
+      def log_level=(*)
         raise RuntimeError, "Please set log levels on Jekyll.logger"
       end
     end

data/lib/jekyll/assets/patches.rb

@@ -2,7 +2,7 @@
 # Copyright: 2012-2015 - MIT License
 # Encoding: utf-8
 
-require_relative "patches/jekyll/cleaner"
-require_relative "patches/sprockets/asset"
-require_relative "patches/jekyll/site"
-require_relative "patches/kernel"
+require "jekyll/assets/patches/jekyll/cleaner"
+require "jekyll/assets/patches/sprockets/asset"
+require "jekyll/assets/patches/jekyll/site"
+require "jekyll/assets/patches/kernel"

data/lib/jekyll/assets/patches/kernel.rb

@@ -3,7 +3,7 @@
 # Encoding: utf-8
 
 module Kernel
-  def has_javascript?
+  def javascript?
     require "execjs"
     if block_given?
       yield

data/lib/jekyll/assets/version.rb

@@ -4,6 +4,6 @@
 
 module Jekyll
   module Assets
-    VERSION="2.0.3"
+    VERSION="2.1.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-assets
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0
 platform: ruby
 authors:
 - Jordon Bedwell
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-23 00:00:00.000000000 Z
+date: 2015-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -69,33 +69,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :development
+        version: '2.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: envygeeks-coveralls
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: luna-rspec-formatters
   requirement: !ruby/object:Gem::Requirement
@@ -148,6 +148,7 @@ files:
 - lib/jekyll/assets/addons/compass.rb
 - lib/jekyll/assets/addons/font_awesome.rb
 - lib/jekyll/assets/addons/js_es6.rb
+- lib/jekyll/assets/addons/processors/liquid.rb
 - lib/jekyll/assets/addons/proxies/magick.rb
 - lib/jekyll/assets/cached.rb
 - lib/jekyll/assets/config.rb
@@ -160,10 +161,9 @@ files:
 - lib/jekyll/assets/hooks/context_patches.rb
 - lib/jekyll/assets/hooks/disable_erb.rb
 - lib/jekyll/assets/hooks/helpers.rb
-- lib/jekyll/assets/hooks/jekyll/asset_drops.rb
-- lib/jekyll/assets/hooks/jekyll/ignore.rb
-- lib/jekyll/assets/hooks/jekyll/initialize.rb
-- lib/jekyll/assets/hooks/jekyll/write_assets.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
@@ -204,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Assets for Jekyll

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

@@ -1,9 +0,0 @@
-# Frozen-string-literal: true
-# Copyright: 2012-2015 - MIT License
-# Encoding: utf-8
-
-Jekyll::Hooks.register :site, :after_reset do |jekyll|
-  unless jekyll.config["exclude"].grep(/\A\.asset\-cache\/?/).size > 0
-    jekyll.config["exclude"].push(".asset-cache/")
-  end
-end

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

@@ -1,7 +0,0 @@
-# Frozen-string-literal: true
-# Copyright: 2012-2015 - MIT License
-# Encoding: utf-8
-
-Jekyll::Hooks.register :site, :post_read do |jekyll|
-  Jekyll::Assets::Env.new(jekyll)
-end