jekyll-assets 1.0.0 → 2.0.0.pre.beta1

data/Rakefile

@@ -1,9 +1,3 @@
-require "bundler/gem_tasks"
-
 require "rspec/core/rake_task"
-RSpec::Core::RakeTask.new
-
-require "rubocop/rake_task"
-RuboCop::RakeTask.new
-
-task :default => [:spec, :rubocop]
+RSpec::Core::RakeTask.new(:spec)
+task :default => [:spec]

data/lib/jekyll/assets.rb

@@ -1,14 +1,20 @@
-require "jekyll/assets/patches"
-require "jekyll/assets/filters"
-require "jekyll/assets/tag"
-require "jekyll/assets/version"
+require "sprockets"
+require "sprockets/helpers"
+require "jekyll"
 
-module Jekyll
-  module Assets
-    HOOKS = []
+require_relative "assets/hook"
+require_relative "assets/helpers"
+require_relative "assets/extras/es6"
+require_relative "assets/extras/font-awesome"
+require_relative "assets/extras/helpers"
+require_relative "assets/extras/prefix"
 
-    def self.configure(&blk)
-      HOOKS << blk
-    end
-  end
-end
+require_relative "assets/env"
+require_relative "assets/patches/jekyll/cleaner"
+require_relative "assets/patches/sprockets/asset"
+require_relative "assets/patches/jekyll/site"
+
+require_relative "assets/hooks/post_read"
+require_relative "assets/hooks/post_write"
+require_relative "assets/filters"
+require_relative "assets/tag"

data/lib/jekyll/assets/cached.rb

@@ -0,0 +1,12 @@
+module Jekyll
+  module Assets
+    class Cached < Sprockets::CachedEnvironment
+      attr_reader :jekyll, :parent
+      def initialize(env)
+        @parent = env
+        @jekyll = env.jekyll
+        super env
+      end
+    end
+  end
+end

data/lib/jekyll/assets/configuration.rb

@@ -1,94 +1,50 @@
-# stdlib
-require "ostruct"
-
 module Jekyll
   module Assets
-    class Configuration
-      DEFAULTS = {
-        :dirname         => "assets",
-        :sources         => %w(_assets/javascripts
-                               _assets/stylesheets
-                               _assets/images),
-        :js_compressor   => nil,
-        :css_compressor  => nil,
-        :autosize        => false,
-        :cachebust       => :hard,
-        :cache           => false,
-        :gzip            => %w(text/css application/javascript),
-        :debug           => false,
-        :version         => 1
-      }.freeze
-
-      # rubocop:disable Metrics/AbcSize
-      def initialize(site, config = {})
-        @site = site
-        @data = OpenStruct.new DEFAULTS.merge(config)
-
-        @data.sources  = [@data.sources] if @data.sources.is_a? String
-        @data.dirname  = @data.dirname.gsub(%r{^/+|/+$}, "")
-
-        compress = OpenStruct.new @data.compress
-
-        @data.js_compressor   ||= compress.js
-        @data.css_compressor  ||= compress.css
-        @data.cache           ||= @data.cache_assets
-      end
-      # rubocop:enable Metrics/AbcSize
-
-      def baseurl
-        unless @data.baseurl
-          baseurl = "/" << [@site.config["baseurl"], @data.dirname].join("/")
-
-          # if baseurl not given - autoguess base on dirname
-          @data.baseurl = baseurl.squeeze("/")
+    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
 
-        @data.baseurl.chomp "/"
-      end
-
-      def js_compressor
-        compressor @data.js_compressor
-      end
-
-      def css_compressor
-        compressor @data.css_compressor
-      end
-
-      def cachebust
-        return :none if none?(@data.cachebust)
-        return @data.cachebust.to_sym if @data.cachebust.to_s[/^(soft|hard)$/]
-        fail "Unknown cachebust strategy: #{@data.cachebust}"
-      end
-
-      def cache_assets?
-        @data.cache ? true : false
-      end
-
-      def cache_path
-        @data.cache.is_a?(String) ? @data.cache : ".jekyll-assets-cache"
-      end
-
-      def gzip
-        return @data.gzip if @data.gzip.is_a? Array
-        @data.gzip ? DEFAULTS[:gzip] : []
-      end
-
-      def version
-        @data.version
-      end
-
-      def method_missing(name, *args, &block)
-        @data.send name, *args, &block
-      end
-
-      private
-
-      def none?(val)
-        val.to_s.empty? || "none" == val.to_s.downcase
-      end
-
-      def compressor(val)
-        none?(val) ? nil : val.to_sym
+        merge_into
       end
     end
   end

data/lib/jekyll/assets/context.rb

@@ -0,0 +1,23 @@
+module Jekyll
+  module Assets
+    class Context
+      def initialize(context)
+        patch context
+      end
+
+      def patch(what)
+        what.class_eval do
+          alias_method :_old_asset_path, :asset_path
+          def asset_path(asset, opts = {})
+            out = _old_asset_path asset
+            return unless out
+
+            environment.parent.used.add(environment.find_asset \
+              resolve(asset))
+          out
+          end
+        end
+      end
+    end
+  end
+end

data/lib/jekyll/assets/env.rb

@@ -0,0 +1,181 @@
+require_relative "logger"
+require_relative "configuration"
+require_relative "context"
+require_relative "cached"
+
+module Jekyll
+  module Assets
+    class Env < Sprockets::Environment
+      attr_reader :jekyll, :used
+      class << self
+        attr_accessor :digest_cache, :assets_cache
+        def digest_cache
+          @_digest_cache ||= \
+            {}
+        end
+      end
+
+      def initialize(path, jekyll = nil)
+        jekyll, path = path, nil if path.is_a?(Jekyll::Site)
+        @used, @jekyll = Set.new, jekyll
+        path ? super(path) : super()
+        disable_erb
+
+        jekyll.config["assets"] = Configuration.merge(asset_config)
+        private_methods(false).select { |v| v =~ %r!\Asetup_! }.map { |v| send(v) }
+        Hook.trigger :env, :post_init, self
+        jekyll.sprockets = self
+      end
+
+      def in_cache_dir(*paths)
+        cache_dir = asset_config.fetch("cache", ".asset-cache") || nil
+        jekyll.in_source_dir(
+          cache_dir, *paths
+        )
+      end
+
+      def cached_write?
+        !@used.any?
+      end
+
+      def all_assets(cached = false)
+        if !cached
+          then Set.new(@used).merge extra_assets
+          else Set.new(self.class.assets_cache).merge extra_assets
+        end
+      end
+
+      def extra_assets
+        each_logical_path(*asset_config.fetch("assets", [])).map do |v|
+          find_asset v
+        end
+      end
+
+      def cdn?() !dev? && !!asset_config["cdn"] end
+      def baseurl() jekyll.config["baseurl"] || "" end
+      def dev?() %W(development test).include? Jekyll.env end
+      def compress?(what) !!asset_config["compress"][what] end
+      def asset_config() jekyll.config["assets"] ||= {} end
+      def digest?() !!asset_config["digest"] end
+      def prefix() asset_config["prefix"] end
+
+      def prefix_path(path = "")
+        prefix = cdn? && asset_config["skip_prefix_with_cdn"] ? "" : self.prefix
+        path   = [baseurl, prefix, path]
+        if cdn? && (cdn = asset_config["cdn"])
+          File.join(cdn, *path).chomp(
+            "/"
+          )
+        else
+          File.join(*path).chomp(
+            "/"
+          )
+        end
+      end
+
+      def cached
+        Cached.new(self)
+      end
+
+      def write_all
+        if cached_write?
+          then write_cached_assets else write_assets
+        end
+      end
+
+      private
+      def write_assets(assets = self.all_assets)
+        self.class.assets_cache = assets
+        self.class.digest_cache = Hash[assets.map do |a|
+          [a.logical_path, a.digest]
+        end]
+
+        assets.each do |v|
+          v.write_to as_path v
+        end
+      end
+
+      private
+      def write_cached_assets(assets = all_assets(true))
+        assets.each do |a|
+          if !a.is_a?(Tag::ProxiedAsset)
+            viejo = self.class.digest_cache[a.logical_path]
+            nuevo = find_asset(a.logical_path).digest
+            path  = as_path a
+
+            if nuevo == viejo && File.file?(path)
+              next
+            end
+          else
+            if File.file?(a.logical_path)
+              next
+            end
+          end
+
+          self.class.digest_cache[a.logical_path] = a.digest
+          a.write_to as_path a
+        end
+      end
+
+      private
+      def as_path(v)
+        path = digest?? v.digest_path : v.logical_path
+        jekyll.in_dest_dir(File.join(prefix, path))
+      end
+
+      def disable_erb
+        self.config = hash_reassoc(config, :engines) do |h|
+          h.delete(".erb")
+        h
+        end
+      end
+
+      private
+      def setup_css_compressor
+        if compress?("css")
+          self.css_compressor = :sass
+        end
+      end
+
+      private
+      def setup_js_compressor
+        if compress?("js")
+          Helpers.try_require "uglifier" do
+            self.js_compressor = :uglify
+          end
+        end
+      end
+
+      private
+      def setup_context
+        Context.new(context_class)
+      end
+
+      private
+      def setup_version
+        self.version = Digest::MD5.hexdigest \
+          jekyll.config.fetch("assets", {}).to_s
+      end
+
+      private
+      def setup_sources
+        asset_config["sources"].each do |v|
+          append_path jekyll.in_source_dir(v)
+        end
+      end
+
+      private
+      def setup_logger
+        self.logger = Logger.new
+      end
+
+      private
+      def setup_cache
+        if cache_dir = asset_config.fetch("cache", ".asset-cache")
+          self.cache = Sprockets::Cache::FileStore.new \
+            jekyll.in_source_dir(cache_dir)
+        end
+      end
+    end
+  end
+end

data/lib/jekyll/assets/extras/es6.rb

@@ -0,0 +1,5 @@
+Jekyll::Assets::Helpers.try_require_if_javascript? "sprockets/es6" do
+  if ExecJS.runtime.is_a?(ExecJS::RubyRhinoRuntime)
+    Jekyll.logger.warn "ES6 transpiler has trouble with RubyRhino, use Node"
+  end
+end

data/lib/jekyll/assets/extras/font-awesome.rb

@@ -0,0 +1 @@
+Jekyll::Assets::Helpers.try_require "font-awesome-sass"

data/lib/jekyll/assets/extras/helpers.rb

@@ -0,0 +1,6 @@
+Jekyll::Assets::Hook.register :env, :post_init do |e|
+  Sprockets::Helpers.configure do |c|
+    c.prefix   = e.prefix_path
+    c.digest   =     e.digest?
+  end
+end

data/lib/jekyll/assets/extras/prefix.rb

@@ -0,0 +1,5 @@
+Jekyll::Assets::Helpers.try_require_if_javascript? "autoprefixer-rails" do
+  Jekyll::Assets::Hook.register :env, :post_init do |e|
+    AutoprefixerRails.install(e)
+  end
+end

data/lib/jekyll/assets/filters.rb

@@ -1,19 +1,17 @@
-# internal
-require "jekyll/assets/renderer"
-
 module Jekyll
   module Assets
     module Filters
-      %w(asset asset_path image javascript stylesheet).each do |name|
-        module_eval <<-RUBY, __FILE__, __LINE__
-        def #{name} path                    # def stylesheet logical_path
-          r = Renderer.new @context, path   #   r = Renderer.new @context, path
-          r.render_#{name}                  #   r.render_stylesheet
-        end                                 # end
-        RUBY
+      %W(js css img image javascript stylesheet style asset_path).each do |v|
+        define_method v do |path, args = ""|
+          Tag.send(:new, v, "#{path} #{args}", "").render(
+            @context
+          )
+        end
       end
     end
   end
 end
 
-Liquid::Template.register_filter Jekyll::Assets::Filters
+Liquid::Template.register_filter(
+  Jekyll::Assets::Filters
+)