jekyll-assets 2.0.0.pre.beta2 → 2.0.0.pre.beta3

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

@@ -0,0 +1,98 @@
+require "forwardable"
+
+module Jekyll
+  module Assets
+    module Liquid
+      class Tag
+        class ProxiedAsset
+          attr_reader :args, :asset, :env
+          extend Forwardable
+
+          def_delegator :@asset, :liquid_tags
+          def_delegator :@asset, :content_type
+          def_delegator :@asset, :filename
+
+          def initialize(asset, args, env, tag)
+            @env = env
+            @asset = asset
+            @args = args
+            @tag = tag
+
+            cache_file
+            proxy_file
+          end
+
+          # -------------------------------------------------------------------
+
+          def cached?
+            @_cached
+          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
+            }"
+          end
+
+          # -------------------------------------------------------------------
+
+          def write_to(name)
+            File.binwrite(name, source)
+          end
+
+          # -------------------------------------------------------------------
+
+          private
+          def proxy_file
+            unless cached?
+              args.proxies.each do |key, val|
+                Proxies.get(key).first.fetch(:class).new(self, val).process
+              end
+            end
+          end
+
+          # -------------------------------------------------------------------
+
+          private
+          def cache_file
+            if File.file?(filename)
+              @_cached = true else @_cached = false
+              FileUtils.cp asset.filename, filename
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,122 @@
+module Jekyll
+  module Assets
+    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] }
+
+            all << {
+              :name => names.uniq,
+              :tags => tags.flatten.uniq,
+              :args => args.flatten.uniq,
+              :class  => _class
+            }
+          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.fetch(:class).is_a?(Symbol) }.map do |v|
+              v[:name]
+            end. \
+            flatten
+          end
+
+          # -------------------------------------------------------------------
+
+          def self.base_keys
+            all.select { |val| val.fetch(:class).is_a?(Symbol) }.map do |v|
+              v[:name]
+            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
+              get_by_name_and_tag_and_arg(
+                name, tag, arg
+              )
+            elsif name && tag
+              get_by_name_and_tag(
+                name, tag
+              )
+            else
+              all.select do |val|
+                val.fetch(:name).include?(name)
+              end
+            end
+          end
+
+          # -------------------------------------------------------------------
+
+          def self.get_by_name_and_tag_and_arg(name, tag, arg)
+            all.select do |val|
+              (val.fetch(:name).include?(name))   && \
+              (val.fetch(:tags).include?(:all)    || \
+                  val.fetch(:tags).include?(tag)) && \
+              (val.fetch(:args).include?( arg))
+            end
+          end
+
+          # -------------------------------------------------------------------
+
+          def self.get_by_name_and_tag(name, tag)
+            all.select do |val|
+              (val.fetch(:name).include?(name))   &&
+              (val.fetch(:tags).include?(:all)    || \
+                  val.fetch(:tags).include?(tag))
+            end
+          end
+
+          # -------------------------------------------------------------------
+
+          def self.all
+            @_all ||= Set.new
+          end
+
+          # -------------------------------------------------------------------
+
+          private
+          def self.generate_class(name, tag, &block)
+            _class = const_set(random_name, Class.new)
+            _class. class_eval(&block)
+            return _class, name, tag
+          end
+
+          # -------------------------------------------------------------------
+
+          private
+          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"
+          ]
+        end
+      end
+    end
+  end
+end

data/lib/jekyll/assets/logger.rb

@@ -1,22 +1,45 @@
 module Jekyll
   module Assets
+    class Logger
+      Prefix="Jekyll Assets:"
+      def log
+        @_log ||= Jekyll.logger
+      end
 
-    # TODO: jekyll/jekyll@upstream add support for blocks as messages...
-    # NOTE: This is a temporary class, until we can go upstream and fix
-    #   the little known fact that it doesn't accept a block for a message
-    #   it is passing on.  Until then we are holding this.
+      # -----------------------------------------------------------------------
+      # Log Level: 1
+      # -----------------------------------------------------------------------
 
-    class Logger
-      def instance
-        @logger ||= Jekyll.logger
+      def warn(msg = nil, &block)
+        log.warn(Prefix, (block_given?? block.call : msg))
       end
 
-      %W(warn error info debug).each do |k|
-        define_method k do |msg = nil, &block|
-          instance.send(k, "Jekyll Assets:", block ? block.call : msg)
-        end
+      # -----------------------------------------------------------------------
+      # Log Level: 1
+      # -----------------------------------------------------------------------
+
+      def error(msg = nil, &block)
+        log.error(Prefix, (block_given?? block.call : msg))
       end
 
+      # -----------------------------------------------------------------------
+      # Log Level: 2
+      # -----------------------------------------------------------------------
+
+      def info(msg = nil, &block)
+        log.info(Prefix, (block_given?? block.call : msg))
+      end
+
+      # -----------------------------------------------------------------------
+      # Log Level: 3
+      # -----------------------------------------------------------------------
+
+      def debug(msg = nil, &block)
+        log.debug(Prefix, (block_given?? block.call : msg))
+      end
+
+      # -----------------------------------------------------------------------
+
       def log_level=(*a)
         raise RuntimeError, "Please set log levels on Jekyll.logger"
       end

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

@@ -0,0 +1,5 @@
+class Hash
+  def fetch_or_store(key, val)
+    fetch(key, nil) || store(key, val)
+  end
+end

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

@@ -3,8 +3,8 @@ module Jekyll
     # TODO: jekyll/jekyll@upstream: This method should really have a hook ya.
     alias_method :_old_obsolete_files, :obsolete_files
     def obsolete_files
-      _old_obsolete_files.delete_if do |v|
-        v =~ %r!\A#{Regexp.escape(site.in_dest_dir("assets"))}(\/.*)?\Z!
+      _old_obsolete_files.delete_if do |path|
+        path =~ %r!\A#{Regexp.escape(site.in_dest_dir("assets"))}(\/.*)?\Z!
       end
     end
   end

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

@@ -0,0 +1,31 @@
+module Kernel
+  def has_javascript?
+    require "execjs"
+    if block_given?
+      yield
+    end
+  rescue LoadError, ExecJS::RuntimeUnavailable
+    Jekyll.logger.debug("ExecJS or JS Runtime not available." \
+      " Skipping loading of library.")
+  end
+
+  def try_require(file)
+    require file
+    if block_given?
+      yield
+    end
+  rescue LoadError
+    return nil
+  end
+
+  def try_require_if_javascript(file)
+    ["execjs", file].map(&method(:require))
+    if block_given?
+      yield
+    end
+  rescue LoadError, ExecJS::RuntimeUnavailable
+    Jekyll.logger.debug("ExecJS, JS Runtime or `#{file}' not available." \
+      " Skipping the loading of libraries.")
+    return
+  end
+end

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

@@ -1,13 +1,13 @@
 module Sprockets
   class Asset
-    def data_uri
-      "data:#{content_type};base64,#{Rack::Utils.escape \
-        Base64.encode64(to_s)}"
+    def liquid_tags
+      metadata.fetch_or_store(:liquid_tags, Set.new)
     end
 
-    def liquid_tags
-      metadata[:liquid_tags] ||= \
-        Set.new
+    # -------------------------------------------------------------------------
+
+    def data_uri
+      "data:#{content_type};base64,#{Rack::Utils.escape(Base64.encode64(to_s))}"
     end
   end
 end

data/lib/jekyll/assets/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Assets
-    VERSION="2.0.0.pre.beta2"
+    VERSION="2.0.0.pre.beta3"
   end
 end

data/lib/jekyll/hooks/initialize.rb

@@ -0,0 +1,3 @@
+Jekyll::Hooks.register :site, :post_read do |jekyll|
+  Jekyll::Assets::Env.new(jekyll)
+end

data/lib/jekyll/hooks/write_assets.rb

@@ -0,0 +1,3 @@
+Jekyll::Hooks.register :site, :post_write do |jekyll|
+  jekyll.sprockets.write_all
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-assets
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.beta2
+  version: 2.0.0.pre.beta3
 platform: ruby
 authors:
 - Jordon Bedwell
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-23 00:00:00.000000000 Z
+date: 2015-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -128,29 +128,40 @@ files:
 - 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/compass.rb
+- lib/jekyll/assets/addons/font_awesome.rb
+- lib/jekyll/assets/addons/js_es6.rb
+- lib/jekyll/assets/addons/proxies/magick.rb
 - lib/jekyll/assets/cached.rb
-- lib/jekyll/assets/configuration.rb
-- lib/jekyll/assets/context.rb
+- lib/jekyll/assets/config.rb
 - lib/jekyll/assets/env.rb
-- lib/jekyll/assets/extras/es6.rb
-- lib/jekyll/assets/extras/font-awesome.rb
-- lib/jekyll/assets/extras/helpers.rb
-- lib/jekyll/assets/extras/prefix.rb
-- lib/jekyll/assets/filters.rb
-- lib/jekyll/assets/helpers.rb
 - lib/jekyll/assets/hook.rb
-- lib/jekyll/assets/hooks/post_read.rb
-- lib/jekyll/assets/hooks/post_write.rb
+- lib/jekyll/assets/hooks/cache.rb
+- lib/jekyll/assets/hooks/compression.rb
+- lib/jekyll/assets/hooks/configuration.rb
+- lib/jekyll/assets/hooks/context_patches.rb
+- lib/jekyll/assets/hooks/disable_erb.rb
+- lib/jekyll/assets/hooks/helpers.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/filters.rb
+- lib/jekyll/assets/liquid/tag.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/logger.rb
+- lib/jekyll/assets/patches/hash.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/tag.rb
-- lib/jekyll/assets/tag/parser.rb
-- lib/jekyll/assets/tag/proxied_asset.rb
-- lib/jekyll/assets/tag/proxies.rb
-- lib/jekyll/assets/tag/proxies/magick.rb
 - lib/jekyll/assets/version.rb
+- lib/jekyll/hooks/initialize.rb
+- lib/jekyll/hooks/write_assets.rb
 homepage: http://github.com/jekyll-assets/jekyll-assets/
 licenses:
 - MIT

data/lib/jekyll/assets/configuration.rb

@@ -1,51 +0,0 @@
-module Jekyll
-  module Assets
-    module Configuration
-      DEVELOPMENT = {
-        "skip_prefix_with_cdn" => false,
-        "prefix"    => "/assets",
-        "digest"    => false,
-        "assets"    => [],
-
-        "compress"  => {
-          "css"     => false,
-          "js"      => false
-        },
-
-        "sources"   => [
-          "_assets/css", "_assets/stylesheets",
-          "_assets/images", "_assets/img", "_assets/fonts",
-          "_assets/javascripts", "_assets/js"
-        ]
-      }
-
-      PRODUCTION = DEVELOPMENT.merge({
-        "digest"    => true,
-        "compress"  => {
-          "css"     => true,
-          "js"      => true
-        },
-      })
-
-      def self.defaults
-        %W(development test).include?(Jekyll.env) ? \
-          DEVELOPMENT : PRODUCTION
-      end
-
-      def self.merge(merge_into, config = self.defaults)
-        merge_into = merge_into.dup
-        config.each_with_object(merge_into) do |(k, v), h|
-          if !h.has_key?(k) || (v.is_a?(Hash) && !h[k])
-            h[k] = v
-
-          elsif v.is_a?(Hash)
-            h[k] = merge h[k], \
-              v
-          end
-        end
-
-        merge_into
-      end
-    end
-  end
-end