jekyll-assets 0.5.4 → 0.6.0

data/HISTORY.md

@@ -1,3 +1,11 @@
+### 0.6.0 (2013-07-14)
+
+* Remove `type` attributes from tags genereated by `javascript` and
+  `stylesheet` helpers. See #37.
+* Fix issue with nested assets not being regenerated when cache enabled.
+  See #35.
+
+
 ### 0.5.4 (2103-07-07)
 
 * Rename configuration options `compress.js` and `compress.css` into

data/README.md

@@ -151,13 +151,13 @@ case just install `uglifier` gem and add following lines into your `config.yml`:
 
 ``` yaml
 assets:
-  compress:
-    js:   uglifier
-    css:  sass
+  js_compressor:  uglifier
+  css_compressor: sass
 ```
 
 If you want to use YUI compressor for minification, install `yui-compressor`
 gem and put `yui` in place of `uglifier` and/or `sass` in the config file.
+You can also define and use your own compressor, see "Custom Compressors".
 
 Let's go crazy now! Assume you want your blog's `body` background color to be
 white all the time, but red if you compiled your web-site in December. Just add
@@ -210,6 +210,30 @@ assets:
 [amazon-s3]: http://aws.amazon.com/s3
 
 
+### Custom Compressors
+
+Sprockets comes with good set of preconfigured compressors, but imagine you are
+not satisfied with default settings. For example you want to strip all comments
+but copyrights info. In this csae you can define and use your own compressor.
+
+To do so, first let's define new compressor in `_plugins/ext.rb`:
+
+``` ruby
+require "jekyll-assets"
+require "sprockets"
+
+Sprockets.register_compressor 'application/javascript',
+  :my_uglifier, Uglifier.new(:comments => :copyright)
+```
+
+Once it's done, just tell assets to use `my_uglifier` as js compressor:
+
+``` yaml
+assets:
+  js_compressor: my_uglifier
+```
+
+
 ### Compilation Cache
 
 To improve build time, you can enabled compiled assets cache:

data/lib/jekyll/assets_plugin/patches/asset_patch.rb

@@ -0,0 +1,20 @@
+# 3rd-party
+require "sprockets"
+
+
+module Jekyll
+  module AssetsPlugin
+    module Patches
+      module AssetPatch
+
+        def jekyll_assets
+          []
+        end
+
+      end
+    end
+  end
+end
+
+
+Sprockets::Asset.send :include, Jekyll::AssetsPlugin::Patches::AssetPatch

data/lib/jekyll/assets_plugin/patches/bundled_asset_patch.rb

@@ -0,0 +1,20 @@
+# 3rd-party
+require "sprockets"
+
+
+module Jekyll
+  module AssetsPlugin
+    module Patches
+      module BundledAssetPatch
+
+        def jekyll_assets
+          @processed_asset.jekyll_assets
+        end
+
+      end
+    end
+  end
+end
+
+
+Sprockets::BundledAsset.send :include, Jekyll::AssetsPlugin::Patches::BundledAssetPatch

data/lib/jekyll/assets_plugin/patches/context_patch.rb

@@ -1,3 +1,7 @@
+# stdlib
+require "set"
+
+
 module Jekyll
   module AssetsPlugin
     module Patches
@@ -8,8 +12,16 @@ module Jekyll
         end
 
 
-        def asset_path *args
-          site.asset_path(*args)
+        def _jekyll_assets
+          @_jekyll_assets ||= Set.new
+        end
+
+
+        def asset_path path, *args
+          _jekyll_assets << resolve(path).to_s
+          site.asset_path path, *args
+        rescue Sprockets::FileNotFound
+          raise Environment::AssetNotFound, path
         end
 
       end

data/lib/jekyll/assets_plugin/patches/index_patch.rb

@@ -9,16 +9,16 @@ module Jekyll
 
         def self.included base
           base.class_eval do
-            alias_method :find_asset_without_jekyll, :find_asset
-            alias_method :find_asset, :find_asset_with_jekyll
+            alias_method :__orig_find_asset, :find_asset
+            alias_method :find_asset, :__wrap_find_asset
           end
         end
 
 
-        def find_asset_with_jekyll path, options = {}
-          asset = find_asset_without_jekyll path, options
-          @environment.site.bundle_asset! asset if asset and options[:bundle]
-          asset
+        def __wrap_find_asset path, options = {}
+          __orig_find_asset(path, options).tap do |asset|
+            @environment.site.bundle_asset! asset if asset and options[:bundle]
+          end
         end
 
       end

data/lib/jekyll/assets_plugin/patches/processed_asset_patch.rb

@@ -0,0 +1,59 @@
+# stdlib
+require "set"
+
+
+# 3rd-party
+require "sprockets"
+
+
+module Jekyll
+  module AssetsPlugin
+    module Patches
+      module ProcessedAssetPatch
+
+        def self.included base
+          base.class_eval do
+            attr_reader :jekyll_assets
+
+            alias_method :__orig_build_dependency_paths, :build_dependency_paths
+            alias_method :build_dependency_paths, :__wrap_build_dependency_paths
+
+            alias_method :__orig_init_with, :init_with
+            alias_method :init_with, :__wrap_init_with
+
+            alias_method :__orig_encode_with, :encode_with
+            alias_method :encode_with, :__wrap_encode_with
+          end
+        end
+
+
+        def __wrap_build_dependency_paths environment, context
+          @jekyll_assets = Set.new
+
+          context._jekyll_assets.each do |path|
+            @jekyll_assets << path
+            environment.find_asset(path).jekyll_assets.each{ |p| @jekyll_assets << p }
+          end
+
+          __orig_build_dependency_paths environment, context
+        end
+
+
+        def __wrap_init_with environment, coder
+          __orig_init_with environment, coder
+          @jekyll_assets = Set.new coder["jekyll_assets"].map{ |p| expand_root_path(p) }
+        end
+
+
+        def __wrap_encode_with coder
+          __orig_encode_with coder
+          coder["jekyll_assets"] = jekyll_assets.map{ |p| relativize_root_path p }
+        end
+
+      end
+    end
+  end
+end
+
+
+Sprockets::ProcessedAsset.send :include, Jekyll::AssetsPlugin::Patches::ProcessedAssetPatch

data/lib/jekyll/assets_plugin/patches/site_patch.rb

@@ -15,8 +15,8 @@ module Jekyll
 
         def self.included base
           base.class_eval do
-            alias_method :write_without_assets, :write
-            alias_method :write, :write_with_assets
+            alias_method :__orig_write, :write
+            alias_method :write, :__wrap_write
           end
         end
 
@@ -61,15 +61,17 @@ module Jekyll
           if not asset_files.include? asset
             file = AssetFile.new self, asset
 
+            asset.jekyll_assets.each{ |path| bundle_asset! assets[path] }
+
             asset_files   << file
             static_files  << file
           end
         end
 
 
-        def write_with_assets
+        def __wrap_write
           static_files.push(*asset_files).uniq!
-          write_without_assets
+          __orig_write
         end
 
       end

data/lib/jekyll/assets_plugin/renderer.rb

@@ -2,8 +2,8 @@ module Jekyll
   module AssetsPlugin
     class Renderer
 
-      STYLESHEET = '<link rel="stylesheet" type="text/css" href="%s">'
-      JAVASCRIPT = '<script type="text/javascript" src="%s"></script>'
+      STYLESHEET = '<link rel="stylesheet" href="%s">'
+      JAVASCRIPT = '<script src="%s"></script>'
 
 
       def initialize context, logical_path

data/lib/jekyll/assets_plugin/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module AssetsPlugin
-    VERSION = "0.5.4"
+    VERSION = "0.6.0"
   end
 end

data/spec/lib/jekyll/assets_plugin/patches/site_patch_spec.rb

@@ -131,11 +131,31 @@ module Jekyll::AssetsPlugin
 
       it "should regenerate assets upon multiple #process" do
         @site.assets_config.cachebust = :none
-        2.times { @site.process }
-
+        2.times{ @site.process }
         @dest.join("assets", "app.css").exist?.should be_true
       end
 
+
+      context "with cache" do
+        def site
+          Jekyll::Site.new(Jekyll.configuration({
+            "source"      => fixtures_path.to_s,
+            "assets"      => { "cache" => true, "cachebust" => :none },
+            "destination" => @dest.to_s
+          }))
+        end
+
+        after do
+          site.assets.cache_path.rmtree if site.assets.cache_path.exist?
+        end
+
+        it "should regenerate static assets upon multiple #process" do
+          2.times{ site.process }
+          @dest.join("assets", "noise.png").exist?.should be_true
+        end
+      end
+
+
       context "#gzip" do
         subject { site.assets_config }
 

data/spec/spec_helper.rb

@@ -26,6 +26,8 @@ RSpec.configure do |config|
   config.include Jekyll::AssetsPlugin::RSpecHelpers
 
   config.before(:all) do
+    Jekyll.logger.log_level = Jekyll::Stevenson::WARN
+
     @dest = fixtures_path.join("_site")
     @site = Jekyll::Site.new(Jekyll.configuration({
       "source"      => fixtures_path.to_s,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-assets
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-07 00:00:00.000000000 Z
+date: 2013-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -185,8 +185,11 @@ files:
 - lib/jekyll/assets_plugin/environment.rb
 - lib/jekyll/assets_plugin/filters.rb
 - lib/jekyll/assets_plugin/patches.rb
+- lib/jekyll/assets_plugin/patches/asset_patch.rb
+- lib/jekyll/assets_plugin/patches/bundled_asset_patch.rb
 - lib/jekyll/assets_plugin/patches/context_patch.rb
 - lib/jekyll/assets_plugin/patches/index_patch.rb
+- lib/jekyll/assets_plugin/patches/processed_asset_patch.rb
 - lib/jekyll/assets_plugin/patches/site_patch.rb
 - lib/jekyll/assets_plugin/renderer.rb
 - lib/jekyll/assets_plugin/tag.rb
@@ -242,7 +245,7 @@ rubyforge_project:
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: jekyll-assets-0.5.4
+summary: jekyll-assets-0.6.0
 test_files:
 - spec/fixtures/.gitignore
 - spec/fixtures/_assets/app.css.erb